0 files changed, 0 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 5d4ce997d6..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,26 +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
-xml-i18n-*
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 832444b195..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,84 +0,0 @@
-Evolution was written by:
-
-Addressbook
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
-	Nat Friedman <nat@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Chris Toshok <toshok@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-
-Artwork
-	Tuomas Kuosmanen <tigert@ximian.com>
-	Jakub Steiner <jimmac@ximian.com>
-
-Calendar
-	Seth Alves <seth@ximian.com>
-	Eric Busboom <eric@softwarestudio.org> (libical author)
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
-	Damon Chaplin <damon@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Rodrigo Moya <rodrigo@ximian.com>
-	Jesse Pavel <jesse@ximian.com>
-	JP Rosevear <jpr@ximian.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <mrproper@ximian.com>
-	Aaron Weber <aaron@ximian.com>
-
-Mailer
-	Radek Doulik <rodo@ximian.com>
-	Larry Ewing <lewing@ximian.com>
-	Bertrand Guiheneuf <bertrand@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Matt Loper <matt@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-	Jeff Stedfast <fejj@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-	Peter Williams <peterw@ximian.com>
-	Dan Winship <danw@ximian.com>
-	Michael Zucchi <notzed@ximian.com>
-
-Notes
-	Anders Carlsson <andersca@gnu.org>
-
-Pilot
-	JP Rosevear <jpr@ximian.com>
-
-Shell
-	Miguel de Icaza <miguel@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Ettore Perazzoli <ettore@ximian.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>
-	Gediminas Paulauskas <menesis@delfi.lt>
-	GNOME PL Team <translators@gnome.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>
-	Kjartan Maraas <kmaraas@gnome.org>
-	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>
-
-UI
-	Anna Dirks <anna@ximian.com>
-
-Widgets
-	Damon Chaplin <damon@ximian.com>
-	Miguel de Icaza <miguel@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Chris Toshok <toshok@ximian.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/COPYING-DOCS b/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/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/ChangeLog b/ChangeLog
deleted file mode 100644
index 26cde14aa9..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,7667 +0,0 @@
-2002-05-14  Dan Winship  <danw@ximian.com>
-
-	* data/evolution.1: Document "evolution default:mail"
-
-2002-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Add an explanation/warning about why we want Berkeley DB
-	3.1.17 and nothing else.
-
-2002-04-28  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (EVO_CHECK_LIB): Bumped the required version number
-	of gal to 0.19.99.15.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't generate libibex/Makefile anymore.
-
-	* Makefile.am: Removed libibex from SUBDIRS.
-
-	* tools/Makefile.am: Don't link with libibex.
-
-	* tests/Makefile.am: Same here.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.19.99.14.
-
-2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.19.99.13.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.12.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.11.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for gethostbyaddr_r
-
-2002-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for socklen_t and if it doesn't exist,
-	define it as unsigned int.
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Fix static linking on solaris which doesn't have a
-	static libresolv.
-
-2002-04-01  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (newStrItem): only include if USE_STRTBL is
-	defined.
-	(deleteStrItem): same.
-	(hashStr): same.
-	(lookupStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just dup the string.
-	(unUseStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just free the string.
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	Darwin/OS X portability from Max Horn <max@quendi.de>
-
-	* libversit/vcc.y: Remove #include <malloc.h>.
-
-	* libversit/vobject.c: Likewise, and #include <stdlib.h>
-
-2002-03-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add argument `--enable-shlib-components'.  New
-	substitutions OAF_SHLIB_LOCATION, OAF_SHLIB_PREFIX,
-	OAF_SHLIB_SUFFIX.
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for GConf.  Add gthreads to LIBIBEX_CFLAGS
-	and LIBIBEX_LIBS.
-
-2002-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.19.99.10.
-
-2002-03-24  Peter Williams  <peterw@ximian.com>
-
-	* tools/killev: Change the OAFIID for the GtkHTML editor to
-	have :1.1 at the end.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD):
-	s/libversit.la/libversit.a/
-
-2002-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_ADDRESSBOOK_DEPS): add gal.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Allow the user to enable OpenSSL over Mozilla NSS
-	using --enable-openssl or --disable-nss.
-
-2002-02-24  jacob berkman  <jacob@ximian.com>
-
-	* sounds/Makefile.am (EXTRA_DIST): add $(sounds_DATA)
-
-2002-02-22  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: add libglade the to the E_UTIL flags.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-02-12  T�ivo Leedj�rv  <leedjarv@interest.ee>
-
-	* configure.in: Added et to ALL_LINGUAS.
-
-2002-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure PISOCK cflags are added where
-	appropriate
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (SUBDIRS): added sounds.
-
-	* configure.in (AC_OUTPUT): added sounds/Makefile.
-
-	* sounds/Makefile.am: new file.
-	* sounds/default_alarm.wav: default alarm sound, currently only used
-	when vCalendar files are imported with audio alarms. We need a better
-	sound.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-01-28  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: added bonobo to filter flags to avoid compile
-	error
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Use GNOME_FULL_LIBS and GNOME_FULL_CFLAGS.
-
-	* configure.in: Define the CAMEL_{CFLAGS,LIBS} using
-	EVO_SET_COMPILE_FLAGS.  Likewise define E_UTIL_{CFLAGS,LIBS},
-	E_NAME_{CFLAGS,LIBS}, SHELL_{CFLAGS,LIBS},
-	IMPORTERS_{CFLAGS,LIBS}, WOMBAT_{CFLAGS,LIBS} and
-	E_WIDGETS_{CFLAGS,LIBS}, LIBFILTER_{CFLAGS,LIBS}.  Remove
-	GAL_{LIBS,CFLAGS}.  Add GNOME_FULL_{CFLAGS,LIBS}.  Also, move all
-	this stuff after OpenSSL check so they benefit from all the
-	cflags/ldflags discoveries for the support libraries.
-
-2002-01-25  Ettore Perazzoli  <ettore@ximian.com>
- 
-	* configure.in: Require gal 0.19.99.1.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define a new macro EVO_SET_COMPILE_FLAGS.  Define
-	EVOLUTION_ADDRESSBOOK_CFLAGS, EVOLUTION_ADDRESSBOOK_LIBS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS, EVOLUTION_SUMMARY_LIBS,
-	EVOLUTION_SUMMARY_CFLAGS, EVOLUTION_CALENDAR_LIBS,
-	EVOLUTION_CALENDAR_CFLAGS, EVOLUTION_CALENDAR_CONDUIT_LIBS,
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS through it.  Remove SOUP_CFLAGS
-	and SOUP_LIBS.
-
-2002-01-15  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Add a check for libsoup. Define SOUP_CFLAGS and 
-	SOUP_LIBS
-
-	* README: Update to include the SOUP dependancy.
-
-2002-01-04  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-        * configure.in: Added "eu" to ALL_LINGUAS
-
-2001-12-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in (camel_providerdir): Define this here, using only
-	EVOLUTION_MAJOR_VERSION and EVOLUTION_MINOR_VERSION (and not MICRO
-	and NANO).
-
-2001-12-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: check for alloca.h.
-
-2001-12-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16358, No man page for Evolution.]
-
-	* data/Makefile.am (man_MANS): Install the man page.
-
-	* data/evolution.1: New man page for Evolution.
-
-2001-12-10  JP Rosevear  <jpr@ximian.com>
- 
-	* configure.in: use UTF-8 as the char set when testing pilot link
- 
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (_Name): "Ximian Evolution", not
-	"Evolution".
-
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up VERSION to 1.1.0.99.
-
-2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
-	string that will be appended to the X-Mailer header.
-
-2001-11-21  Jeffrey Stedfast  <fejj@ximian.com>
- 
-	* README: Updated. Don't say that the user needs to copy their
-	mozilla database files into ~/evolution, since Evolution now
-	builds it's own default database files if they don't exist and
-	also remove instructions for building with OpenSSL.
- 
-	* acconfig.h: Remove HAVE_OPENSSL define
- 
-	* configure.in: Remove checks for OpenSSL libraries.
- 
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked 
-	against gettext 0.10.40 and 0.10.35 without any problem. 
-	Please contact me if anyone wants to disable it (AGAIN).
-
-2001-11-19  Abel Cheung  <maddog@linuxhall.org>
-
-	* configure.in: I will keep adding zh_TW to ALL_LINGUAS before
-	  somebody is willing to tell me why it is deleted without
-	  reason. It was checked against newest gettext (0.10.40) and
-	  older gettext (0.10.35) without any problem. A few
-	  translations are not removed from ALL_LINGUAS even though
-	  they failed in msgfmt checking.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated.
-
-	* configure.in: 0.99.2.  Require gtkhtml 0.16.1 and GAL 0.18.1.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Redone with the bug #s from Bugzilla.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS: Calendar/tasks NEWS.
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: restore cflags and ldflags properly
-
-2001-11-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: save the ldflags properly
-
-2001-11-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check to make sure pilot-link has the charset
-	conversion stuff enabled
-
-2001-11-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/killev: Chop the output from `uname -s'.  Thanks to
-	Michael Gerdts for suggesting the fix.
-
-2001-11-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Re-added zh_TW to ALL_LINGUAS. Translator keep
-	  complaining to me, and waste a month before discovering it was
-	  disabled while I know nothing about it. Please at least complain
-	  to me if it's gettext problem.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up to 0.99.1 for snapshot purposes.
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Upgrade version number to 0.99.0.  Require GtkHTML
-	0.16 and GAL 0.18.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Small update
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (Icon): evolution.png instead of
-	evolution-icon.png.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version to 0.17.100.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS (Conduits): update
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to MAILER_CFLAGS and MAILER_LIBS too.
-
-2001-10-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mailer): Updated mailer NEWS.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): My mailer news.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_VFS_GNOME_CFLAGS too.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_GNOME_LIBS,
-	BONOBO_GNOME_CFLAGS, BONOBO_HTML_GNOME_LIBS,
-	BONOBO_HTML_GNOME_CFLAGS.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Require GAL version 0.15.99.10.  I know you all
-	love this.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.2
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (ALL_LINGUAS): added en_AU (copied en_GB).
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.15.99.9.
-
-2001-10-30  <notzed@ximian.com>
-
-	* configure.in: Move the configure version number check down
-	a bit for gtkhtml/gal, c'ause i'm sick of fixing a manual
-	patch i have every bloody time the version changes.
-
-2001-10-29  Joe Shaw  <joe@ximian.com>
-
-	* configure.in: Require gal 0.15.99.8
-
-	* addressbook/backend/ebook/e-card-simple.c,
-	addressbook/gui/component/addressbook-storage.c,
-	addressbook/gui/widgets/e-addressbook-view.c,
-	calendar/gui/e-calendar-table.c,
-	calendar/gui/e-itip-control.c,
-	calendar/gui/e-meeting-model.c,
-	calendar/gui/itip-utils.c,
-	calendar/gui/print.c,
-	calendar/gui/alarm-notify/alarm-notify-dialog.c,
-	filter/rule-editor.c,
-	mail/mail-config.c,
-	mail/mail-folder-cache.c,
-	mail/mail-format.c,
-	mail/mail-local.c,
-	mail/mail-ops.c,
-	mail/mail-vfolder.c,
-	shell/e-local-storage.c,
-	shell/e-summary-storage.c: Change includes of
-	e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h
-
-	* e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added my addressbook changes.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* AUTHORS: Add Larry and Radek.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.1
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/importers/Makefile
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.7.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: no need to use destdir
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.6.
-
-2001-10-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change the help string on "--enable-nntp" to
-	mention the fact that NNTP support is incomplete and unsupported.
-	If the user doesn't pass --enable-nntp, don't mention NNTP at all
-	in the summary at the end. Also, mention which SSL library is
-	being used when SSL support is enabled, and don't mention anything
-	about S/MIME since it doesn't work.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: GAL 0.15.99.5.
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* AUTHORS: Updated my email address.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* configure.in: Bump gal requirement.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: and add a way to get some more spew about the
-	commands we're executing.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use eq instead of ==.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required GAL to 0.15.99.3 so EEntry's
-	"draw_button" argument can be used in
-	addressbook/gui/component/select-names/e-select-names.c.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in: bumped required GAL to 0.15.99.2.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: HAVE_KDE_APPLNK.
-
-	* configure.in (EVO_CHECK_LIB): AC_DEFINE `HAVE_KDE_APPLNK' in the
-	case in which the kde applnk dir is found.  Also fix the logic
-	with the checking so it doesn't get fooled.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: include destdir in the path of the kde desktop
-	installation dir
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'
-	in the `KDE_APPLNK_DIR'.
-
-	* configure.in: New option `--with-kde-applnk-path'.  Define the
-	`HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'
-	value.
-
-2001-10-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
-	declarations together so they both happen.
-
-2001-10-18  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use a new fangled perl script that queries oaf for
-	interfaces we want to kill.
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.15.99.1
-	for use in evolution-addressbook-export.
-
-	* tools/.cvsignore: Added evolution-addressbook-clean,
-	evolution-addressbook-export, evolution-addressbook-import, and
-	.libs.
-
-	* tools/Makefile.am: Added evolution-addressbook-clean,
-	evolution-addressbook-export, and evolution-addressbook-import.
-
-	* tools/evolution-addressbook-clean.in: Main script to clean up
-	the local contact database.
-
-	* tools/evolution-addressbook-export.c: Exports the local
-	addressbook to the specified file
-	(--output-file).  If no --output-file is given, writes out to a
-	unique file in the /tmp directory.  In either case, prints the
-	filename to stdout.
-
-	* tools/evolution-addressbook-import.c: Imports the specified file
-	(--input-file) to the local addressbook.
-
-2001-10-18  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Wrote Addressbook news.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: kill evolution-ldif-importer.
-
-2001-10-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in (AC_OUTPUT): Fix the order of the help/ subdirs.
-	These must be sorted as a preorder walk for a tree!
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.99.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.  Require GtkHTML 0.15 or later and GAL 0.14
-	or later.  Also, make $with_nspr_includes default to
-	`/usr/include/nspr' instead of `/usr/include/mozilla' and
-	$with_nss_includes to `/usr/include/moznss' instead of
-	`/usr/include/mozilla'.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell, plus some minor fixes for
-	consistency.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated.
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): Updated for beta 6.
-
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: add libart to list of libraries to use in
-	EXTRA_GNOME_CFLAGS/LIBS, which is needed for latest libart versions
-
-2001-10-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(default_user/local/Makefile) before
-	AC_OUTPUT()ing the other subdirs of `default_user/local'.  Fix
-	pointed out by Dmitry G. Mastrukov <dmitry@fitmark.net>.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove movemail check, since it's not relevant any
-	more.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Bumped required version of gtkhtml to 0.14.99.1
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.13.99.1.
-
-2001-10-01  Aaron Weber <aaron@ximian.com>
-
-	* help/C/Makefile.am: removed an extraneous tab.
-	
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.99.
-
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.
-
-2001-10-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more news.
-
-2001-09-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (nspr_libs): Order the linkline to be the same as
-	the order in Mozilla (it is suggested that they be in this order).
-	(nss_libs): Same.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove references to the "compose" program, since
-	that functionality went into the shell.
-	(AC_OUTPUT): Sort and remove duplicates.
-
-	* cmdline/*: gone
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added a flag to enable pedantic PGP/MIME - this is
-	not recommended for end-users. It is mostly meant for testing
-	purposes.
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: make sure the solaris network libs get added to
-	the LDAP link line before we test for openldap.  Thanks to Frank
-	Belew for finding this.
-
-2001-09-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.12.99.0.
-
-2001-09-21  Nat Friedman  <nat@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Changed to 99.
-	(VERSION): Added ".$EVOLUTION_MICRO_VERSION" suffix.
-
-2001-09-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 0.14.  Depend on gal >= 0.12,
-	gtkhtml >= 0.13.
-
-2001-09-21  Michael Zucchi  <NotZed@Ximian.com>
-
-	* NEWS (Mail): Updated.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more NEWS items here.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Remove dead directory from AC_OUTPUT
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated required version of gal to 0.11.99.4.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove unneeded conditionals
-
-2001-09-13  Yanko Kaneti  <yaneti@declera.com>
-
-	* configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* data/evolution.mime: override the gnome-vfs.mime to match .vcf
-	as text/x-vcard.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: temporarily disable zh_TW
-
-2001-09-10  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: one-line OpenSSL fix from Yanko Kaneti
-	<yaneti@declera.com>
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated slightly.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes by Neil Conway <neilconway@home.com, as per #8090.]
-
-	* configure.in: Fix the error message if scrollkeeper is not found.
-
-	* README: A bunch of minor fixes, tweaks and cleanups.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8089, Undocumented Scrollkeeper dependency.]
-
-	* README: Add scrollkeeper 0.1.4 to the list of dependencies.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Only check for OpenSSL if we were not able to find
-	Mozilla's NSS libraries.
-
-2001-09-04  Peter Williams  <peterw@ximian.com>
-
-	* omf-install/Makefile.am (install-data-local): Don't put
-	$(srcdir) in the file path twice.
-
-2001-09-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.11.99.2.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* configure.in: Bumped required version of GAL to 0.11.3
-	(for g_utf8_collate)
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Nike Gerdts <michael.gerdts@usa.alcatel.com> for
-	#6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and
-	LDFLAGS.]
-
-	* configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS
-	instead of after them; likewise, put DB3_LDADD before the already
-	defined LDADD.
-
-2001-08-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: We don't need to check for both bonobo-conf 0.11
-	AND bonobo-conf 0.2.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.13.99.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump requirements to GAL 0.11, bonobo-conf 0.11,
-	GtkHTML 0.12.  Don't autogen
-	`doc/devel/executive-summary/Makefile'.  Bump version number to
-	0.13.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS (Global): Added.
-
-2001-08-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* NEWS (Mail): Updated some more.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated.
-
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.5.
-
-2001-08-19  Aaron Weber  <aaron@ximian.com>
-
-	*Makefile.am: added "help" to subdirs.
-	
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use
-	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
-	evolution's local state dir.  this should fix the core dumps
-	during install on freebsd and solaris.
-
-	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
-	otherwise default to glib-config.  a cheap solution to get this
-	working on freebsd (where they have glib12-config, but not
-	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
-	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
-	this out, and AC_SUBST so omf-install/Makefile.am can use it.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Move the libical compile order.
-
-2001-08-16  "Big Iain" Holmes  <iain@ximian.com>
-
-	* configure.in: Add widgets/e-timezone-dialog/Makefile
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* AUTHORS: I know what you did last summer!
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.3.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Some info on adding --localstatedir to the configure
-	options.
-	* Makefile.am: Added omf-install to the build.
-	* configure.in: Adjust for the move of the user docs.
-	
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Addded missing dirs to the build. Add checks for
-	scrollkeeper and jw to get the docs building on later Red Hat's.
-	* omf-install/*: Added this for integration with scrollkeeper.
-	
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* configure.in (LDAP_LIBS): Remove an obvious typo reported by
-	Miles
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Be truthful about the versions of libs we need.
-	
-2001-08-10  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: if libldap.la is there, default to static linking
-	of openldap.  if it's not, default to dynamic.  also, provide
-	--with-static-ldap for users that want to override these defaults.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: link statically with OpenLDAP.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require GAL 0.10.99.2.
-
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* tools/killev: Added #!/bin/sh
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't link to libnssckbi3 when linking to nss.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot information
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require gal 0.10.99.1 or greater.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #5594, "killev doesn't kill all evolution processes".]
-
-	* tools/killev: Added bonobo-moniker-xmldb, gnome-gtkhtml-editor
-	and gnome-spell-component.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.99.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ooops.  We want GAL >= 0.10.0 and GtkHTML >=
-	0.11.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove `$EVOLUTION_MICRO_VERSION' from `VERSION'.
-	(EVO_CHECK_LIB): 
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell changes and slightly changed
-	the formatting for the addressbook ones.
-
-	* configure.in: Require GtkHTML 0.10.0 and GAL 0.9.0.
-
-2001-07-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-07-31  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: bump required version of gtkhtml to 0.10.99.
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Bump to 0.11.99
-
-2001-07-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix up the "exactly version N" case of EVO_CHECK_LIB
-
-2001-07-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Changed to use test -h instead of -L for checking
-	/var/mail vs /var/spool/mail
-
-2001-07-13  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: more updates
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mail): Merged mine and Peter's entries.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Start new entry
-
-2001-07-11  Peter Williams  <peterw@ximian.com>
-
-	* acconfig.h: Add HAVE_BROKEN_SPOOL here.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (have_nss_includes): Fix nss include check to work.
-
-2001-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added option --with-broken-spool for solaris mbox
-	spool format.
-
-2001-07-10  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* configure.in: Added ro (Romanian) to ALL_LINGUAS
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (SYSTEM_MAIL_DIR): Make sure /var/mail
-	isn't a symbolic link such as on Red Hat 7.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the required version of gal.
-
-2001-07-03  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *: use bonobo-conf everywhere
-	
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (MAILER_LIBS):
-	(MAILER_CFLAGS): added bonobo_conf.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Made evolution depend on bonobo-conf 0.2.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Check for gtkhtml 0.9.99.1. 
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for libGal 0.8.99.7.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (evolution_db_version): s,AC_DEFINE,AC_DEFINE_UNQUOTED
-	to make these not totally useless.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Build the composer after the addressbook,
-	as it needs some CORBA stuff from the latter.
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* tools/killev: Added evolution-alarm-notify.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.8.99.6.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add `camel/tests/mime-filter/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (gal): Bump required gal version for new accessors
-	in ETree.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/gui/contact-list-editor, and
-	correct path of contact-editor.
-
-2001-06-21  Rodrigo Moya <rodrigo@gnome-db.org>
-
-	* libwombat/: added new directory for the libwombat library, which
-	will contain the implementation of all CORBA interfaces defined
-	in the wombat.idl file
-
-2001-06-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix the OpenLDAP check to default to "no" if you
-	don't specify anything.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* docs/C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-20  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change --enable-ldap to --with-openldap, allow a
-	path prefix as an argument. Add some libtooly goodness to the
-	libldap check in case it depends on ssl libraries.
-
-2001-06-19  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Tweak the db3 header check to like our RH7 build
-	machine again.
-
-2001-06-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y (LexBuf): Changed buf to an int here.
-	(lexGetQuotedPrintable): Changed cur to an int here.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Add "--with-db3" to fill in both
-	--with-db3-includes and --with-db3-libs. Make them get cached
-	properly so you don't need to specify it every time. Simplify some
-	code.
-
-	* acconfig.h: Add #defines for the current supported db3 version
-	so that when we change it we don't have to hunt all of them down
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check the modes on $system_mail_dir and set up
-	variables for camel/Makefile to make camel-lock-helper
-	setuid/setgid.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: One slight db3 check correction
-
-2001-06-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: fix typo in -ldb3 check.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Update db3 configure checks for RedHat. /me beats
-	a sleeping cat to death
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.8.99.2.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added addressbook/gui/merging/Makefile.
-
-2001-06-08  Jason Leach  <jleach@ximian.com>
-
-	* my-evolution/Makefile.am (INCLUDES): builddir != srcdir fix.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Byebye executive-summary, hello my-evolution
-
-	* configure.in: Remove all the executive-summary Makefiles. Add the
-	my-evolution.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: Vanity, thy name is trow.
-
-2001-06-05  JP Rosevear  <jpr@ximian.com>
-
-	* config.log: Bump version to 0.10.99
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* README: Included information about db3.
-
-	* acconfig.h: Added HAVE_DB_H and HAVE_DB3_DB_H.
-
-	* configure.in: Added various checks for db3 libraries and
-	includes.  Of note are the new configure options
-	--with-db3-includes=PREFIX and --with-db3-libs=PREFIX to specify
-	the location for your db3 library.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal dependency to 0.8.99.1
-
-2001-05-29  JP Rosevear  <jpr@ximian.com>
-
-	* README: update version requirements
-
-2001-05-23  Dan Winship  <danw@ximian.com>
-
-	* README: Remove reference to verify-evolution-install.sh since it
-	doesn't work any more.
-
-	* configure.in (EVO_CHECK_LIB): allow this to take a max version
-	too, mostly so we can bound the allowable gal versions for
-	releases, but also to require libxml < 2.0.
-	(OpenSSL): Fixicate to work on NetBSD (OpenSSL in /usr, no libdl).
-
-2001-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* tools/killev: s/evolution-vcard-import/evolution-vcard-importer
-	
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create MAILER_CFLAGS and MAILER_LIBS so that we
-	don't have the same libs multiple times in the libtool
-	command-line.
-
-2001-05-20  Duncan Mak  <duncan@ximian.com>
-
-	* tools/killev (sysname): Add in evolution-vcard-importer as part
-	of the list of processes to kill in killev.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am (SUBDIRS): Changed build order.  Now addressbook
-	gets built before mail.
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create CAMEL_CFLAGS and CAMEL_LIBS so that we
-	don't have to link in all sorts of unnecessary garbage from GNOME
-	that we don't need.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: add the importers.
-
-2001-05-14  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/evolution-C.omf: added file for Scrollkeeper
-
-2001-05-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add the nspr includes to the list of includes used
-	to test for NSS headers, and don't assume -lpthread in the
-	nss/nspr libs - use PTHREAD_LIB.
-
-2001-05-09  Iain Holmes  <iain@ximian.com>
-
-	* tools/killev: Added rdf-summary killing stuff from R Burton
-	(r.burton@180sw.com)
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: OpenSSL LDFLAGS also needs to include -lcrypt
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the importers subdir.
-
-	* configure.in: Make the importers/Makefile
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped check for gal to 0.7.99.3.
-
-2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL
-
-	* configure.in: Check for OpenSSL.
-
-2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: upped required gtkhtml version to 0.9.3, even that is
-	not enough for idl changes.
-	* README: you need LIB_XML_1_BRANCH. updated all version requirements
-	from configure.in
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen
-	`executive-summary/widgets/Makefile', as that subdir doesn't get
-	distributed anymore.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* README: We no longer depend on libunicode.
-
-	* configure.in: Remove check for libunicode. Remove unicode cflags
-	and libs from all CFLAGS and LIBS variables. Add GAL_LIBS for
-	things that need to depend on just gal (for gunicode).
-
-	* configure.in: Check for gethostbyname_r so e_gethostbyname_r
-	will DTRT.
-	
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump up the gal requirement
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen the the Makefile for the importer
-	docs.
-
-	* Makefile.am (SUBDIRS): Build the docs last.
-
-2001-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (have_nspr_libs): We need to link in more than just
-	libnspr4, we also need libpthread.
-	(have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added in composer-message.png.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: `mail/importers/Makefile' must come after
-	`mail/Makefile'.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add `doc'.
-
-	* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated the required version of gal to 0.6.99.0.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check if gethostbyname_r take five params
-
-	* acconfig.h: add GETHOSTBYNAME_R_FIVE_ARGS 
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* AUTHORS: /me is a translator.
-	* configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo &&
-	exit 1.
-
-2001-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): create the makefile in
-	camel/tests/smime
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev (sysname): add some more 16 character versions for
-	freebsd.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* AUTHORS: Brag.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/evolution-today-mini.png: converted from exec-16-summary.xpm,
-	removed the latter.
-	* art/evolution-trash.png, art/evolution-trash-mini.png: images for
-	trash folder, one converted from deleted_message.xpm, another from mc.
-	* art/Makefile.am: install.
-
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README (SSL): Remind users that they will currently have to copy
-	their cert database from their mozilla directory into ~/evolution.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/Makefile.am: added missing (new) files.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We
-	forgot to do this before branching *again*...)
-
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* README: add a bit mentioning that if configure claims you don't
-	have something installed when you think you do, that it's probably
-	because you installed it in the wrong prefix, or because you need
-	a -devel package.
-
-	* configure.in: Add a new macro EVO_CHECK_LIB that checks for a
-	gnome-config-based library of a given version or later, correctly,
-	and if doesn't find it, suggests that you consult the README. Fix
-	the various library checks to use this. Meanwhile, remove a bunch
-	of old cruft and reorganize a little.
-
-	* acconfig.h: Remove cruft
-
-2001-03-28  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: In a burst of egomania, added myself.
-
-2001-03-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: create camel/misc/Makefile
-
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* README: Update xml-i18n-tools version
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/new-message.xpm: file->new->mail message
-	* art/folder.xpm: file->new->folder
-	* art/new_appointment.xpm: file->new->appontment
-	* art/print-preview.xpm: file->print preview
-	* art/configure_16_calendar.xpm: for the tools menu
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/splash.png: move it a bit up so the icons fit better
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.11.
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/configure_16_folder.xpm, configure_16_mail.xpm,
-	copy_16_message.xpm, edit.xpm, encrypt.xpm,
-	evo-16-address-conduit.png, evo-16-calendar-conduit.png,
-	evo-16-todo-conduit.png, exec-16-summary.xpm, import.xpm,
-	print.xpm, reply_to_all.xpm, reply.xpm, save.xpm,
-	send-receive.xpm, work_offline.xpm, find_contact.xpm,
-	send-24-receive.png, evo-48-calendar-conduit.png,
-	evo-48-todo-conduit.png, import.png, send-48-receive.png,
-	move_message.xpm, all_contacts.xpm, forward.xpm,
-	configure_16_addressbook.xpm, Makefile.am,
-	evo-48-address-conduit.png: renamed icons to make Miguel's
-	speedups possible
-	* art/evolution-inbox.png: color coded one
-	* art/envelope.png: reverted back to the non-color coded one
-	* art/evolution-contacts-plain.png: non-color coded one for
-	the "new contact" dialogue
-	
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Require bison, not yacc (for vcc.y)
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added all the new icons to the
-	distribution.
-
-2001-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: More fixes for NSPR and NSS checks - use fixed it
-	to use AC_CHECK_HEADERS instead of AC_CHECK_FILES. Also made it
-	not default the nspr lib path to /usr/lib/mozilla which may not be
-	in the user's library path when checking for nspr libs.
-
-2001-03-20  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_send-receive.png: send-receive for the s/r dialog
-	* art/24_send-receive.png: send-receive to replace the
-	fetch-mail-doggie
-	* art/16_send-receive.xpm: send-receive for (future) menu
-	item
-	* art/16_import.xpm: for the file menu
-	* art/16_work_offline.xpm: for the file menu
-	* AUTHORS: so I can show off
-	* art/splash.png: making radek famous ;)
-	* art/envelope.png, evolution-calendar.png, evolution-contacts.png, 
-	evolution-tasks.png, evolution-today.png: 
-	 new concept of color coded apps:
-	    - mailer: 		#efb43e
-	    - calendar:		#bab5ab
-	    - contacts: 	#9794ab
-	    - tasks:		#6e9e6e
-	    - exec. summary:	#c4757e
-	
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix ettore's fix ;-)
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.8.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Make sure we never define `NSPR_CFLAGS' or
-	`NSS_CFLAGS' as just "-I".
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: pulled from the 0.9 release.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Added directions on how to build with SSL support.
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_import.png: for the import druid
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal requirement to 0.5.99.7
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: create doc/devel/executive-summary/Makefile
-	* evolution.png: moved to art/.
-	* evolution.desktop: moved to data/.
-	* Makefile.am: reflect those moves.
-	* art/*.xpm: moved 8 files from calendar/gui here.
-	* art/Makefile.am: added moved files.
-	distribute *.xpm, install *.png and *view.xpm.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated to AC_SUBST the NSPR/NSS flags.
-
-2001-03-14  Dan Winship  <danw@ximian.com>
-
-	* README: Pull up some of the clarifications from the 0.9 branch
-
-2001-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add -lresolv to LDAP_LIBS if it's there.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Added the mail/importers dir.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Rearranged some of the dependencies to try to get them
-	into a more correct order (needed for people building all of these
-	packages by hand).
-
-2001-03-12  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update
-
-2001-03-09  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Hm... probably would be
-	clever to be calling this 0.9 rather than 0.8, since it's almost
-	0.10.
-
-2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y: Changed int to char when returning a character
-	from a stream (since it needs to be able to hold EOF.)
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed --enable-assbarn-security and replaced it
-	with the real options:
-	--with-nspr-includes=PREFIX
-	--with-nspr-libs=PREFIX
-	--with-nss=PREFIX
-
-	* acconfig.h: #undef HAVE_NSS
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.5.99.6 or later.
-
-2001-03-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* shell/main: /* xgettext:no-c-format */ before the welcome
-	message.
-	* configure.in: Don't try to generate a Makefile in
-	camel/providers/vee as it's empty.
-	
-2001-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot instructions
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.4.
-
-2001-03-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Reorganize a bit to get rid of warnings about
-	AC_TRY_COMPILE being used before AC_ISC_POSIX
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added views/addressbook/Makefile.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install conduit icons
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add logic to make sure we're building against OpenLDAP >= 2
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Redo the Kerberos stuff again to deal with the
-	stuff currently on my machine. I think it should deal with both
-	the MIT and KTH versions of both krb4 and krb5 now.
-
-2001-03-01  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_evo-address-conduit.png: 48^2 version of the
-	addressbook pilot conduit. (for the new control center)
-	* art/16_evo-address-conduit.png: 16x16 version for current
-	gnomecc
-	* art/48_evo-todo-conduit.png: for new gnomecc
-	* art/16_evo-todo-conduit.png: for old gnomecc
-	* art/48_evo-calendar-conduit.png: for new gnomecc
-	* art/16_evo-calendar-conduit.png: for old gnomecc
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.2.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.1.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.0.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* various .cvsignore files: Ignore generated .oaf files
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install new files
-
-	* art/*view.xpm: add files from calendar/gui
-
-2001-02-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: rework ldap check logic so it'll work to
-	--disable-ldap if you've previously configured with --enable-ldap.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* data/evolution.keys, evolution.desktop: removed, they are generated.
-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
-	* data/evolution.desktop: removed, it duplicates above. 
-	* Makefile.am, data/Makefile.am: reflect above changes, merge 
-	translations. 
-
-2001-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added hacks to check for Mozilla libs like nspr
-	and nss that we will need for SSL and S/MIME.
-
-2001-02-09  Michael Meeks  <michael@ximian.com>
-
-	* configure.in: depend on bonobo >= 0.36
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the version number of gal required to 0.5.
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update to latest requirements
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Added xml-* files.
-
-2001-02-05  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require version 0.4.99.8 of gal.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.
-
-2001-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: allow --enable/disable-ldap.
-
-2001-02-01  Jason Leach  <jasonleach@usa.net>
-
-	* tools/killev: Fix this script to make it work with Solaris.
-	Patch from Louise Miller.
-
-2001-01-29  Eskil Heyn Olsen  <eskil@eazel.com>
-
-	reviewed by: JP Rosevear  <jpr@ximian.com>
-
-	* acconfig.h:
-	Added the ENABLE_NNTP define
-	
-	* configure.in:
-	Fixed the NNTP m4 section.
-
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: added sk to ALL_LINGUAS.
-	* evolution.desktop: added Slovak messages.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in (AC_OUTPUT): remove
-	widgets/shortcut-bar/Makefile from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add the missing .xpm files.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
-	`16_print_xpm', `16_configure_addressbook'.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
-
-2001-01-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-22  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/splash.png: From the "Ideas from the shower" department:
-	new splash screen.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update package requirements
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in: Changed a leftover $with_x_mailer to
-	$with_sub_version.  Made it so that if $with_sub_version isn't
-	specified, we don't try to output it, and also corrected the way
-	SUB_VERSION is defined.
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): add the
-	doc/devel/importer/Makefile as a target.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.
-
-	* configure.in: Removed `--with-x-mailer' option; replaced with a
-	more generic `--with-sub-version' option.  So, don't define
-	`X_MAILER'; instead, define `SUB_VERSION'.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --enable-nntp switch.  default is no.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* configure.in, acconfig.h: Add --with-x-mailer to set the version
-	string that appears in the X-Mailer header.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the 
-	Message->Move/Copy to folder -menu entries.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/evolution-calendar-mini.png: New version of calendar icon that
-	looks more like a calendar and not a dictionary or something :)
-
-	Btw, the icons get scaled for some reason, even though that is
-	not necessary as all of those should be 16x16 pixels. Can anyone look 
-	into this? 
-
-2001-01-15  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *.c: changed the signature of the property_bag get/set
-	functions.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove old config message
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* tools/evolution-move-tasks: new script to move tasks from the
-	Calendar folder to the new Tasks folder, so people won't lose tasks.
-	This can be deleted after a few releases.
-
-	* tools/Makefile.am (bin_SCRIPTS): added above.
-
-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* config.h.in: Removed GPG stuff.
-
-	* acconfig.h: Take out all refs to PGP and GPG stuff.
-
-	* configure.in: Take out the PGP/GPG detection stuff.
-
-2001-01-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Suggest what to do if gtk-doc is not found.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Make evolution depend on the new version of gal.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
-	a bit and mention the OAF stable branch.
-
-2001-01-11  Dan Winship  <danw@helixcode.com>
-
-	* art/priority-high.xpm: Add a white outline around the "!" so it
-	still shows up clearly in selected rows when your theme selection
-	color is reddish. (Problem pointed out by Federico.)
-
-2001-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: At the end of the configure process, report
-	whether the documentation files will be built or not.
-
-2001-01-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/move-message.png, art/move-message.png: New versions.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.
-
-2001-01-05  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/evolution-contacts-mini.png: This looks more pretty.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Removed camel/providers/mbox/Makefile and
-	camel/providers/mh/Makefile.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require bonobo 0.31
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: If we find threads ok, then always turn on
-	ENABLE_THREADS.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (Addressbook): Added a bit of addressbook NEWS.
-
-	* configure.in: Updated the gal check to require gal 0.4.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved
-	these images each up one pixel.
-
-2000-12-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS: Update.
-
-2000-12-14  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS: Update
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/splash.png: New splash from Jimmac.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* README: Removed mention of ETable and EText in widgets
-	directory.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* README: Mention the gconf stable branch.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the required version of gal.
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to
-	Editor.idl
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* data/evolution.keys: Added some Norwegian translations.
-	
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Increased the required version of gal.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* README: minor tweak
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests/stream/Makefile.am.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* README: gnome-vfs depends on gconf, so add that.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Bumped required gal version to 0.2.99.4 for
-	e_str_make_safe.
-
-	* README: Added some necessary :'s in the pilot-link cvs stuff.
-
-2000-11-30  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
-	shell/main.c, notes/main.c,
-	addressbook/gui/component/addressbook-factory.c:
-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.
-
-2000-11-29  JP Rosevear  <jpr@helixcode.com>
-
-	* README: Update pilot info
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Bump required gal version to 0.2.99.3 for iconv
-	changes
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* COPYING-DOCS: Added a copy of the GNU Free Documentation
-	License.
-
-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
-
-	* configure.in: Auto* magic for various camel locking types
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* AUTHORS: Update - hopefully I assigned blame correctly :-)
-
-	* MAINTAINERS: ditto
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Correct the bonobo version error message
-
-	* README: Update
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests stuff to output macro.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added local provider dir to output macro.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for libgpgme. (Support not added to mail
-	yet.)
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Removed the
-	default_user/local/Tasks/Makefile until the relevant files are on
-	CVS.
-
-2000-11-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* Added widgets/menus that contains the gal-view-menus.c code from
-	Gal that depended on Bonobo.
-
-	* configure.in: Update list of Makefiles;  
-
-	* widgets/Makefile.am: Update.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Update the gal reqiurement version.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo >= 0.29, due to the XSync
-	fix.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.99.1.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.3
-
-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 602e3bf73b..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-Email: ettore@ximian.com
-Email: danw@ximian.com
-Email: chris@ximian.com
-Email: federico@ximian.com
-Email: iain@ximian.com
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index df0a66c3fb..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-changelogs =			\
-	ChangeLog
-
-EXTRA_DIST =			\
-	AUTHORS			\
-	$(changelogs)		\
-	COPYING-DOCS		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	xml-i18n-merge.in	\
-	xml-i18n-update.in	\
-	xml-i18n-extract.in
-
-SUBDIRS =			\
-        intl                    \
-        macros                  \
-        data                    \
-        e-util                  \
-	libical			\
-        widgets                 \
-        shell                   \
-        camel                   \
-        filter                  \
-        libversit               \
-	libwombat		\
-	addressbook             \
-        composer                \
-        mail                    \
-        calendar                \
-        wombat                  \
-	importers		\
-	my-evolution		\
-        art                     \
-	sounds			\
-	ui			\
-        default_user            \
-	views			\
-        tools                   \
-	doc			\
-	help			\
-        po			\
-	omf-install
-
diff --git a/NEWS b/NEWS
deleted file mode 100644
index c9e577e07a..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,2408 +0,0 @@
-*** SOMEONE SHOULD MERGE NEWS FROM THE 1-0 BRANCH HERE ***
-
-Evolution 0.99.2 (Release Candidate 2), 2001-11-14
---------------------------------------------------
-
-Misc:
-  #14783 -- killev does not check for system type properly
-  #14630 -- HTML docs refer to missing gifs in stylesheet-images
-  #15027 -- Typos in the docs
-  #15028 -- Corrections to the user documentation
-  #15056 -- Spelling Error
-
-Shell:
-
-   #6295 -- Go to folder dialog should have the e-tree focused
-  #13872 -- Crash
-
-Summary
-
-  #13478 -- Summary hangs at startup
-  #14518 -- Crashing while starting the program
-
-Mailer:
-
-  #10560 -- Messages in Korean charset displayed as blank
-  #10735 -- Extra cruft at bottom of Compose window's View menu
-  #11177 -- Closing main window while dialog up, hangs
-  #11647 -- "Body contains" and "Body does not contain" searches are
-            matching strings in the message header
-  #13996 -- Searches not available in IMAP in offline mode
-  #14351 -- pgp 5.5.8 not supported, recognized as 2.6.x
-  #14361 -- IMAP/SSL APPENDs hang
-  #14542 -- Crash pressing ctrl-a ctrl-k
-  #14569 -- Crash when moving a folder
-  #14620 -- Weird font issue in Mdk 7.2
-  #14659 -- GPG messages are truncated
-  #14672 -- evolution-mail crashes on startup
-  #14794 -- PGP signing problem, complaining about 2.6.x when 6.5.1
-            is installed
-  #14826 -- Crashed the editor by using Alt-C (capitalize word)
-  #14838 -- Saving passwords dosen't work
-  #14848 -- Forwarding wrong email in separate window when using prev/next
-            buttons
-  #14861 -- DnD a message from a folder with a space in the name fails
-  #14951 -- Cancelling before IMAP connect causes IMAP to loop forever
-  #14965 -- Message copy fails with space in folder names
-  #15038 -- Can page up or page down off of table
-  #15154 -- Long line rendering bug
-  #15267 -- Outgoing filter move/copy to folder crashes Mailer
-  #15296 -- Mailer hangs when fetching mail
-  #15324 -- Table handling code not rendering centered content when
-	    it should
-  #15374 -- "___" in autogenerated name of vfolder created by sender of message
-  #15393 -- Pointer grab when shift-double clicking
-
-Addressbook:
-
-   #9501 -- Appointment Editor has "Save changes?" confirmation but
-            Contact editor does not
-  #14107 -- Crash: Address auto-complete pop-up appears after sending mail
-  #14646 -- Doesn't handle failure in default_book case
-  #14743 -- Contacts crashes when saving a List
-  #14780 -- Pushing categories in Contact editor crashes Contacts
-  #17355 -- e-select-names/completion from arbitrary storages
-
-Pilot conduits:
-
-  #9465  -- Palm Addressbook sync corrupts character set
-  #14562 -- Crash
-  #15355 -- Bogus warning in calendar conduit
-
-Calendar:
-
-  #10285 -- Problem printing the calendar
-  #13631 -- Left-over debug print
-  #14021 -- Problems entering a task
-  #14335 -- UTF-8 Error in schedule meeting
-  #14337 -- Meeting is added to calender even when selecting decline
-  #14362 -- Appointments (public or private) don't show in the Day
-	    view of the calendar
-  #14392 -- Event editor removes wrong pages when object updated
-  #14524 -- Meeting page dragging broken for all day events
-  #14655 -- evolution-alarm-notify crash on start
-  #14687 -- load_uri failures are not noticed by the client talking
-            to the wombat
-  #14704 -- Free/busy info not in UTC
-  #14765 -- Schedule page timezone problems
-  #14842 -- EWeekView - typing in event & day incorrect
-  #14845 -- Crash assigning category to new task
-  #14941 -- Crash
-  #15137 -- Crash when double clicking on empty appointment
-
-
-Version 0.99.0 (1.0 Release Candidate 1), 2001-11-05
-----------------------------------------------------
-
-Shell:
-
-  - Fixed problems with icons not showing up in the druids.  (Ettore,
-    Anna)
-
-  - Fixed some dnd brokenness.  (Ettore)
-
-  - Fixed some random crashes and made the shell more robust in case
-    of activation problems or components crashing.  (Ettore)
-
-  - Implemented a newer, prettier about box.  (Ettore)
-
-  - Made sure the quit message always gets displayed.  (Ettore)
-
-  - Made sure the shell doesn't allow for folder names with slashes.
-    (Ettore)
-
-  - Made the folder selection and folder creation dialogs play better
-    with the WM for out-of-proc components.  (Ettore)
-
-  - Make sure components don't display dialogs before the shell
-    windows are displayed.  (Ettore)
-
-  - Fixed some problems with copying/transferring/renaming folders.
-    (Ettore)
-
-  - Made the pop-up folder bar have the expected size when popped up.
-    (Ettore)
-
-Mailer:
-
-  - Fixed SMTP truncation, IMAP/SSL truncation/hangs when
-    sending/appending messages.  (Jeff)
-
-  - Implemented rename for imap/maildir folders.  Rename also tracked
-    in vfolder and filter code.  Use rename for local folders when we
-    can instead of copy/delete.  (Michael, Jeff)
-
-  - Fixed startup wizard next page race bugs. (Michael)
-
-  - Fixed toolbars vanishing, Bonobo Suxors. (Michael)
-
-  - Made filter/vfolder on mailing lists honour domains, but also
-    backward compatible.  (Michael)
-
-  - Fixed the password coming up behind the main window.  (Michael,
-    Ettore)
-
-  - Fixed numerous crash on startup/exit/while doing nothing/switching
-    folder/components, many races and other architectural errors.
-    (Michael, Jeff)
-
-  - Bunch of vFolder fixes and feature completion. (Michael)
-
-  - Added a 'index body' option to configure folder.  (Michael)
-
-  - Fixed 'unread' counts, again.  (Michael)
-
-  - Fixed some problems leaking file descriptors and overusing them
-    when not necessary.  (Michael)
-
-  - Implemented iconv() caching and Solaris friendly iconv name
-    converter.  Made override display charset work in more cases.
-    (Michael, Jeff)
-
-  - Various untranslated buttons/menus and other translation issues
-    fixed.  (Michael, Jeff)
-
-  - Offline searching in IMAP. (Michael)
-
-  - Don't warn the user if he drags a message and drops it in the same
-    place.  (Jeff)
-
-  - Fixed replying-to and forwarding messages with attachments to
-    attach the appropriate attachments in the new message.  (Jeff, Larry)
-
-  - Don't allow the user to edit the default searches and keep all the
-    search menus consistant accross all folders.  (Jeff)
-
-  - Allow the user to drag&drop and/or move messages to the Trash
-    folder.  (Jeff)
-
-  - Various fixes to the filtering code.  (Jeff, Michael)
-
-  - Make various dialogs non-modal.  (Jeff)
-
-  - Fixes to POP3 UID caching so users can "leave mail on server" and
-    not get duplicates.  (Jeff)
-
-  - Fixes to IMAP caching code where servers support the UIDPLUS
-    extension. Will also now un-cache a folder when the user deletes
-    it from the IMAP server.  (Jeff)
-
-  - Removed support for PGP 2.6.x due to security issues (pgp would
-    always return 0 suggesting that the signature was valid even when
-    it wasn't).  (Jeff)
-
-  - "Whitespace-only" recipients are now ignored, rather than being
-    flagged as invalid. (Trow)
-
-  - Fixed bugs related to message searching: memory leak, i18n problems,
-    etc. (Trow)
-
-  - We no longer leave stray windows lying around after doing the
-    "Add Sender to Addressbook" operation. (Trow)
-
-  - Bcc: headers are now shown when viewing drafts, sent mail. (Trow)
-
-  - Lots and lots and lots of other little and not so little things.
-    (Michael, Jeff, Dan, Trow)
-
-Addressbook:
-
-  - General bug fixes.  (Everybody)
-
-  - Printing fixes.  (Trow)
-
-  - Fixed the dreaded "this should never happen" bug.  (Trow)
-
-  - Plugged memory leaks.  (Trow)
-
-  - Fixed use-score sort ordering when doing completion.  (Trow)
-
-  - Fixed EAddressPopup race conditions.  (Trow)
-
-  - Implemented transfer function for shell, so moving contact
-    folders now works.  (Trow)
-
-  - Fixed occasional completion flakiness.  (Trow)
-
-  - Fixed contact count on folder bar.  (Trow)
-
-  - Fixes for LDAP/multibook address completion.  (Toshok, Trow)
-
-  - Added a "Do you want to save changes?" dialog to the contact 
-    and contact list editors. (Toshok)
-
-  - Fixed date (birthday and anniversary) handling for LDAP. (Toshok)
-
-  - Fixed nasty LDAP modification bug. (Toshok)
-
-  - Add a config setting (/Addressbook/default_book_uri) to specify where
-    vcards and email addresses from mail messages are stored as contacts.
-    (Toshok)
-
-  - Fixed problem that arose in an earlier beta where some contacts
-    couldn't be modified or deleted from local addressbook.
-    (Chris Toshok)
-
-  - LDIF Importer.  (Chris Toshok, Michael M. Morrison)
-
-  - Fixed Memory Leaks.  (Trow)
-
-  - Always show the correct message about the number of contacts on the
-    message bar.  (Trow)
-
-  - Fixed printing of contacts.  (Trow)
-
-  - Fixed the incredibly annoying bug which caused completed
-    (underlined) contacts to spontaneously revert when edited.
-    (Trow)
-
-  - Better event handling in minicard view.  (Chris Lahey)
-
-  - Fixed Bold font in select names dialog.  (Chris Lahey)
-
-  - Show error dialog if saving a contact to a file fails.  (Chris Lahey)
-
-  - Handle carriage returns in any contact field properly.  (Chris Lahey)
-
-Summary:
-
-  - Worked around gnome-vfs problems that were causing crashes.  (Trow)
-
-  - Set the defaults to be CNN and Boston (Ettore)
-
-  - Move the location of the RDF file to be in a place that will always exist.
-
-  - Fixed numerous bugs (Trow, iain)
-
-  - Made the offline stuff work correctly (iain)
-
-  - Fixed a bug were the summary wouldn't retain settings if all folders,
-    or RDFs, or weather stations were removed. (iain)
-
-Importers:
-
-  - Made the pine importer work for multidepth mail folders. (iain)
-
-Calendar:
-
-  - Underlined accelerators now work in the editor dialogs.  (Damon)
-
-  - Many fixes for scheduling meetings.  (JP)
-
-  - Status bar messages for long queries.  (Rodrigo)
-
-  - Appointments with empty summaries are now deleted from the views.
-    Also, you can press Escape to cancel editing [#780].  (Federico)
-
-  - The alarm daemon no longer displays "old" alarms twice. (Federico)
-
-  - Alarms now handle timezones correctly [#5852].  (Federico)
-
-  - Repeating alarms are now handled [#12163].  (Federico)
-
-  - The alarm daemon is launched as soon as the calendar starts, not
-    when you actually open a folder [#13867].  (Federico)
-
-  - You can now set a default reminder to be added to new appointments
-    [#13649].  (Federico)
-
-  - Fixes for printing week views [#13687, #13688].  (Damon)
-
-  - Tasks printout now matches the task list better [#10280].  (Damon)
-
-  - Better handling of DATE values, as opposed to DATE-TIME ones.  (Damon)
-
-  - Many changes to handle the default timezone better.  (Damon)
-
-  - Recurrence generation fixes [#11525].  (Damon)
-
-  - Fixed merging of complete VCALENDAR components.  (Damon)
-
-  - Fixes to the folder transfer functions.  (Ettore, Federico)
-
-  - Tasks activation fixes.  (Damon)
-
-  - Outlook interoperability fixes.  (Damon, JP)
-
-  - Miscellaneous fixes to the event/task editors.  (Damon, JP, Federico)
-
-  - New iCalendar importer.  (Rodrigo)
-
-  - Fixed problems introduced in Beta 6 due to the changes in the URI
-    management functions.  (Rodrigo)
-
-  - Prettier alarm notification dialog.  (Larry)
-
-  - Session management for the alarm daemon.  (Federico)
-
-  - Added activity bars for long calendar operations.  (Rodrigo)
-
-  - Added iCal file importer.  (Rodrigo)
-
-  - Show error dialogs on calendar failures.  (Rodrigo)
-
-Conduits:
-
-  - Addressbook phone numbers now preserved if they can't all be
-    synced to desktop (JP)
-
-  - Sync addressbook phone numbers from non-english pilots (JP)
-
-  - Various memory leak fixes (JP)
-
-  - Handle multi-day calendar events (without recurrences) (JP)
-
-  - Make sure task records are marked complete in every relevant field
-    (JP)
-
-  - Use new timezone stuff everywhere (JP, Damon)
-
-  - Translate task priorities better (JP)
-
-
-Version 0.16 (Beta 6), 2001-10-10
----------------------------------
-
-Shell:
-
-  - Now the shell restarts stale components from previous sessions
-    properly.  This should reduce the need for oaf-slay to only the
-    cases in which a specific component is completely stuck (which
-    hopefully should never happen).  (Ettore)
-
-  - Fixed the saving of the size of the shortcut bar and the folder
-    bar.  (Ettore)
-
-  - Always display a new default view for the shell, unless the user
-    specified an `evolution:' URI on the command-line.  (Ettore)
-
-  - Fix the weird behavior for right click -> open in new window in a
-    pop-up folder bar.  (Ettore)
-
-  - Make the copy/move and dnd code to detect copying of folders onto
-    themselves correctly.  (Ettore)
-
-Mailer:
-
-  - Bcc: addresses are now visible when browsing messages in
-    the "Sent" folder.  (Trow)
-
-  - Various backend fixes like thread safeness of concurrent
-    triggered events, more forgiving address header decoding,
-    fixes for recent breakage to progress reports, adding a deleted
-    event/state for folders, various deadlocks.  (Michael, Jeff)
-
-  - Fixed quick-searching by receipients to work.  (Michael)
-
-  - Caching of iconv handles to improve performance of many internal
-    mail reading/indexing operations.  (Michael)
-
-  - Major oops in mbox code that caused significant performance
-    problems getting/filtering mail fixed.  (Michael)
-
-  - Message charsets can now be overridden by a user-chosen charset
-    encoding in the mail display.  (Jeff)
-
-  - Report errors when file cannot be attached in the composer.  (Jeff)
-
-  - File->Folder->Properties and Delete Folder now work for VFolders.
-    (Michael)
-
-  - VFolders, Filters and Searches are saved in a safe manner so that
-    they should not be lost with quota/filled disk problems.  (Michael)
- 
-  - VFolders now update with new mail on their sources.  (Michael)
-
-  - Fixed the "Load HTML Images" radio button options in the mail
-    config dialog to work properly.  (Jeff)
-
-  - When an IMAP folder is deleted, removed any cached messages that
-    had been in that folder when it was "alive".  (Jeff)
-
-  - New icons for PGP signature authenticity.  (Jeff, Jimmac)
-
-Addressbook:
-
-  - General fixes.  (Chris Toshok, Trow, Iain, Chris Lahey, JP)
-
-  - LDAP configuration dialog fixes.  (Chris Toshok)
-
-  - New authentication work.  (Chris Toshok)
-
-  - Fixed crashes related to editing the Master Category List.  (Trow)
-
-  - Address completion is no longer confused by whitespace.  (Trow)
-
-  - More work on having multiple wombats.  (Chris Toshok)
-
-  - Contact names no longer mysteriously disappear when using the
-    SelectNames dialog.  (Trow)
-
-Calendar:
-
-  - Backend improvements (Rodrigo)
-
-  - Compilation fixes for latest Bonobo (Rodrigo)
-
-  - Fixed problem with exceptions to recurring events.  (Damon)
-
-  - Fixed handling of UNTIL property in recurring events. (Damon)
-
-  - The alarm daemon will now notify you of alarms that should have
-    occurred while it was not running.  (Federico)
-
-  - Handle monthly-by-day and "last day" recurrences in the conduits.  (JP)
-
-  - Added priorities to the fields in the attendee list.  (Chris)
-
-  - Enhancements to the event editor for meetings.  (JP)
-
-Summary:
-
-  - Bugfixes.  (Iain)
-
-  - Recurring events have the correct time and date.  (Iain)
-
-
-Version 0.15 (Beta 5), 2001-10-02
----------------------------------
-
-Shell:
-
-  - Fixed a problem with shortcuts not appearing when created by the
-    mailer.  (Ettore)
-
-  - Fixed right-click menu behavior for folders in the folder bar.
-    (Ettore)
-
-  - Got Rename to work again.  (Ettore)
-
-  - Fixed some folder copy/move/dnd bugs.  (Ettore)
-
-  - Added a menu item to configure the Pilot settings.  (Ettore)
-
-  - Fixed some other miscellaneous bugs/crashes.  (Ettore)
-
-  - Added ability to run the intelligent importers from the File->Import
-    menu item. (iain)
-
-Mailer:
-
-  - Fixed the multiple error-dialog thing.  (Michael)
-
-  - Fixes to PGP decrypting and verification code.  (Jeff)
-
-  - Made vFolders work a lot better.  (Michael)
-
-  - Added a confirm expunge option to the mail settings dialog.
-    (Jeff)
-
-  - Fixed the update-IMAP-unread-counts bug.  (Jeff)
-
-  - Show messages in the user's preferred charset if the message
-    itself doesn't contain charset information or if the message
-    charset is wrong (ie the system can't convert the text to utf-8).
-    (Jeff)
-
-  - Many backend fixes that users won't notice.  (Michael, Jeff, Dan)
-
-  - Fixed the crash that accompanied the invalid address warning.  (Trow)
-
-  - Properly encode the mailto: links we generate inside of displayed
-    messages.  (Trow)
-
-  - Improve the signature editor. (iain)
-
-Calendar:
-
-  - Backend improvements (JP, Rodrigo).
-
-  - The alarm daemon can now re-enter properly [#10840].  (Federico)
-
-  - Alarms can now have zero-time offsets [#7892].  (Federico)
-
-  - Warning fixes.  (Chris)
-
-  - Fixed custom Glade widgets on non-Linux systems.  (Dan)
-
-  - Fixed crashing problems in the event/task editor.  (Damon)
-
-Addressbook:
-
-  - Miscellaneous bug fixes.  (Trow, Chris Toshok, Chris Lahey, JP,
-    Peter Williams)
-
-  - Better handling of addresses containing commas or other special
-    characters.  (Trow)
-
-  - Fixed bugs related to sending mail by left-clicking on an address
-    inside a message.  (Trow)
-
-  - Auto-completion now matches against contact nicknames.  (Trow)
-
-  - Added help text and generally cleaned up the contact editor.
-    (Anna)
-
-  - Handle multiple wombats properly.  (Chris Toshok)
-
-  - Made which book to use for address completion configurable (no gui
-    for this yet.)  (Chris Toshok)
-
-  - Made Print Preview work in addressbook.  (Chris Lahey)
-
-Pilot:
-
-  - Now syncs exception dates in calendar and addressbook notes.  (JP)
-
-  - Does not overwrite custom data on pilot.  (JP)
-
-  - Address completion no longer marks records as changed.  (JP)
-
-  - Miscellaneous other bug fixes.  (JP)
-
-Summary:
-
-  - Cache images instead of repeatedly reloading them (iain)
-
-  - Only redraw when the summary is visible (iain)
-
-  - Use the encoding specified in the RDF file (Takuo Kitame)
-
-  - Leak fixes (Larry)
-
-  - Show todays tasks works (iain)
-
-  - Make the preferences dialog nicer. (iain)
-
-Importers:
-
-  - Handle cases where the Netscape transport is nothing. (iain)
-
-Version 0.14 (Beta 4), 2001-09-21
----------------------------------
-
-General:
-
-  - Lots of i18n fixes.  (Zbigniew Chyla and others)
-
-  - Made the splash screen use BackingStore.  (Ettore)
-
-  - Added a quit dialog box.  (Ettore)
-
-  - Fixed a shell crash that could happen when launching Evolution
-    before a previously launched instance was done initializing itself.
-    (Ettore)
-
-  - Fixed other random shell crashes.  (Ettore)
-
-  - Got the shell to remember window geometries on exit.  (Ettore)
-
-  - Fixed some things for Automake 1.5 (unfinished).  (Richard
-    Boulton)
-
-  - Add nice highlighting to DnD operations in the folder tree.
-    (Ettore, Clahey)
-
-  - Fixed several leaks.  (Dan)
-
-  - Fixed some problems with folder creation and deletion.  (Toshok)
-
-  - Made the Summary the default folder.  (Ettore)
-
-  - Made the title bar display the unread message count again.
-    (Ettore)
-
-Mail:
-
-  - Had a few beers while sitting back and relaxin'.  (Jeff, Michael)
-
-  - Check for valid addresses before sending. (Trow)
-
-  - Use contact preferences when deciding whether or not to put the
-    composer into HTML mode by default. (Trow)
-
-  - Properly address mail from "hidden" contact lists. (Trow)
-
-  - Redid folder unread counts/folder tree backend code
-    completely. (Michael)
-
-  - Implemented/fixed getfolderinfo in maildir/spool/local
-    folder/vfolder, required to make unread counts work. (Michael)
-
-  - Redid 'local folder' handling code completely. (Michael, Peter)
-    Also fixed the properties dialogue to get the list of supported
-    types dynamically, and set the right one at startup. (Michael)
-
-  - Redid vfolder code in evolution-mail completely.  Main visible
-    change is they open at startup, and the vfolder editor works
-    much better.  (Michael)
-
-  - Made it so fcntl(2) locking failures on filesystems (e.g. NFS)
-    that dont support locking are treated as success. (Michael)
-
-  - Fix imap inbox filtering, then moved it to CamelFolder, and
-    partly implemented it for spool and maildir mailboxes.  (Michael)
-
-  - Made the vfolder UNMATCHED folder's name translatable.  (Michael)
-
-  - Change the way the 'not body contains' filter rule works, so that
-    it runs much more efficiently, particularly on IMAP.  (Michael)
-
-  - Camel will not try and convert charsets of data that contain
-    invalid charset data, thus data will not be tainted by
-    a failed conversion process. (Michael)
-
-  - A few threading scheduling changes to try to optimise the user
-    experience.  Also changed the way threads are terminated,
-    avoiding some possible libpthread bugs.  (Michael)
-
-  - Changed vfolder uri's to not include the query, set it separately.
-
-  - Removed a lot of special case code for vfolder/file uri's, other
-    dead or newly redundant code, cleanups, etc.  (Michael)
-
-  - Fixed a bug in libibex that would overallocate block data and
-    corrupt it and crash, also fail-back and reset the index in
-    more cases.  (Michael)
-
-  - Fix filtering on score so the expression compiles. (Michael)
-
-  - Came to visit USA at a very wrong time.  (Michael)
-
-  - Removed X-Evolution headers before sending messages.  (Jeff)
-
-  - When configuring a new default account, make sure to set it as the
-    default.  (Jeff)
-
-  - Convert all textual parts to 8bit before saving them, this makes
-    saved messages more human readable.  (Jeff)
-
-  - Don't cache PGP passphrases unless the user requests to do so.
-    (Jeff)
-
-  - Unsubscribe from folders before deleting them.  (Jeff)
-
-  - Fixed a number of race conditions in the subscribe dialog.  (Jeff)
-
-  - Save transport (SMTP) passwords if the user has asked us to.  (Jeff)
-
-  - Hide the S/MIME frame in the account editor, we won't be
-    supporting it for 1.0.  (Jeff)
-
-  - Fixed it so that icons are displayed for PGP messages.  (Jeff)
-
-  - Give a description for each of the Source and Transport types when
-    configuring an account. This makes a few things less confusing.
-    (Jeff)
-
-  - When performing a Send & Receive on a disconnected IMAP server, if
-    the user provides a password, connect tot he IMAP server and display
-    it's folders too.  (Jeff)
-
-  - Return a folder info for each IMAP folder created when the user
-    creates a recursive directory structure.  (Jeff)
-
-  - Added support for more charset conversions (including all
-    Windows-cp125x charsets).  (Jeff)
-
-  - When the disk is full, warn the user and don't crash.  (Jeff)
-
-  - Handle POP servers that don't support the UIDL extension.  (Jeff)
-
-  - Several PGP fixes.  (Jeff)
-
-Addressbook:
-
-  - Miscellaneous bug fixes. (Jon Trowbridge, Chris Toshok, Chris Lahey,
-    Ettore Perazzoli, Iain Holmes, Zbigniew Chyla, Jacob Berkman)
-
-  - Fixed race conditions associated with adding/removing contacts.
-    The addressbook should be much more stable now.  (Trow)
-
-  - Fixed reference counting bugs in addressbook & wombat.  (Trow)
-
-  - Made address lookup smarter; cut & paste of address now mostly works.
-    (Trow)
-
-  - Plugged Trow's memory leaks.  (Larry)
-
-  - Name completion now works with one-word names, so it is now much
-    easier to send mail to Cher.  (Trow)
-
-  - Better handling of contact lists in the composer entries.  (Trow,
-    Toshok)
-
-  - SelectNames dialog fixes.  (Trow)
-
-  - Better handling of contact lists in the pilot conduits.  (JP)
-
-  - Added Free busy URL and Calendar URI info to contact editor and
-    ECard.  (JP)
-
-  - Made it so you can select uneditable text in Contact Editor.
-    (Chris Toshok)
-
-  - Worked on LDAP dialog.  (Chris Toshok)
-
-  - General LDAP work.  (Chris Toshok)
-
-  - Fixed charset handling within VCard handling.  (Chris Lahey)
-
-  - Reworked Drag & Drop for card view.
-
-Calendar & Tasks:
-
-  - Free/Busy changes.  (JP, Rodrigo)
-
-  - iTIP fixes (JP)
-
-  - i18n fixes, particularly for printing (Zbigniew Chyla)
-
-  - Added option to confirm deletions (Federico)
-
-  - Improved alarm system (Federico)
-
-  - Fixed crashing bug when deleting a folder (Federico)
-
-  - Added option to hide completed tasks (Damon)
-
-  - Timezone changes for interoperability with Outlook (Damon)
-
-  - Fixed problems displaying/parsing times in locales which don't specify
-    'am' and 'pm' strings (Damon)
-
-  - Added toolbar button to delete the selected calendar event (Damon)
-
-  - Meeting selector integrated (JP)
-
-Summary:
-
-  - Fixed bugs and leaks.  (Iain)
-
-  - Fixed bug with handling of the Slashot RDF files.  (Iain)
-
-  - Made the Addressbook and Tasks links open the editor for
-    them.  (Iain)
-
-  - Mail summary doesn't force all folders to be opened.  (Iain)
-
-  - Calendar summary shows if an alarm is set for an appointment.  (Iain)
-
-  - Timezone fixes.  (Iain, Damon)
-
-Importers:
-
-  - Fixed more bugs.  (Iain)
-
-  - Netscape importer shouldn't crash on Movemail users anymore.
-    (Iain)
-
-  - Pine importer should import addressbooks better.  (Iain)
-
-  - VCard importer will actually import things now.  (Iain)
-
-
-Version 0.13 (Beta 3), 2001-08-21
----------------------------------
-
-Global:
-
-  - New startup assistant to create mail accounts, import mail and set 
-    your timezone.  (Iain, Taylor)
-
-  - Improved the appearance and behavior of the clickable title bar and
-    the folder tree.  (Ettore)
-
-  - "Stock" folders such as Inbox have their names translated now and
-    cannot be removed.  (Ettore)
-
-  - Moved the Summary (formerly known as "My Evolution") to be a
-    normal node instead of being the toplevel node.  (Ettore)
-
-  - Fixed some problems with copying, moving and removing folderes.
-    (Jason)
-
-  - Fixed the handling of documentation files in the Help menu.  It
-    now integrates nicely with Nautilus and Scrollkeeper.  (Aaron,
-    Kjartan)
-
-  - Implemented the `File -> New' menu.  (Ettore)
-
-  - Improved error messages on start-up.  (Ettore)
-
-  - Fixed various crashes and minor bugs.  (Ettore, Jason)
-
-  - Various UI tweaks and improvements.  (Anna, Tuomas, Jakub)
-
-Mail:
-
-  - Fixed creating IMAP folders.  (Jeff)
-
-  - Add a shortcut to the INBOX of IMAP or spool stores when 
-    their accounts are first created. (Peter)
-
-  - Fixed Crash on Exit bugs.  (Jeff)
-
-  - Many more i18n fixes.  (Zbigniew Chyla, Jeff and others)
-
-  - Subscribe dialog UI tweaks. (Peter, Anna)
-
-  - Displaying PGP signed messages now shows icons.  (Jeff)
-
-  - Sensitize menu items based on number of selected messages. (Peter)
-
-  - Always-sign options for PGP.  (Jeff)
-
-  - Fixed keep-on-server for POP servers that don't support UIDL.
-    (Jeff)
-
-  - Several IMAP fixes. (Peter, Jeff, Danw)
-
-  - Fix crash after conversion of an empty folder to another
-    format. (Peter)
-
-  - Ibex now limits its file descriptor usage. (Michael)
-
-  - When deleting an account, remove the shortcuts that point to it. (Peter)
-
-  - Several IMAP fixes. (Peter, Jeff, Danw)
-
-  - Miscellaneous bugfixes all around. (Peter, Jeff, Danw, Michael, others)
-
-Calendar & Tasks:
-
-  - Calendar no longer crashes when you scroll a busy month view
-    (Federico).
-
-  - Performance improvements throughout (Damon).
-
-  - Improved search bar; now handles categories.  (Jon, Federico)
-
-  - The date navigator now reflects the results of the search bar.
-    (Federico)
-
-  - An empty task is no longer added when you have selected a
-    category. (Federico)
-
-  - Internationalization fixes (Zbigniew).
-
-  - Timezone fixes (Damon).
-
-  - Time transparency and component classification support (Damon).
-
-  - Folder bar now displays the selected time range (Damon).
-
-  - Improved settings dialog (Anna, Damon, Federico).
-
-  - iTIP/iMIP fixes for attendees, cancellation. (JP).
-
-  - Category icon drawing fixes. (Rodrigo)
-
-  - Alarm fixes. (Federico)
-
-  - Calendar components can be saved independently. (JP)
-
-  - New icons. (Tuomas)
-
-  - Contacts support. (Damon)
-
-  - You can double-click on appointments to edit them. (Damon)
-
-  - Share more code between the backends. (Rodrigo)
-
-  - Miscellaneous fixes all over the place. (Damon, JP, Rodrigo, Federico)
-
-Addressbook:
-
-  - Various fixes.  (Anna Dirks, Dan Winship, Jason Leach, Jos Dehaes,
-    Kjartan Maraas, Lahey, Nat Friedman, Radek Doulik, Toshok, Trow)
-
-  - Made addressbook menus match the right click menus.  (Lahey)
-
-  - Made addressbook use camel for building email addresses.  (Trow)
-
-  - Fixed up phone number matching to not cause errors.  (Lahey)
-
-  - Made the alphabet bar change the current search.  (Lahey)
-
-  - Made duplicate contact matching less sensitive.  (Lahey)
-
-  - Changed advanced search to match behavior in mailer.  (Toshok)
-
-  - Redesigned LDAP server dialog.  (Anna Dirks)
-
-  - Work on addressbook authentication.  (Toshok)
-
-  - Changes to EDestination.  (Trow)
-
-  - Magic comma work.  (Trow)
-
-  - Redesigned ESelectNames dialog.  (Anna Dirks)
-
-  - Made LDAP changes appear in gui immediately if they're made by the
-    local client.  (Toshok)
-
-  - Made ECard hold a link to its original EBook.  (Lahey, Trow)
-
-  - Adapted for new ESearchBar. (Federico, Trow)
-
-  - Added the ability to create cards from anywhere in evolution.
-    (Lahey)
-
-  - Made searches for completion not use invalid cached data.  (Trow)
-
-  - Encode strings typed in by the user for use in sexps.  (Toshok)
-
-  - Made EContactEditor make the save button active more often.
-    (Toshok)
-
-  - Made ESelectNames handle LDAP storages.  (Toshok)
-
-  - Added full country list to addressbook full address editor.
-    (Lahey)
-
-  - Added the contact count to the folder bar.  (Lahey)
-
-  - Updated icons.  (Damon, Ettore)
-
-  - Worked on addressbook conduit.  (JP)
-
-  - Made ESelectNames only show names on the left that aren't on the
-    right.  (Trow)
-
-  - Fixed up minicard dragging.  (Toshok)
-
-My Evolution:
-
-  - Miscellaneous fixes all over the place. (iain)
-
-  - New icons. (Tuomas and Jakub)
-
-  - Works for people whos text colour was a light colour. (iain)
-
-
-Version 0.12 (Beta 2), 2001-07-31
----------------------------------
-
-Shell:
-
-  - Change the name of the local storage node from "local" to "Local
-    Folders".  (Jason)
-
-  - Fixed a problem with invalid URIs crashing the shell.  (Jason)
-
-  - Hide internal folder types (like "vtrash") from user.  (Ettore)
-
-  - Fixed some crashes that could happen when creating folders.
-    (Ettore)
-
-  - Fixed the URIs for the installed manuals in the help menu.
-    (Ettore)
-
-  - Added a status bar to show components' tasks instead of using
-    pop-up progress dialogs.  (Ettore)
-
-  - Other miscellaneous bug and leak fixes.  (Jason, Ettore)
-
-  - Initialize GConf properly when GtkHTML is built with GConf
-    support.  (Frederic Crozat)
-
-  - Make the shortcut bar not change the current group when renaming
-    it.  (Jason)
-
-Mail:
-
-  - Use new shell ActivityClient interface for progress reporting so
-    the ongoing activities appear at the bottom of the window instead of
-    using a pop-up.  (Michael)
-
-  - "Remember this password" check box added.  (Peter, Jeff)
-
-  - UI for timespan editor cleaned up.  (Peter)
-
-  - UTF8 issues with PGP and mail display addressed.  (Jeff)
-
-  - Translate some more strings.  (Jeff, Zbigniew Chyla)
-
-  - Fix camel_session_*_timeout functions.  (Michael)
-
-  - Fix application/pgp handling.  (Jeff)
-
-  - Fix DnD with no messages selected.  (Jeff)
-
-  - Respect the GTK+ theme when generating the header in the mail
-    display.  (Jeff)
-
-  - Make the default date column smaller.  (Peter)
-
-  - Don't display "0 hidden" messages.  (Peter)
-
-  - 'q' now toggles the message (pre)view.  (Peter)
-
-  - Rename the "Date" column to "Sent".  (Peter)
-
-  - Fix saving of passwords (some passwords were being saved and
-    loaded under different URI's).  (Jeff)
-
-  - Enter now always open the message in a new window.  (Peter)
-
-  - Gray out unsupported authentication mechanisms.  (Jeff)
-
-  - Fix saving/loading of several preferences.  (Peter, Jason)
-
-  - Overwrite attachment files correctly.  (Jeff)
-
-  - Don't lose the selection when deleting the last message.  (Jason)
-
-  - Improve guessing of which address to use when replying.  (Jeff, Jason)
-
-  - If SSL isn't supported, indicate so.  (Peter)
-
-  - Improve handling of NoSelect IMAP folders.  (Peter)
-
-  - Add a browse button for local mailboxes.  (Jason)
-
-  - VTrash handling improvements.  (Jeff, Peter)
-
-  - Display "unsent" in outbox summary.  (Peter)
-
-  - Only have main view folder browsers save view settings.  (Peter)
-
-  - Fixes to POP3 cache.  (Jeff)
-
-  - Handle variants of charset names.  (Jeff)
-
-  - Progress reporting and optimizations for IMAP.  (Dan)
-
-  - Progress reporting for SMTP.  (Michel)
-
-  - Handle unencoded eight-bit headers.  (Jeff)
-
-  - Miscellaneous improvements to Camel backend.  (Michael, Jeff)
-
-  - Several crashes fixed.  (everyone)
-
-Addressbook:
-
-  - Fixed some warnings.  (Chris T.)
-
-  - I18n fixes.  (Zbigniew Chyla)
-
-  - Address quoting in composer bug fixed.  (Jon)
-
-  - Made it so that Other Contacts doesn't show up if you don't have
-    LDAP compiled in.  (Jason)
-
-  - Made it so that Other Contacts doesn't show up if you don't have
-    any LDAP servers configured.  (Jos Dehaes)
-
-  - General bug fixes.  (Chris T., Jon, Frederic Crozat, Jason,
-    JP, Ettore, Chris L.)
-
-  - Some LDAP cleanup.  (Chris T.)
-
-  - Crash fixes.  (Jon, Dan)
-
-  - Work on contact lists.  (Chris T., Jon)
-
-  - Made Contact Editor Save & Close button not active if nothing is
-    changed.  (Chris T.)
-
-  - Added accelerators to a few dialogs.  (Taylor Hayward)
-
-  - Made evolution-vcard-importer.c load the file into the correct directory.
-    (Iain)
-
-Calendar & Tasks:
-
-  - Show icons for categories.  (Rodrigo)
-
-  - Multiple selections for cut/copy/paste in task list.  (Rodrigo)
-
-  - Added missing underlined shortcuts for dialogs.  (Taylor)
-
-  - Many timezone-related fixes.  (Damon, Federico)
-
-  - Alarm notification dialogs.  (Federico)
-
-  - iTIP and iMIP ongoing work.  (JP)
-
-  - Consistency & cosmetic fixes for dialogs and menus.  (Damon,
-    Federico)
-
-  - You can now create new calendar/tasks folders in the shell.
-    (Ettore)
-
-  - Printing fixes.  (Damon)
-
-  - Added a search bar for tasks folders.  (Federico)
-
-  - The task pad in the day view is now filtered as well.  (Federico)
-
-  - Timezone support for conduits.  (JP)
-
-  - General bug fixes.  (Federico, JP, Damon, Rodrigo)
-
-My Evolution:
-
-  - Removed the wipe trackers option.  (Iain)
-
-  - Fix broken links in the Calendar.  (Iain)
-
-  - Added some more German cities.   (Iain)
-
-  - Fixed the New Feed button.  (Iain)
-
-  - Fixed the KDE and Newsforge urls.  (Iain and Jason)
-
-
-Version 0.11 (Beta 1), 2001-07-12
----------------------------------
-
-Shell:
-
-  - Drag and drop handling (Chris T.)
-
-  - Online/Offline operation (Ettore)
-
-  - Numerous code cleanups and bug fixes (Ettore & Jason)
-
-Mail:
-
-  - Added ability to specify a charset in the composer and for the 
-    Preview Pane.  (Jeff, Danw)
-
-  - Auto-save messages during composition and composer 
-    crash-recovery.  (Larry)
-
-  - Better signature file handling.  (Radek)
-
-  - File->Insert menu.  (Larry)
-
-  - Address-completion in the composer.  (Trow)
-
-  - Much improved PGP/GPG.  (Jeff)
-
-  - Cut/Copy/Paste and Drag & Drop.  (Jeff)
-
-  - Disconnected IMAP, IMAP filtering, and other IMAP improvements. (Danw)
-
-  - Empty Trash On Exit.  (Jeff)
-
-  - More informative Folder message counts (new/hidden/total).  (Peter)
-
-  - Implemented "Select Thread".  (Peter)
-
-  - Movemail fixes and improvements.  (Michael)
-
-  - Improved/Configurable Forward/Reply functionality.  (Jeff, Trow, Danw)
-
-  - Improved Message browser window.  (Jeff, Peter)
-
-  - Load HTML images Sometimes/Always/Never.  (Danw)
-
-  - rfc2184 conformance.  (Jeff)
-
-  - Online/Offline modes.  (Ettore, Danw, Jeff)
-
-  - HTML indexing.  (Michael)
-
-  - Spool providers.  (Michael)
-
-  - Many i18n fixes. (Jeff, Trow, Larry, Michael)
-
-  - Fixed saving of html signature preferences. (Peter)
-
-  - Cleaned up exiting by having remote stores sync folders (Peter)
-
-  - Attached binhex files do not cause infinite loops (Peter)
-
-  - Don't send BCC headers when sending via SMTP (Peter)
-
-  - Let you show and hide attached message/rfc822's (Peter)
-
-  - Implemented Create/Remove/Move Folder. (Jason, Jeff)
-
-  - Maildir fixes and improvments, support for subdirectories. (Michael)
-
-  - Progress reporting using via shell activity interface. (Michael)
-
-  - Many bug fixes all around.  (Michael, Jeff, Danw, Peter, Trow and others)
-
-Addressbook:
-
-  - Cut/Copy/Paste (Chris T.)
-
-  - Improvements to address completion, matching and merging (Jon, Chris L.)
-
-  - LDAP improvements (Chris T.)
-
-  - Numerous bug fixing (Jon, Chris L., Chris T.)
-
-Calendar & Tasks:
-
-  - Timezone support (Damon)
-
-  - Cut/Copy/Paste (Rodrigo)
-
-  - Event/Task editor rewrite (Federico & JP)
-
-  - Improved Printing (Damon)
-
-  - Itip/Imip improvements (JP)
-
-Importers: 
-
-  - Fixes, bug fixes and more fixes. (Iain & Jason)
-
-General:
-
-  - New graphics/icons (Jakub & Tuomas)
-
-  - UI Improvements (Anna & Taylor)
-
-  - 'make distcheck' should hopefully be working again (Peter)
-
-  - Have 'make install' work for non-root users in Camel, albeit
-    with a large and important warning message (Peter)
-
-My Evolution:
-
-  - Completely new and prettier My Evolution (nee Executive Summary) 
-
-  - Pretty graphics (Jakub)
-
-  - Mail, Calendar and Task summaries to tell you what you need to do
-    today.
-
-  - Weather forecasts so you don't need to look out the window (I
-    dunno, hackers seem to dislike looking out the window or
-    something...)
-
-  - News feeds so you don't need to go to websites to see what news
-    articles you don't want to read.
-	
-  - Printing, you can print it out and make it look like you've got
-    lots of stuff to do when really you're just trying to pass the 
-    time by playing Aisleriot or GLine all day (Iain)
-
-
-Version 0.10 "Tasmanian Devil", 2001-04-26
-------------------------------------------
-
-Shell:
-
-  - Fixed some usability bugs in the folder selection and creation
-    dialogs.  (Ettore)
-
-  - Added a --debug option.  (Dan)
-
-  - Added support for drag and drop operations.  (Ettore)
-
-Mail: 
-
-  - SSL (S/IMAP, S/POP, and S/SMTP).  (Jeff)
-
-  - Virtual Trash folders in each mail storage and "Empty Trash" menu
-    item to expunge all folders in a store.  (Jeff)
-
-  - Email addresses in mail headers are now right-clickable to add
-    them to the Addressbook (Jon, Radek)
-
-  - Hide deleted messages is now a mode rather than a one-time
-    operation. (Michael)
-
-  - When sending plain text mail, use the new plain text mode of the
-    GtkHTML editor (Larry)
-
-  - Cancellable operations, cancellable/async dns lookup, slightly
-    improved progress reporting.  (Michael)
-
-  - Allow per-identity Draft and Sent folders.  (Dan)
-
-  - Replies quoted with "> " in messages are now displayed dimmed to
-    make it easier to find the new bits of text. (Radek)
-
-  - Saved searches.  Searches now configurable via XML with supporting
-    C code.  (Michael)
-
-  - UNMATCHED vFolder (shows all messages that are in no other
-    vFolder). (Michael)
-
-  - SASL Authentication (Kerberos4, DIGEST-MD5, CRAM-MD5, PLAIN,
-    LOGIN, ANONYMOUS) for IMAP and SMTP (haven't done POP yet)
-    (Jeff, Dan)
-
-  - Filter/vFolder on Mailing List.  (Michael)
-
-  - Resend sent items.  (Jeff)
-
-  - Allow users to turn on/off headers in the composer and added
-    Reply-To header entry in the composer.  (Miguel, Jeff)
-
-  - Numerous OpenPGP (PGP/MIME) fixes.  (Jeff)
-
-  - Replying to a message chooses account based on message
-    addressee's.  (Jeff)
-
-  - Redid Forward Inline and Forward Quoted.  (Jeff)
-
-  - IMAP fixes: greater configurability for faster startup/mail check
-    (Dan), folders should now notice new messages when you switch to
-    them (Dan), copying/moving many messages at once should be much
-    faster (Jeff), better support for old IMAP servers (Dan)
-
-  - IMAP message bodies are now cached to local disk to speed up
-    re-access (Dan)
-
-  - New config dialogs (last time!) (Anna, Dan)
-
-  - Sorting by a text field in the message list no longer generates a
-    random order. (Michael)
-
-  - Fixed "crash when getting new mail from 2 POP servers" bug. (Dan)
-
-  - Numerous bugfixes, cleanups and optimisations. (Everyone)
-
-Addressbook:
-
-  - Added support for non editable sources.  (Toshok)
-
-  - Added address completion for use in contact entries using the
-    select names system.  (Jon Trowbridge)
-
-  - Fixed some major crashes in the addressbook backend.  (Clahey)
-
-  - Updated Ximian's contact information.  (Jason Leach)
-
-  - Finished LDAP support.  (Toshok)
-
-Calendar:
-
-  - Event creation fixes.  (Miguel)
-
-  - Calendar loading fixes and removal of old code.  (Federico)
-
-  - Made the iTIP control have better spacings.  (Anna)
-
-  - i18n fixes.  (Kjartan)
-
-Tasks:
-
-  - Created a popup list item for ETable to select the Status,
-    Classification, Priority, Percent & Transparencey fields.  (Damon)
-
-  - Created a popup date editor item for ETable to set all the dates in the
-    tasks.  (Damon)
-
-Importers: 
-
-  - Created Intelligent Importers that look for certain files on your disk
-    and works out what type of data it is. Currently Intelligent Importers
-    exist for Pine, Elm and Netscape. (Iain)
-
-General:
-
-  - Rewrote ETree in gal.  Changed evolution to support the changes in
-    API.  (Clahey)
-
-  - Lots of Etable/ETree bug fixes.  (Clahey)
-
-  - Lots of i18n/l10n fixes.  (Kjartan Maraas, Gedeminas Paulauskas,
-    and the Evolution gang)
-
-  - Fixed the shell interface so it could correctly create folders. (Iain)
-
-
-Version 0.9 "Platypus", 2001-03-12
-----------------------------------
-
-Shell:
-
-  - Importing framework.  (Iain)
-
-  - Made the splash screen a regular window.  (Miguel)
-
-  - Added a menu item to hide the shortcut bar to the shortuct bar
-    right-click menu.  (Jason)
-
-  - Update the shortcut labels to contain the number of unread
-    messages as well.  (Jason)
-
-  - Pre-select a newly created folder in the folder selection dialog.
-    (Ettore)
-
-Mail:
-
-  - GPG/PGP support is now mostly working and sort of configurable.
-    Except that the pretty pictures are missing.  (Jeff)
-
-  - Exciting new configuration druid (Anna, Jeff) and configuration
-    editor-of-the-month (Jeff). You can now have multiple identities
-    that use different transports.  (Jeff)
-
-  - The folder-tree unread message counts now work much better. But
-    vfolders only display their unread message counts *after you've
-    looked at the folder for the first time*.  (Dan)
-
-  - New mail send/receive stuff with status dialog.  (NotZed)
-
-  - "Stop" button and support for cancelling operations.  (NotZed)
-
-  - Various fixes involving IMAP folders and subscriptions.  (Dan)
-
-  - Fake messages to root threads in the message list are now gone.  (NotZed)
-
-  - NNTP support is no longer configured by default, as this code is
-    not expected to be completed by 1.0.
-
-  - Interface for hiding messages matching certain criteria.  (NotZed)
-
-  - Quick search bar now includes "Sender contains" option (Tuomas? Eek!)
-
-  - The mailer now properly launches "gnome_segv" when it crashes. I
-    mean, if it were to crash.  (Dan)
-
-  - IMAP attachments are now not loaded unless you look at them.  (Dan)
-
-  - The X-Mailer header can now include a compile-time-specified
-    string (for specifying package version, etc).  (Dan)
-
-  - The Date header in the message list now formats dates differently
-    depending on how long ago they are.  (Chris)
-
-  - The composer doesn't ask if you want to save before closing if you
-    haven't changed anything. Also, it has more useful window titles
-    (Jason Leach) And you can now turn off the "are you sure you
-    didn't mean to enter a subject?" dialog box.  (Jeff)
-
-  - The "Menu" key on a Windows keyboard (the one with the picture of
-    a pop-up menu) now pops up the message list right-click menu.
-    (Dan)
-
-  - Lots of internal stuff that doesn't much affect the user-visible
-    functionality, particularly involving multithreading, message
-    threading, filters/searching, and regression testing.  (NotZed)
-
-  - Importers for Outlook Express 4 and mbox (used by most mailers like
-    Netscape, Pine, Elm, Eudora) (Iain & Jeff)
-
-Addressbook:
-
-  - Fixed crashing bug on PPC.  (Clahey)
-
-  - Updated to work with both OpenLDAP 1 and OpenLDAP 2.  (Toshok)
-
-  - Added configuration dialog for LDAP.  (Toshok)
-
-  - Plenty of bug fixes.  (Clahey, Toshok, Meeks, JP, Larry, Jason,
-    Federico, Dan, Zucchi, Gediminas Paulauskas, Ettore)
-
-  - Moved category dialog to gal.  (JP)
-
-  - Worked on LDAP authentication.  (Toshok)
-
-  - Worked on status messages.  (Toshok)
-
-  - Worked on GalView stuff.  (Clahey)
-
-  - Improved the select names dialog GUI.  (Clahey)
-
-Calendar:
-
-  - New "go to date" dialog.  (JP)
-
-  - Categories support for appointments.  (JP)
-
-  - New alarms page in event editor.  (Anna, JP)
-
-  - Weekday picker now follows the week start setting.  (Federico)
-
-  - Date-editing widgets are more consistent with each other.
-    (Federico)
-
-  - Colorization fixes to the views.  (Damon)
-
-  - Optimizations to the views.  (Damon)
-
-  - New, simpler loading interface for calendars in the Wombat.  (Federico)
-
-  - Removal of lots of old Gnomecal code.  (Federico, JP)
-
-  - Alarm instance generation support for the Wombat.  (Federico)
-
-  - Alarm trigger queueing for the GUI.  (Federico)
-
-  - More robust launching and registration of the components.  (Federico)
-
-  - More i18n friendliness.  (JP, Federico)
-
-  - Start of the alarm notification daemon.  (Federico)
-
-  - Cosmetic and focus fixes all over the place.  (Federico, JP)
-
-Tasks:
-
-  - New, stand-alone tasks component.  (Damon)
-
-  - Categories support.  (JP, Damon)
-
-  - Your old tasks are migrated automatically to the new tasks folder.
-    (Federico)
-
-  - You get asked for confirmation when trying to delete a task entry.
-    (Federico)
-
-Conduits:
-
-  - Many bug fixes and cleanups.  (JP)
-
-Executive Summary:
-
-  - Bugfixes and memory leaks removed.  (Iain)
-
-  - Calendar summary component.  (Iain)
-
-  - RDF Summary saves it's state.  (Iain)
-
-  - Mail summary shows vFolder summaries as well.  (Iain)
-
-  - User changable number of columns. (Iain)
-
-
-Version 0.8 "Archaeopteryx", 2000-12-14
----------------------------------------
-
-Shell:
-
-  - Added a `--no-splash' option.  (Ettore)
-
-  - Plugged a number of memory leaks.  (Federico)
-
-  - Added interfaces to display an arbitrary string associated with a
-    folder, and highlight it on demand.  (Ettore, Dan)
-
-  - Changed the Storage IDLs so that you can associate a physical URI
-    to the toplevel node as well.  (Ettore)
-
-  - If a shell is already running, `evolution' will just make it
-    create a new view instead of creating a new shell.  (Ettore)
-
-Mail:
-
-  Display:
-
-  - The folder tree now shows unread message counts for mail
-    folders. For local folders, this updates in real time.  For IMAP, it
-    only updates when you "Get Mail".  To be continued.  (Dan)
-
-  - New "important" column in the message list.  User-settable.  (Dan)
-
-  - The message list "Size" column now displays more prettily and
-    sorts correctly.  (Jeff)
-
-  - New command to view the raw source to a message.  (Jeff)
-
-  - More reliable MIME icon code in the mailer and the composer.
-    (Dan, Iain)
-
-  - Lots of internationalization fixes.  (Dan, Kjartan)
-
-  Composer / Outgoing mail
-
-  - Various fixes to use the best charset and MIME encoding for
-    outgoing messages.  (Michael, Jeff)
-
-  - You can now forward messages inline, instead of attaching them.
-    Forwarding multiple messages now results in a multipart/digest
-    attachment.  (Jeff)
-
-  - Replies are now preceded by "On DATE, PERSON wrote:" (Jeff)
-
-  - Better reply editing, automagically sets indentation and paragraph
-    style to Normal. (Radek)
-
-  - HTML signature support.  (Radek)
-
-  - Inline image support.  (Radek)
-
-  - Fixes for addresses with commas.  (Jeff, Michael)
-
-  - Fix to not allow attaching directories, devices, etc.
-    (Jeff)
-
-  - Fixed the sign of the GMT offset in generated Date headers. 
-    (Michael)
-
-  - Fixed a bug in base64 encoding.  (Michael)
-
-  - Fixed a problem in connecting to non-ESMTP SMTP servers.  (Jeff)
-
-  Miscellaneous Commands / Features:
-
-  - The mailer will now remember your passwords, if you configure
-    that option for a service.  (Dan)
-
-  - New "Apply Filters" command to apply filter rules to selected
-    messages.  (Jeff)
-
-  - No more "No new mail" dialog.  (Jeff)
-
-  - Individual messages can now be saved to disk.  (Jeff)
-
-  - Synced the Message menu with the right-click menu.  (Jeff)
-
-  - Mailer now uses the same search bar as the addressbook.  (Anna,
-    Chris, Jeff)
-
-  Filters:
-
-  - Now supports filtering on system flags (ie Answered, Seen,
-    Unseen).  (Jeff)
-
-  - Regular expression searches are now moved to their own Option
-    menu.  (Jeff)
-
-  - Allows regex searching on the entire message header.  (Jeff)
-
-  - Now has soundex filters (x sounds like y).  (Jeff)
-
-  IMAP:
-
-  - "Get Mail" now scans all folders.  (Dan)
-
-  - IMAP password dialog no longer pops up at startup: click on the
-    server in the folder tree to connect.  (Dan)
-
-  - Folder subscription support.  (Chris Toshok, Dan)
-
-  - Various IMAP folder naming fixes. (May fix Cyrus support) (Dan)
-
-  - Seen/deleted flags are preserved across "Get Mail".  (Jeff)
-
-  - Fixed a bug that could cause messages to be marked as seen
-    even when the UI thought they weren't.  (Dan)
-
-  - Fixes for IMAP folders with spaces in their names (again).
-    (Jeff)
-
-  - IMAP Kerberos 4 authentication support.  (Dan)
-
-  POP3:
-
-  - Fixed a bunch of error cases in POP3 connection.  (Dan)
-
-  - Fixed POP3 to more reliably delete messages when it was supposed
-    to be doing so.  (Dan)
-
-  Local mail:
-
-  - Major local mail rewrite that fixed memory leaks, reduced
-    memory consumption, improved efficiency, etc.  (Michael)
-
-  - Maildir support.  (Michael)
-
-  - Local mail folders are now locked (via dot locking and/or
-    fcntl/flock) while Evolution is modifying them, and it will
-    notice if they've changed while it's not looking. (Michael)
-
-Calendar:
-
-  - To-do and calendar conduits working except for extended
-    character support (ie accented chars) (JP)
-
-  - Updated wombat implementation of change reporting (JP)
-
-  - Majorly kick-ass new recurrence page in the event editor with an
-    easy UI, a preview of what will happen, and lots of love. (Anna)
-
-  - Imported a new libical with the APIs we require for alarms, the
-    start of the timezone code.  This may be the last Evolution
-    release that uses a CVS-imported libical; in the future we should
-    depend on official tarballs. (Federico)
-
-  - Event editor now deals gracefully with iCalendar recurrences we
-    cannot edit. (Federico)
-
-  - Plenty of fixes to the ETable calendar model for the task list
-    (Damon).
-
-  - The task list now saves its state, selected columns and sort order
-    (Damon).
-
-  - Lots of love to the iTIP engine and user interface.  Scheduling
-    appointments via email should be working fine, and they should
-    also work when you receive them. (Jesse)
-
-  - Lots of work on the calendar preferences code. (Damon)
-
-  - Many functional and cosmetic fixes to the day and week
-    views. (Damon)
-
-  - Event and task editors now ask if you try to close them without
-    saving changes. (Damon)
-
-  - You are now prompted if you are sure that you want to delete an
-    appointment. (Federico)
-
-  - Plenty of memory leaks fixed. (JP, Federico)
-
-  - Prettified the event editor a bit by making widget spacings
-    consistent. (Federico)
-
-  - Fixed semantics for handling exception dates (Federico)
-
-  - Some fixes to the recurrence instance generation engine. (Damon)
-
-  - Fixed insertion of new objects via notification into the task
-    list.  (JP, Federico)
-
-  - Misc. polishing for the event editor's innards. (Damon, Federico)
-
-  - Misc. cruft removal from old Gnomecal code (Federico, Miguel)
-
-  - Prettier icons for the task list. (Federico)
-
-Addressbook:
-
-  - Addressbook conduit now working, experimentally, except for
-    extended character support (ie accented chars.) (JP)
-
-  - Extended wombat functionality with getChanges call. (JP)
-
-  - Full name and address dialogs in contact editor fixed. (Chris)
-
-Executive Summary: (iain)
-
-  - Now compiled by default.
-
-  - Prettier default dialogs.
-
-  - Customisable background.
-
-  - RDF Summary, and Mail Summary components.
-
-  - Fixes and optimisations.
-
-  - Can restore state.
-
-Version 0.7, "Loch Ness Monster", ????
---------------------------------------
-
-There have been no verified sightings of this release.
-
-
-Version 0.6, "Procompsognathus", 2000-10-19
--------------------------------------------
-
-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 eba68391cc..0000000000
--- a/README
+++ /dev/null
@@ -1,268 +0,0 @@
-Evolution is the integrated mail, calendar and address book
-distributed suite from Ximian, Inc.
-
-See http://www.ximian.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 using Evolution, you should subscribe to the Evolution
-mailing list. If you are interested in hacking on it, you should
-subscribe to the Evolution Hackers mailing list. Send mail to
-"evolution-request@ximian.com" or
-"evolution-hackers-request@ximian.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 are mailing list archives available at
-http://lists.ximian.com/archives/public/evolution/     and
-http://lists.ximian.com/archives/public/evolution-hackers/
-
-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 the configure script complains that you don't have a library that
-you know you have installed, it usually means either that you've
-installed things into multiple prefixes (see the bits on GNOME_PATH
-below) or (if you're on Linux) that you installed the "foo" package
-but forgot the "foo-devel" or "foo-dev" packages.
-
-
-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, and easier to switch between using packages
-and building it yourself, but it may also 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" or "autogen.sh"
-when building the other packages you need. For example:
-
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-
-    --localstatedir is needed to make the docs integrate with scrollkeeper
-    and needs to point to the directory containing the scrollkeeper indices
-    which are in: gnome-config --localstatedir
-
-If you build in another prefix instead, 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. For example:
-
-        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 and ${prefix}/lib in your LD_LIBRARY_PATH.
-
-
-DEPENDENCIES
-------------
-
-The following required 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 Ximian
-GNOME ( http://www.ximian.com/desktop/ ).  Other packages may be
-available from the Ximian GNOME evolution preview mirror.
-
-If installing from packages, remember that you need both the runtime
-and -devel packages for each library.
-
- - xml-i18n-tools - latest from xml-i18n-tools-stable-1-x branch in
-   GNOME CVS (0.8.2 is too old)
-
- - scrollkeeper - 0.1.4 or later (*)
-
- - gnome-xml - 1.8.10 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_BRANCH".)
-   (*)
-
- - gnome-print - 0.25 or later (*)
-
- - gdk-pixbuf - 0.9.0 or later (*)
-
- - ORBit - 0.5.8 or later (*) (If you get this from GNOME CVS, use the
-   tag "orbit-stable-0-5".)
-
- - oaf - 0.6.2 or later (If you get this from GNOME CVS, use the tag
-   "oaf-stable-0-6")
-
-   *** 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 - 1.0.0 or later (If you get this from GNOME CVS, use
-   the tag "gnome-vfs-1-0")
-
-   *** If you are using gnome-vfs from CVS, you should use the flag
-   *** "--disable-more-warnings" when configuring, or it may fail to
-   *** build.
-
- - libglade - 0.14 or later
-
- - bonobo - 1.0.3 or later
-
-   *** Note that bonobo must be installed with the same --prefix as
-   *** either gnome-libs or evolution for the Makefiles to work
-   *** properly.
-
- - gal (GNOME Application Library) - 0.18.1 or later
-
- - gtkhtml - later than 0.16.1
-
- - SOUP: later than 0.6.99
-
-Other non-GNOME Dependencies:
-
- - Berkeley's libdb - 3.1.17
-
-   db3 is available from http://www.sleepycat.com. Make sure to get
-   3.1.17, it isn't the latest version.
-
-     --- IMPORTANT WARNING ---
-
-     The on-disk format of DB files has been changing between versions
-     2, 3 and 4.  Also, because of the libdb API, there is no way to
-     easily handle the different formats from within the application.
-     For this reason, Evolution has chosen to use one specific version
-     of the library (version 3) and stick to it, so that users do not
-     need to convert their addressbook files to use them with
-     different version of Evolution.
-
-     That's why Evolution REQUIRES libdb 3.1.17, and NO OTHER VERSION.
-
-     If you force the check to accept a version different from 3.1.17,
-     your binary of Evolution will be using a different format from
-     the chosen one; this means that it will not be able to read
-     addressbook databases created by other versions of Evolution
-     which were compiled in the standard way.  Also, we DO NOT
-     GUARRANTEE that Evolution will work with different versions of
-     libdb at all, even if it can be trivially made to compile against
-     them.
-
-     SPECIAL NOTE FOR BINARY PACKAGERS:
-
-     If you are making binary packages for end-users (e.g. if you are
-     a distribution vendor), please statically link Evolution to
-     Berkeley DB 3.1.17, as mandated by the configure.in check.  DO
-     NOT patch configure.in to work around the check.  Forcing the
-     check to link to a different version of the library will only
-     give headaches and pain to your users, who will see their
-     addressbook disappear and will complain to us (the Evolution
-     team) about losing their data.
-
-     Besides, libdb will be linked statically, which means that your
-     distribution doesn't actually need to ship DB 3.1.17 itself
-     separately.
-
-     The Evolution team will be infinitely grateful for your
-     co-operation.  Thanks.
-
-
-COMPILING BERKELEY DB
----------------------
-
-If you don't have 3.1.17 installed on your system or Evolution doesn't
-detect it for some reason, here is a way to get Evolution to link to
-it without messing up your system installation.
-
-� * Get the Sleepycat tarball from:
-
-����� http://www.sleepycat.com/update/3.1.17/db-3.1.17.tar.gz
-
-� * Install the content somewhere _other_ than the evolution source tree.
-���  e.g: NOT evolution/db-3.1.17
-
-� * Compile according to instructions, but installing into some custom
-��� prefix, for example:
-
-����� ../dist/configure --prefix=/home/user/berkeleydb-3.1.17
-
-� * Autogen Evolution specifying that it has to look for the DB
-��� library there, for example:
-
-����� ./autogen.sh --prefix=/opt/gnome
-����� --with-db3-includes=/home/user/berkeleydb-3.1.17/include
-����� --with-db3-libs=/home/user/berkeleydb-3.1.17/lib
-
-
-COMPILING PALM PILOT SUPPORT
-----------------------------
-
-If you want support for PalmPilot syncing (currently experimental so
-please back up your pilot) you will also need to do the following:
-
-1) pilot-link 0.9.5
-http://www.pilot-link.org
-
-2) gnome-pilot 0.1.61
-http://www.eskil.org/gnome-pilot/
-
-3) evolution
-In your evolution source directory do ./autogen.sh --prefix=<evo-prefix> 
---with-pisock=<pilot-link-prefix> --enable-pilot-conduits=yes
-make
-make install
-
-
-SSL SUPPORT
------------
-
-If you want SSL support (and someday S/MIME), you will also need libnspr4 and
-libnss3 which can be found at http://www.mozilla.org.
-
-Once you have libnspr4 and libnss3 (and their respective includes) installed,
-in your evolution source directory do:
-./autogen.sh --prefix=<evo-prefix> --with-nspr-includes=<nspr-includes-prefix>
---with-nspr-libs=<nspr-libs-prefix> --with-nss-includes=<nss-includes-prefix>
---with-nss-libs=<nss-libs-prefix>
-
-You'll need to `cp ~/.mozilla/default/*.db ~/evolution` on you've
-installed Evolution in order to get a functional SSL-enabled
-Evolution.
-
-WARNING: Evolution also comes with OpenSSL support
-(--with-openssl-libs and --with-openssl-includes), but it's not very
-well tested, and quite unstable at this point.  It is recommended that
-you use the NSPR-based SSL support instead.
-
-
-NEWSGROUP (NNTP) SUPPORT
-------------------------
-
-Experimental support for NNTP is enabled if you use the --enable-nntp
-configure option, but it's currently unmaintained and highly unstable
-and experimental.
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index e4aed8a2d6..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,50 +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 HAVE_KRB4
-#undef NEED_KRB_SENDAUTH_PROTO
-#undef HAVE_KRB5
-#undef HAVE_NSS
-#undef HAVE_OPENSSL
-#undef HAVE_SSL
-#undef USE_DOT
-#undef USE_FCNTL
-#undef USE_FLOCK
-#undef ENABLE_NNTP
-#undef HAVE_BROKEN_SPOOL
-#undef ENABLE_PEDANTIC_PGPMIME
-#undef HAVE_KDE_APPLNK
-
-/* db3 version */
-#undef EVOLUTION_DB_VERSION_MAJOR
-#undef EVOLUTION_DB_VERSION_MINOR
-#undef EVOLUTION_DB_VERSION_PATCH
-
-/* Sub-version identification string.  */
-#undef SUB_VERSION
-
-/* Preview-release string */
-#undef VERSION_COMMENT
-
-/* Define if ctime_r takes three arguments */
-#undef CTIME_R_THREE_ARGS
-
-/* Define if gethostbyname_r takes five arguments */
-#undef GETHOSTBYNAME_R_FIVE_ARGS
-
-/* Define if gethostbyaddr_r takes seven arguments */
-#undef GETHOSTBYADDR_R_SEVEN_ARGS
-
-/* Define to `int' if your system doesn't have `socklen_t'. */
-#undef socklen_t
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 bc664491e8..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,11855 +0,0 @@
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/idl/addressbook.idl: Removed an incorrect comment here.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Enable the dropdown widgets even if the contact is not editable so
-	that you can view any email address, phone number, or postal
-	address on read only contacts.
-
-2002-05-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added SimpleCard interface.
-
-	* gui/component/select-names/Makefile.am: Added
-	e-simple-card-bonobo.c and e-simple-card-bonobo.h.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added SIMPLE_CARD_LIST arg.
-
-	* gui/component/select-names/e-simple-card-bonobo.c,
-	gui/component/select-names/e-simple-card-bonobo.h: New class to
-	represent an ECardSimple across Bonobo.
-
-2002-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added "first_email" property.
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass %FALSE as
-	@has_shared_folders to evolution_storage_new().
-
-2002-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link against the libtool version of
-	libversit
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): oops, add the NULL back at the
-	end of possible_types.
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init):
-	bleah, need to pass the GtkWindow here so we can pop up the a
-	modal parented dialog (gtk modal dialogs suck?).
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): add "ldap-contacts" to the list
-	of possible types.
-
-2002-05-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder):
-	s/ldap_config/addressbook_config/
-
-2002-05-03  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): finally
-	remove the #if 0's and use the oaf query stuff to get backends
-	that handle specific protocols.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_folder_list_changed_callback): Call
-	evolution_config_control_changed when the EFolderList changes.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Updated this
-	to have the ConfigControlFactory have an addressbookwide generic
-	name and added OAFIID:GNOME_Evolution_Addressbook_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES),
-	gui/component/addressbook-component.c,
-	gui/component/addressbook-storage.c, gui/component/addressbook.c:
-	Replaced ldap-config.c and ldap-config.h with addressbook-config.c
-	andaddressbook-config.h.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: Based on ldap-config.c and
-	ldap-config.h.  Added a folder list control.  Made this a multi
-	factory.
-
-	* gui/component/ldap-config.c, gui/component/ldap-config.h:
-	Replaced these with addressbook-config.c and addressbook-config.h.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (selection_change):
-	Desensitize the to, cc, and bcc buttons if there's no selection
-	here.  Fixes Ximian bug #21482.
-
-2002-05-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (verbs): Changed
-	some of these to bind to the ContactListEditor verbs since they're
-	marked as that in the ui file.  Fixes Ximian bug #13034.
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): fix
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h
-	(e_addressbook_model_peek_card): Added this function so that there
-	would be less duplication of cards during run time when
-	duplication is unnecessary.
-
-	* gui/widgets/e-addressbook-view.c: Cleaned up get_card_list and a
-	number of associated functions to be much more uniform and
-	simpler.
-	(get_has_email_address): Don't show the "Send Message to Contact"
-	menu item if there are no email addresses in the listed contacts.
-	Fixes bug #1298.
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed this to set a
-	subject when sending a contact.  This makes the signature be set
-	properly also.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* printing/Makefile.am: Don't link to libibex anymore.
-
-	* conduit/Makefile.am: Same.
-
-	* backend/ebook/Makefile.am: Again here.
-
-	* gui/component/Makefile.am: And finally here.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_child_free): Unref the text_model here instead of
-	the model, since the model never gets set.  Removed the model
-	field since it's no longer used.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/ldap-config.c: Updated this for the new
-	e_table_memory_store_insert function prototype.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade (folder_browse):
-	Added a "Browse..." button to switch to a different addressbook
-	folder.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Moved extern EvolutionShellClient out of this function so that
-	it'd be more readable.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Coded handling of the
-	select_entry to search within the displayed contacts.
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to have an entry-select instead of an entry-find.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to match the redesign.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): Make unused
-	menu items disappear instead of graying out.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h: Removed
-	e_addressbook_reflow_adapter_right_click and
-	e_addressbook_reflow_adapter_base_right_click.
-
-	* gui/widgets/e-addressbook-view.c: Handle right click menu for
-	both types of view.  Merged right click on white space with right
-	click on main area.  General clean up.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h: Removed a couple unnecessary
-	functions.  Added e_minicard_view_widget_get_view.  Added
-	right_click signal.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added the right_click signal and the e_minicard_view_get_card_list
-	function.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.h: Removed an unused
-	variable here.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click,
-	table_white_space_event): Added a current view submenu to the
-	popup menu here.
-
-2002-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin):
-	Allow GDK_ACTION_COPY also, since the composer for example does
-	not accept MOVE's. Completes bug #8448.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.glade: change order of scope option
-	menu to match how it's stored.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: change ldap
-	config control text so it fits in the config dialog.
-
-	* gui/component/ldap-config.c: #ifdef lots of stuff HAVE_LDAP so
-	it'll build/run in either case.
-	(addressbook_source_dialog_destroy): rename
-	addressbook_add_server_druid_destroy to this, and free lots more
-	stuff.
-	(addressbook_add_server_druid):
-	addressbook_add_server_druid_destroy ->
-	addressbook_source_dialog_destroy.
-	(do_schema_query): add 3 second timeout to schema query.
-	(addressbook_edit_server_dialog): hook up destroy signal.
-	(config_control_new): if HAVE_LDAP isn't defined, put up a label
-	saying so.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add LDAP_CFLAGS to INCLUDES
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): no more
-	source->type.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.c (addressbook_dialog_get_source):
-	fill in source->ssl.
-	(addressbook_source_dialog_set_source): set up auth/scope/ssl
-	option menus properly.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): always include the
-	limit/ssl in the uri so we don't need to rely on defaults
-	everywhere.
-	(ldap_source_foreach): store the ssl option.
-
-	* gui/component/addressbook-storage.h: reorder SSLType to match
-	the UI.
-
-	* backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate)
-	add field for ldap_timeout.
-	(pas_backend_ldap_connect): reorder things a bit - we need to
-	start tls before the root dse query, if we can.
-	(pas_backend_ldap_load_uri): track the way ssl parameters are
-	given in the uri, and parse out the timeout.
-
-	* gui/component/ldap-config.c (port_changed_func): use the
-	symbolic SSL name instead of an integer constant.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (get_ldap_library_info): fix
-	memory leaks.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: remove the
-	Addressbook_ConfigControl stuff to LDAP_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove addressbook-config.* and add ldap-config.*
-	(glade_DATA): same.
-	(evolution_addressbook_LDADD): add LDAP_LIBS.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	addressbook_config_register_factory =>
-	ldap_config_register_factory.
-
-	* gui/component/addressbook.c (book_open_cb): remove source->type
-	check - they're always LDAP.
-	(load_uri_cb): same.
-
-	* gui/component/addressbook-storage.c (ldap_unparse_ssl): new
-	function.
-	(ldap_parse_ssl): new function.
-	(addressbook_storage_init_source_uri): use a more flexible scheme
-	to build up the uri's, and add in the ssl parameter.
-	(load_source_data): fill in source->ssl, and remove source->type
-	assignment.
-	(addressbook_source_copy): copy source->ssl, and remove
-	source->type copy.
-	(create_ldap_folder): addressbook_create_new_source =>
-	ldap_config_create_new_source.
-
-	* gui/component/addressbook-storage.h: remove
-	AddressbookSourceType (it was always LDAP), and add
-	AddressbookLDAPSSLType.
-
-2002-04-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Append
-	/addressbook.db to the end of the default URI if it starts with
-	file:
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not
-	loop forever if you have more than one backend.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Changed this to use
-	ECategoriesMasterListOptionMenu.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb),
-	gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-view.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Include
-	addressbook-config.h here as this file uses it.
-
-	* gui/component/select-names/e-select-names.c (SPEC, SPEC2): Made
-	this dialog searchable by typing in the ETable.
-
-	* gui/widgets/e-addressbook-model.c: Include e-addressbook-util.h
-	here.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Fixed a
-	memory leak here by using "selection-done" signal.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-view.c:
-	Added a right click menu for areas that aren't cards.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Update
-	for new-and-improved consistent default folder uri.
-
-	* gui/component/addressbook.c (addressbook_load_default_book): Use
-	e_book_load_default_book rather than duplicating most of its logic
-	here.
-	(load_uri_cb): Modify to work as a callback for
-	addressbook_load_default_book as well as addressbook_load_uri.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (create_view): Add
-	view_info arg, but don't do anything with it.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	config_item:type
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to the static libversit
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Update for evolution_shell_client_user_select_folder API change.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove AddressbookConfig,
-	ContactNew, ContactNewList EPixmap entries.
-
-	* gui/component/addressbook-factory.c (main): Print out a
-	debugging message just before the main loop starts, for debugging
-	purposes.
-
-2002-04-02  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Fix spelling of
-	E_CARD_SIMPLE_PHONE_ID_TTYTDD and E_CARD_SIMPLE_FIELD_PHONE_TTYTDD
-	(they previously ended with "TTD" instead of "TDD")
-
-	* backend/ebook/e-card-simple.c: Update for spelling fix.
-
-	* backend/pas/pas-backend-ldap.c: Likewise
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	parent_class should be static. (From Max Horn <max@quendi.de>)
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add priority
-	for the config page.  Renamed to "Directory Servers".
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): don't free req->vcard.
-	it's freed in pas_book_free_request.
-	(pas_backend_file_process_remove_card): don't free req->id for the
-	same reason.
-	(pas_backend_file_process_modify_card): don't free req->vcard for
-	the same reason.
-	(pas_backend_file_process_get_changes): don't free req->change_id
-	or release_unref the listener for the same reason.
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): make sure
-	to call ldap_value_free (values);, and ldap_msgfree (resp).
-	(get_ldap_library_info): don't ask me why, but it appears we have
-	to free each extension char*.
-	(query_ldap_root_dse): make sure to free values in the
-	subschemaSubentry code before overwriting it, and call
-	ldap_msgfree(resp) when we're all done.
-	(build_card_from_entry): don't leak the DN, ldap attributes, or
-	the berval the ldap_*_attribute calls use to step through the
-	attributes.  the docs say this berval is freed when
-	ldap_next_attribute returns NULL, but if we don't free it it leaks
-	a substantial amount of memory.
-	(pas_backend_ldap_search): make sure to only allocate *op once,
-	and fix the g_warning since op isn't valid in its scope anymore.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: Update for libversit change: Use .a
-	rather than .la now.
-
-	* printing/Makefile.am: Likewise
-
-	* gui/component/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_menu_activated):
-	Removed.
-	(addressbook_factory_new_control): Don't connect anymore, as this
-	signal has been removed from the ESearchBar.
-	(addressbook_factory_new_control): No more custom menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Update to
-	use new EPopupMenu API.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Update to use new
-	EPopupMenu API.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): Update to match new EPopupMenu api.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove the
-	`addressbook_search_menu_items'.
-	(addressbook_menu_activated): Removed.
-	(addressbook_factory_new_control): Don't connect.  No menu items.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (control_activate): Call
-	`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
-	the search bar.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon
-	for the LDAP sources configuration control.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove verb "AddressbookConfig".
-	(config_cb): Removed.
-
-	* gui/component/addressbook-config.c: Remove `dialog' member from
-	`AddresbookDialog'.  Instead, add a `config_control' member.
-	(config_control_new): New.
-	(addressbook_config): Removed.
-	(addressbook_config_register_factory): New.
-	(config_control_factory_fn): New, factory function for the
-	ConfigControl page.
-	(addressbook_source_edit_changed): Don't change the sensitivity of
-	the dialog.  Rather, invoke ::changed on the ConfigPage.
-	(auth_checkbutton_changed): No need to manually change the
-	sensitiviness of the buttons here either.
-	(add_source_clicked): Likewise, just invoke
-	evolution_config_control_changed().
-	(edit_source_clicked): Likewise.
-	(addressbook_dialog_close): Removed.
-	(config_control_destroy_callback): New, callback for when the
-	config control gets destroyed.
-	(addressbook_dialog_apply): Removed.
-	(config_control_apply_callback): New callback for
-	EvolutionConfigControl::apply.
-	(addressbook_dialog_ok): Removed.
-	(addressbook_config_control_new): Set up ->config_control and
-	connect the signals.
-
-	* gui/component/addressbook-config.glade: Call the main hbox in
-	the addressbook_sources dialog `addressbook_sources_main_hbox'.
-
-	* gui/component/addressbook-component.c (owner_set_cb): Call
-	`addresbook_config_register_factory'.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add items for
-	OAFIID:GNOME_Evolution_Addresbook_ConfigControl and
-	OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory.
-
-2002-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	change contains x-evolution-any-field to beginswith on email,
-	full_name, and nickname.  faster, and more applicable to this
-	dialog.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add TLSNotAvailable to
-	BookLister_CallStatus.
-
-	* backend/ebook/e-book-types.h: add TLS_NOT_AVAILABLE to the EBookStatus enum.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add TLS_NOT_AVAILABLE to the
-	switch.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_static_capabilities): fix name.
-	(pas_backend_ldap_class_init): fix name.
-	(pas_backend_ldap_connect): change return type to CallStatus so we
-	can return different errors from here.  Also, do STARTTLS if the
-	user has asked for it and the connection supports it, returning
-	TLSNotAvailable (and close the connection) if they chose to
-	require it.
-	(pas_backend_ldap_load_uri): return pas_backend_ldap_connect.
-	(func_beginswith): pull in change from evolution-1-0-branch to
-	make full_name beginswith search both cn and sn.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): since I've
-	gone ahead and made the file backend (by way of
-	pas-backend-card-sexp.c) use case insensitive searches for
-	beginswith, there's no need to list upper and lower case here.
-
-	* gui/component/addressbook.c (addressbook_search_option_items):
-	reorder things to put "Any field contains" at the end, since it's
-	the least efficient search.  Also reorder the enum to the same
-	ordering.  Change "Name contains" to "Name begins with" and change
-	"Email contains" to "Email is".
-	(addressbook_search_activated): change FULL_NAME to beginswith,
-	and change EMAIL to is to match the labels.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_name): new
-	function, so we can compare both full and family names (so
-	beginswith can operate on them both.)
-	(endswith_helper): use e_utf8_strstrcase here, since all the
-	backends backends use case insensitive searching.
-	(func_endswith): same.
-
-2002-03-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_create_card): track
-	union/struct change.
-	(pas_book_queue_remove_card): same.
-	(pas_book_queue_modify_card): same.
-	(pas_book_queue_get_cursor): same.
-	(pas_book_queue_get_vcard): same.
-	(pas_book_queue_authenticate_user): same.
-	(pas_book_queue_get_book_view): same.
-	(pas_book_queue_get_changes): same.
-	(pas_book_free_request): new function - free everything we need to
-	for each type of request.
-	(pas_book_destroy): call pas_book_free_request here instead of
-	just freeing 3 elements of the old struct.  yay plugging memleaks.
-
-	* backend/pas/pas-book.h: make PASRequest a union and split out
-	members into structs, so it's a little clearer which fields are
-	used by which requests.  Also, add prototype for
-	pas_book_free_request so backends can just free everything at once
-	(usually in their requests_queued signal func.)
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): track struct/union change.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-	(pas_backend_file_build_cards_list): same.
-	(pas_backend_file_process_get_vcard): same.
-	(pas_backend_file_process_get_cursor): same.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_process_check_connection): same.
-	(pas_backend_file_process_authenticate_user): same.
-	(pas_backend_file_process_get_supported_fields): same.
-	(pas_backend_file_process_client_requests): case the union to the
-	specific struct and pass it to the process_* functions.  also,
-	call pas_book_free_request here, instead of relying on each of the
-	functions to free their stuff.
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Update for
-	evolution_storage_new() change.
-
-2002-03-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): don't set "editable" here, as
-	the way things work the backend isn't able to override a setting
-	from the UI, so writable books never show up as writable.
-
-2002-03-04  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20871]
-	* gui/component/select-names/select-names.glade: add the
-	status-message label.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add status_message field.
-
-	* gui/component/select-names/e-select-names.c (status_message):
-	new function, set the label's text from the message.
-	(e_select_names_init): get the status-message label, and if it's
-	valid, connect to the status_message signal of the
-	EAddressbookModel.
-
-2002-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): don't
-	ref the view here, since it keeps the view alive until the search
-	is over, which we don't want.  we want the view's death to cancel
-	the search.  This speeds up starting new searches after one is
-	already active (since switching searches actually creates a new
-	book view and destroys the old one.)
-	(ldap_search_dtor): remove the matching unref here.  The unref as
-	it was was incorrect anyway, and caused a crash (we needed
-	search_op->view, not op->view.)
-
-2002-02-27  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20690]
-	* backend/pas/pas-backend-ldap.c (func_and): the data arg is not
-	GList** anymore, it's PASBackendLDAPSExpData*, so use
-	ldap_data->list instead of *list.
-	(func_or): same.
-	(func_not): same.
-	(func_contains): same.
-	(func_is): same.
-	(func_endswith): same.
-	(func_beginswith): same, but also special case the beginswith
-	"fileAs" query type (the one used by the alphabet buttons on the
-	right hand side, so we can deal with entries that don't have
-	fileAs attributes, and return meaningful responses.)
-	(pas_backend_ldap_build_query): initialize the
-	PASBackendLDAPSExpData struct and pass that instead of &list.
-	Also, take the PASBackendLDAP arg to add to the struct in case we
-	need it at some point in the future.
-	(ldap_search_handler): pass in the PASBackendLDAP.
-
-2002-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): move
-	card_count++ inside the if that checks to see if a card matches
-	(and adds the card to the list).
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): only
-	handle the ESB_ADVANCED case here now.  the actual query work is
-	done in addressbook_search_activated.
-	(addressbook_search_activated): split out all the searching
-	functionality here.
-	(addressbook_factory_new_control): hook up "search_activated" to
-	addressbook_search_activated.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): make the right auth page
-	start up open.
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	free the binddn.
-	(addressbook_source_copy): copy the binddn;
-
-2002-02-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs 20740, 16680, and god knows what else :) ]
-	* gui/widgets/e-addressbook-model.c (create_card): double the
-	allocated size every time we need more space instead of using a
-	fixed size increment.  this helps huge queries.  Also, remove the
-	gtk_object_get of "file_as", as it was dead code.
-	(book_view_loaded): handle errors here (by popping up a dialog).
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): search_idle ->
-	search_timeout.
-	(build_card_from_entry): comment out some spew, and unref ecard
-	when we're done to plug a memory leak.
-	(send_pending_adds): send along to the client all the cards we've
-	been saving up.
-	(poll_ldap): use a timeout for ldap_result to keep the backend
-	from blocking (and it turns out keep the frontend from hanging
-	waiting on a ref to complete) on large db's with few matches.
-
-	Also, add some fairly smart, self-tuning aggregating of cards.
-	Keep track of the number of cards we've sent the last time through
-	as well as this time, and estimate the number we want to aggregate
-	the next time based on them (we average them at the moment),
-	subject to maximum/minimum number of cards.  also, we have a
-	maximum aggregation time, after which we force a flush if there
-	are pending cards and recalculate our target pending number.
-	there's a minimum wait time to possibly keep outselves from
-	spamming the ui, although it's 0 at the moment.
-
-	Lastly, make sure to only notify the GUI of status messages when
-	we need to.  this results in a *huge* savings.
-	(ldap_search_handler): initialize all the pending card stuff, and
-	use a timeout instead of an idle function for poll_ldap.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): performance optimization
-	for large adds.  If we're a CardAddedEvent and there's an existing
-	CardAddedEvent at the end of the queue, just concat the lists of
-	cards together.  This is to keep the gui from falling further and
-	further behind the ldap backend, which is merrily spewing updates
-	at the gui.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Define $(iconsdir).
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	helper function.
-	(create_component): Add the icons for the user creatable items as
-	well.
-
-2002-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	track change to signature, and (for now) just change all the
-	return FALSE's to _RepositoryOffline (what FALSE used to map to in
-	pas_book_factory_process_request), and change TRUE to _Success.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri):
-	track change to signature, and differentiate between
-	pas_backend_ldap_connect failing (RepositoryOffline), and
-	ldap_url_parse failing (OtherError).
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): since pas_backend_load_uri
-	returns status now, use it to nodify the BookListener if there's a
-	failure.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): track change
-	to signature.
-
-	* backend/pas/pas-backend.h: change return type of
-	pas_backend_load_uri to
-	GNOME_Evolution_Addressbook_BookListener_CallStatus to allow
-	differentiation between failure types.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): handle _AUTHENTICATION_FAILED.
-
-	* backend/ebook/e-book-types.h (EBookStatus): add
-	_AUTHENTICATION_FAILED.
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, notify
-	the listener that the repository is offline.  (partial fix for bug
-	20347)
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_dn_from_ecard): escape
-	commas in the dn, since they're used by ldap to specify the node's
-	placement in the tree. (fixes bug 20089)
-	(rfc2254_escape): just use sprintf and %02X instead.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Keep a
-	ref of the model in this case as well.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Make
-	sure to only set the query once when creating a new book and not
-	at all on addressbook model creation.  This prevents an accidental
-	pair of changes from making the addressbook model load a remote
-	addressbook.
-
-	* gui/widgets/e-addressbook-model.c (get_view): If this is the
-	first_get_view and the addressbook is remote, empty the view
-	instead of leaving it in the state it used to be in.  This only
-	occurs if you set the book after the model has existed for a
-	while.
-	(e_addressbook_model_set_arg): When setting the book, set
-	first_get_view to TRUE.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach to the
-	emvw instead of the emv here.
-
-	* gui/widgets/e-minicard-view-widget.c, e-minicard-view-widget.h:
-	Made this object have a "column_width" argument and a
-	"column_width_changed" signal which are a simple layer down to the
-	EMinicardView contained within.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_attach): Made this attach to an
-	EMinicardViewWidget instead of a EMinicardView.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c, backend/ebook/e-book-util.h
-	(e_book_expand_uri, e_book_load_address_book_by_uri,
-	e_book_use_address_book_by_uri): New functions that take a file://
-	url ending in the directory name and automatically append the
-	addressbook.db and do the appropriate thing.
-
-	* backend/pas/pas-backend-card-sexp.c,
-	backend/pas/pas-backend-card-sexp.h: Added copyright notice here.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/component/addressbook.c
-	(set_prop): Use e_book_expand_uri instead of
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-storage.c: Fixed the fcntl include
-	here.
-
-	* gui/component/addressbook.c (ContactsCopyToFolder,
-	ContactsMoveToFolder): Added handlers for these two verbs.
-
-	* gui/component/addressbook.h: Removed addressbook_expand_uri in
-	favor of e_book_expand_uri.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (transfer_cards):
-	Added code to handle Move to and Copy to right click menu items.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h (e_addressbook_transfer_cards):
-	New function to pop up a dialog and transfer a set of cards to the
-	given folder.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (display_view): Don't attach to
-	the view if it doesn't exist yet.  We have to make this then
-	attach later.
-	(e_addressbook_view_copy_to_folder,
-	e_addressbook_view_move_to_folder): New functions utilizing
-	e_addressbook_transfer_cards.
-	(table_right_click): Add copy_to_folder and move_to_folder to the
-	right click menu for tables here.
-	(e_addressbook_view_discard_menus): Handle menu unmerging here.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): Removed unused field.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach the
-	GalViewMinicard to the EMinicardView here.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_load, gal_view_minicard_save): Made these save
-	the column width of the view.
-	(gal_view_minicard_attach, gal_view_minicard_detach): Added these
-	functions to allow the GalViewMinicard to set the column width of
-	a EMinicardView and to monitor its changes.
-
-2002-02-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_arg): Added an argument to get the model.
-
-	* gui/widgets/e-addressbook-view.c (writable_status): Don't bother
-	connecting to the writable_status callback on the book, simply
-	rely on the writable_status callback on the addressbook model.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h
-	(set_empty_message): Handle the case of a read only view here.
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): remove
-	"New" from user creatable menu items
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_setup_menus): Changed this function to use the
-	new GalViewMenus which takes a GalViewInstance, instead of a
-	GalViewCollection.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (find_address_mailing): tidy
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): load
-	default address setting
-	(addrconduit_save_configuration): save default address setting
-	(e_addr_gui_new): new gui routine for conduit settings
-	(e_addr_gui_fill_widgets): ditto
-	(e_addr_gui_fill_config): ditto
-	(e_addr_gui_destroy): ditto
-	(e_addr_context_destroy): destroy the gui and new_cfg
-	(local_record_from_ecard): reinstate commented out bits, determine
-	which address to sync to pilot
-	(ecard_from_remote_record): determine which address to sync from
-	pilot
-	(fill_widgets): put the gui widgets in
-	(create_settings_window): create gui
-	(save_settings): fill gui
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/contact-editor/e-contact-editor.c (address_text_changed): if
-	the shown address in the mailing address or there is no mailing
-	address, set the default flag and make sure the button is checked
-	(address_mailing_changed): set the flags properly when the mailing
-	address changes
-	(e_contact_editor_init): listen for the check button being toggled
-	(find_address_mailing): find the address (if any) with the default
-	flag
-	(set_address_field): set the mailing address button appropriately
-	(fill_in_info): find the mailing address
-
-	* gui/contact-editor/e-contact-editor.h: add new class data member
-
-	* gui/contact-editor/contact-editor.glade: show mailing address
-	check button
-
-2002-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_auto_recipient):
-	New function to find out if a destination was one which was
-	auto-matically set by Evolution.
-	(e_destination_set_auto_recipient): Set whether or not the dest is
-	an auto-recipient.
-	(e_destination_touch): Don't touch the address if it is an
-	auto_recipient.
-	(e_destination_list_to_vector_sized): New function to avoid having
-	to calculate the length of the list ourselves. Allows for a bit of
-	optimization if our caller knows the length of the list.
-	(e_destination_xml_encode): Encode the auto_recipient bit.
-	(e_destination_xml_decode): Decode the auto_recipient bit.
-
-2002-02-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card): Made
-	this preserve addressbook flags other than the first three.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_ADDR_MASK and
-	E_CARD_ADDR_DEFAULT.
-
-	* backend/ebook/e-card.c (get_address_flags): Added "PREF" to
-	E_CARD_ADDR_DEFAULT mapping.
-
-	* backend/ebook/test-client.c: Added #include "e-book-util.h".
-
-2002-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes):
-	compute the change db filename based on our contact db filename.
-	(pas_backend_file_load_uri): store the filename in
-	bf->priv->filename.
-	(pas_backend_file_destroy): free the filename, and (!) free
-	bf->priv too.
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Revert
-	my previous change as trow says this will break auto-completion
-	stuff.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS.
-	* gui/contact-list-editor/Makefile.am: Likewise.
-	* gui/merging/Makefile.am: Likewise.
-	* gui/search/Makefile.am: Likewise.
-	* gui/component/select-names/Makefile.am: Likewise.
-
-2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Don't
-	check for an @ in the email address. This is to fix bug #10960.
-
-2002-01-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 16097 ]
-	* gui/component/addressbook-config.glade: gui love for the new
-	auth stuff.
-	
-	* gui/component/addressbook.c (load_uri_cb): track change to auth,
-	and offer up different prompt strings depending on which method
-	(binddn or email) we're using.
-	
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): use the
-	new auth types for ldap.
-	(ldap_parse_auth): same.
-	(addressbook_storage_auth_type_to_string): new function.
-	(load_source_data): get the binddn too.
-	(ldap_source_foreach): store out binddn or emailaddr, depending on
-	the auth type chosen.
-
-	* gui/component/addressbook-storage.h: add the more detailed auth
-	types, add "binddn" to the source structure, and add a prototype
-	for addressbook_storage_auth_type_to_string.
-	
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	set the auth stuff  (in)sensitive.
-	(auth_optionmenu_activated): new function.
-	(addressbook_source_dialog_set_source): track UI change.
-	(addressbook_source_dialog_get_source): same.
-	(add_scope_activate_cb): rename add_activate_cb to this to
-	distinguish it from the auth stuff.
-	(add_auth_activate_cb): new function.
-	(addressbook_source_dialog): track change to auth UI stuff.
-	(addressbook_storage_auth_type_to_string): new function.
-
-	* backend/ebook/e-book.h: add auth_method arg to
-	e_book_authenticate_user.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): track change
-	to prototype - add auth_method arg, and pass it along to the CORBA
-	call.
-
-	* backend/ebook/test-client.c (book_open_cb): track api change -
-	keep this building.
-
-	* backend/pas/pas-book.h: add auth_method slot in PASRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): add
-	auth_method arg and add it to the PASRequest.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): track
-	idl change, add auth_method and pass it along to
-	pas_book_queue_authenticate_user.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): support both
-	"ldap/simple-email" and "ldap/simple-binddn" auth methods.
-
-	* backend/idl/addressbook.idl: add "in string authMethod" to
-	authenticateUser.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
-	and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags
-
-	* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and
-	EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.
-	* backend/pas/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* printing/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* gui/widgets/Makefile.am (INCLUDES): Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass a
-	NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include
-	<locale.h>.
-
-2002-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug # 16864 ]
-	* backend/ebook/evolution-ldif-importer.c (getValue): create and
-	return a GString here, instead of writing to a fixed size buffer.
-	(parseLine): use a GString here instead of a fixed size buffer.
-
-2002-01-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_search_handler): Set the
-	number of cards to return to the value specified in the ldap uri,
-	leaving the default at 100.  Fixes Ximian bug #13953.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog),
-	gui/component/addressbook-config.glade: Added a limit entry here
-	to edit the limit field of the source.
-
-	* gui/component/addressbook-storage.c,
-	gui/component/addressbook-storage.h
-	(addressbook_storage_init_source_uri): Added a limit field to this
-	class and pass that value through in the uri that's generated.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Made username match with no
-	domain match be vague instead of partial.  Fixes Ximian bug
-	#13612.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (view_contact_cb): New verb to open
-	a bunch of cards.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): Call
-	e_addressbook_show_multiple_cards instead of doing this ourselves.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h
-	(e_addressbook_show_multiple_cards): Added this function to show a
-	bunch of cards, including a dialog if lots of windows are going to
-	appear.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_view,
-	e_addressbook_view_can_view): e_addressbook_view_view calls
-	e_addressbook_show_multiple_cards on the appropriate list of
-	cards.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(fill_in_countries), gui/contact-editor/fulladdr.glade: Sort
-	country list.  Country list moves from fulladdr.glade to
-	e-contact-editor-address.c, but only a few country names have
-	actually changed.  Fixes Ximian bug #16545.
-
-2001-12-20  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #17725
-
-	* evolution/addressbook/printing/e-contact-print.c (complete_sequence):
-	Do not assume that the first byte of file_as is the first letter, use
-	utf8 functions instead.
-
-2002-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: move all functions here, get rid of
-	header files, use e-pilot-settings to display gui
-
-2002-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove misleading
-	title and fix spacing
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (alphabet_state_changed): Handle
-	setting the search bar to "Advanced..." when the alphabet buttons
-	are pushed and back when they're cleared.  Fixes Ximian bug
-	#12904.
-	(addressbook_menu_activated): When the user calls Search->clear,
-	set the search to ESB_ANY and "", don't just set the text.  This
-	is especially useful when it's set to ESB_ADVANCED.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (alphabet_state_change): Added
-	this signal which gets emitted when the alphabet buttons are
-	pushed.
-	(command_state_change): Removed the ref pair here.  It's not
-	necessary.  gtk_signal_emit refs the object itself.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (name_synonyms): Added a couple
-	of names here.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_get_nth_obj): Removed an unused
-	variable.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (create_alphabet): Use toggle
-	buttons here.  Fixes Ximian bug #10734.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_fields): Choose the
-	first filled in address field here.  Fixes Ximian bug #2222.
-
-2002-01-03  Joe Shaw  <joe@ximian.com>
-
-	* backend/ebook/test-card.c: Add a test for getting arbitrary
-        fields.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_arbitrary): Added.
-	(prop_info_table): Add a LIST_PROP for arbitrary fields.
-
-2002-01-03  Nat Friedman  <nat@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Free the
-	query if the oaf response is of zero length.
-
-2001-12-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): When we clean, don't clean the model's last
-	element.  This helps keep things working properly when we have
-	signal-character separators.
-	(section_right_click_cb): Changed to work properly with our
-	EText-emitted popup signal.
-	(e_select_names_add_section): Use ETexts for the recipient
-	sections, rather than tables.  This lets us make them directly
-	editable. (Bug #1721)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_new): Pass in a ESelectNamesTextModel, not a
-	ESelectNamesModel.
-	(e_select_names_popup): Adjust for the new signature for
-	e_select_names_model_text_pos.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Schedule a cleaning when we focus out.
-	(focus_in_cb): Cancel pending cleaning when we get focus.  This
-	helps us avoid bad things happening during the fast focus out/ins
-	that happen when the completion dropdown appears.
-	(completion_handler): Adjust for new signatures of
-	e_select_names_model_text_pos and e_select_names_model_name_pos.
-	(e_select_names_manager_entry_new): Pass in our
-	ESelectNamesTextModel when constructing the
-	ESelectNamesCompletion.
-	(e_select_names_manager_entry_free): Cancel any pending clean-ups.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the text off of the text model.
-	Which is the only way that really makes sense when you think about
-	it.
-
-	* gui/component/select-names/e-select-names-completion.c: Added a
-	copy of the associated ESelectNamesTextModel to
-	ESelectNamesCompletionPrivate.  This replaces the
-	ESelectNamesModel.
-	(e_select_names_completion_destroy): Unref ->text_model.
-	(e_select_names_completion_handle_request): Pass in our text
-	model's separator info when calling e_select_names_model_text_pos.
-	(e_select_names_completion_new): Pass in the text model as an arg
-	instead of the model, and ref it as needed.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_init): Set separator as either ", " or
-	",", depending on the value of the EVOLUTION_DISABLE_MAGIC_COMMA
-	environment variable.
-	(e_select_names_text_model_destroy): Free the separator.
-	(changed_cb): Flush our cached text on changed.
-	(e_select_names_text_model_set_source): Use our own changed_cb
-	callback on changed, rather than just connecting up
-	e_text_model_changed.
-	(e_select_names_text_model_set_separator): Added.  Lets the
-	separator between recipients be specified.
-	(e_select_names_text_model_get_text): Cache the text we get from
-	calling e_select_names_model_get_textification.
-	(e_select_names_text_model_insert_length): A bunch of small
-	changes to properly support generic separators, rather than
-	(implicit and explicitly) assuming ", ".
-	(e_select_names_text_model_delete): More small tweaks to handle
-	generic separators.
-	(e_select_names_text_model_get_nth_obj): Use new signature when
-	calling e_select_names_model_name_pos, and use our cached text.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_destroy): We don't cache the text or
-	addr_text anymore, so no need to free them here.
-	(e_select_names_model_changed): ...and no need to reset our text
-	and addr_text caches here.
-	(e_select_names_model_get_textification): Take a separator as an
-	arg, rather than just using ", ".  Also, no caching.
-	(e_select_names_model_get_address_text): Take a separator as an
-	arg, rather than just using ", ".  And no caching here either.
-	(e_select_names_model_clean): Add arg that give us control over
-	whether or not the last entry should get cleaned.  We need this
-	when using a one-character separator, so that new destinations
-	that get tacked onto the end don't get immediately cleaned away
-	for being empty.
-	(e_select_names_model_name_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-	(e_select_names_model_text_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/component/addressbook-factory.c (main): Push GdkRGB visual
-	and colormap.
-
-2001-12-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Add cut/copy/paste to
-	right-click menu.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Add
-	cut/copy/paste to right-click menu.  (Fixes bug #14528.)  Also,
-	disable some right-click options if our addressbook isn't
-	editable.
-
-2001-12-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (check_for_slow_setting): go slow and
-	clear the map if the last uri and the current uri do not match
-	(post_sync): save the last uri
-
-	* conduits/address-conduit-config.h: handle a last uri config
-	option
-
-2001-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_default_book_open):
-	change this to match its e-book counterpart, and only failover to
-	the local addressbook if the protocol wasn't supported.  that way
-	errors like "failure to connect" are still reported to the user.
-
-	* backend/ebook/e-book-util.h: add prototypes for
-	e_book_load_default_book and e_book_get_config_database.
-
-	* backend/ebook/e-book-util.c (e_book_default_book_open): new
-	function, basically cut and paste addressbook_default_book_open
-	from addressbook.c here.
-	(e_book_load_default_book): cut and past
-	addressbook_load_default_book here, pretty much, except leave off
-	the auth stuff.
-	(e_book_get_config_database): new function, returns the
-	Bonobo_ConfigDatabase for e_book_load_default_book to use.
-
-	* conduit/address-conduit.c (start_addressbook_server): use
-	e_book_load_default_book here.
-	
-2001-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 17355 ]
-	* gui/component/select-names/e-select-names.c (new_folder): if
-	we're dealing with an LDAP folder, prepend [LDAP] to it.  Now that
-	we have 3 different places where folders are coming from, it helps
-	to be able to differentiate "Contacts" in ~/evolution and a
-	"Contacts" ldap server and a "Contacts" exchange folder.
-	(add_additional_select_names_uris): loop through the bonobo conf
-	settings for additional folders, adding them to the option menu.
-	(e_select_names_hookup_shell_listeners): call
-	add_additional_select_names_uris.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
- 
- 	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): Use an #ECanvasBackground here
-	instead of a #GnomeCanvasRect.
- 
-2001-12-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Added
-	'cache_complete' flag to ESelectNamesCompletionPrivate.
-	(e_select_names_completion_seq_complete_cb): Set cache_complete
-	to TRUE if our query wasn't interrupted.
-	(e_select_names_completion_start_query): Set cache_complete to
-	FALSE at the beginning of a potentially-cached query.
-	(e_select_names_completion_do_query): Only reuse cached cards
-	if cache_complete is TRUE.  (Fixes bug #10241)
-
-2001-12-15  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (e_addr_context_destroy): don't free
- 	the hash table keys, we didn't allocate them and free the change
- 	objects and unref the associated cards
- 	(local_record_from_uid): unref the temp card we create
- 	(replace_record): ref the new card associated with the card change
- 	and unref the old one
-
-2001-12-13  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (local_record_from_ecard): Make sure
- 	to copy the custom fields so they are not overwritten
-
-2001-12-13  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_new): Used
-	g_strdup_printf to dup a string.  Doh!  Changed to g_strdup.
-	(Bug #17126)
-
-2001-12-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): Remove a reference to code
-	I don't want to commit yet. :-)
-
-	* gui/component/select-names/e-select-names-manager.c: Extensively
-	refactored -- this code had gotten _really_ ugly.  Untangle things
-	to the point where our reference counting problems are fixable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove all of the ugly hacks to work around our
-	memory management problems, and just unref the manager.
-	(Fixes #14412)
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(search_for_dn_with_objectclasses): move search_for_dn's contents
-	here, and add an "existing_objectclasses" parameter that we pass
-	on to build_card_from_entry.
-	(search_for_dn): call search_for_dn_with_objectclasses with NULL
-	for existing_objectclasses.
-	(build_card_from_entry): if existing_objectclasses is non-NULL,
-	fill it in with the list of existing objectclass values for this
-	entry.
-	(add_objectclass_mod): if existing_objectclasses is non-NULL,
-	meaning we're modifying an entry, search in the existing
-	objectclasses for the ones we want to be there, and only add
-	what's missing.  If none are missing, don't add objectclass_mod to
-	the list of mods.
-	(create_card_handler): track change to add_objectclass_mod (pass
-	NULL).
-	(modify_card_handler): use search_for_dn_with_objectclasses
-	instead of search_for_dn, and pass the existing objectclasses to
-	add_objectclass_mod.  also, free the list when we're done.
-	(poll_ldap): track change to build_card_from_entry (pass NULL).
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	we need to be able to disable non-labels here as well.  since
-	we're using enable_widget and not gtk_widget_set_sensitive, it's
-	okay to handle entries/text's, etc, here.
-	(widget_field_mappings): add label-caluri and label-fburl here.
-
-	* gui/contact-editor/contact-editor.glade: change the label names
-	for the freebusy/calendar urls to have more descriptive names,
-	since we use them in e-contact-editor.c now.
-
-	* backend/pas/pas-backend-ldap.c: add support for
-	caluri/calendarURI, fburl/freeBusyURI.
-
-	* backend/pas/evolutionperson.schema: add calendarURI and
-	freeBusyURI.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Fixed up the
-	accelerators and such here.
-
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):
-	Translate this string.
-	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.
-	(setup_tab_order): Fixed up the tab order here.
-
-	* gui/contact-editor/fulladdr.glade: Made the country combo
-	focusable here.
-
-2001-12-03  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_equal): Make address
-	comparisons case-insensitive. (Fixes 11776)
-
-	* backend/ebook/e-card.c (e_card_email_match_single_string): Make address
-	host comparisons case-insensitive. (Fixes 11776)
-
-	* gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean
-	ESelectNamesModel on focus-out. (Half of a fix for 15656)
-
-	* backend/ebook/e-destination.c (nonempty): Fix this function
-	and make it utf8-safe. (The other half of the fix for 15656)
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Consistency
-	fixes with standard contact editor.  Added Save As, Send As, and
-	Send To.  Replaced Save toolbar with Save and Close and added Save
-	and Close menu item.  Added a trash icon.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
-	Setup the tab order here.  Fixes Ximian bug #13751.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (connect_master_list_changed,
-	make_suboptions): Changed how this list of categories gets
-	computed.  Fixes Ximian bugs #7707 and #7708.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),
-	printing/e-contact-print.c (e_contact_divide_text, e_contact_output,
-	e_contact_rectangle, e_contact_print_letter_tab,
-	e_contact_print_letter_heading, e_contact_get_card_size,
-	e_contact_print_card, e_contact_print_phone_list):
-	s/gnome_font_get_width_string/gnome_font_get_width_utf8/
-	s/gnome_font_get_width_string_n/gnome_font_get_width_utf8_sized/
-
-2001-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): check against
-	LDAP_SUCCESS as the return value, not -1.
-	(pas_backend_ldap_build_all_cards_list): same.
-	(pas_backend_ldap_process_authenticate_user): same.
-
-2001-11-12  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14843 ]
-	* backend/pas/pas-backend-ldap.c (func_and): don't crash if a
-	subexpression wasn't filled in.
-
-	* backend/pas/pas-backend-ldap.c (func_or): same.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	Release callback's reference to EContactListEditor.
-	(list_modified_cb): Release callback's reference to
-	EContactListEditor.
-	(save_card): Ref the EContactListEditor on behalf of the
-	e_book_foo callback. (Fixes bug #14743)
-	(save_card): Set changed to false once we've saved.
-	(list_deleted_cb): Release callback's reference.
-	(delete_cb): Hold reference for the callback.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): If
-	our call to e_categories_new returns NULL, put up an error dialog
-	and return.  (Fixed #14780)
-		
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14687 ]
-	* backend/pas/pas-backend-file.c
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): do load_uri before add_client,
-	so we know if the load actually worked (add_client uses this
-	information to respond to the new client.)  before this change,
-	the client would still think the book was in a useful state even
-	if the load_uri failed.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client): if
-	the we're not connected, say so.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	same.
-	(pas_backend_file_load_uri): don't report_writable here,
-	add_client does it.  was only needed before because of the
-	improper ordering in pas-book-factory.c above.
-
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14646 ]
-	* gui/component/addressbook.c (addressbook_default_book_open): new
-	function.  if the default_book failed to load, load the local
-	addressbook in its place.
-	addressbook_load_default_book): if we're loading the default_book
-	uri, use addressbook_default_book_open as the open_response.
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): reset the
-	load_state to NotLoaded so we can attempt another load_uri on
-	the book if it fails.
-
-2001-11-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Explicitly destroy entries.  Part of the fix for
-	the lingering completion window bug.
-
-2001-11-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: Use ordering of the pilot's phone
-	label list to find fields we sync in order to avoid strcmp'ing the
-	pilot's labels rendering phone syncing usable only for english
-	language pilots
-
-2001-11-03  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14410 ]
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	init in_async_call to FALSE.
-	(card_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(card_modified_cb): same.
-	(card_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add in_async_call flag for when we make a wombat call and need to
-	disable the UI.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init in_async_call to FALSE.
-	(list_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(list_modified_cb): same.
-	(list_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add in_async_call flag for when we make a
-	wombat call and need to disable the UI.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Check for
-	NULL dates before converting them to strings.  Fixes Ximian bug
-	#14394.
-
-2001-11-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Leak select-names related data structures until
-	the memory management issues get sorted out.  Fixed bug #14086.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/widgets/e-addressbook-table-adapter.c: Make the pre_changes
-	and changes match here.
-
-2001-10-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): Check that local_listener and
-	other_contacts_listener are non-NULL before
-	disconnecting/unrefing.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(entry_destroyed): The entry shouldn't unref the manager.
-	(e_select_names_manager_create_entry): The entry shouldn't hold a
-	ref to the manager.  It becomes circular.
-	(e_select_names_manager_create_entry): On the other hand, we
-	should hold a ref to the entry we create.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove the explicit dialog destroy hack.
-
-2001-10-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Force the select names dialog to be destroyed.
-	This is a hack to fix bug #14002 -- I'll clean up the refcounting
-	issues post-freeze.  At least now it won't crash.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): make sure
-	to translate the character sets of the names
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(manager_ok_cb): send a null bonobo arg to prevent explosion
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/widgets/e-addressbook-view.c: correct include typo
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/widgets/e-minicard.c (add_field): Five characters, not four!
-	
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): Convert xml-ified destinations into proper
-	addresses.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/component/select-names/e-select-names-bonobo.c (init):
-	Connect to manager's "ok" signal.
-	(manager_ok_cb): Emit "ok" bonobo-signal.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added "ok" signal.
-	(e_select_names_clicked): Emit 'ok' signal.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): new function, a "Do you want
-	to save changes?" dialog.
-
-	* gui/widgets/e-addressbook-util.h: add prototype for
-	e_addressbook_prompt_save_dialog.
-
-	* gui/contact-editor/e-contact-editor.c (prompt_to_save_changes):
-	call e_addressbook_prompt_save_dialog and save the card if they
-	select save.  return TRUE if the dialog should be closed, FALSE
-	otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): call e_addressbook_prompt_save_dialog
-	and save the card if they select save.  return TRUE if the dialog
-	should be closed, FALSE otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): overload
-	this function for modifying objectclasses too, so we can make sure
-	evolutionPerson shows up in the objectclasses of an entry if it
-	shows up in the schema for the server.
-	(create_card_handler): add @replace = FALSE in the call to
-	add_objectclass_mod.
-	(modify_card_handler): call add_objectclass_mod with @replace =
-	TRUE.
-	(anniversary_compare): fix typo - return "equal", not "TRUE".
-	(birthday_compare): same.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* conduit/address-conduit.c (pre_sync): Comment out spew.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	Comment out spew.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): Comment out spew.
-	(get_dnd_selection): Comment out spew.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): Comment out spew.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): Check that
-	our BonoboUIComponent has a container so we don't get a lot of
-	annoying debug spew.
-
-	* printing/smallbook.ecps: Fixed fonts.
-
-	* printing/phonelist.ecps: Fixed fonts.
-
-	* printing/medbook.ecps: Fixed fonts.
-
-	* printing/e-contact-print.c (e_contact_get_card_size): Commented
-	out spew.
-
-	* gui/widgets/e-minicard.c (remodel): Check that e_minicard->card
-	!= NULL.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): We were using
-	book_data->book_view immediately after unrefing it.  Reordered the
-	code a bit to avoid this.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.h: add prototype for
-	pas_book_factory_dump_active_backends.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_dump_active_backends): new function.
-	(dump_active_server_map_entry): new function.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Drop a match if either of the text fields is NULL.
-	This could happen if any of the utf-8 involved is invalid, for
-	example. (Bug #13757)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): fix bug that allowed
-	for phone's not to be in priority order and the item to still be
-	syncable
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get management by id
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (is_syncable): a card also needs to
-	have its phone nums in priority order to be "syncable"
-	
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): move the syncable
-	checking code to a different function
-	(ecard_from_remote_record): set the name parts individually
-	(local_record_from_ecard): use is_syncable
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (file_as_get_style,
-	file_as_set_style): Use the actual ECardName in the ECard instead
-	of parsing the full_name here.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_set_name): New function to set the ECardName on
-	this card and fix the file_as if necessary.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_get): Handle returning dates here.
-	(e_card_simple_get_allow_newlines): New function.  Returns whether
-	it makes much sense to have newlines in this string.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h
-	(addressbook_create_new_source): The first argument here should
-	be const.
-
-	* gui/component/addressbook-storage.c: Added #include
-	"addressbook-config.h".
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): On an
-	escape here, cancel editing and remove the focus from the text.
-
-	* gui/widgets/e-minicard.c (add_field): Set allow_newlines here.
-	(field_activated): Stop editing on the activate signal and remove
-	the focus from the text.  Fixes Ximian bug #12286.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.h: tidy
-
-	* conduit/address-conduit-config.h: ditto
-
-	* conduit/address-conduit.c (add_record): unref ecard when done
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_date_from_string): Expose this
-	function.
-	(e_card_date_to_string): ...and this one.  Fixes build problem in
-	pas-backend-ldap.c.
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change "this should never
-	happen" dialog to not give my name/e-mail.  Sorry translators.
-	But this really should never happen, thanks to my fix below.
-
-	* gui/component/addressbook-component.c: Initialize
-	global_shell_client to NULL. (Bug #6625)
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	[ bug #12979 ]
-	* backend/pas/pas-backend-ldap.c (anniversary_populate): new
-	function.
-	(anniversary_ber): new function.
-	(anniversary_compare): new function.
-	(birthday_populate): new function.
-	(birthday_ber): new function.
-	(birthday_compare): new function.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): free up all the book_data
-	list stuff.
-	(e_select_names_completion_got_book_view_cb): deal with book_data
-	being passed as the closure, and increment the
-	pending_completion_seq counter.
-	(e_select_names_completion_card_added_cb): deal with book_data
-	being passwd as the closure.
-	(e_select_names_completion_seq_complete_cb): same, and decrement
-	the pending_completion_seq if we haven't gotten one for this book
-	view before.
-	(e_select_names_completion_stop_query): cancel all the
-	book_data's.
-	(e_select_names_completion_start_query): use the books_not_ready
-	counter instead of book_ready.  also, do e_book_get_book_view on
-	each of the book's in our list.
-	(e_select_names_completion_do_query): change to deal with our
-	list.
-	(e_select_names_completion_book_ready): decrement the
-	book_not_ready counter.
-	(e_select_names_completion_new): add the book we're created with
-	to our list.
-	(e_select_names_completion_add_book): implement.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_add_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): use addressbook_config_data, and
-	don't unref the db.
-	(e_select_names_manager_create_entry): always add NULL for a book
-	(which corresponds to the local book), and if the completion_book
-	is present, add it to the list of books to complete again.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (merge_cb): change to
-	EBookCallback signature, and unref the book.
-	(quick_add_merge_card): use addressbook_load_default_book.
-	(ce_have_book): change to EBookCallback signature, and unref the
-	book.
-	(edit_card): use addressbook_load_default_book.
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	change to EBookCallback signature, and unref the book.
-	(add_card_idle_cb): use addressbook_load_default_book, and call
-	the cb if it fails.
-	(e_address_popup_cleanup): fix type -- should be "pop->card =
-	NULL", not "pop = NULL".
-	(contact_editor_cb): change to EBookCallback signature.
-	(edit_contact_info_cb): use addressbook_load_default_book.
-	(start_query): change to EBookCallback signature.
-	(e_address_popup_query): use addressbook_load_default_book.
-
-	* gui/widgets/e-minicard-control.c (book_open_cb): change to
-	EBookCallback signature, and unref the book.
-	(save_in_addressbook): use addressbook_load_default_book instead
-	of e_book_use_local_address_book.
-
-	* gui/widgets/Makefile.am (INCLUDES): change includes since we're
-	including addressbook.h which has it's own set of funky include
-	path requirements.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't leak
-	stuff. (Bug #13709)
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb,
-	nickname_simple_query_cb): Set book_uri when cardification occurs.
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Turned off use_ellipsis (it breaks
-	emulate_label_resize) and on emulate_label_resize.  Fixes Ximian
-	bug #13693.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Doh!  We should be sorting our contacts so that the
-	most frequently used ones are at the top of the list, not the
-	bottom.
-
-	* backend/pas/pas-book.c (pas_book_check_queue): That should be a
-	bonobo_object_unref, not a gtk_object_unref.
-	(pas_book_queue_request): Likewise, we need to bonobo_object_ref
-	here.
-	(pas_book_destroy): If our pas_book_check_queue timeout is still
-	active, disable it.  This should never happen, but it never hurts
-	to be careful.
-	(pas_book_destroy): Set book->priv to NULL after we free it.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): copy phone
-	labels and show phone as well, clear correct entry text and
-	correctly detect unsyncable cases
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): touch the
-	record on lookup
-	(check_for_slow_setting): write touched only if we are doing a
-	slow sync
-	(card_removed): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid
-	reentrancy guards.
-	(pas_book_queue_request): Changed our idle handler into a timeout,
-	so as to work w/ reentrancy guards.
-	(pas_book_init): Explicit initialization.
-
-2001-10-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototypes for
-	addressbook_config_database, and addressbook_load_default_book.
-
-	* gui/component/addressbook.c (addressbook_config_database): new
-	function, so we aren't activating the db everywhere we need to use
-	it.
-	(addressbook_load_default_book): load the default book, after
-	getting the uri from bonobo-config.
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_card_added_cb): Return
-	on cancellation.
-	(simple_query_sequence_complete_cb): Act if not cancelled.
-	(simple_query_book_view_cb): Free & return on cancellation.
-	(e_book_simple_query_cancel): Set cancellation flag.
-
-	* gui/component/e-address-popup.c (e_address_popup_query): Hold a
-	reference to ourselves for the duration of our addressbook fetch.
-	(start_query): Release when we've fetched our addressbook.
-	(e_address_popup_cleanup): Break out most of what we do in
-	_destroy into a separate function.
-	(e_address_popup_destroy): Class cleanup.
-	(contact_editor_cb): Paranoid clean-up.
-	(add_contacts_cb): Paranoid clean-up.
-	(e_address_popup_ambiguous_email_add): Paranoid clean-up.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: remove the merges as valid sync
-	types
-
-	* conduit/address-conduit.c (pre_sync): write out only the touched
-	records if we are doing copies
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get the sync type
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c (e_address_popup_destroy):
-	Cancel any pending queries.
-
-	* gui/contact-editor/e-contact-editor.c (close_dialog): Don't
-	assert, but check if ce->app != NULL, since this function can
-	(apparently) get called multiple times.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Remove bad
-	dialog ref-counting crap.
-
-	* gui/contact-editor/e-contact-editor.c (save_card): Ref our
-	EContactEditor, since we are holding a pointer to it in
-	EditorCloseStruct.
-	(card_modified_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-	(card_added_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (check_for_slow_setting): make debug
-	info more accurate
-	
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (e_addr_context_destroy): prevent
-	double unref
-	(cursor_cb): correct typo
-	(card_removed): remove the card from the map if was archived and
-	is now deleted
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.h: new member
-
-	* conduit/address-conduit.c (print_remote): free the struct after
-	using it
-	(e_addr_context_new): make consistent with other conduits
-	(e_addr_context_destroy): properly destroy the context
-	(cursor_cb): no need to ref the card, its done for us
-	(clear_entry_text): util function to free a field
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer so we don't
-	have to free it later
-	(local_record_from_ecard): only fill in the fields we might not
-	sync, clear a field before replacing the contents
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(set_has_cursor): Added has_cursor argument.  Setting the argument
-	to TRUE if the minicard doesn't have focus will grab the focus.
-	Fixes Ximian bug #3024.
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Initialize
-	gnome-vfs.
-
-	* gui/component/addressbook-component.c (xfer_file): Added.
-	(Copied from the calendar.)
-	(xfer_folder): Fixed to allow renaming of contact folders.
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): Removed key_press handler here
-	since delete and backspace are now handled by keybindings.
-
-2001-10-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c: Fix command paths when we specify
-	our pixmaps, so we don't get a lot of totally useless & very ugly
-	bonobo-ui spew.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): The empty
-	string as an arg shouldn't generate a warning.
-
-	* gui/component/select-names/e-select-names-completion.c: Removed
-	our cancelled flag and e_select_names_completion_cancel function,
-	since we were just duplicating stuff that had ended up in
-	ECompletion.
-	(match_name): Form our menu_text properly on an additional-name
-	match.
-	(e_select_names_completion_got_book_view_cb): Store handles for
-	our signals, disconnect them properly when we switch book views.
-	(e_select_names_completion_stop_query): Disconnect signals when we
-	stop our query.
-	(check_capabilities): Spew if we are using LDAP for completion.
-	(e_select_names_completion_destroy): Disconnect our signals when
-	we destroy.
-	This all should fix bug #10241.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Set "draw_button" argument to TRUE
-	on this EEntry.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (save_it): Put up an
-	error dialog if there's an error while saving.  If the person hits
-	cancel on the "file exists" dialog, don't close the file selection
-	dialog.  Fixes Ximian bug #7055.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(model_and_selection_free): right_click_up here when we let go of
-	the popup.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	right_click_up here.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section, e_select_names_set_default): Use an
-	EEntry here instead of a GtkLabel.  Fixes Ximian bug #7067.
-
-2001-10-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_model_force_folder_bar_message when we activate the
-	component. (Fixes bug #11749)
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_force_folder_bar_message): Added.  Forces
-	emission of a folder_bar_message.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_set_default): stick with the style font if the
-	efont bold font does not exist.	
-	(e_select_names_set_default): don't forget to unref the oldstyle.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Fix memory leak.
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Free our
-	string vector letter_v when we are done with it.
-
-	* gui/contact-editor/e-contact-quick-add.c (edit_card): Unref our
-	QuickAdd structure.
-
-	* gui/component/e-address-popup.c (e_address_popup_construct):
-	Unref our style after we are done with it.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): We
-	shouldn't leak the info returned by oaf_query.
-
-	* gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove
-	superfluous call to quick_add_unref.
-	(editor_closed_cb): Remove superfluous call to quick_add_unref.
-
-	* gui/component/select-names/e-select-names.c (esn_get_key_fn): We
-	need to unref the card returned by e_addressbook_model_get_card.
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make LDAP servers
-	non-user-creatable.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_card): Check that the
-	string we are checking for xml-ness is non-NULL.
-
-	* backend/ebook/e-destination.c (e_destination_importv): Filter
-	out empty destinations. (also Bug #13036)
-
-	* printing/e-contact-print.c (e_contact_build_style): Use
-	gnome_font_new_closest; if gnome_font_new fails and returns NULL,
-	our spacing gets all messed up. (Bug #10785)
-	
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_can_print):
-	Allow printing if there are any cards in our view.  The selection
-	has nothing to do with it.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Check
-	for strings that contain non-whitespace, rather than just looking
-	for a non-zero first character. (Bug #13036)
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	Handle focus_change in event by selecting that contact.  Fixes
-	Ximian bug #3024.
-
-	* gui/component/addressbook-component.c (owner_unset_cb):
-	Repeatedly call gtk_main_quit here as long as there is a main loop
-	around.  This is an ugly hack around Ximian bug #11760.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: Added #include
-	<gal/widgets/e-unicode.h>.
-
-	* gui/widgets/e-minicard-control.c: Made this display the number
-	of extra cards in the attachment as well as made it save them all
-	to the local addressbook if the person selects the button.  Fixes
-	Ximian bug #9507.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Changed this to not
-	grab on a right click.  Fixes Ximian bug #12660.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_motion): Get @folder_type here too [to
-	match the changes in the EvolutionShellComponentDnd interface].
-	Also, remove a debugging message.
-	(destination_folder_handle_drop): Likewise.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (add_menu_item):
-	Translate labels in select-names option menu. (Bug #9604)
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Made the default window size
-	slightly wider. (Bug #7516)
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h
-	(e_card_list_get_vcard): Made this take a const GList.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(check_capabilities): Added.  Check if our book is local or
-	networked.
-	(e_select_names_completion_book_ready): Call check_capabilities.
-	(e_select_names_completion_new): Call check_capabilities.
-	(e_select_names_completion_do_query): If we have a networked book,
-	keep trying if we haven't been able to cache any cards --- our
-	earlier attempts could have failed due to too many matches. (Bug
-	#12932)
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Lag our cardification on focus-out.  This seems to
-	help with the unintended cardifications that can result from the
-	weird focus-out/focus-in events that get generated when the popup
-	disappears.
-
-	* backend/ebook/e-card-compare.c: Removed some debug spew.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	grab focus in the Account entry when preparing the dialog, fixes
-	#10406.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (new_folder): make
-	sure to also add "ldap-contacts" folders to the option menu.
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync all
-	the fields we can, with out overwriting
-	(local_record_from_ecard): write the fields to the pilot in
-	priority order unless there are fields on the pilot we can't
-	store, then fill in the fields as they are on the pilot
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): Did a bit of clean
-	up here.  Might fix some crashes, specifically Ximian bug #10164.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated the model
-	column numbers here.  Fixes Ximian bug #12308.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_upgrade_db):
-	add upgrade from 0.1 to 0.2, where we make sure id dbt's match
-	vcard id's, fixes longstanding bug (#7406) where cards were not
-	modifiable or removable after having been created during a 1-2
-	week long window in early betas.
-	(PAS_BACKEND_FILE_VERSION): change to 0.2
-	(PAS_ID_PREFIX): #define this here.
-	(pas_backend_file_create_unique_id): use PAS_ID_PREFIX instead of
-	the string.
-
-2001-10-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (support_format_fn): Return
-	FALSE if no extension.
-
-2001-10-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_id): If card->id is NULL,
-	return an empty string.
-	(e_card_set_id): Don't allow the card id to be set to NULL; use
-	the empty string instead.
-	(e_card_get_vobject): When building our vcard, pass in the empty
-	string as the id if card->id is NULL. (Bug #10164)
-
-2001-10-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): don't set
-	the phone info if it is blank
-	(ecard_from_remote_record): save up to 3 fax numbers
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	unref the book after we pass it off to evolution-addressbook.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_dtor): unref
-	op->view.
-	(pas_backend_ldap_process_create_card): ref op->view.
-	(remove_card_dtor): unref op->view.
-	(pas_backend_ldap_process_remove_card): ref op->view.
-	(modify_card_dtor): unref op->view.
-	(pas_backend_ldap_process_modify_card): ref op->view.
-	(ldap_search_dtor): unref op->view.
-	(pas_backend_ldap_search): ref op->view.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-	
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): make sure to unref the
-	book_view here so we don't leak them.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init and e_passwords_shutdown.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueQP, addPropValueSets,
-	e_card_get_vobject): Properly decide whether a property needs to
-	be marked as QP by searching for '\n'.  Fixes Ximian bug #3021.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as,
-	e_contact_list_save_as): Set the default file name here.  Fixes
-	Ximian bug #7053.
-
-2001-10-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Added linebreaks to our
-	"this shouldn't happen" dialog message. (Bug #12498)
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Add a component name
-	to the e_passwords_init() call.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c: commit the importer
-	originally from Michael M. Morrison, with fixups by toshok.
-
-	* backend/ebook/Makefile.am (bin_PROGRAMS): add
-	evolution-ldif-importer.
-	(oaf_in_files): add
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.
-
-	* backend/ebook/e-card-simple.h: add WANTS_HTML and IS_LIST.
-
-	* backend/ebook/e-card-simple.c (field_data): add WANTS_HTML and
-	IS_LIST.
-	(e_card_simple_set): fix typo.
-
-	* backend/ebook/.cvsignore: ignore
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf and
-	evolution-ldif-importer.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in:
-	ldif importer oafinfo.
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a boolean type here.
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Check to see if the uri we are
-	setting is the same as the current uri.  If so, do nothing.
-	(Bug #11324)
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c
-	(e_destination_reverting_is_a_good_idea): Added.  Heuristic for
-	whether or not we want to revert to an earlier cardified state.
-	(e_destination_cardify): Don't be quite as aggressive about
-	reverting to previous cardified states. (Bug #11890)
-
-2001-10-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_destroy,
-	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,
-	e_card_simple_set_address, e_card_simple_set_delivery_address,
-	file_as_get_style, file_as_set_style, e_card_simple_set,
-	e_card_simple_set_arbitrary),
-	gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_destroy,
-	e_contact_editor_address_set_arg,
-	e_contact_editor_address_get_arg),
-	gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_destroy,
-	e_contact_editor_fullname_set_arg,
-	e_contact_editor_fullname_get_arg),
-	gui/contact-editor/e-contact-editor.c (phone_entry_changed,
-	address_text_changed, name_entry_changed, full_name_clicked,
-	full_addr_clicked, fill_in_info): Changed these to use the new ref
-	and unref functions for ECard auxillary types.
-
-	* backend/ebook/e-card-simple.h: Added a comment.
-
-	* backend/ebook/e-card-types.h: Added ref_count field to all the
-	types.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and
-	unref functions here for all the ECard auxillary types.  Removed
-	the corresponding free functions.  Switched to using these
-	functions where appropriate.
-
-	* gui/component/addressbook-factory.c: #include
-	<e-util/e-passwords.h>
-
-	* gui/component/addressbook.c (load_uri_cb): const correctify.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names.c: #include
-	<addressbook/gui/component/addressbook.h>
-
-	* gui/widgets/e-addressbook-model.c (modify_card): Removed an
-	unnecessary ref here.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_folder):
-	Don't need this any more.
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Check that
-	view->view != NULL.
-	(save_contact_cb): Check that view->view != NULL.
-	(search_cb): Check that view->view != NULL.
-	(delete_contact_cb): Check that view->view != NULL.
-	(print_cb): Check that view->view != NULL.
-	(print_preview_cb): Check that view->view != NULL.
-	(stop_loading_cb): Check that view->view != NULL.
-	(cut_contacts_cb): Check that view->view != NULL.
-	(copy_contacts_cb): Check that view->view != NULL.
-	(paste_contacts_cb): Check that view->view != NULL.
-	(select_all_contacts_cb): Check that view->view != NULL.
-	(send_contact_cb): Check that view->view != NULL.
-	(send_contact_to_cb): Check that view->view != NULL.
-	(update_command_state): Check that view->view != NULL.  Hold a
-	reference to the AddressbookView for the duration of the function,
-	in case we exit during bonobo-reentrancy.
-	(addressbook_view_ref): Added.
-	(addressbook_view_unref): Added.  Simple ref counting for
-	AddressbookView objects.
-	(addressbook_view_clear): Zero out an AddressbookView.  This is
-	now separated from the deallocation of the AddressbookView object,
-	so that we don't leave a dangling pointer if we exit during
-	bonobo-reentrancy in update_command_state. (Which often seems to
-	happen if we exit while addressbook operations are going on.)
-	(destroy_callback): Replace previous call to addressbook_view_free
-	with addressbook_view_clear/addressbook_view_unref calls.
-	(addressbook_factory_new_control): Initialize the reference count
-	in the AddressbookView object.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	Carefully zero out our destroyed object.
-	(command_state_change): Hold a reference to ourselves during the
-	signal emission.
-	(get_selected_cards): Ref cards as we add them to the list.
-	(e_addressbook_view_stop): Check for view != NULL.
-	(e_addressbook_view_can_create): Check for view != NULL.
-	(e_addressbook_view_can_print): Check for view != NULL.
-	(e_addressbook_view_can_save_as): Check for view != NULL.
-	(e_addressbook_view_can_send): Check for view != NULL.
-	(e_addressbook_view_can_send_to): Check for view != NULL.
-	(e_addressbook_view_can_delete): Check for view != NULL.
-	(e_addressbook_view_can_cut): Check for view != NULL.
-	(e_addressbook_view_can_copy): Check for view != NULL.
-	(e_addressbook_view_can_paste): Check for view != NULL.
-	(e_addressbook_view_can_select_all): Check for view != NULL.
-	(e_addressbook_view_can_stop): Check for view != NULL.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): Be
-	careful about zeroing out our destroyed object.
-	
-	* backend/ebook/e-book-view.c (e_book_view_stop): Added.  Stops
-	event processing in the underlying listener.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_destroy): If our select names dialog is
-	still around, destroy it.  Otherwise, the dialog will hang around
-	after our composer goes away.
-
-2001-10-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: add an Email Address
-	field/label/help text.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the email entry
-	from the source.  also, set the initial state of the email
-	label/entry.
-	(auth_checkbutton_changed): set the email label/entry
-	sensitive/editable if auth is turned on, and
-	insensitive/uneditable if it's off.
-	(addressbook_source_dialog_get_source): get the email address from
-	the email entry.
-	(addressbook_source_dialog): hook up the email entry to the
-	changed signal foo, as well as the focus handler for displaying
-	help text.
-
-2001-10-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): db isn't a BonoboObject, so don't
-	bonobo_object_unref it!
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/addressbook.c (forget_passwords_cb): new function,
-	call e_passwords_forget_passwords.
-	(verbs): Add ContactsForgetPasswords.
-	(load_uri_auth_cb): new function, call the callback and free up
-	our closure stuff.
-	(load_uri_cb): once the uri is loaded, check if we're configured
-	to authenticate for it, and do so, using the e_passwords stuff.
-	(addressbook_load_uri): wrapper around e_book_load_uri.  save off
-	the parameters and start the load-with-auth machinery.
-	(book_open_cb): remove all the auth stuff from here, as it's
-	handled elsewhere now.
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init.
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	e_book_load_uri -> addressbook_load_uri.
-	(destination_folder_handle_drop): same.
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_load_uri (a wrapper around e_book_load_uri that also
-	handles authentication if the user selects it.)
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Check to make sure our call to
-	e_addressbook_model_get_card doesn't return NULL.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_get_card): Chek that we aren't requesting a
-	negative row.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	Move to the bottom of the scrolled window, so we can see the
-	address we just added.
-	(table_drag_data_received_cb): Move to the bottom of the scrolled
-	window, so we can see the contact we just dropped.
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	We don't own the string returned by e_categories_master_list_nth,
-	so terrible things will happen if we free it. (Bug 10916)
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_set_arg):
-	don't set the editable field on the model - let the book do that.
-	(book_writable_cb): call writable_status to propagate a ui-change
-	event up (and sensitize the write-only toolbar buttons after you
-	authenticate with ldap.)
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): for some
-	reason, matching on protocol is causing problems for me.
-	disabling it for now.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c: use ldap.png for ldap
-	contacts.
-
-2001-10-03  Iain Holmes  <iain@ximian.com>
-
-	* addressbook/gui/component/addressbook-storage.c 
-	(addressbook_storage_setup): Only load_storages if you have LDAP.
-	(load_source_data): Only do stuff if you have LDAP.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
-	gui/widgets/e-minicard.c (remodel): Fixed these to determine the
-	fields to use properly.
-
-2001-10-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Strip out commas before forming our query.
-	(match_name): Use e_card_compare_name_to_string_full, rather
-	than our crufty old matching code.  Not only is this cleaner,
-	but that crufty old code was very broken when it came to 
-	handling strings with whitespace. (Bug 8988)
-	(match_nickname): utf8 and bug fixes.
-
-	* backend/ebook/e-card-compare.c
-	(e_card_compare_name_to_string_full): Added.  This is basically
-	e_card_compare_name_to_string with a bunch of extra options, so
-	that it can more readily be reused in other contexts.
-	(e_card_compare_name_to_string): This is now just a call to
-	e_card_compare_name_to_string_full with the extra args filled in
-	to defaults that simulate the old behavior.
-
-2001-10-02  Chris Toshok  <toshok@ximian.com>
-
-        * backend/ebook/e-book.c (e_book_construct): remove most of the
-	oaf stuff from here.  we do it in load_uri, where we'll have more
-	information (namely, the protocol we're using.)
-	(activate_factories_for_uri): do an oaf query to get a list of all
-	objects implementing our BookFactory interface and also supporting
-	the protocol used in the uri.
-        (e_book_load_uri): try activating book factories to handle this
-	uri, and start the iteration over the list.
-        (e_book_load_uri_from_factory): try and load the uri.
-        (e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-        (e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-	
-2001-10-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): Made the max length of
-	the textification be 2047 characters.  Fixes Ximian bug #3021.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): if there
-	was no first name or last name, file as the company.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): if there is a db error,
-	assume deletion
-	(pas_backend_file_changes): write after all is done for efficiency
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): g_strdup
-	(pas_backend_file_changes): ditto, make sure to free all data and
-	do a hash write after each add/remove
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): use
-	the local record category
-	(local_record_from_ecard): ndle the fields and category we don't
-	sync by making sure we don't overwrite them
-
-2001-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_construct): do an oaf query to
-	get a list of all objects implementing our BookFactory interface,
-	instead of just activating the one IID.  this should really be a
-	global list, not a per EBook.
-	(e_book_load_uri): start the iteration over our list of
-	BookFactory's.
-	(e_book_load_uri_from_factory): try and load the uri.
-	(e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-	(e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-
-2001-09-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): use the old
-	record (if there was one) so as not to overwrite fields we don't
-	sync
-	(pre_sync): store the dbi in the context and don't make it object
-	data
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_destroy): use
-	priv->iid instead of the hardcoded string here.
-	(pas_book_factory_activate): parameterize the factory's iid, as in
-	the calendar server, and provide a default if iid == NULL.
-
-	* backend/pas/pas-book-factory.h: add iid parameter for
-	pas_book_factory_activate.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): Use
-	camel_address_format, not camel_address_encode.
-
-2001-09-26  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added help text (thanks 
-	to Aaron) and re-worded the labels, and fixed the shortcuts on the 
-	brand-spanking-new Collaboration tab.
-	
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	completion_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): get /Addressbook/Completion/uri, and
-	if it's present, use the corresponding EBook for completing
-	addresses.
-	(focus_out_cb): use manager->completion_book here instead of NULL,
-	which corresponds to the local addressbook.
-	(completion_popup_cb): same.
-	(e_select_names_manager_create_entry): same.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Properly handle names when the individual elements (given,
-	addition, family) contain whitespace.  (Bug #10502)
-
-	* backend/ebook/e-destination.c (e_destination_set_name): Reset
-	textrep when we change the name.
-	(e_destination_set_email): Reset textrep when we change the email.
-	(e_destination_get_textrep): Make sure that the textrep version of
-	the address is properly quoted if it contains unsafe characters.
-	(All related to bug #10796)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Fix nickname matching. (bug #9698)
-	(make_match): Use e_completion_match_new when building our match,
-	rather than ad hoc manipulation of the struct.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): set
-	the last_use and use_score fields of the card to known values so
-	the card doesn't register as changed when only they have changed
-
-2001-09-26  Peter Williams  <peterw@ximian.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): Fix this function
- 	to set email addresses properly, and handle multiple occurrences of
- 	email addresses, home phone numbers, and business phone numbers.
-	
-2001-09-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	Handle creating the new contact in the current folder if it's a
-	contacts folder.  Fixes Ximian bug #7814.
-
-2001-09-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (LDAP_SCHEMA): add
-	evolutionperson.schema
-	(EXTRA_DIST): add LDAP_SCHEMA to the dist (but don't install it).
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync the
-	note the to pilot and make sure to blank fields when appropriate
-	(local_record_from_ecard): sync the note to the desktop
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_create): g_free (id) in the
-	error case to plug a memory leak.
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): when creating the cards,
-	don't display any of the subname fields (surname, given, middle,
-	suffix, etc.)
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_get): add getters for the additional name fields.
-	(field_data): move FAMILY_NAME to the end of the list, and add
-	GIVEN_NAME, ADDITIONAL_NAME (middle name), and NAME_SUFFIX.
-	
-	* backend/ebook/e-card-simple.h: same.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (print_preview_cb): Hooked up print
-	preview button.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_print_preview): Added this function.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_preview): Added this function.
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb):
-	Use the default e-mail address if we have nothing else to go on.
-	Previously we just failed, which basically meant that name-only
-	searches would never work properly.
-	(nickname_simple_query_cb): The logic was a bit tangled here; if
-	our query status isn't SUCCESS, always give up but don't leak the
-	destination.  And if our nickname query fails and we try the
-	name-and-email query, use the textrep for a name-only search.  The
-	only reason we are doing a nickname query in the first place is if
-	we have an obviously invalid e-mail.
-	(launch_cardify_query): Use e_destination_is_valid to determine
-	if we should try a nickname query first.
-	These changes basically fix bug 7728, and generally make the
-	auto-cardification of addresses a lot more clever and robust.
-
-	* backend/ebook/e-book-util.c (name_and_email_cb): Use
-	e_card_compare_name_to_string instead of e_card_name_match_string.
-	(e_book_name_and_email_query): The arguments to g_strsplit were
-	in the wrong order.  Doh!
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Added.  Replaces e_card_name_match_string, and actually works.
-
-	* backend/ebook/e-card.c: Removed e_card_name_match_string
-	function, which didn't work particularly well.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (cursor_cb): don't add to the complete
-	list of cards if the card is a list
-	(card_added): don't add to the list of changes if the card is a
-	list
-	(card_changed): ditto
-	(card_removed): ditto
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change the "this should
-	never happen" message into a request for people to e-mail me
-	directly with info if they encounter that error.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query):
-	Freeing name[i] instead of namev[i] is a bad idea. (bug #10270)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Properly handle our GnomeUIInfo labels so that
-	they won't be leaked if they are dynamic strings, so that they
-	will be i18n-correct, and so that underscores won't be interpreted
-	as key accelerators.  What a PITA.  Also, don't leak our
-	iterators.  (Bug #10200.)
-	(popup_menu_list): The same GnomeUIInfo tweaking as in
-	popup_menu_card.
-	(popup_menu_nocard): Ditto.
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
- 
- 	* backend/ebook/e-card-simple.c (field_data): add caluri field data
- 
- 	* backend/ebook/e-card.c (e_card_get_vobject): add the caluri
- 	property when appropriate
- 	(parse_caluri): handle read caluri
- 	(e_card_class_init): add caluri arg
- 	(e_card_destroy): free the caluri
- 	(e_card_get_arg): return caluri arg
- 	(e_card_set_arg): set caluri from arg
- 	(e_card_init): init caluri to null
- 
- 	* backend/ebook/e-card-simple.h: new simple field
- 
- 	* backend/ebook/e-card.h: new member
- 
- 	* gui/contact-editor/e-contact-editor.c (field_changed): util
- 	callback to change the command state
- 	(set_entry_changed_signal_field): hook up a change signal to above
- 	(set_entry_changed_signals): use above function
- 
- 	* gui/contact-editor/e-contact-editor.glade: Add collaboration
- 	page and fields
-	
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_build_cards_list): create a sexp and check if
-	the cards match before adding them to the list
-	(pas_backend_file_process_get_cursor): send extra param
-
-2001-09-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): unref the destination regardless
-	of whether we get an email addresss.
-
-2001-09-17  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): use g_strfreev.
-	(match_name): s/g_free/g_strfreev.
-	(match_file_as): s/g_free/g_strfreev.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query): fix
-	the memory handling here.  All there members of the vector need to
-	be freed all the time.
-
-	* backend/ebook/load-pine-addressbook.c (parse_line): free the
-	string outside of the test that makes sure there are three
-	entries.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): don't malloc a match we will never use.
-
-	* gui/widgets/e-addressbook-model.c (get_view): free the dup'd
-	capabilities.
-
-2001-09-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): We want
-	to assume that a destination that comes from a card is
-	automatically valid, but the right way to check that is by calling
-	e_destination_from_card, not by checking if dest->priv->card !=
-	NULL.  (Fixed bug #10017)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Fixed a stupid bug was causing completion to fail
-	for contacts who have only one name.  (The classic example we all
-	know and love is 'George <jirka@5z.com>')  (bug #8353)
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to has no valid e-mail addresses.
-	(bug #10137)
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Code implicitly
-	assumed that event->button.button is 1, 2, or 3, causing disaster
-	when using a wheel-mouse.  Fixed. (bug #9400)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):
-	use enable_widget instead of gtk_widget_set_sensitive.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(disable_widget_foreach): same.
-	(enable_writable_fields): same.
-	(set_editable): same.
-	(enable_widget): new function, using both gtk_widget_set_sensitive
-	and *_set_editable to allow the user to select text in GtkEntry's
-	and GtkText's.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_arg): use set_editable as well as
-	set_sensitive, to allow the user to select text in GtkEntry's.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_set_arg): same.
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix syntax errors (which are
-	broken, imo...)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: reorder the LDAP scopes so
-	that they match the order of the option menus in the glade file.
-
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	new function, mostly there to house some #ifdef'ed out code.
-	(option_menuitem_activated): new function, to keep track of
-	changes to the ldap scope optionmenu.
-	(addressbook_source_dialog_set_source): set the menu history as
-	well as the dialog's copy of the scope.
-	(addressbook_source_dialog_get_source): fill in the source's scope
-	from the dialog's copy, and add more #if the_ui_gods_smile_on_me
-	code.
-	(add_activate_cb): new function, add an activate callback for the
-	optionmenu's items.
-	(addressbook_source_dialog): more #if the_ui_gods_smile_on_me
-	code, always start the dialog on page 0, and hook up the
-	scope optionmenu's items.
-
-2001-09-15  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): No
-	loose name matches on family names. (#8802)
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): We can't use NULL as the
-	first arg for e_addressbook_show_contact_editor anymore.  Damn.
-	(#8535)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
-	"stop" do nothing but set the stopped flag, as in
-	e-book-view-listener.c.
-	(e_book_listener_destroy): Clean up our queue here, rather than in
-	e_book_listener_stop.
-	(response_free): Added.  Move the rather lengthy bit of code
-	needed to free a EBookListenerResponse into one place.
-	(e_book_listener_check_queue): Properly deal with the stopped
-	flag.
-	(e_book_listener_queue_response): If the stopped flag is set, just
-	drop the incoming response.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): Make "stop" do nothing but set the
-	stopped flag.
-	(e_book_view_listener_destroy): Move all of the clean-up that used
-	to be in e_book_view_listener_stop here.  This considerably simplifies
-	the logic required to avoid various race conditions.
-	(e_book_view_listener_check_queue): Properly deal with the stopped flag.
-	(e_book_view_listener_queue_response): Drop all incoming responses if
-	we are stopped.
-
-2001-09-14  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_request): Hold a
-	reference to the book on behalf of our idle function.
-	(pas_book_check_queue): When we are finished, drop the reference
-	we've been holding on behalf of the idle function.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): Hold a reference to the
-	book_view while sending our notifications.
-	(pas_backend_file_process_remove_card): Hold a reference to the
-	book_view while sending our notifications.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove
-	debugging spew.
-
-	* backend/ebook/e-book-util.c: Remove a lot of unused code that
-	worked around bugs that have long since been fixed.
-	(simple_query_disconnect): Added.  Breaks out the part of
-	simple_query_free that disconnect signals.
-	(simple_query_free): Replace code w/ a call to
-	simple_query_disconnect.
-	(simple_query_sequence_complete_cb): Call simple_query_disconnect
-	before executing the callback, so that our callbacks don't get
-	triggered by any book changes that might occur during that
-	callback.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Changed to be consistent with
-	e_book_listener_check_queue.
-	(e_book_view_listener_queue_response): Also changed to use a
-	high-frequency timeout.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	OK, I've agonized over this stupid little function, and it should
-	now be race-free.
-	(e_book_listener_queue_response): We process our response queue in
-	a high-frequency timeout rather than an idle.  Using an idle
-	function leads to some tricky race conditions and bad interactions
-	with bonobo's semi-broken attempts to take over event processing.
-	(e_book_view_listener_stop): Manually disable our timeout and
-	clean up.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* gui/component/select-names/Makefile.am: Set CLEANFILES directly
-	instead of using `+='.
-
-	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to
-	`LDAP_BACKEND_FILES'.
-
-	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of
-	using `+='.
-
-2001-09-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_init.  ldap_open is deprecated in openldap 2.x.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* backends/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	Fix the check.
-
-2001-09-12  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-destination.c: free the values that are being
-	leaked here.
-
-2001-09-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c (match_email): 
-	printf arguments were reversed by mistake.  Fixed bug #9693.
-
-2001-09-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_list): Added.  Treat right-clicks on a contact list as
-	a special case.
-	(e_select_names_popup): Check if we are dealing with a contact
-	list.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): See
-	e_book_listener_check_queue below.
-	(e_book_view_listener_queue_response): See
-	e_book_listener_queue_response below.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	Explicitly prohibit reentrancy.  Use gtk-unref rather than
-	bobobo-unref.
-	(e_book_listener_queue_response): Hold a gtk-ref to the listener
-	while the idle function runs, not a bonobo-ref.  As far as I can
-	tell, it is impossible to avoid a race condition here when we have
-	to worry about bonobo reentrancy.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Alter a copy of the
-	original EDestination, rather than just using a new one.  We need
-	to do this to preserve prior-card information for possible
-	reversion later.
-	(e_select_names_text_model_delete): Ditto.
-
-	* backend/ebook/e-destination.c (e_destination_clear_card): When
-	clearing a destination where ->card != NULL, store it for possible
-	reversion later.
-	(e_destination_revert): If we have an old card stored, go back to
-	using it for the destination.
-	(e_destination_is_valid): Tries to detect obviously broken
-	addresses.
-	(e_destination_cardify): If our destination is invalid, first try
-	to cardify simply by reverting to an older card.
-	(e_destination_destroy): Unref any cached old card.
-	(e_destination_copy): Copy the old card information.
-
-2001-09-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(sync_table_and_models): Show all rows in the table, and then
-	remove the rows that correspond to entries in the
-	ESelectNamesModels in the children.
-	(real_add_address): Freeze/thaw our ESelectNamesModel, so that we
-	don't change our table while we are in the middle of iterating
-	over the selection.
-	(remove_address): Just delete the address from the
-	ESelectNamesModel, the signal handler will do the rest.
-	(selected_rows_foreach_cb): Call remove_address to do our dirty
-	work.
-	(e_select_names_add_section): Connect to the 'changed' signal from
-	the ESelectNamesModel, and call sync_table_and_models explicitly to
-	get our initial state correct.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Deal with EDestinations in our table that don't
-	come from cards.
-
-	* gui/component/select-names/e-select-names-manager.c: Added
-	another ESelectNamesModel* to the ESelectNamesManagerSection
-	struct.  Called 'original_model', this contains a copy of the
-	model as it is when we begin using the SelectNames dialog.
-	(section_copy): Copy the original model.
-	(section_free): Free the original model.
-	(e_select_names_manager_add_section_with_limit): Initialize the
-	original model.
-	(e_select_names_clicked): I've changed the semantics of this
-	dialog quite a bit... no UI freeze can stop me!  If OK is clicked,
-	we do nothing.  If Cancel is clicked, we revert to the
-	'original_model' copy of our address entry state before we started
-	editting.  Finally, we close the dialog before any of thing. Doing
-	it last caused problems, because signals were being triggered
-	which had dangling pointers as their closures.
-	(e_select_names_manager_activate_dialog): Copy our current state
-	to the original model, and share the same ESelectNamesModel
-	between the dialog and the address entry in the composer..
-	(e_select_names_manager_get_cards): Removed.  It had been
-	#if 0/#endif-ed out for a while.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_freeze): Added.
-	(e_select_names_model_thaw): Added.
-	(e_select_names_model_uncardify): Added.  If possible,
-	"uncardifies" a specific model entry.
-	(e_select_names_model_changed): Changed to pay attention
-	to the freeze count.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(clean_query_text): Strip leading/trailing whitespace from
-	queries.
-
-	* backend/ebook/e-destination.c (e_destination_uncardify): Added.
-	Converts a card-associated destination into a text-associated
-	destination w/ the e-mail address.
-	(e_destination_list_to_vector): Added.  A convenience routine.
-	(e_destination_freev): Added.  A convenience routine.
-	(e_destination_touchv): Added.  I'm lazy.
-
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	(make_contact_editor_cb): show the right contact editor (the list
-	editor for list cards).
-	
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): do the EDestination xml magic on email
-	addresses we put in the popup.
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	For every category:
-	- set .translate to FALSE (e_categories_master_list_nth returns
-	translated category name)
-	- convert category name in UTF-8 to locale's encoding
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Fixed two bugs:
-	- missing coversion of contact name to GTK+ locale,
-	- passing dynamically created string (contact name) inside uiinfo struct
-	to gnome-app-helper functions.
-	Remember: these functions may change strings, trying to translate them!
-	(popup_menu_nocard): Ditto
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Removed unused factory
-	variable.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (notify_listener): new
-	function, notify the bonobo listener.
-	(remove_ldap_folder): track change to EvolutionStorage signal.
-	(create_ldap_folder): same, and make sure the type is
-	"ldap-contacts".
-	(load_source_data): folders that we create should have
-	"ldap-contacts" as their type.
-	(addressbook_storage_add_source): same.
-
-	* gui/component/addressbook-component.c: (folder_types): add
-	"ldap-contacts", for display of ldap servers (they get their own
-	icon, and their own name in the Create New Folder dialog.
-	(create_view): use IS_CONTACT_TYPE since we support two folder
-	types now.
-	(create_folder): same.
-	(remove_folder): same.
-	(xfer_folder): same.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: (pixmaps): change
-	/Toolbar/ContactEditorSave to /Toolbar/ContactEditorSaveClose.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add -DEVOLUTION_IMAGESDIR.
-
-	* gui/widgets/e-addressbook-view.c (card_deleted_cb): remove
-	status messages from here.
-	(e_addressbook_view_delete_selection): same.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit a
-	NULL status message along with the stop_state_changed.  The null
-	status message will clear the status bar for this view.
-
-	* gui/component/addressbook.c (set_status_message): use the
-	EvolutionActivityClient stuff.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): remove status
-	message for abandoning a search.
-	(ldap_op_process_current): wrap status messages in _().
-	(ldap_op_process): same.
-	(create_card_handler): same, and remove the notify_status for ""
-	and add a notify_complete call after the card is added.
-	(remove_card_handler): same.
-	(modify_card_handler): same.
-	(poll_ldap): wrap status messages with _(), and remove the "Search
-	Complete" message.
-	(ldap_search_handler): wrap status message.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): use
-	_() on status messages, and make sure the last notify_* called is
-	notify_complete.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the addressbook.]
-
-	* gui/component/addressbook-component.c
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID): Removed.
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID): New.
-	(create_component): Renamed from `factory_fn'.  Just register the
-	thing on OAF.
-	(addressbook_component_factory_init): Just call it.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Remove the
-	ShellComponentFactory.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE
-	if the file isn't a valid VCard file.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes (mainly making buttons on the right side less Anglocentric :-)
-
-	* backend/ebook/e-card-simple.c
-	(field_data): Marked "name" and "short_name" fields for translation.
-	(e_card_simple_get_name, e_card_simple_get_short_name): Return
-	localized version of the name (using U_() macro).
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_changed_signals):
-	Connect "changed" signal from "entry-web" entry to widget_changed.
-	(changing this field wasn't making "Save and Close" button sensitive)
-
-	* gui/widgets/Makefile.am (glade_DATA): Removed alphabet.glade.
-
-	* gui/widgets/e-addressbook-view.c
-	(button_labels, button_letters): New strings containing a list of
-	labels and "values" of all buttons placed on the right side of the
-	addressbook view (intended for localization).
-	(struct LetterClosure): Changed the type of letter field to gunichar.
-	(e_utf8_split): New function, similar to g_strsplit, but operates on
-	UTF-8 strings.
-	(jump_to_letter): Don't hardcode letters, build queries dynamically
-	using UTF-8 and localized letters stored in button_letters.
-	(connect_button): Removed.
-	(create_alphabet): Don't use glade file, build buttons manually using
-	(localized) labels from button_labels. Use (localized) values from
-	button_letters when creating LetterClosure.
-
-	* gui/widgets/e-minicard-view-widget.[ch]
-	(e_minicard_view_widget_jump_to_letter): Changed the type of the
-	second argument from char to gunichar.
-
-	* gui/widgets/e-minicard-view.c
-	(compare_to_utf_str): Renamed from compare_to_letter, now operates on
-	UTF-8 string.
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar + conversion to UTF-8 string.
-
-	* gui/widgets/e-minicard-view.h
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar.
-
-2001-09-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
-	backend/pas/pas-backend-file.c (do_create),
-	backend/pas/pas-backend-ldap.c
-	(create_card_handler, remove_card_handler, modify_card_handler,
-	pas_backend_ldap_process_get_vcard, poll_ldap): Use
-	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
-	since all internal communications and database storage are assumed
-	to be utf8.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_duplicate): Simplified this function considerably.
-	(e_card_simple_get_vcard_assume_utf8): Added this function.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
-	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
-	these functions pay attention to charset attributes.
-	(e_card_new_with_default_charset,
-	e_card_load_cards_from_file_with_default_charset,
-	e_card_load_cards_from_string_with_default_charset): New functions
-	that let you change the default charset from UTF-8.
-	(e_card_get_vcard): Made this write out charset attributes when
-	necessary.
-	(e_card_get_vcard_assume_utf8): New function that writes out a
-	card without writing out charset attributes.
-
-	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
-	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
-	backend/ebook/test-card.c (main),
-	gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
-	(main), gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(pstream_load): Changed the default charset to be used here to
-	ISO-8859-1.
-
-	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
-	backend/ebook/load-pine-addressbook.c (add_card_cb),
-	backend/ebook/test-client-list.c (get_cursor_cb),
-	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
-	e_card_get_vcard_assume_utf8 to print out testing strings.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_contains): Changed this to be const
-	EDestination *dest to fix a warning.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Translate window title here.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): s/_/U_/
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare):
-	Use g_utf8_collate.
-
-	* gui/widgets/e-minicard.c (e_minicard_compare):
-	Ditto.
-
-	* printing/e-contact-print.c (card_compare):
-	Ditto.
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Use e_select_names_model_merge to
-	combine the selected names with any existing ones.  This causes
-	you to not lose addresses typed directly into the entry while the
-	SelectNames dialog is up. (Bug #8058)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_merge): Merge the contents of one
-	ESelectNamesModel into another, avoiding duplicates.
-
-	* backend/ebook/e-destination.c (e_destination_equal): Added.
-	Determines if two destinations appear to refer to the same
-	recipient.
-
-	* backend/ebook/e-card.c (e_card_list_send): Added cast to
-	g_free args to silence compiler warnings.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Paranoia.  Check that name != qa->name.
-	(quick_add_set_email): Check that email != qa->email.
-	(ce_have_book): Store the QuickAdd data structure in object data,
-	so that we can be extra-careful and avoid having a dangling
-	pointer floating around out somewhere as the closure for a signal.
-	Fixes bug #8155, I think.
-	(card_added_cb): Clear object data to ensure single unref.
-	(editor_closed_cb): Clear object data to ensure single unref.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_score): Make sure that comp->priv->query_text isn't
-	NULL.  (Fixes bug #8195)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	This function can be re-entrant during the signal emission; Added
-	extra ref/unrefs and checks to avoid problems if this happens.
-	This is similar to my recent changes to
-	e_book_view_listener_check_queue.  (Fixes bug #7400)
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Get rid of a warning by
-	initializing the closing NULL element in folder_types correctly.
-
-	* gui/component/select-names/e-select-names.c: Updated to match
-	the studlyCapsification of attributes in shell/Evolution*.idl.
-
-2001-08-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_file_as): Added.  Generated queries against file_as.
-	(match_file_as): Added.  Match results of queries against
-	file_as. (Bug #8152)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added ref/unref pair to make
-	sure that our listener doesn't get finalized during the signal
-	emission and leave us with a dangling pointer. (Bug #7661)
-
-	* backend/ebook/e-card.c (e_card_list_send): Removed some debugging
-	spew that I left in by mistake.
-
-	* gui/widgets/e-addressbook-model.c (create_card): Removed debugging
-	spew.
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to is a contact list. (Bug #6580)
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Display localized status string (added missing _()).
-
-2001-08-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_card): Put a
-	freeze/thaw around our the set of operations that changes the
-	internal state of our card, so 'changed' signal callbacks won't be
-	invoked on a card in an intermediary state.  This fixes the bug
-	that was causing the e-mail addresses in cards to be blank when
-	replying to a message.  (An unexpected side-effect of toshok's
-	change on 8/22 to make sure that priv->email != NULL).
-	(e_destination_get_name): Code slightly rearranged for (IMO)
-	clarity.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): add
-	BUTTON_PRESS_MASK so double clicks still work.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): switch
-	"full_name" to "x-evolution-any-field" in all the queries where we
-	want to match all cards, since the backends universally handle
-	this special case more efficiently.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	In the GUI, the toggle is labelled "hide addresses", not "show
-	addresses" -- so we have to reverse the boolean value we read in.
-	(fill_in_info): Same bug as before: since the GUI reads "hide", we
-	have to initialize the toggle to '!show_addresses', not
-	'show_addresses'.
-
-	* backend/ebook/e-destination.c
-	(e_destination_list_show_addresses): Added.
-	(e_destination_xml_encode): Encode the value of
-	e_destination_list_show_addresses into the XML.
-	(e_destination_xml_decode): Read and store the "show_addresses"
-	flag.
-
-2001-08-22  jacob berkman  <jacob@ximian.com>
-
-	* gui/component/e-address-popup.c (emit_event): emit an event from
-	our event source
-	(contact_editor_cb): emit a destroy event so our control frame can
-	be destroyed.
-	(edit_contact_info_cb): emit a hide event so our control frame can
-	be hidden
-	(e_address_popup_cardify):
-	(add_contacts_cb): emit the destroy event
-	(e_address_popup_factory_new_control): don't unref our object at
-	widget destroy time as that was really really broken
-	(e_address_popup_factory_new_control): create an event source and
-	aggregate ourself with it
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	display a nicer warning when we can't find a widget for a given
-	field
-	(e_contact_editor_raise): only raise if there is a window
-
-	* gui/contact-editor/contact-editor.glade: name some widgets that
-	got unnamed, and set the first entry as defaultable
-
-	* gui/contact-editor/e-contact-editor.c: envelope printing is
-	disabled in 1.0
-
-2001-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_email): make
-	sure we don't get into a situation where priv->email == NULL.
-
-2001-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): if we're dragging,
-	drag_button_down won't be true in the BUTTON_RELEASE case, since
-	we set it to false in MOTION_NOTIFY once the threshold is reached.
-	(e_minicard_drag_end): remove this function, since it was needed
-	to work around a bug in gnome-canvas.
-	
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Wrap our addressbook table
-	adapter in an ETableWithout, so that we can make addresses appear
-	and disappear when we remove/add them to the section lists
-	(To/Cc/Bcc) on the right of the dialog.
-	(real_add_address_cb): When we add an address, hide it in the main
-	list.
-	(e_select_names_init): Get pointer to our without table from the
-	table's object data, and store it.
-	(remove_address): When we remove an address, show it in the main
-	list.
-	(card_key): Added.  Allocate a unique key from an ECard.
-	(esn_get_key_fn): Added.  Callback for ETableWithout.
-	(esn_dup_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_gotten_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_duped_key_fn): Added.  Callback for ETableWithout.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Changed
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS
-	type.  This allows the cards in the ESelectName dialog to
-	appear in proper sort order (i.e. as 'Doe, John' rather than
-	'John Doe').  Fixes ximian #6002.
-
-2001-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_class_init): fix arg info - we're
-	only passing 1 GTK_TYPE_POINTER arg, not 2.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): lots of fixes for
-	DnD.  For GDK_BUTTON_PRESS, we grab immediately.  For
-	GDK_BUTTON_MOTION, we start the drag after a certain threshold,
-	and connect to the "drag_end" signal on our canvas so we'll know
-	when the drag is complete.  For GDK_BUTTON_RELEASE, we release the
-	grab if we were dragging and get the event.
-	(e_minicard_drag_end): new function, just remove the pointer/gtk
-	grabs and disconnect.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "gint
-	drag_button"
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): use DB_NOTFOUND const
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_changes): null out card_sexp so that
-	we don't crash when copying
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: fix warnings, get compiling again
-
-	* conduit/address-conduit-config.h: remove c/p typos
-
-	* conduit/address-conduit.h: ditto
-
-	* conduit/Makefile.am: link against the static camel
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for
-	toolbar. Used Delete icon in menu.
-
-	* gui/component/addressbook.c: use 'Save As' icon rather than 'Save'
-	as it seems more appropriate. Also added delete icon for menu.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Update the folder list to
-	include a display name and a description.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: use new Cut/Copy/Paste/Save/Search
-	icons.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (set_folder_bar_label),
-	gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h (update_folder_bar_message),
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h
-	(folder_bar_message): Set the folder bar message here.  Fixes
-	Ximian bug #4670.
-
-	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use
-	strlen(SEPARATOR) here so that if the separator changes the length
-	will work properly.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added full country list.
-	Fixes Ximian bug #5123.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Hook up `delete-message.png' as the
-	icon for "ContactDelete".
-	* gui/contact-editor/e-contact-editor.c: Likewise.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_get_other_contact_storage.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): rename register_storage
-	to this, and return the EvolutionStorage.
-	(load_source_data): register_storage =>
-	addressbook_get_other_contact_storage.
-	(addressbook_storage_add_source): register_storage =>
-	addressbook_get_other_contact_storage.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): connect to the "changed" signal on
-	"entry-web" to update command state.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	call e_card_set_id on the list's card so we can continue to use
-	this dialog.  also, call command_state_changed if we aren't
-	closing the dialog so the toolbar is properly sensitized.
-	(list_deleted_cb): always close the dialog after we successfully
-	delete a list.
-
-	* gui/contact-editor/e-contact-editor.c (card_added_cb): call
-	e_card_set_id on the card so we can continue to use this dialog
-	(to modify or delete the card.)
-	(card_deleted_cb): always close the dialog after we successfully
-	delete a card.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): call
-	e_sexp_encode_string on the search string the user types in so it
-	doesn't break sexp parsing in the wombat.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: changed to new print icon.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: (struct
-	ESelectNamesFolder): rename physical_uri to uri, since it includes
-	the addressbook.db for file: uris.
-	(e_select_names_folder_free): physical_uri => uri.
-	(e_select_names_option_activated): physical_uri => uri, and we
-	don't need to strdup_printf "addressbook.db" onto the end anymore.
-	(new_folder): if the physical_uri is a file: uri, append
-	/addressbook.db onto it.
-	(hookup_listener): new function, split out lots of code from
-	e_select_names_hookup_shell_listener.
-	(e_select_names_hookup_shell_listeners): rename
-	e_select_names_hookup_shell_listener to this, and hookup both the
-	local and "Other Contacts" listener, using hookup_listener.
-	(e_select_names_destroy): disconnect from the
-	other_contacts_listener and unref it.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add a listener for Other Contacts, and rename
-	"listener" to "local_listener."
-
-2001-08-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): If we get the
-	"sequence_complete" signal when we aren't searching, it means the
-	addressbook changed out from under us.  Clear the search cache, so
-	that future completion requests won't use the out-of-date cached
-	data.  Also, don't unref book_view... we leave the EBookView open
-	so that we can catch these addressbook changes.
-	(e_select_names_completion_do_query): Don't use the book_view
-	being non-NULL as a sign that another query is still running.
-	(e_select_names_completion_got_book_view_cb): Properly unref any
-	previous value in book_view.
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Changed the
-	messages here in the right click menus.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): unref our
-	card_sexp.
-	(create_card_handler): make sure to set the id of the vcard so it
-	gets properly transmitted back to the BookView, and notify all
-	matching BookViews to add the created card.
-	(remove_card_handler): notify all matching BookViews to remove the
-	card.
-	(modify_card_handler): notify all matching BookViews to modify the
-	card.
-	(pas_backend_ldap_process_get_book_view): init card_sexp based on
-	the view's search.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): use card_sexp.
-	(pas_backend_file_book_view_free): same.
-	(vcard_matches_search): use the new pas_backend_card_sexp_match_vcard call.
-	(pas_backend_file_search): use card_sexp.
-	(pas_backend_file_process_get_book_view): same.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-card-sexp.[ch].
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Added code
-	so the user can create a new contact or contact list from anywhere
-	in evolution.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/evolutionperson.schema: Added a closing paren.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_handle_request): Renamed from _begin to
-	match changes in gal 0.10.99.3.
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add): 
-	Check that name != NULL before we start messing with it.
-	(Fixes bug #7329)
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Boost scoring on an exact nickname match.
-	Manually addressify match.
-	(match_name): Manually addressify matches.
-	(book_query_score): Remove automatic addressification.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Minor
-	tweak to avoid a crash if we have a negative subid with id
-	ESB_CATEGORY.  This should never happen.
-	(addressbook_menu_activated): Reset the entry/option when we
-	select "Clear".
-	Some changes to reflect renaming in ESearchBar.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Cardify after importing destinations.
-	This might fix a problem that Damon is having.
- 
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: set title of initial
-	dialog to Addressbook Sources (bug #6704).
-
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): don't
-	let people add subdirs in the ldap server storage - everything is
-	toplevel there.
-
-2001-08-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_vcard): implement using
-	search_for_dn.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Tell the search bar to translate the subitem texts.
-
-2001-08-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Add "Any Category" option for category searches.
-	(addressbook_query_changed): Do the right thing on an
-	"Any Category" search.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Fix up to match the
-	pas_book_new/get_vcard changes.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Got rid of an extraneous _ here.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,
-	forgot to write this function.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added focus targets
-	here.  Fixes part of Ximian bug #5843.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Grab focus here.  Fixes Ximian bug #2265.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control): 
-	(addressbook_query_changed): Fixed two const warnings here.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Fixed some missing includes
-	here.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view.c (add_book_iterator): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_vcard): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the
-	part where the uri is made part of the uid.  Made uri a separate
-	field.  Fixes Ximian bug #6490.
-
-	* backend/ebook/e-destination.c, backend/ebook/e-destination.h:
-	Change this to use ECard's split uids and uris.
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_to_supported_fields): don't
-	g_strdup the stuff we're passing into e_list_append, since it does
-	the copy for us.
-	(check_schema_support): don't initialize supported_fields list
-	here, since there's a gross case where the programmer/user can
-	bring up the contact editor before the connection stuff is
-	finished, and we don't want to crash.
-	(pas_backend_ldap_init): move it here to we can guarantee it's
-	there. (bug #6546).
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): don't access source->auth
-	if source == NULL (bug #7086).
-
-2001-08-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c,
-	backend/ebook/e-book.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Changed get_card to be asyncronous.
-
-	* backend/ebook/e-card.c, backend/ebook/test-client.c: Changed
-	these to deal with the new get_card functionality.
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/select-names/e-select-names.c: Mark a string for translation.
-	* This fixes bug #7052
-	* printing/e-contact-print.h: Add headers to make it stand on itw own.
-	* printing/e-contact-print.c: Marked some strings for translation.
-	* printing/e-contact-print-envelope.c: Same here.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add):
-	Remove single- or double-quotes from names before sticking them
-	into the addressbook. (Bug #6499)
-
-	* gui/component/addressbook.c (addressbook_query_changed):
-	Properly handle "Category is" queries by checking the search bar
-	suboption.
-	(addressbook_factory_new_control): Attach subitems corresponding
-	to all wombat categories to the "Category is" ESearchBarItem.
-
-	* gui/component/addressbook.c: Set the ESearchBarItem
-	subitems explicitly to NULL.
-
-2001-08-10  Anna Marie Dirks <anna@ximian.com>
-	 * gui/component/select-names/select-names.glade: did a little
-	packing-magic to get the two tables at bottom of this dialog
-	to seem to line up. 
-
-	*gui/component/select-names/e-select-names.c: changed the title
-	of this dialog to "Select Contacts from Addressbook". 
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-        * gui/component/select-names/select-names.glade: redesigned
-        this dialog to fix bug #6815. 
-
-	*gui/component/select-names/e-select-names.c: connected the
-	widgets (or one of them anyway. clahey did the rest) for my
-	new and lovely glade file.
-	
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: remove passwd_cb.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	This change is dedicated to Jacob Berkman.
-	(e_select_names_text_model_insert_length): If the last character
-	we inserted was a "magic comma", remember its position.
-	(e_select_names_text_model_delete): If the last character we
-	inserted was a "magic comma", and if the next thing we do is to
-	hit backspace, delete both the comma and the extra whitespace we
-	added.
-	(e_select_names_text_model_init): Initialize our last magic comma
-	position.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Hook up some magic to
-	(basically) cardify an entry on focus-out.  (What we do is actually
-	more complicated than that.)
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): After we set an entry's text, try to
-	cardify it.  We need to do this so that (for example) reply
-	e-mails get properly cardified.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): Use e_select_names_model_append,
-	rather than manipulating lists directly.
-	(e_select_names_model_insert): Connect "changed" signal proxy for
-	added EDestination.
-	(e_select_names_model_append): Ditto.
-	(e_select_names_model_replace): Ditto, and disconnect signals for
-	replaced EDestination.
-	(e_select_names_model_delete): Ditto on the disconnection.
-	(e_select_names_model_delete_all): Ditto.
-	(e_select_names_model_cardify): Added.  Try to cardify a specified
-	EDestination.
-	(e_select_names_model_cancel_cardify): Added.  Cancel the pending
-	cardification of a single EDestination.
-	(e_select_names_model_cardify_all): Added.  Cardify all of the
-	EDestinations in the model.
-	(e_select_names_model_cancel_cardify_all): Added.  Cancel's any
-	and all pending cardifications.
-
-	* backend/ebook/e-destination.c (e_destination_class_init): Added
-	"changed" and "cardified" signals.
-	(e_destination_freeze): Added (static).
-	(e_destination_thaw): Added (static).
-	(e_destination_clear_card): Reset allow_cardify and
-	cannot_cardify, cancel any pending cardifications, and emit the
-	"changed" signal.
-	(e_destination_clear_strings): Emit the "changed" signal.
-	(e_destination_clear): Do freeze/thaw to prevent multiple signal
-	emissions.
-	(e_destination_set_card): Check that the card we are setting is
-	not equal to the current card, and emit the "changed" signal if we
-	are actually changing.
-	(e_destination_set_card_uri): Emit "changed" signal, if necessary.
-	(e_destination_set_name): Emit "changed" signal, if necessary.
-	(e_destination_set_email): Emit "changed" signal, if necessary.
-	(e_destination_set_html_mail_pref): Emit "changed" signal, if
-	necessary.
-	(use_card_cb): If we've just loaded/set the ECard, emit the
-	"changed" signal.
-	(e_destination_set_raw): Emit "changed" signal, if necessary.
-	(e_destination_allow_cardification): Added.
-	(e_destination_set_allow_cardification): Added.
-	(e_destination_cardify): Added.  Tries to automatically convert
-	a string-based EDestination to one based on an ECard.
-	(e_destination_cardify_delayed): Added.  Cardifies in a timeout.
-	(e_destination_cancel_cardify): Added.  Cancels any pending
-	cardifications.
-	(e_destination_xml_decode): Added freeze/thaw.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): Added.  A
-	canned simple query for nicknames.
-
-	* backend/ebook/e-card.c (e_card_email_find_number): Added.  Given
-	a card and an string containing an email address, return the index
-	number of the address inside of the card, or -1 if the address is
-	not found.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes ximian bugs #5080, #6021, #6704, #6705 ] 
-	
-	* gui/component/addressbook.c (book_open_cb): create our own
-	dialog that prompts for both the email address and the password.
-	the email address is stored in the source and filled in for the
-	user after the first time they enter one and press OK.
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): has a
-	return value, not a int* parameter.
-	(create_ldap_folder): new function, we can create ldap servers
-	from the File->New->Folder menu item now.
-	(register_storage): hook up the "create_folder" signal.
-	(addressbook_storage_init_source_uri): remove the file case, we
-	only build ldap uris here.
-	(load_source_data): remove the file source stuff, and handle
-	"emailaddr".
-	(save_source_data): call ldap_source_foreach directly.
-	(addressbook_source_free): remove file source stuff.
-	(addressbook_source_copy): same.
-
-	* gui/component/addressbook-storage.h: get rid of all the file
-	source stuff from AddressbookSource, since this is only being used
-	for ldap servers.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): look up the ldap
-	entry based on the provided email address and use the resulting
-	DN/passwd to authenticate.
-
-	* gui/component/addressbook-config.c: pretty much gutted to make
-	it work with the new UI.
-
-	* gui/component/addressbook-config.glade: new version from anna.
-	
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Upped the minimum width
-	on all addressbook columns to 75.  Fixes Ximian bug #2773.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): mark
-	the dialog as changed so the save button is immediately available.
-
-	* gui/contact-editor/e-contact-editor.c (card_modified_cb): once
-	we save reset the change flag to false if we aren't closing the
-	dialog.
-	(card_added_cb): same.
-	(e_contact_editor_class_init): add a "changed" arg.
-	(e_contact_editor_set_arg): add setter for "changed".
-	(e_contact_editor_get_arg): add getter for "changed".
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): better
-	to assume that we can write to the local addressbook than that we
-	can't write to it :)
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (create_ui):
-	call e_pixmap_update so we can use the same save/save-as pixmaps
-	as the contact editor.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): new
-	function, used by the context menu.
-	(e_addressbook_reflow_adapter_right_click): put "Open" at the top
-	of the menu.  also, disable "Delete" if the addressbook isn't
-	writable.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (rfc2254_escape): escape *, \, (,
-	and ), as per rfc2254.
-	(func_contains): escape the string.
-	(func_is): same.
-	(func_beginswith): same.
-	(func_endswith): same.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out
-	since Envelope printing is disabled for 1.0.	
-	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.
-	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Removed "Print
-	Envelope" menu item.
-	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.
-	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef
-	this HAVE_LDAP.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): set the title of the window to
-	"Advanced Search".
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): pass view->view instead
-	of the EBook.
-	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.
-	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.
-	(addressbook_search_option_items): add "Advanced..." here.
-	(addressbook_query_changed): add special handling for Advanced...
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add EAddressbookView and remove the
-	model/adapter fields.  Also fix prototype of
-	e_addressbook_search_dialog_new.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_class_init): get rid of
-	set_arg/get_arg.
-	(button_press): set the query on the EAddressbookView, and always
-	close the dialog.
-	(e_addressbook_search_dialog_init): get rid of the minicard view,
-	and pack the other widgets accordingly.
-	(e_addressbook_search_dialog_new): pass EAddressbookView instead
-	of EBook.
-	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #5066 ]
-	* gui/component/addressbook-storage.c (remove_ldap_folder): new
-	function, remove the source.
-	(register_storage): connect to the "remove_folder" signal so we
-	know when to remove the folder.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry): use
-	g_strcasecmp since ldap attribute names are not case sensitive.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): make sure we update the changed
-	state if a successful drop happens.
-
-2001-08-07  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make the OK button the keyboard default
-	instead of Cancel.  Bug #4942.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): new EBookOp destructor
-	(e_book_unqueue_op): use e_book_op_free
-	(e_book_do_response_create_card): ditto
-	(e_book_do_response_generic): ditto
-	(e_book_do_response_get_cursor): ditto
-	(e_book_do_response_get_view): ditto
-	(e_book_do_response_get_changes): ditto
-	(e_book_do_response_open): ditto
-	(e_book_do_response_get_supported_fields): ditto
-
-2001-08-05  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): set
-	op->listener to NULL to catch possible use of freed op
-	(e_book_do_response_get_changes): ditto
-
-	* backend/ebook/e-book-view-listener.c
-	   (e_book_view_listener_check_queue): this callback could be (and
-	   indeed is) called from signal emited above, 
-	   signal handler could call e_book_view_listener_stop, so we need to check
-	   if idle is still set and if not we don't want to unref again
-
-2001-08-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Made it so
-	that if there's one less match than possible compares are
-	considered more VAGUE.  Fixes Ximian bug #3400.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check for storage != NULL
-	here.  This shouldn't come up unless addressbook has crashed
-	previously within this session of evolution, but this is just a
-	bit of insurance.  Fixes Ximian bug #3699.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Changed the
-	criteria of whether the first part of each iteration matched or
-	the second one did.  Before it got it wrong sometimes and caused
-	the pointer to jump off the end of the array.  Fixes Ximian bug
-	#4674.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Update
-	for EvolutionStorage API changes.
-	(addressbook_storage_add_source): Ditto.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Made this
-	change the query based on which letter is clicked.  Fixes Ximian
-	bug #2202.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Fixed warnings here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(hash_cleanup_fn): Removed this unused function.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card,
-	fill_in_info): Made the list of E_CARD_PHONE types in
-	phone_correspondences more complete by adding the new 5
-	E_CARD_PHONE types.  Also, made it a bit less restrictive for some
-	types (E_CARD_PHONE_HOME will actually match
-	E_CARD_SIMPLE_PHONE_ID_HOME now.)  Made e_card_simple_sync_card
-	and fill_in_info search for an exact match in the list of
-	phone_correspondences and then look for a partial match.  Got rid
-	of not going forward when doing a remove from an EList since EList
-	handles this case automatically.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_PHONE types for
-	assistant, callback, radio, telex, and ttytdd.
-
-	* backend/ebook/e-card.c (get_phone_flags, set_phone_flags):
-	Handle the new E_CARD_PHONE types.
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/Makefile.am (ecpsdir): Add camel dependency.
-
-	* gui/component/Makefile.am: Add camel dependency.
-
-	* backend/ebook/Makefile.am: Add camel dependency.
-
-	* gui/component/addressbook-factory.c (main): Properly init camel.
-
-	* backend/ebook/e-destination.c (e_destination_clear_strings):
-	Clear ->raw.
-	(e_destination_is_empty): We aren't empty if ->raw is set..
-	(e_destination_set_raw): Replaces e_destination_set_string.
-	(e_destination_get_name): Use camel's parser to extract the name
-	from ->raw.
-	(e_destination_get_email): Use camel's parser to extract the email
-	address from ->raw.
-	(e_destination_get_address): Use camel to produce properly quoted,
-	RFC-compliant addresses.  Thanks camel! (Bug #5860)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Always append an e-mail address, as long as it
-	doesn't have one already at it's beginning or end.  Don't limit
-	self to just emailifying entries tied to cards with multiple
-	addresses.  (I didn't really want to do this, but people seem to
-	like keeping multiple cards for the same person, and other
-	solutions (like scanning all matches for duplicate names, and only
-	emailifying those) just seemed like way too much work for such a
-	limited payoff.)
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	s/e_destination_set_string/e_destination_set_raw/.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Quote _'s in our popup menus, so that "foo_bar"
-	doesn't get displayed as "foobar" w/ the 'b' underlined. (Bug
-	#5558)
-	(popup_menu_nocard): Ditto.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Removed some extra padding and pack the addressbook view into a
-	frame with inward shadowing, just because it looks prettier.
-
-	* gui/contact-editor/e-contact-editor.c: Use the updated Save,
-	Save As, and Print icons for the menus and toolbar.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact verbs
-	here.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (e_addressbook_view_save_as,
-	e_addressbook_view_send, e_addressbook_view_send_to): New
-	functions to allow outside users to cause the addressbook to save,
-	send, or send a message to its selection.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/.cvsignore: Removed this file from this unused
-	directory.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Added file-exists.glade.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists),
-	gui/contact-editor/file-exists.glade: Added a dialog to ask the
-	user whether to replace an already existing file.  Mostly from a
-	patch by Jos Dehaes.  Fixes Ximian bug #2231.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Removed thrash checking code
-	here since thrashing shouldn't happen now that we've cleaned this
-	up some.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): Properly
-	handle cases where construction fails.
-
-2001-07-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c: Added #include
-	<e-util/e-path.h>.
-
-2001-07-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	Convert translated string to UTF8 before calling put_html.
-
-2001-07-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_do_query): Properly handle the case
-	where our "cleaned" completion is the empty string.  This happens,
-	for example, if the query text is the string "\"".  (Bug #5610).
-
-	* backend/ebook/e-destination.c (e_destination_get_address_textv):
-	Reassure fejj that I'm not doing something stupid here.
-	(e_destination_get_address): Fix address quoting.  This is a
-	stop-gap measure until I can change this code to use Camel's
-	superior address-handling routines.  (Also Bug #5610)
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Fix a
-	return value bug, to make it so if it fails to load an
-	addressbook-sources.xml file (either a parse error or it doesn't
-	exist for example), it deregisters the storage.
-	(register_storage): Don't make a storage for users who don't have
-	LDAP support built in.  Bug #1950.
-
-2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* addressbook/gui/component/addressbook-factory.c: Fix crashes
-	when gtkhtml is compiled with gconf support
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Tidy ldadds
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c: Fixing a
-	small, stupid mistake; use e_select_names_model_get_textification
-	for the getter for "text".
-
-	* backend/ebook/e-card.c: Removed some debugging chatter.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Store the completion
-	handler in the entry's object data.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added support for getting "destinations"
-	and "allow_contact_lists" properties.
-	(entry_set_property_fn): Added support for setting "destinations"
-	and "allow_contact_lists" properties.
-	(impl_SelectNames_get_entry_for_section): Added definitions for
-	"destinations" and "allow_contact_lists" properties.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_get_match_contact_lists): Added.
-	(e_select_names_completion_set_match_contact_lists): Added.
-	Controls whether contact lists are offered as options during
-	completion.
-	(book_query_process_card_list): Check if match_contact_lists
-	is set before (duh!) matching on a contact list.
-	(e_select_names_completion_init): Set match_contact_lists
-	to TRUE by default.
-
-2001-07-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_contains): change the way
-	x-evolution-any-field is converted to an ldap query.  it used to
-	be we'd nest queries like: (|(|(|(foo=*x*))(bar=*x*))(baz=*x*)).
-	now we build it like: (|(foo=*x*)(bar=*x*)(baz=*x*)).  much more
-	efficient (both in the building, and on the server side no doubt).
-
-2001-07-25  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Properly dup
-	the results of e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(e_select_names_popup): Check that our destination isn't empty
-	before building our popup. (Bug #5250)
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Made
-	argument const.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: Added checks
-	for all of the args of the exposed functions, so that
-	we won't crash on bad inputs.  (Related to bug #4856.)
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to
-	"Add Anyway".
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added
-	fallbacks for the name in the case of an e-card, to avoid the
-	"nameless contact" bug.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): need the EDestination magic
-	here too for when we modify an already shown card.
-
-	* gui/contact-list-editor/e-contact-list-model.c: make
-	parent_class static, just to be anal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(remove_entry_cb): removing entries changes the list, so flag it.
-	(table_drag_data_received_cb): restrict cards we add to lists to
-	be non-list cards.
-	(extract_info): clear out the email list in the card before we
-	repopulate it from the contact list model.
-	(fill_in_info): set the checkbox to active/inactive based on
-	thecard.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (wants_html_changed): call
-	widget_changed.
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(widget_changed): new function that we can either call or set as a
-	signal to change the "changed" flag on the dialog.
-	(set_entry_changed_signals): connect lots of "changed" signals on
-	widgets to widget_changed.
-	(add_lists): connect "changed" to widget_changed.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check if
-	evolution_shell_client_get_local_storage returns CORBA_OBJECT_NIL,
-	which it should never do.  If it does, print a warning in a dialog
-	and try to recover w/o crashing.  (Bug #5193)
-
-2001-07-24  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Don't
-	stop the idle_queue and unref from here, since this might be
-	called from inside e_book_listener_check_queue, and we don't want
-	to return to that function with the listener having been
-	destroyed.
-	(e_book_listener_check_queue): Don't exit early if the queue is
-	stopped. Proceed through the check if the queue is NULL (which is
-	must be if the queue is stopped), and then reach the existing code
-	to remove the idle handler. Combined with the above, this fixes
-	ximian #4485 (again). This is not a plot to boost my
-	showstopper-bugfixing count by fixing the same bug over and over
-	again.
-
-2001-07-23  Dan Winship  <danw@ximian.com>
-
-	Re-fix for my 07-18 not-quite-fix.
-
-	* backend/ebook/e-book-listener.c: Add a "stopped" flag like
-	EBookViewListener.
-	(e_book_listener_check_queue): Don't emit signals if the listener
-	is stopped.
-	(e_book_listener_queue_generic_response, etc): Don't queue
-	responses if the listener is stopped.
-	(e_book_listener_stop): Flush the queue and stop queue/emitting
-	further responses.
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Revert the previous
-	change and call e_book_listener_stop() instead.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): When removing an idle handler, unref
-	the listener as well, since e_book_view_listener_queue_response
-	will have ref'ed it.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): Add a
-	@type arg.  If the type is not "contacts", report an
-	`UNSUPPORTED_TYPE' error through the listener.  Also, remove
-	`g_print()' debugging messages.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make the "contacts"
-	folders user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	[ patch contributed by Jos Dehaes <jos.dehaes@bigfoot.com> ]
-	
-	* gui/component/addressbook-storage.c (register_storage): new
-	function, register our evolution_storage.
-	(addressbook_storage_setup): remove storage registration from
-	here.
-	(load_source_data): register the storage here before we load
-	addressbook-sources.xml, and deregister it if there are no sources
-	listed.
-	(addressbook_storage_remove_source): unregister the storage if the
-	list of sources hits 0 length.
-
-2001-07-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Flush the listener's
-	queue before unreffing it to ensure that it doesn't emit any more
-	"responses_queued" signals after the EBook is destroyed.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue,
-	e_book_listener_queue_response, e_book_listener_new): Use
-	bonobo_object_ref/unref rather than gtk_object_ref/unref.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response, e_book_view_listener_new):
-	Likewise.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-compare.c (simple_query_cb): prune the list
-	of cards that match our query using the avoid list here, instead
-	of using the avoid list in the query itself, since ldap can't
-	handle that.
-	(use_common_book_cb): remove the block of code including the avoid
-	list in the query sent to wombat.
-
-2001-07-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs #4611 - crash searching in the name field at Bigfoot for "\"
-	        and  #4554 - general ldap search crash ]
-	
-	* backend/pas/pas-backend-ldap.c (func_contains): the length of
-	the big query string needs to take into account the length of the
-	footer as well as the header - fix random memory corruption here.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	list can be NULL, specifically if there's a parsing error in the
-	sexp, so deal with it.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): Hold a reference to our
-	listener while the idle function is active.
-	(e_book_view_listener_check_queue): Only unref the listener when
-	the idle function is finished.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Instead of replacing section->model with
-	source, copy source onto section->model with
-	e_select_names_model_overwrite_copy.  #if 0/#endif out all of the
-	stuff related to ETextModels, because it doesn't make any sense to
-	me, and everything appears to work without it.
-	(Die bug #2059.  Die! Die! Die!)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_overwrite_copy): Added.  Copies the contents
-	of one ESelectNamesModel onto another.
-
-	* backend/ebook/e-destination.c (e_destination_copy): Made the argument
-	const.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): Removed
-	old, broken code and annoying g_messages.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_response): Hold a reference to the listener
-	while the idle function is active.
-	(e_book_listener_check_queue): Only release our reference to the
-	listener when the queue is empty.  These two changes fix a race
-	condition, since the listener could be unrefed while the listener
-	was still active. (Seems to fix bug #4485)
-
-2001-07-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade,
-	gui/merging/e-card-duplicate-detected.glade,
-	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
-	printing/e-contact-print.glade: Patch from Taylor Hayward
-	<thayward@gjpc.com>.  Added accelerators to a few dialogs.
-
-2001-07-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added addSectionWithLimit to the SelectNames interface.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_add_section_with_limit): Added.  Implements
-	addSectionWithLimit.
-	(e_select_names_bonobo_construct): Set up as a BonoboEventSource.
-	(init): Listen for "changed" signals from our manager.
-	(manager_changed_cb): Notify our listeners if we get a changed
-	signal from our manager.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added a "changed" signal".
-	(section_copy): Propogate the signal connection.
-	(section_free): Disconnect the changed handler.
-	(e_select_names_manager_add_section_with_limit): Connect to the
-	new section's model, listening for changes.
-	(e_select_names_manager_activate_dialog): Connect to the "working
-	copy" model, listening for changes.
-	(e_select_names_manager_add_section_with_limit): Added.
-	(e_select_names_manager_add_section): Changed to just be a special
-	case of e_select_names_manager_add_section_with_limit.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_set_limit): Added.  Allows a max number of
-	names allowed in the model.
-	(e_select_names_model_get_limit): Added.  Returns the limit.
-	(e_select_names_model_at_limit): Added.  Returns TRUE if the
-	model is "full".
-	(e_select_names_model_insert): Check that we aren't at the
-	limit before inserting.  Silently return if we are.
-	(e_select_names_model_append): Check that we aren't at the
-	limit before appending.  Silently return if we are.
-
-2001-07-16  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix bug #4705 - LDAP storage gets saved with corrupted binddn]
-	
-	* gui/component/addressbook-config.c (addressbook_dialog_apply):
-	call addressbook_storage_write_sources here after we're done
-	rebuilding them.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): don't write the source file
-	here.
-	(addressbook_storage_add_source): same.
-	(addressbook_storage_remove_source): same.
-	(addressbook_storage_write_sources): new function, write the
-	source file out.
-	(addressbook_source_copy): g_strdup the binddn so we don't end up
-	free'ing it multiple times thanks to copies freeing theirs.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	address_storage_write_sources.
-
-2001-07-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/pas/evolution-vcard-importer.c (ebook_create): Don't just 
-	use the default directory. Use the directory that is passed into the
-	load file function.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_string):
-	Commented out some unused variables and labels.
-	(e_destination_importv): Check for the xml not parsing correctly
-	and just return NULL here.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_import_destinationv): Handle a NULL destv
-	here.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a
-	call to e_table_view_to_model_row here.
-	(e_addressbook_view_can_print, e_addressbook_view_can_delete,
-	e_addressbook_view_can_copy): If the selection model is NULL here,
-	return NULL (this was done before in a g_return_val_if_fail which
-	is only conditionally included.)
-
-2001-07-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Changed Company to
-	Organization here.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/Makefile.am: add ldap cflags
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_xml_decode):
-	Oops. I introduced my own bug, accidently set `email' to a
-	g_free'd pointer - eek!
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_importv): Optimized
-	the same way I optimized g_strsplit. If you use a GPtrArray
-	instead of a linked list, you save yourself from having to iterate
-	through the list an extra 3 times.
-	(e_destination_xml_decode): Do NOT, I repeat: do NOT!
-	e_utf8_xml1_decode something which is already in UTF-8 or you'll
-	corrupt it!! I smack thee who hath done this evil deed!
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* backend/e-book/evolution-vcard-importer.c (support_format_fn):
-	Check for no extension. Actually same as Jason's fix below :) but
-	also check the file contents.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-config.glade: add accelerators,
-	taylor's patch
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (support_format_fn):
-	Crash fix because strcmp() hates NULL arguments.  Bug #3777.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Added
-	some comments for clarity and fixed a pretty noticable bug with
-	how right click "Remove" was deleting more than it should with
-	consecutive runs.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: assign OID's to the schema
-	entries, and add schema support for contact lists.
-
-2001-07-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set
-	bf->priv->file_db before calling do_create.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Fixed order
-	of arguments to evolution_shell_component_new.
-
-2001-07-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Check that str isn't
-	the empty string before doing an insert.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): We were
-	being too smart for our own good here, and causing problems for
-	the completion code... (bug #4253, bug #4255, bug #4280)
-	(e_destination_set_name): Clear any cached address.
-	(e_destination_set_email): Clear any cached address.
-	(e_destination_get_address): Handle the cases where the name
-	contains some e-mail information.
-
-2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Marked a
-	string for translation. Also add the neccesary includes to make
-	_() macros work.
-	
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard.c (add_field): Detect the embedded
-	EDestination XML, and convert it to a nice-looking e-mail address.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Adjusted to
-	reflect changes to EContactListModel.  (Yeah, this is vague,
-	but the changes are _really_ obvious and boring.)
-
-	* gui/contact-list-editor/e-contact-list-model.c: Revamped
-	to make everything an EDestination, rather than storing either
-	cards or strings.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Use
-	e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use e_destination_get_name and
-	e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Use e_destination_get_name instead of
-	e_card_name_to_string.
-	(quick_add_cb): Use e_destination_get_address.
-	(popup_menu_nocard): Use e_destination_get_name.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_changed): Removed obsolete debugging code.
-	(e_select_names_model_get_textification): Use e_destination_get_textrep.
-	(e_select_names_model_get_address_text): Use e_destination_get_address.
-	(e_select_names_model_get_string): Use e_destination_get_textrep.
-	(e_select_names_model_replace): Use e_destination_get_textrep.
-	(e_select_names_model_name_pos): Use e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Match only if this isn't a contact list.
-	(match_email): Match only if this isn't a contact list.
-	(match_name): Do the right thing in the case of a contact list.
-	(book_query_process_card_list): Don't construct a match for
-	each possible e-mail address if this is a contact list.
-
-	* backend/ebook/e-destination.c: Major-league de-crufting and
-	rationalization, combined with lots of hacks to make things work
-	properly with contact lists.
-	(e_destination_copy): Copy contact list info.
-	(e_destination_clear_card): Clear contact list info.
-	(e_destination_is_empty): If we contain a contact list, we aren't
-	empty.
-	(e_destination_set_card_uri): Added.  Allows us to set a
-	destination by card URI.
-	(e_destination_set_name): Allows the contact's name only ("Jane
-	Smith") to be set.
-	(e_destination_set_email): Allows the contact's e-mail only
-	("jane@assbarn.com") to be set.
-	(e_destination_set_string): Takes a free-form string containing a
-	contact's name and/or e-mail, and tries to do the right thing with
-	it.
-	(e_destination_contains_card): Renamed.  Used to be
-	e_destination_has_card.
-	(e_destination_from_card): Added.  Returns TRUE if the
-	EDestination comes from either a ECard (which we presently hold)
-	or is specified by an ECard URI.
-	(e_destination_use_card): Allows an EDestination's ECard to be
-	accessed, via a callback.  If we only are holding the URI, the
-	card will be loaded and stored in the EDestination.
-	(e_destination_get_name): Returns the name only ("Jane Smith"), or
-	NULL.
-	(e_destination_get_email): Returns the email only
-	("jane@assbarn.com"), or NULL.
-	(e_destination_get_address): Added.  Returns a "full address" if
-	both the name & e-mail are available ("Jane Smith
-	<jane@assbarn.com>"), or just the e-mail if the name is unknown
-	("jane@assbarn.com>").  If the destination is a contact list,
-	returns a comma-separated list of addresses.
-	(e_destination_get_textrep): Added.  Returns a "text
-	representation" of the EDestination.  This is what is now
-	displayed for completed, "cardified" destinations in addressbook
-	entries.
-	(e_destination_is_evolution_list): Check to see if this
-	destination is for a contact list.
-	(e_destination_xml_encode): Added.  Build an XML data structure
-	representing an EDestination.
-	(e_destination_xml_decode): Added.  Parse an XML data structure,
-	constructing an EDestination.
-	(e_destination_export): Added.  Returns a null-terminated string
-	containing an XML representation of the EDestination, with
-	newlines and excess whitespace removed.
-	(e_destination_import): Added.  Parses a string containing an XML
-	representation of an EDestination.
-	(e_destination_exportv): Added.  Returns a null-terminated string
-	containing an XML representation of a collection of EDestinations,
-	with newlines and excess whitespace removed.
-	(e_destination_importv): Added.  Takes an XML representation of a
-	collection of destinations, parses it, and returns a vector of
-	EDestinations.
-
-	* backend/ebook/e-card.c (e_card_duplicate): Copy the ->book
-	pointer.
-	(e_card_get_id): Check that the argument is valid.
-	(e_card_set_id): Check that the argument is valid.
-	(e_card_get_book): Added.  Return the EBook the ECard came from.
-	(e_card_get_uri): Added.  Tries to returns a URI for the ECard,
-	which is of the form (EBook URI)/(ECard unique ID).  Returns NULL
-	if the EBook URI or the ID are unknown/not set.
-	(e_card_get_vobject): If we have the URI, use it as the
-	VCUniqueStringProp, rather than just the ID.  This is a hack to
-	make DnD work properly.
-	(parse_id): Detect if the unique ID we've been passed is a URI or
-	just a plain card ID, and do the right thing in either case.
-	(e_card_uri_extract_book_uri): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_uri_extract_card_id): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_load_uri): Added.  Allows an ECard to be loaded by its
-	URI.
-
-	* backend/ebook/e-book-view.c: Added a EBook * to the
-	_EBookViewPrivate struct.  This is meant to contain the EBook the
-	EBookView is associated with.
-	(add_book_iterator): Added.  A convenience function for attaching
-	the EBook to a GList of cards (if no EBook is already stored).
-	(e_book_view_do_added_event): Record the EBook in the added
-	ECards.
-	(e_book_view_do_modified_event): Record the EBook in the modified
-	ECards.
-	(e_book_view_set_book): Added.  Stores a pointer to the
-	EBookView's "parent" EBook.
-	(e_book_view_init): Init book_view->priv->book to NULL.
-	(e_book_view_destroy): Unref book_view->priv->book.
-
-	* backend/ebook/e-book.c: Added a uri field to _EBookPrivate.
-	(e_book_unqueue_op): Removed debugging spew.
-	(e_book_do_response_get_view): Attach the current EBook to the
-	created EBookView.
-	(e_book_do_response_get_changes): Attach the current EBook to the
-	created EBookView.
-	(e_book_load_uri): Save a copy of the uri in the EBook.
-	(e_book_get_uri): Added.  Just returns book->priv->uri.
-	(e_book_get_card): Attach a pointer to the Ebook to the
-	newly-loaded ECard.
-	(e_book_add_card): Attach a pointer to the EBook to the
-	newly-added ECard.
-	(e_book_commit_card): Attach a pointer to the EBook to the
-	committed ECard.
-	(e_book_init): Initialize the uri to NULL.
-	(e_book_destroy): Free the uri string on destruction.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	Removed.  [It was just bogus testing code for the right-click menu
-	populating interface in the shell].
-	(factory_fn): Pass NULL as the PopulateContextMenuFn.
-
-2001-07-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: 
-	Added some accelerators, padding, and a "memebers" frame;
-	also fixed spacing and growth behaviour of this dialog. 
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Fix a memory
-	leak here.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Set
-	info->avoid = NULL.  This shouldn't make a difference, but it
-	can't hurt.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Check if the row is within our
-	table and return from this function as if the card is a standard
-	card, not a list.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): 
-	added $(BONOBO_CONF_LIBS) to get it to compile.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	$(BONOBO_CONF_LIBS).
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories),
-	gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Switched to an ECategoriesMasterListWombat instead of an
-	ECategoriesMasterListArray here.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): srcdir !=
-	builddir compile fix.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same.
-
-	* gui/search/Makefile.am (INCLUDES): Same.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Turned off wombatification of the categories master list here.
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	use ECARD_UID_LINK_PREFIX.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX.
-
-	* backend/ebook/e-destination.h: add prototype for
-	e_destination_importv_list.
-
-	* backend/ebook/e-destination.c (e_destination_importv_list): new
-	function, take an ECard corresponding to an address list and
-	resolve any linked cards, returning an EDestination vector.
-
-	* backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here,
-	since we need to use it in a few places.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	related_contacts field.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_import_destinationv): Added this function.
-
-	* gui/contact-editor/contact-editor.glade: Replaced the entry here
-	for related contacts with a table which is filled in in the C code.
-
-	* gui/contact-editor/e-contact-editor.c,
-	gui/contact-editor/e-contact-editor.h (add_lists): Added a select
-	names entry here for the related contacts field.
-
-	* gui/widgets/Makefile.am: Removed all the test programs here
-	since there are circular dependencies now.
-
-2001-07-01  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Fall
-	back to use the name field if all else fails (which can happen
-	with imported EDestinations).
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the
-	"recipient not specified" bug --- we were not correctly checking
-	for whether or not an EDestination was actually empty.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_evolution_list): Check args.
-	Somewhere in the code (somewhere in the minicard stuff) this can
-	be called with a NULL arg, which was causing crashes.
-	(e_card_evolution_list_show_addresses): Check args.
-
-	* backend/ebook/e-destination.c (build_field): I was accidentally
-	comparing characters and strings here, and didn't see the compiler
-	warning.  Fixed.
-	(e_destination_exportv): Don't export any empty destinations.
-	(bug#3825).
-
-2001-06-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/e-address-popup.c (e_address_popup_construct): Marked
-	strings for translation.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/merging/e-card-merging.c (match_query_callback): Make the
-	standard for considering two cards to be match stricter.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Use the card's use-score to set the match's
-	sort_major value.
-	(match_name): Removed obsolete code.
-	(e_select_names_completion_begin): Added (double) cast to make
-	match->score calculation come out properly.
-
-	* backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and
-	X-EVOLUTION-USE-SCORE to attribute_jump_array.
-	(e_card_get_today): Added.  A convenience routine for getting
-	today's date and putting it in a GDate.
-	(e_card_get_use_score): Added.  Compute the current, time-decayed,
-	use-score for the card.
-	(e_card_touch): Increment the use-score by one; update the last
-	used date.
-	(e_card_date_to_string): Added as a convenience routine, getting
-	rid of some code duplication.
-	(e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and
-	X-EVOLUTION-LAST-USE.
-	(parse_last_use): Added.
-	(parse_use_score): Added.
-	(e_card_class_init): Added args for last-use and use-score.
-	(e_card_get_arg): Added handlers for last-use and use-score.
-	o
-	(e_card_set_arg): Added handlers for last-use and use-score.
-
-	* backend/ebook/e-destination.c: Added pending_card_id to
-	EDestinationPrivate struct.
-	(e_destination_copy): Copy the pending_card_id.
-	(e_destination_is_empty): Check for a pending_card_id.  We are
-	non-empty if we have one.
-	(e_destination_clear_card): Clear pending_card_id.
-	(e_destination_set_card): Clear pending_card_id.
-	(e_destination_has_pending_card): Added.
-	(e_destination_use_card): Added.  An asynchronous way to load a
-	pending card and then apply a callback to it.
-	(build_field): Be paranoid, map our special characters to '_'.
-	(e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a
-	hard-wired array size.  Added the "card" entry.
-	(e_destination_import): Fix bug in handling of the "name" field.
-	Process the "card" field.
-	(e_destination_touch): "Touch" and commit the ECard corresponding
-	to the e-mail address in the destination.  (A query against the
-	local addressbook is actually performed, in case the destination
-	isn't cardified.
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the
-	way E_CARD_MATCH_FOO results are mapped to comparison results.
-	Report better matches when the family name is matched.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Added a search field to the query here.
-	(e_select_names_init): Update the query on a number of signals here.
-
-	* gui/component/select-names/e-select-names.h: Added search_entry
-	here.
-
-	* gui/component/select-names/select-names.glade: Added the search
-	entry here.  Added some labels.  Removed the update button.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_option_activated): Change the uri here to have
-	addressbook.db at the end.
-
-	* gui/component/select-names/select-names.glade: Changed the name
-	of the folder option menu here to match the name used in the code.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Change the query when the "Update List" button is pushed.
-
-	* gui/component/select-names/e-select-names.h: Removed
-	currently_selected field.  Added categories_entry field.
-
-	* gui/component/select-names/select-names.glade: Added "Update
-	List" button.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR
-	define.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add our pixbuf and
-	pixbuf size.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): init the icon pixbuf
-	and its size.
-	(e_minicard_destroy): unref the list_icon_pixbuf.
-	(e_minicard_realize): create the list_icon GnomeCanvasPixbuf.
-	(e_minicard_resize_children): clip the header_text by the
-	list_icon, and place the list_icon in the right spot.
-	(remodel): show the list_icon if we're a list, and hide it
-	otherwise.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): pop up
-	list editor for lists, contact editor otherwise.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): change "editor" to
-	GtkOjbect, since it can be either a contact editor or contact list
-	editor.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): don't allow editting of any fields
-	except the name and file_as for lists.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): remove ancient
-	e-table include, and add include for contact-editor so we can
-	reuse the confirm_delete dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): remove prototype for
-	e_contact_list_editor_close, since the function no longer exists.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_deleted_cb): new function, emit our "list_deleted" signal.
-	(delete_cb): new function, called from the Delete toolbar item.
-	(e_contact_list_editor_raise): flesh out function.
-	(extract_info): "evolution_list" => "list".
-	(fill_in_info): same.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): add support for
-	X-EVOLUTION-LIST and X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(parse_list): new function, parse the boolean X-EVOLUTION-LIST.
-	(parse_list_show_addresses): new function, parse the boolean
-	X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(e_card_class_init): add args for "list" and
-	"list_show_addresses".
-	(e_card_set_arg): add support for list and list_show_addresses.
-	(e_card_get_arg): same.
-	(e_card_init): init list and list_show_addresses.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_row_count): track storage change - we're only using
-	1 array now.
-	(contact_list_value_at): same.
-	(contact_list_model_destroy): same.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_card): same.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): new function - just free/unref
-	all existing rows.
-	(e_contact_list_model_get_email): new function, returns the
-	alloc'ed string containing either an email address or an encoded
-	ECardId.
-
-	* gui/contact-list-editor/e-contact-list-model.h: remove the 2
-	separate arrays for email and cards, and store them in the same
-	array.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add the visible_addr_checkbutton widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(visible_addrs_toggled_cb): new function.
-	(e_contact_list_editor_init): connect to "toggled" on
-	visible_addrs_checkbutton.
-	(file_save_cb): new function.
-	(tb_save_and_close_cb): new function.
-	(verbs): add Save and Save & Close.
-	(list_added_cb): new function.
-	(list_modified_cb): new function.
-	(save_card): new function - we do *not* use e_card_merging_* calls
-	here.
-	(e_contact_list_editor_get_arg): un-#if 0 code in the "card"
-	getter.
-	(e_contact_list_editor_set_arg): same for the "card" setter.
-	(extract_info): new function.
-	(fill_in_info): new function.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add a
-	checkbutton at the bottom to determine whether to visibly include
-	mail addresses in mail sent to this list.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Oops.  Can't use the wombat
-	version of the master categories list yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): memmove
-	counts were off in this function.
-	(remove_card, modify_card): Moved the table notifications around a
-	bit here.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade
-	(e_select_names_create_categories): Added a categories combo here.
-	It's not used yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/search/addresstypes.xml: Added category searching to the
-	advanced search dialog here.
-	
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Added
-	category searching to the file backend.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Added
-	category searching to the search bar.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.
-
-2001-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: change layout
-	slightly, the icon no longer pushes everything to the left, and
-	make the buttons on the right smaller and more in line with the
-	other widgets.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): return the SimpleAndString->string
-	instead of querying the ecardsimple.
-	(e_contact_list_model_init): initially allocate 10 of each type
-	(email and simple).
-	(e_contact_list_model_add_email): realloc if need be.
-	(e_contact_list_model_add_card): same, and initialize the string
-	displayed to be "[Name] [<email>]".
-	(e_contact_list_model_remove_row): change for SimpleAndString.
-	(contact_list_model_destroy): free our 2 arrays.
-
-	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts
-	and the SimpleAndString struct.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =>
-	Ximian.
-	(e_contact_list_editor_init): hook up d&d destination signals, and
-	un-#if 0 the delete_event signal.
-	(table_drag_motion_cb): new function.
-	(table_drag_drop_cb): new function.
-	(table_drag_data_received_cb): new function.
-	(file_close_cb): new function.
-	(verbs) uncomment the close verb.
-	(close_dialog): new function.
-	(app_delete_event_cb): new function.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =>
-	Ximian.
-
-2001-06-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Add a huge steaming pile of
-	code to handle the case of single-address merging.  In other
-	words, if you go to "harvest" an address by right-clicking on it
-	in the mail viewer, and you already have a closely-matching
-	contact (w/ a different e-mail address), this gives you the
-	option of editting that contact's e-mail addresses to add the
-	one you just clicked on.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): It is
-	amazing how much better things work when you don't try to
-	dereference the pointer you just freed.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to
-	libecontacteditor.a.
-	(minicard_widget_test_LDADD): same.
-	(INCLUDES): same, for the includes.
-
-	* gui/widgets/e-minicard.h: correct e-contact-editor.h path.
-
-	* gui/widgets/e-addressbook-util.h: correct path to
-	e-contact-editor.h, and add e-contact-list-editor.h.  Add
-	prototype for e_addressbook_show_contact_list_editor.
-
-	* gui/widgets/e-addressbook-util.c: remove #include
-	"e-contact-editor.h" (our header includes it.)
-	(added_cb): rename card_added_cb to this, and make it so it can be
-	reused in both the list and card cases.  remove the g_print too.
-	(modified_cb): same for modified case.
-	(deleted_cb): same for deleted case.
-	(editor_closed_cb): change first arg to GtkObject* so we can reuse
-	this for both list and card.
-	(e_addressbook_show_contact_editor): use added_cb, modified_cb,
-	deleted_cb, and pass FALSE as user_data.
-	(e_addressbook_show_contact_list_editor): new function, same as
-	above but creating a contact-list-editor, and pass TRUE as
-	user_data.
-
-	* gui/component/e-address-popup.c: correct path to contact-editor.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/select-names/e-select-names-popup.c: same.
-
-	* gui/component/select-names/e-select-names-text-model.c: same.
-
-	* gui/component/addressbook.c (new_contact_list_cb): new function.
-	(update_command_state): update ContactNewList command.
-	(verbs): remove ViewAll from the toolbar from the verb list.  Add
-	ContactNewList.
-	(pixmaps): same for pixmaps.
-	
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): new
-	path for contact-editor.
-	(INCLUDES): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h:
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/contact-list-editor/Makefile.am: Initial contact-list editor
-	  commit.
-
-	* gui/Makefile.am (SUBDIRS): add contact-editor.
-
-	* Makefile.am: (SUBDIRS): remove contact-editor.
-
-2001-06-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): Renamed.  (The old name,
-	edit_contact_info_have_book_cb was a hold-over from before, when
-	we weren't using e_book_use_local_address_book.)
-
-	* gui/component/e-address-popup.c
-	(e_address_popup_schedule_refresh): A Added.  We now do the name
-	refreshes in an idle function, rather than in the setters.
-	(e_address_popup_set_free_form): Added.  Properly handle inputs of
-	the form "Foo <bar@zar.com>", extracting the name and e-mail
-	address.
-	(e_address_popup_set_name): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_set_email): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_name_only_matches): Temporary place-holder for
-	handling name-only matches.
-	(query_cb): If our initial query fails (and included e-mail
-	information), do a name-only query.  This is to handle the case of
-	adding new e-mail addresses to existing contacts.
-	(e_address_popup_query): Eliminated the "common_book" crap; using
-	e_book_use_local_address_book instead.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Make
-	sure that the ->avoid list gets properly freed.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): fix a refcounting
-	memleak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fix memory
-	leak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c: add prototype for
-	close_dialog to remove warnings.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): track
-	change to e_addressbook_show_contact_editor signature.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	add an entry for "Card ID already exists".
-	(e_addressbook_show_contact_editor): track the change to signal
-	names and e_contact_editor_new signature here.
-
-	* gui/widgets/e-addressbook-util.h: change
-	e_addressbook_show_contact_editor's signature to match
-	e_contact_editor_new more closely.
-
-	* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free
-	up the simple mapping to plug a potentially sizeable memory leak.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): call
-	e_addressbook_show_contact_editor here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_have_book_cb): remove the get_supported_fields
-	stuff, since the contact editor handles it for us now, and call
-	e_addressbook_show_contact_editor.
-
-	* gui/component/e-address-popup.c (edit_contact_info_cb): same.
-
-	* gui/component/addressbook.c (new_contact_cb): track change to
-	e_addressbook_show_contact_editor.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (ce_have_book): rename
-	ce_book_found_fields to this, remove the fetching of fields (the
-	contact editor code handles that now.), and change the add_card
-	signal to card_added.
-	(card_added_cb): copied somewhat from merge_cb above.  we don't
-	need to do the merge here, just call the callback.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	track signal change.  add book arg, and is_read_only -> editable.
-	(wants_html_changed): if the card isn't already changed, flag it
-	as such (and update the commands.)
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(full_name_clicked): is_read_only -> editable.
-	(full_addr_clicked): same.
-	(card_added_cb): new function, emit our card_added signal, and
-	close the dialog if we're supposed to.  properly deal with error
-	status here.
-	(card_modified_cb): same, modulo card_added -> card_modified.
-	(save_card): actually call e_card_merging_book_{add/commit}_card
-	instead of using a signal.  Also, add a gboolean arg to tell
-	whether or not to close the dialog after saving the card.
-	(card_deleted_cb): new function, just emit our "card_deleted"
-	signal.
-	(delete_cb): actually call e_book_remove_card here, instead of
-	using a signal.
-	(tb_save_and_close_cb): call save_card with TRUE for should_close.
-	(e_contact_editor_init): init changed = FALSE;
-	(e_contact_editor_destroy): unref our book if we have one.
-	(e_contact_editor_new): new signature, set the "book" arg, and
-	call e_book_get_supported_fields here.
-	(supported_fields_cb): new function, show the contact editor.
-	(e_contact_editor_set_arg): initialize changed to FALSE when
-	setting the card (but *after*, since the changed callbacks will
-	set it to TRUE.)  also, call command_state_changed if editable
-	changes.  also handle setting "book".  oh, and is_read_only ->
-	editable.
-	(command_state_changed): new function - set the state of the
-	commands we care about.
-	(e_contact_editor_get_arg): add "book" handling, and is_read_only
-	-> editable.
-	(_phone_arrow_pressed): is_read_only -> editable.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-	(set_editable): rename set_read_only to this, and is_read_only ->
-	editable.
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor):
-	is_read_only -> editable, add a "changed" flag so we can sensitize
-	commands correctly, and add an EBook* arg to e_contact_editor_new
-	and to the EContactEditor struct.  Also, change all the signals to
-	past tense, and send the EBookStatus in them.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): is_read_only -> editable.
-	(e_contact_editor_address_set_arg): same.
-	(e_contact_editor_address_get_arg): same.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): same.
-	(e_contact_editor_fullname_set_arg): same.
-	(e_contact_editor_fullname_get_arg): same.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): same.
-
-	* contact-editor/Makefile.am: don't build contact-editor-test now,
-	until contact-editor gets moved to gui/ and we can more easily
-	depend on the e_card_merging_* calls.
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): return
-	CardIdAlreadyExists for LDAP_ALREADY_EXISTS.
-
-	* backend/idl/addressbook.idl: Add CardIdAlreadyExists to the
-	BookListener status enum.
-
-	* backend/ebook/e-book-types.h: add
-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add support for
-	CardIdAlreadyExists.
-
-2001-06-19  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c: Serious de-crufting,
-	removal of gtk_object_set_data() hacks, simplified by using
-	some of the newer ebook convenience routines, etc.
-	(ce_book_found_fields):
-	s/e_contact_editor_raise/e_contact_editor_show/, to accomodate the
-	small changes in the contact editor API.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduit/address-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): implement this
-	properly, using base and (objectclass=*).
-
-2001-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): save ourselves a
-	function call - call close_dialog instead of file_close_cb.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-component.c: Set the
-	"expoted_dnd_types" to NULL in the folder_types.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(search_override_check): Add a workaround for an EText bug.
-	(e_select_names_completion_begin): Fix up the match scoring in the
-	search_override case so the lines are offered in the correct
-	order.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/Makefile.am (glade_DATA): Added
-	e-card-merging-book-commit-duplicate-detected.glade here.
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Added this file.  The GUI for asking whether to commit a modified
-	card.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h
-	(e_card_merging_book_commit_card): Added this function.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at), gui/widgets/e-addressbook-util.c
-	(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use
-	e_card_merging_book_commit_card instead of e_book_commit_card here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Made e_card_simple_get_id return const char *.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Made
-	e_card_get_id return const char *.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id
-	variable const here.  Added a break to make it slightly more
-	efficient.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made
-	e_minicard_get_card_id return const char *.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (entry_compare): Made this handle
-	the "id" property in searches.
-	(pas_backend_file_process_modify_card): Made id variable const
-	here.
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): Made id
-	variable const here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c: Rolled
-	back the change 2 ago, dated 06/11/2001 01:51 in CVS, involving
-	e-book-listener.[ch] and e-book.c.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri,
-	e_book_get_supported_fields, e_book_authenticate_user,
-	e_book_remove_card_by_id, e_book_add_vcard, e_book_commit_vcard,
-	e_book_get_cursor, e_book_get_book_view, e_book_get_changes): Made
-	it so that all of these functions queue their ops before calling
-	their CORBA functions.  This way, if the response is sent back
-	before the CORBA function returns there's no problem.  Added
-	e_book_unqueue_op so that the op could be unqueued if the CORBA
-	call fails.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c, backend/ebook/e-book-listener.h
-	(e_book_listener_unpop_response): Added this function to put a
-	response back into the queue.
-
-	* backend/ebook/e-book.c (e_book_check_listener_queue,
-	e_book_queue_op): Handle the case where the op hasn't been queued
-	yet when we get the response.  In this case we unpop the response.
-	Also, when queueing an op, we check to see if there are any
-	responses waiting.
-
-	* This change has been reverted.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h
-	(e_card_locate_match_full): Added this function to let you do
-	slightly more complicated searches.
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use
-	e_card_locate_match_full to check if the card exists in the book
-	it's being added to instead of in the default book.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Removed unused email variable.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (use_common_book_cb): Null
-	terminate the strv here.
-	(e_card_locate_match): ref here instead of unref.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL
-	card here.
-
-	* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am
-	(INCLUDES): Added addressbook/gui/merging here.
-
-	* contact-editor/e-contact-quick-add.c (book_ready_cb),
-	gui/component/addressbook-component.c (dnd_drop_book_open_cb),
-	gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_append_row), gui/widgets/e-addressbook-util.c
-	(add_card_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(book_open_cb): Use e_card_merging_book_add_card instead of
-	e_book_add_card here.
-
-	* gui/Makefile.am (SUBDIRS): Added merging.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD),
-	gui/widgets/Makefile.am (minicard_test_LDADD,
-	minicard_widget_test_LDADD): Added libecardmerging.a here.
-
-	* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:
-	New addressbook library.
-
-	* gui/merging/e-card-duplicate-detected.glade: Glade file for
-	duplicate detected dialog.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New
-	files for detecting duplicates before adding and putting up a
-	dialog if duplicates are found.
-
-	* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h
-	here.
-
-2001-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
-	the gtk_widget_show call...
-	(e_contact_editor_show): and put it here.
-
-	* contact-editor/e-contact-editor.h: add prototype for
-	e_contact_editor_show.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): call
-	e_addressbook_show_contact_editor.
-	(card_modified_cb): call e_addressbook_error_dialog if status !=
-	SUCCESS.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
-	e_addressbook_show_contact_editor.  also, use card_modified_cb as
-	the commit_card callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): clean
-	this area up alot, call e_addressbook_show_contact_editor.
-	(card_deleted_cb): call e_addressbook_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(card_modified_cb): new function, call e_addressbook_error_dialog
-	if the status != SUCCESS.
-	(addressbook_set_value_at): use card_modified_cb as the callback
-	for e_book_commit_card.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
-	e-addressbook-util.[ch].
-
-	* gui/component/addressbook.c (new_contact_cb): use
-	e_addressbook_show_contact_editor here.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Remove
-	references to ECategoryMasterListWombat.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Make
-	this work when multiple names are selected then right
-	click->Remove.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come
-	in.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,
-	pas_backend_file_process_remove_card,
-	pas_backend_file_process_modify_card,
-	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,
-	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using
-	them.
-	(pas_backend_file_build_all_cards_list): Reindented.
-
-	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits
-	with a custom widget that creates an EDateEdit.
-
-	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead
-	of a GnomeDateEdit.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #655: SelectNames doesn't let you remove addresses after
-	 you add them)
-	
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): New function, provides a popup menu with
-	just "Remove" in it.
-	(remove_cb): New callback to do the remove.
-	(e_select_names_add_section): Attach the "right_click" signal to
-	the section_right_click_cb above.
-
-2001-06-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(completion_handler): Change the completion handler to use the
-	ECompletionMatch.
-
-	* gui/component/select-names/e-select-names-completion.c
-	General changes to convert for ECompletionMatch use.
-	(emailify_match): Use extra sort keys in ECompletionMatch to let
-	us ensure that the primary email address is always the first
-	option, the secondary comes second, etc.  There was no nice way to
-	do this previously.
-	(match_name): Removed code that adjusted score based on
-	similarities between the "real name" and the e-mail address.  It
-	seemed like a good idea at the time, but produced unexpected and
-	confusing results.
-
-2001-06-04  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Added.  Code for testing
-	if two ECards appear to pertain to the same contact (using loose
-	matching rules, as opposed to requiring exact equality) and to
-	query the addressbook for the "best match" to ECard.
-
-2001-06-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): remove spew,
-	and don't call the ShellView CORBA method if the interface doesn't
-	exist (for whatever reason.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	unref the EAddressbookModel.
-	(create_minicard_view): unref the adapter.
-	(card_added_cb): call e_book_error_dialog if status != SUCCESS.
-	(card_modified_cb): same.
-	(card_removed_cb): new function, and same.
-	(delete_card_cb): pass card_removed_cb as the callback.
-	(emit_status_message): new function, just emit status_message.
-	(status_message): change to call emit_status_message.
-	(card_deleted_cb): emit_status_message ("Done."), and call
-	e_book_error_dialog if status != SUCCESS.
-	(do_remove): pass view in the closure arg.
-	(e_addressbook_view_delete_selection): emit status "Removing
-	cards..." before starting the removal.
-	(e_book_error_dialog): new function - pop up a (possibly) helpful
-	message about why an operation failed.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): ref the EAddressbookReflowAdapter.
-	(e_minicard_view_widget_destroy): unref the adapter.
-	(e_minicard_view_widget_get_selection_model): if there isn't a
-	minicard view return NULL.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(e_addressbook_table_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): rename this from addressbook_destroy, to
-	reflect the method change.
-	(e_addressbook_reflow_adapter_class_init): same.
-	(e_addressbook_reflow_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-model.h: add editable_set flag.
-
-	* gui/widgets/e-addressbook-model.c (writable_status): only record
-	the writable state of the addressbook if the user hasn't set it.
-	(e_addressbook_model_init): init editable_set to FALSE.
-	(e_addressbook_model_set_arg): set editable_set to TRUE.
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move
-	`$(DB3_LDADD)' before libeutil.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add
-	$(DB3_LDADD)'.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/Makefile.am (INCLUDES): Added db3 cflags.
-
-	* backend/pas/pas-backend-file.c: Updated this to use db3.
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h (EAddressbookView): Added
-	fields for the GalViewMenus and GalViewCollection; we need to keep
-	them around while the component is active.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Plug leak; unref the spec.
-	Unref the factories.  Do not unref the collection, since we need
-	it for the signal emission (okay, so the views object adds a
-	reference to it, but if we are interested in it we should keep a
-	reference anyways).
-	(e_addressbook_view_setup_menus): Create the collection and views
-	on the EAddressbookView's fields so that we can keep them around.
-	(e_addressbook_view_discard_menus): New function; gets rid of the
-	collection and views objects.
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_view_discard_menus().
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add the EAddressbookModel* and change the
-	ETableModel's name to "adapter".
-
-	* gui/component/select-names/e-select-names.c (set_book),
-	(addressbook_model_set_uri): these two things take an
-	EAddressbookModel* instead of an ETableModel now.
-	(e_addressbook_create_ebook_table): don't case the
-	EAddressbookModel* to ETableModel*, create an EAddressbookTableAdapter
-	on the EAddressbookModel instead.
-	(e_select_names_init): set e_select_names->adapter.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (remove_card): decrement
-	data_count before emitting the card_removed signal, and break
-	after we've removed the matching card.
-	(e_addressbook_model_class_init): change signature of
-	"card_removed" signal to match what we emit (and what is
-	expected.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the
-	signal name is "destroy", not "destroyed".
-	(do_remove): new function, actually remove the card.
-	(e_addressbook_view_delete_selection): get this working for both
-	view types.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: Print Preview =>
-	ContactsPrintPreview.  Changed peter's change so that the node
-	name is more in line with "Print.."'s
-
-2001-05-30  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/addressbook.c: Use the correct path to the print
-	preview menu item.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (cut_contacts_cb): new function, for
-	the Cut verb.
-	(copy_contacts_cb): new function, for the Copy verb.
-	(paste_contacts_cb): new function, for the Paste verb.
-	(select_all_contacts_cb): new function, for the Select All verb.
-	(update_command_state): add handling for sensitivity of
-	Cut/Copy/Paste/Select All.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): init
-	the invisible and set up selection/destroy signals.
-	(get_selection_model): new function, so we can get the
-	ETableSelectionModel from either view type.  makes lots of the
-	other functions easier, since we can get the list of selected
-	cards using the same code regardless of view type.
-	(invisible_destroyed): new function.
-	(selection_get): new function.  convert the clipboard list to
-	string.
-	(selection_clear_event): new function - free up the list of
-	ECards.
-	(selection_received): if the selection data is valid and
-	well-formed, add the corresponding cards to the ebook.
-	(add_to_list): new function.
-	(get_selected_cards): new function.
-	(e_addressbook_view_cut): new function, implement in terms of
-	_copy and _delete_selection.
-	(e_addressbook_view_copy): claim ownership of the CLIPBOARD
-	selection after saving the list of selected ECards.
-	(e_addressbook_view_paste): call gtk_selection_convert.
-	(e_addressbook_view_select_all): new function, using
-	e_selection_model_select_all.
-	(e_addressbook_view_can_print): re-implement in terms of
-	get_selection_model.
-	(e_addressbook_view_can_delete): same.
-	(e_addressbook_view_can_cut): new function.
-	(e_addressbook_view_can_copy): new function.
-	(e_addressbook_view_can_paste): new function.  hmm, always return
-	TRUE here.
-	(e_addressbook_view_can_select_all): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	selection stuff - the list of selected cards, and the GtkInvisible
-	selection owner, and add prototypes for
-	e_addressbook_view_[can]_{cut,copy,paste,select_all}.
-	
-	* gui/widgets/e-minicard-view-widget.h: add a prototype for
-	e_minicard_view_widget_get_selection_model.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_get_selection_model): new function.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/Makefile.am: Reference libeshell.la instead of
-	libeshell.a.
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):
-	Correct the height calculation here to not include the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed.
-
-	* gui/widgets/e-minicard.c (remodel): Changed this to continue to
-	be more consistent and simpler.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): fix strings such
-	that ones that happening at the beginning or during an operation
-	are followed by "..." and those that stop the operation are
-	followed by "."
-	(create_card_handler): same.
-	(ldap_op_process_current): same, and also call _notify_complete if
-	we can't connect to ldap server.
-	(poll_ldap): same, and change "Polling for LDAP search result" to
-	"Receiving LDAP search results"
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): call
-	notify_status_message at the beginning of this function, and
-	whenever we call _notify_complete.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.h: add sequence_complete_id to
-	EAddressbookModel and stop_state_changed to
-	EAddressbookModelClass.  also, add prototype for
-	e_addressbook_model_can_stop.
-
-	* gui/widgets/e-addressbook-model.c (remove_book_view): disconnect
-	from "sequence_complete", and set search_in_progress to FALSE.
-	(sequence_complete): set search_in_progress to FALSE and emit
-	"stop_state_changed."
-	(e_addressbook_model_class_init): create the "stop_state_changed"
-	signal.
-	(e_addressbook_model_init): init stuff.
-	(book_view_loaded): connect to "sequence_complete" signal.
-	(book_view_loaded): set search_in_progress to TRUE and emit
-	"stop_state_changed"
-	(e_addressbook_model_stop): set search_in_progress to false, emit
-	"stop_state_changed", and set our status to "Search Interrupted."
-	(e_addressbook_model_can_stop): return search_in_progress.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	connect to the stop_state_changed signal on EAddressbookModel.
-	(stop_state_changed): new function.
-	(e_addressbook_view_can_stop): call e_addressbook_model_can_stop.
-
-	* gui/component/addressbook.c (update_command_state): use
-	e_addressbook_view_can_stop to set the sensitivity of the stop
-	button.
-
-2001-05-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	ref the listener for the duration of this function, since emitting
-	"responses_queued" may cause it to be unreffed by its EBook in
-	some cases, which could cause the second response_queue check to
-	look at garbage data if it got destroyed.
-	(e_book_listener_destroy): Call g_source_remove if idle_id is set.
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: track the change in
-	evolution-addressbook.xml's bonobo ui path's.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (change_view_type): update_view_type
-	is gone, since the menu item is gone.
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): use
-	e_table_model_rows_inserted here.
-
-2001-05-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_item_new): Removed an unused variable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Made text here non-const.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Cast to a gpointer here.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Do a better job constructing match strings, so we
-	never try to use a segment of the name that isn't there (resulting
-	in ugly (null)'s in the string).  Boost our score if some part of
-	the name also matches the front part of the e-mail address, so the
-	name match will always trump the e-mail match.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Return the serialized EDestinations
-	(rather than just a string w/ e-mail addresses) through the bonobo
-	component's property bag.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_export_destinationv): Added.  A convenience routine
-	for serializing the model's EDestinations into a string.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(add_html_mail): Added.  Puts in a check menu item for whether or
-	not the recipient wants HTML mail.
-	(popup_menu_card): Add menu item for HTML mail.  Enable edit
-	contact info item.
-	(popup_menu_nocard): Add menu item for HTML mail.  Enable edit
-	contact info item.
-
-	* backend/ebook/e-book-util.c (e_book_use_local_address_book):
-	Added.  Fetches the local addressbook and caches it on the first
-	call.  This is meant to be an easy and efficient way to get at the
-	local addressbook with the minimum of code.
-	(e_book_query_address_locally): Added.  Convenience code that
-	does an e-mail only e_book_name_and_email_query against the
-	local address book.
-
-	* backend/ebook/e-destination.c
-	(e_destination_set_html_mail_pref): Added.  Allows the intended
-	recipient's HTML mail preference to be manipulated.
-	(e_destination_get_email_verbose): Added.  Cleaned up to use
-	e_destination_get_name.
-	(e_destination_get_html_mail_pref): Added.  Read the recipient's HTML mail
-	preference.  If the destination is linked to a card, the
-	preference is taken from the card (unless it has been explicitly
-	overridden by a called to e_destination_set_html_mail_pref).
-	(e_destination_get_address_textv): Added.  Form a unified address string
-	from a NULL-terminated vector of EDestinations.
-	(e_destination_export): Added.  Serialize an EDestination to a string.
-	(e_destination_import): Added.  Unserialize a string to build an
-	EDestination.
-	(e_destination_exportv): Added.  Serialize a NULL-terminated vector of
-	EDestinations to a string.
-	(e_destination_importv): Added.  Unserialize a string to build a
-	NULL-terminated vector of EDestinations.
-
-	* gui/component/select-names/e-select-names-completion.c:
-	Implemented local versions of g_strcasecmp and g_strncasecmp
-	(which should really be in glib, I think...) for utf8, and used
-	them to make this code utf8-safe.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): no more
-	ContactFind command.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add our selection_change
-	signal.
-	(e_minicard_view_widget_realize): connect to the ESelectionModel's
-	selection_changed signal.
-	(e_minicard_view_widget_selected_count): new function.
-	(selection_change): new function - emit our "selection_change"
-	signal.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidgetClass): add selection_change signal.  also,
-	add prototype for e_minicard_view_widget_selected_count.  
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add our command_state_change
-	signal.
-	(e_addressbook_view_init): connect to the writable_status signal
-	on the EAddressbookModel.
-	(minicard_selection_change): new function - calls
-	command_state_change.
-	(create_minicard_view): connect to selection_change on the
-	minicard_view so we know when to update command state.
-	(table_selection_change): new function - calls
-	command_state_change.
-	(writable_status): new function - calls command_state_change.
-	(command_state_change): new function - emits our
-	"command_state_change" signal.
-	(create_table_view): connect to the selection_change signal so we
-	know to update the command state.
-	(change_view_type): update the command state every time we change
-	view types.
-	(e_addressbook_view_can_create): new function.
-	(e_addressbook_view_can_print): new function.
-	(e_addressbook_view_can_delete): new function.
-	(e_addressbook_view_can_stop): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add command_state_change signal, and
-	prototypes of functions the component can use to test the state of
-	commands.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): unlink
-	the writable_status signal on the EBook.
-	(writable_status): new function.
-	(e_addressbook_model_class_init): add our writable_status signal.
-	(e_addressbook_model_init): init writable_status_id.
-	(e_addressbook_model_set_arg): unlink the writable_status signal
-	on the old EBook, and connect it on the new one.
-
-	* gui/widgets/e-addressbook-model.h: add writable_status signal.
-
-	* gui/component/addressbook.c (update_command_state): new
-	function, set the sensitivity of the bonobo commands.
-	(control_activate): update our command state immediately upon
-	activating the control.
-	(addressbook_factory_new_control): register command_state_change
-	to update the commands.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): initialize the model and
-	adapter.
-	(button_press): set on the model.
-	(e_addressbook_search_dialog_new): same.
-	(e_addressbook_search_dialog_set_arg): same.
-	(e_addressbook_search_dialog_destroy): unref the model and
-	adapter.
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add our model and reflow adapter.
-
-2001-05-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: (e_minicard_view_destroy): Fixed
-	up the lifetime of the drag_data_get signal a bit.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel
-	-> ReflowAdapter name change.
-	(get_card_list): same.
-	(e_minicard_view_drag_begin): same.
-	(supported_fields_cb): model -> adapter.
-	(adapter_changed): hook up signals and set the empty message on
-	our adapter.
-	(e_minicard_view_set_arg): add support for "adapter", and set
-	model -> adapter.
-	(e_minicard_view_get_arg): same.
-	(disconnect_signals): no more status_message.
-	(do_remove): track to use adapter.
-	(e_minicard_view_class_init): add adapter arg, and remove
-	status_message.
-	(e_minicard_view_init): all the code here is in adapter_changed
-	now.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView):
-	EMinicardViewModel -> EAddressbookReflowAdapter.
-	(struct _EMinicardViewClass): get rid of status_message.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): remove the status_message
-	signal.
-	(e_minicard_view_widget_new): take the adapter as our argument,
-	and store it away for when we create the view.
-	(e_minicard_view_widget_realize): when we create the view just set
-	the adapter field on it.  also, don't connect to status_message.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add our adapter here, so we can pass it
-	into the view when we create it.
-	(struct _EMinicardViewWidgetClass): remove status_message.
-
-	* gui/widgets/e-addressbook-view.c (status_message): new function,
-	no more propagating status messages!
-	(e_addressbook_view_init): create our model and conenct to its
-	status_message signal.
-	(book_writable_cb): set "editable" on the model, not our object.
-	(e_addressbook_view_set_arg): same, but with "book" and "query" as
-	well.
-	(create_minicard_view): create our reflow adapter and pass it to
-	the minicard view widget.  also, call e_reflow_model_changed so
-	it'll pick up any already present cards.
-	(table_double_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(get_card_list_1): remove the cast, since we don't need it any
-	longer.
-	(table_right_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(table_drag_data_get): same.
-	(create_table_view): create the table adapter, and use it as our
-	ETableModel.
-	(change_view_type): remove the status_message hook up and setting
-	of query/book/editable.
-	(e_addressbook_view_stop): just call e_addressbook_model_stop here
-	instead of switching on the view type.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	our EAddressbookModel.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the
-	adapter files, and remove e-minicard-view-model.[ch].
-
-	* gui/widgets/e-minicard-view-model.[ch]: removed.
-	
-	* gui/widgets/e-addressbook-table-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-table-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-model.c: rework this class to now
-	subclass from ETableModel anymore.  It not subclasses from
-	GtkObject, and we use table and reflow adapters to get at the
-	data.
-
-	* gui/widgets/e-addressbook-model.h: same.
-
-2001-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view-model.c (remove_card): Fix a small
-	error not decreasing the data_count here.
-
-2001-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): create an EBook for
-	@physical_uri.
-	(dnd_drop_book_open_cb): actually add the dropped cards.
-
-	* gui/component/addressbook.c (addressbook_expand_uri): abstract
-	this code out from the set_prop method so we can use it in the
-	component.
-	(set_prop): call addressbook_expand_uri.
-
-	* backend/ebook/e-card.c (e_card_load_cards_from_string): new
-	function.
-
-	* backend/ebook/e-card.h: add prototype for
-	e_card_load_cards_from_string.
-
-2001-05-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): spew the data passed to us.
-	(destination_folder_handle_motion): the suggested_action is not an
-	ActionSet, but an Action, so don't or together multiple actions.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	correct bug causing the Ok button to never be enabled.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	example.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_data_get):
-	use e_card_list_get_vcard to build up the data to send.
-	(e_minicard_view_init): connect to the model's drag_begin signal.
-	(e_minicard_view_drag_begin): gather the list of cards being
-	dragged and call gtk_drag_begin.
-	(add_to_list): new function.
-	(get_card_list): same.
-	(disconnect_signals): disconnect the drag_data_get signal.
-	(e_minicard_view_init): connect to the drag_begin signal on our
-	model.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): change
-	drag_card to drag_list.
-	
-	* gui/widgets/e-minicard-view-model.c (minicard_drag_begin): new
-	function, emit our drag_begin signal.
-	(addressbook_incarnate): connect to the item's drag_begin signal.
-	(e_minicard_view_model_class_init): init our drag_begin signal.
-
-	* gui/widgets/e-minicard-view-model.h: add drag_begin signal.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	always loop through all source types here, making LDAP first so
-	it's forces as the first notebook item.
-	(addressbook_config_auth_label): remove SASL case.
-	(addressbook_source_edit_changed): same.
-	(addressbook_source_item_new): flag the area of code that needs to
-	go into the advanced dialog (if we add one before someone
-	graciously redesigns the entire addressbook gui :)
-
-
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): remove
-	SASL case.
-	(ldap_parse_auth): same.
-
-	* gui/component/addressbook-storage.h: make LDAP come first in our
-	source type enumeration, and remove the SASL auth type.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): If the name is set and
-	the full_name or file_as haven't been yet, set them.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c: Reordered the includes here.
-	(string_to_dbt): The sleepycat libdb documentation suggests
-	memseting the DBT to 0 so we do that here.
-
-	* gui/widgets/e-minicard-view-model.c (addressbook_height): Skip
-	the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-	* gui/widgets/e-minicard.c (remodel): Skip the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	check schema support if we've connected.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (enable_writable_fields):
-	don't leak the ECard or ECardSimple.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in:
-	Renamed the GnomeCard_Importer.oaf.in to this, and change the IID.
-
-	* Makefile.am: Rename all the GnomeCard to VCard.
-
-	* evolution-vcard-importer.c: Make the GnomeCard a generic 
-	vcard importer.
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Removed
-	e-card-pairs.h since we're not using it.
-
-	* backend/ebook/e-book-view.c (e_book_view_check_listener_queue):
-	Added break; to default: case here.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added changed variable so as to avoid sync_card when possible.
-	(e_card_simple_destroy): Free all the data here properly.
-	(e_card_simple_get_arg): Slight simplification here.
-	(fill_in_info, e_card_simple_arbitrary_foreach,
-	e_card_simple_get_arbitrary): Call e_card_free_empty_lists here to
-	save a bit of memory.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Fixed up
-	includes a bit.
-	(e_card_list_get_vcard, e_card_list_send): Added these functions
-	for acting on a group of cards.
-	(parse_org): Cleaned up this function a bit.
-	(e_card_free_empty_lists): Added this function to delete
-	unnecessary ELists and save a bit of memory.
-	(e_v_object_get_child_value): Made this return NULL if not found
-	instead of g_strdup("").
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h (e_contact_list_save_as): Added
-	this function to save multiple contacts.
-
-	* gui/widgets/Makefile.am: Commented out reflow test.
-	(libeminicard_a_SOURCES): Added e-minicard-view-model.c and
-	e-minicard-view-model.h.
-
-	* gui/widgets/e-minicard-view-model.c,
-	gui/widgets/e-minicard-view-model.h: Model for use in
-	EMinicardView.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Reworked this to use the new EReflow stuff.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Doesn't handle
-	right click menus now.  Emits a signal on the parent canvas item
-	instead.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h
-	(e_contact_print_envelope_list_dialog_new): Added this function to
-	print multiple envelopes (only prints first for now.)
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_card_list_dialog_new): Added this function to
-	print multiple cards.  Only prints the first for now.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): flesh out
-	the function more.  It should work now, but there's no way to
-	invoke this method from the ui at the moment, heh.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): Use a different
-	error message in the ldap support/no ldap support/file cases.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/component/addressbook.c: use define from
-	widgets/misc/e-filter-bar.h instead of own enumeration and search menu
-	names.
-
-	* gui/component/Makefile.am, gui/component/select-names/Makefile.am:
-	removed EVOLUTION_VERSION.
-
-2001-05-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): un-#if 0
-	this.
-	(xfer_folder): add skeleton code to validate xfer request.  always
-	notifies with PERMISSION_DENIED at present.
-	(populate_context_menu): un-#if 0 this.
-	(get_dnd_selection): same.
-	(destination_folder_handle_motion): new function.
-	(destination_folder_handle_drop): new function.
-	(factory_fn): create a EvolutionShellComponentDndDestinationFolder
-	interface, and add it to our shell component.
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): init change_id to NULL
-
-2001-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_free): unref the
-	book if the view is being destroyed
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): unref the book_view when
-	we are finished, it is only interesting if someone else has reffed
-	it now (weak reference)
-	(pas_backend_file_add_client): unref the book for the same reason
-	as above
-
-	* Fixes bug #2255
-
-2001-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (vcard_matches_search): if the
-	view does not contain a search context, the result is by default
-	false fixes #2470
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Remove call to
-	unicode_init.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Lots of code has been
-	simplified here.
-	(e_address_popup_factory_new_control): Rather than directly pop
-	our control up in a window (via the e_address_popup_popup
-	function, which is now gone), just return the widget and let the
-	caller do the popping.  This works better, since it means we don't
-	have to work around the vagaries of bonobo focus & event handling.
-	(e_address_popup_set_name): Refresh when both name & email have
-	been set, rather than checking a stupid counter.
-	(e_address_popup_set_email): Ditto.
-
-2001-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): Added save_source_data here.
-
-2001-04-21  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): Properly
-	convert to utf8. (Bug #2256)
-	(build_quick_add_dialog): Properly convert from utf8. (Bug #2256)
-
-2001-04-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Use e_select_names_model_append.  It's
-	nicer.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_append): Added.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): Filter out completion matches that
-	don't have an associated e-mail address.
-	(book_query_score): Give a bonus to the primary address, so that
-	it always comes up first in the completion results.
-
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	Convert utf8 strings into gtk strings before displaying.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h: Added the function
-	e_book_view_listener_stop to tell the book view listener to stop
-	sending signals.
-
-	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
-	EBookViewListener to stop when we're destroyed.
-
-	* backend/pas/pas-backend-file.c (view_destroy,
-	pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): Cleaned these up a bit
-	using bonobo_object_ref and bonobo_object_unref.
-	(pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): bonobo_object_release_unref
-	the EBookListener here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
-	using bonobo_object_ref.  Make sure to unref the listener when
-	we're done with it.  Put the new book_view in the list before
-	telling the book_listener that it's ready.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
-	this up a bit using bonobo_object_dup_ref.
-	(pas_book_view_destroy): Cleaned this up a bit using
-	bonobo_object_release_unref.
-
-	* backend/pas/pas-book.c (pas_book_queue_get_book_view,
-	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
-	just duplicating.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_cursor): Ref the cursor here when
-	we receive it.
-	(impl_BookListener_respond_get_view,
-	impl_BookListener_respond_get_changes): Ref the book_view here
-	when we receive it.
-	(impl_BookListener_respond_open_book): Ref the book here when we
-	receive it.
-	(e_book_listener_destroy): Unref the objects in our queue here.
-
-	* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned
-	this up using bonobo_object_dup_ref.
-	(e_book_view_destroy): Cleaned this up using
-	bonobo_object_release_unref.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_cursor,
-	e_book_do_response_get_view, e_book_do_response_get_changes,
-	e_book_unload_uri): Cleaned this up using
-	bonobo_object_release_unref.
-
-2001-04-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the ESelectNamesModel from the
-	widget's text model instead of storing it as a gtk_object_set_data
-	since it may change.
-
-2001-04-12  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice
-	and Fax phone numbers too, finishing off bug #1667.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the built
-	in VCard.
-
-2001-04-12  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): put the
-	business address into the pilot record as that is what we put into
-	the desktop record
-	(ecard_from_remote_record): set both the address label and
-	delivery address to avoid bad parser guessing, fixes #2143
-
-	* backend/ebook/e-card-types.h: remove deprecated pilot code
-
-	* backend/ebook/e-card.c: ditto
-
-	* backend/ebook/e-card.h: ditto
-	
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Don't add
-	more than five phone numbers and set the remaining blank entries
-	to some reasonable defaults
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Added
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.
-
-	* gui/component/addressbook-component.c (accepted_dnd_types):
-	Fixed a warning here.
-
-	* gui/widgets/e-addressbook-model.c: Modified this to have more
-	columns, but not let them be edited if they're not a simple
-	string.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Fixed a
-	warning and a memory leak here.
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* backend/ebook/evolution-gnomecard-importer.c: added missing #include.
-	* contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were
-	not translated after selecting one of them.
-	* gui/widgets/e-addressbook-view.c: mark popup menu items with N_().
-	Updated list[] for translators.
-	* gui/widgets/e-minicard.c: same.
-	* gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning
-	for "editable" arg.
-	* gui/widgets/e-minicard-view.c: convert "empty_message" to utf8.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): stubbed,
-	#if 0'ed
-	(xfer_folder): same.
-	(populate_context_menu): same.
-	(get_dnd_selection): same.
-	(factory_fn): add the accepted drag types ("text/x-vard") to
-	folder_types.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): on BUTTON_PRESS: if
-	it's button 1, store the button x, y, and set drag_button_down to
-	TRUE.  on BUTTON_RELEASE: always set drag_button_down to FALSE.
-	for MOTION_NOTIFY: initiate drag if the pointer has moved 3
-	pixels.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add fields for
-	button x, y, and a bit for if the button has been pressed so we
-	can tell whether a motion should be a drag.
-	(struct _EMinicardClass): add drag_begin signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin): new
-	function, starts the drag.
-	(book_view_loaded): connect the "drag_data_get" signal.
-	(e_minicard_view_drag_data_get): new function.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	drag_card and id for canvas_drag_data_get_id.
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): new
-	function.
-	(create_table_view): add d&d stuff.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c: add #include <sys/types.h> since
-	gnome-print.h uses time_t without including it.  this really
-	should be fixed in gnome-print.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	make sure to notify new clients to the writable status of an
-	already open (and authenticated) book.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* contact-editor/e-contact-editor.[ch]: Fix headers.
-	* component/addressbook-storage.c: Same here.
-	* gui/search/e-addressbook-search-dialog.c: Same here.
-	* gui/widgets/e-addressbook-view.c: Same here.
-	* gui/widgets/e-minicard-label.c: Same here.
-	* gui/widgets/e-minicard-view-widget.c: Same here.
-	* gui/widgets/e-minicard-view.c: Same here.
-	* gui/widgets/e-minicard-widget-test.c: Same here.
-	* gui/widgets/e-minicard-widget.c: Same here.
-	* gui/widgets/e-minicard.c: Same here.
-	* gui/widgets/test-minicard-label.c: Same here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): Fixed a
-	crash here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (COLS): Made this table model
-	more consistent in the number of columns it has.
-	(addressbook_append_row): Fixed this function.  We removed the col
-	offset.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c (importer_init): Shut
-	down and unregister the factory on exit. 
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* contact-editor/contact-editor.glade: changed icon to
-	evolution-contacts-plain.png.
-	* gui/component/addressbook.c: use new pixmap cache. Added icon for new
-	contact, print, print preview, changed filenames of renamed icons.
-
-2001-03-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Call e_select_names_model_clean after
-	adding address.  This should deal with the bug reports related
-	to stray commas.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_clean): Added.  Remove all empty destinations.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Added.  Check
-	if an EDestination is in essentially a null state.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Tell new clients that are added whether they're writable.
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c: Added #include <libgnome/gnome-paper.h>
-	
-	* printing/e-contact-print-envelope.c: Added #include <time.h>
-	and #include <libgnome/gnome-paper.h>
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_email): Better handle matching of "nameless" contacts.
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Better
-	handle the case of a "nameless" contact.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Clean up #includes. Replace <gnome.h>, <bonobo.h> and
-	<gtk/gtk.h> with more finegrained headers where needed.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of
-	getting the NAME and then the ORG.  That way if we expand
-	NAME_OR_ORG, this will use it.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table, SPEC): Use the correct column
-	in the SPEC.
-
-2001-03-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): Rather than starting
-	the pending query by directly calling
-	e_select_names_completion_do_query, call
-	e_completion_begin_search.  Circumventing the ECompletion API was
-	causing it to get confused in some cases.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card):
-	Added.  Call me old-fashioned, but I just prefer to have a real
-	API rather than doing everything via gtk_object_get/set-type
-	calls.
-	(e_minicard_widget_set_arg): Changed to call
-	e_minicard_widget_set_card.
-
-	* backend/ebook/e-book-util.c: Small changes to get rid of
-	compiler warnings.  (Casting out const, removed unused variables,
-	etc.)  Removed some debugging messages.
-
-	* gui/component/addressbook-factory.c (main): Added call
-	to e_address_popup_factory_init.
-
-	* gui/component/e-address-popup.c: Added.  A popup gadget that is
-	invoked (as a bonobo control) when an address is left-clicked in
-	the mailer.  The addressbook is queries, and the address is either
-	displayed as a minicard (if it already exists) or in a "generic
-	format".  A button is provided for editting/adding the contact.
-	Some of the semantics of this widget are a bit... non-standard,
-	because of bonobo issues.  I can't really seem to replicate
-	popup-menu behavior because of how bonobo propogates events, etc.
-	so I've tried to produce something that I think is non-annoying.
-	YMMV.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c: Update to the new
-	IDL.
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Added artwork from
-	Jakub. 
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged branch:
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: Call
-	e_selection_model_simple_insert_rows and
-	e_selection_model_simple_delete_rows instead of
-	e_selection_model_simple_insert_row and
-	e_selection_model_simple_delete_row.
-
-End of branch
-
-2001-03-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Brutally
-	refactored to boost performance in large-addressbook situations.
-	These fixes give accepable performance (even with the suboptimal
-	pas-backend-file searching) using tigert's addressbook-of-death.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): 
-	Start feeding query matches back to the caller before the
-	entire search is complete; this gives us some "instant feedback"
-	rather than causing evolution to totally lock up...
-
-	* backend/ebook/e-book.c (e_book_queue_op): Tag all queued ops.
-	(e_book_cancel_op): Added.  Search for a pending op with a given
-	tag, and mark it as inactive.
-	(e_book_do_response_get_cursor): Don't execute callback if this
-	operations has been cancelled.
-	(e_book_do_response_get_view): Ditto.
-	(e_book_do_response_get_changes): Ditto.
-	(e_book_do_response_get_supported_fields): Ditto.
-	(e_book_get_supported_fields): Return an operation tag (that can
-	be used to cancel the operation) rather than just TRUE/FALSE.
-	Zero is always an invalid tag and is returned in the case of an
-	error, so this shouldn't break any code that looked at the return
-	value (unless it did so in a particularly stupid way, of course).
-	(e_book_get_cursor): Ditto.
-	(e_book_get_book_view): Ditto.
-	(e_book_get_changes): Ditto.
-	(e_book_cancel): Added.  Cancel a pending operation.  (Basically
-	a call to e_book_cancel_op with error checking, etc.)
-
-	* backend/ebook/e-book-types.h: Added E_BOOK_STATUS_CANCELLED.
-
-2001-03-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_writable_status): new function.
-	(impl_BookListener_report_writable): new function.
-	(e_book_listener_get_epv): fill in epv->notifyWritable.
-
-	* backend/ebook/e-book-listener.h: add writable status entries.
-
-	* backend/ebook/e-book.c (e_book_do_writable_event): new function.
-	(e_book_check_listener_queue): add WritableStatusEvent to the
-	switch.
-	(e_book_class_init): register writable_status signal.
-
-	* backend/ebook/e-book.h: add writable_status signal.
-
-	* backend/idl/addressbook.idl: add notifyWritable method to
-	BookListener.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add "editable"
-	arg.
-	(e_minicard_init): init editable.
-	(e_minicard_set_arg): loop over the minicard fields setting their
-	"editable".
-	(e_minicard_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the
-	contact_editor.
-	(add_field): set "editable" when creatin the e_minicard.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "editable".
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init): add
-	editable arg.
-	(e_minicard_view_init): init editable.
-	(create_card): pass editable to e_minicard canvas item.
-	(e_minicard_view_set_arg): bit of a hack - loop over all the
-	canvas items setting their "editable."
-	(e_minicard_view_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the contact
-	editor.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	"editable."
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add "editable" field.
-	(e_minicard_view_widget_init): init editable to FALSE.
-	(e_minicard_view_widget_set_arg): save editable, and pass it along
-	the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_arg): add editable.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add "editable" field.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabel): add
-	"editable" field.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	add "editable" arg.
-	(e_minicard_label_set_arg): editable, set it on the e_text too.
-	(e_minicard_label_get_arg): editable.
-	(e_minicard_label_construct): set the "editable" field when we
-	create the e_text cavas item
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	default editable to FALSE.
-	(book_writable_cb): new function, set our editable field and
-	gtk_object_set it on the active view.
-	(e_addressbook_view_set_arg): set the active view's editable when
-	we set the view's book, and connect the "writable_status" signal
-	to book_writable_cb.
-	(change_view_type): same.
-	(supported_fields_cb): use our "editable" when creating the
-	contact editor.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	editable field.
-
-	* gui/widgets/e-addressbook-model.c (e_addressbook_model_init):
-	change the default of editable to FALSE.
-
-	* backend/pas/pas-book.c (pas_book_report_writable): new function.
-
-	* backend/pas/pas-book.h: prototype for pas_book_report_writable.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): if
-	we open the file O_RDWR (or create it) report it as writable.  if
-	we can't open it as O_RDWR, try opening it read-only before we
-	attempt to create it.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): if we authenticate
-	successfully, grant write permissions (this is lacking but there's
-	really nothing we can do to determine the extent of the access
-	afforded a user.)
-
-
-2001-03-15  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-widget.c: Added addressbook querying and
-	"cardification" functions, which are turned off by default for now
-	because of addressbook bugs.  Added a popup menu option to turn
-	queries on, so that others can enjoy the thrill of massive flaming
-	death.
-
-	* gui/component/addressbook-factory.c (main): Made warnings always
-	be fatal.
-
-	* backend/pas/pas-book-view.c: Added some debugging spew.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Added
-	a little experimental code to try to make file searches scale
-	better.  #if 0/#endif-ed out for now.
-
-	* contact-editor/e-contact-quick-add.c: #included e-book-util.h.
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Added.
-	Looser name-matching function.
-	(e_card_email_match_string): Added.  Loose e-mail matching.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added code to cause us to
-	abort rather than get trapped in a 100%-CPU-consuming loop in
-	certain situations.  Now we just need to figure out how to avoid
-	these situations altogether.
-
-	* backend/ebook/e-book-util.c: Added.  Now contains the simple
-	query stuff and the open local addressbook functions.
-
-	* backend/ebook/e-book.c: Moved simple query stuff and open local
-	addressbook functions into e-book-util.c.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_arg): 
-	* gui/widgets/e-minicard.c (e_minicard_set_arg, e_minicard_event):
-	Update arguments to e_canvas_item_grab_focus.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Fix a warning
-	here.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_label_test_LDADD): Change to
-	ld order from Greg Williams.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): Moved where we call
-	pas_book_respond_get_book_view.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: add E_STRING_PROP for
-	categories.
-
-	* backend/pas/evolutionperson.schema: add categories attribute.
-
-	* backend/ebook/e-card-simple.c (field_data): add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-	* backend/ebook/e-card-simple.h: add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): add is_read_only
-	param.
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/widgets/e-addressbook-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): add is_read_only param.
-	also, include a little policy here and make it TRUE, as the user
-	shouldn't be editting in this context anyway (imo).
-
-	* gui/component/addressbook.c (supported_fields_cb): add
-	is_read_only param.
-
-	* contact-editor/test-editor.c (main): add is_read_only param.
-
-	* contact-editor/e-contact-editor.c (set_read_only): new function,
-	that either enables or disables all the text fields, combo boxes,
-	and some buttons, depending on the state of is_read_only.
-	(e_contact_editor_class_init): add read/write arg "is_read_only".
-	(full_name_clicked): set the is_read_only of the fullname dialog
-	to the editor's.
-	(full_addr_clicked): same.
-	(e_contact_editor_new): add is_read_only param, that gets set
-	along with the other params.
-	(e_contact_editor_set_arg): add setter for is_read_only.
-	(e_contact_editor_get_arg): add getter for is_read_only.
-	(_phone_arrow_pressed): change TRUE to !editor->is_read_only for
-	entry.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_fullname_set_arg): add setter for is_read_only
-	that enables/disables all the entries/combos.
-	(e_contact_editor_fullname_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): add is_read_only flag.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_address_set_arg): add setter for is_read_only
-	that disables/enables all the entries/combos.
-	(e_contact_editor_address_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): add is_read_only flag.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/Makefile.am: Change the importer includes around a bit.
-
-	* backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-2001-03-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_simple_query): Added. A
-	simplified, cancellable query mechanism that lets you avoid
-	dealing with EBookView.
-	(e_book_simple_query_cancel): Added. Cancels a running query.
-
-	* backend/ebook/e-book-types.h: Add enum EBookSimpleQueryStatus.
-
-2001-03-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(quick_add_cb): Switched to use e_contact_quick_add_free_form.
-	Removed debugging code, hopefully without introducing any bugs
-	in the process.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix bug with commas
-	inside of name/address combos.  As long as the comma is inside of
-	quotes, it will be treated as part of the name rather than as a
-	break between addresses.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Use e_card_name_to_string for nickname match
-	strings.
-	(match_email): Use e_card_name_to_string for email match strings.
-	(e_select_names_completion_begin): Strip quotes out of query text,
-	so we don't produce malformed sexps.
-	Added William Blake quote easter egg.
-
-	* contact-editor/e-contact-quick-add.c: Further attempts to fix...
-	mostly unsuccessful.
-	(e_contact_quick_add_free_form): Added.  Takes a single string
-	and tries to parse out (using some simple, loose rules) the
-	name and e-mail -- then calls e_contact_quick_add.  An attempt to 
-	get the computer to automatically Do The Right Thing.
-
-	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm
-	anal.
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/addressbook-factory.c (main): Add call to
-	e_address_widget_factory_init.
-
-	* gui/component/e-address-widget.h: 
-	* gui/component/e-address-widget.c: Added.  A little widget (and a
-	Bonobo control, BTW) for displaying addresses, with a left-click
-	menu.  Used to display addresses in the mail viewer (as embedded
-	GtkHTML objects, replacing the text previously used).  Still quite
-	incomplete.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Specify a
-	NULL `EvolutionShellComponentGetDndSelectionFn'.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix glitch with
-	inserting comma-delimited stuff when length > 1.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_local_address_book): Added.
-	Just encapsulates opening
-	file://~username/evolution/local/Contactes/addressbook.db, so that
-	path doesn't need to be hardwired in throughout the code.
-
-2001-03-06  Benjamin Kahn  <xkahn@cybersites.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): 
-	Added the third argument to e_contact_editor_new.  (Cheated
-	and send NULL for the field argument, which is probably
-	troublesome.  It will be fixed soon by either clahey or 
-	toshok.)
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_replace): Fix a reference counting bug.
-
-	* gui/component/select-names/e-select-names-manager.c (popup_cb):
-	A callback for creating the appropriate popup by calling
-	e_select_names_popup.
-	(e_select_names_manager_create_entry): Connect popup_cb to the
-	entry's popup signal
-
-	* gui/component/select-names/e-select-names-popup.c: Added.  Code
-	for popup right-click menus for recipient entries.  Still a bit
-	incomplete.
-
-	* backend/ebook/e-destination.c (e_destination_get_email_num):
-	Added.
-
-	* contact-editor/e-contact-quick-add.c: Added.  Some code and a
-	dialog for very quickly adding entries to the address book.
-	Still not fully working.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c: Cleaned up the formatting in this
-	file a bit.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_set_arg):
-	Made it so that passing in NULL to the writable_fields arg sets
-	the set of writable fields to the empty set.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Pass NULL as the
-	writable_fields argument here.
-
-	* gui/widgets/e-addressbook-model.c: Don't offset by one here.
-	This way we will get the file_as field as one of our
-	ETableColumns.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated this for the
-	changes in ECardSimple.
-
-	* gui/widgets/e-minicard.c (remodel): Don't remodel if the item
-	isn't realized.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: doh, track renaming of
-	objectclass from evolvePerson to evolutionPerson.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: rename evolveperson.schema
-	to this, and add remaining attributes.
-
-	* backend/pas/pas-backend-ldap.c: add remaining fields, and fix up
-	ones that were incorrent (either the ldap_attr or the query prop).
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: update sed script
-
-	* conduit/e-address.conduit.in: update for new pilot foo
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): track change to
-	e_contact_editor_new.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): add
-	objectclasses for "person", "organizationalPerson", and "top" as
-	well, just to be complete.
-	(check_schema_support): rename check_for_evolve_person to this, to
-	reflect that we're doing more than just checking for that
-	objectClass.
-	(add_oc_attributes_to_supported_fields): new function.
-	(add_to_supported_fields): new function.
-	(pas_backend_ldap_destroy): unref supported_fields.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): new
-	function.
-	(e_minicard_view_event): split out the creation of the contact
-	editor to the supported_fields callback.
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): new function.
-	(e_minicard_event): split out the creation of the contact editor
-	to the supported_fields callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): split
-	function into two functions, since e_book_get_supported_fields
-	requires a callback now.
-	(supported_fields_cb): new function.
-
-	* gui/component/addressbook.c (new_contact_cb): split this into
-	two functions, since e_book_get_supported_fields requires a
-	callback now.
-	(supported_fields_cb): new function.
-
-	* contact-editor/test-editor.c (main): track change to
-	e_contact_editor_new (pass NULL for the writable_fields arg.)
-
-	* contact-editor/contact-editor.glade: fix several labels so they
-	make better sense (since we look them up in e-contact-editor.c.)
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor): add
-	writable_fields.  also, add it to e_contact_editor_new.
-	
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	add writable_fields arg.
-	(e_contact_editor_destroy): unref the writable_fields list.
-	(e_contact_editor_new): pass @fields as the writable_fields arg.
-	(e_contact_editor_set_arg): add writable_fields support.
-	(enable_writable_fields): new (very hairy) function, to disable
-	everything and reenable just the fields listed in the
-	writable_fields list.
-	(_email_arrow_pressed): set label-email1, entry-email1, and
-	checkbutton-htmlmail to be sensitive since the only way to get
-	here is to activate a writable field in the menu.
-	(_address_arrow_pressed): set label-address, button-fulladdr, and
-	text-address to be sensitive for the same reason.
-	(_phone_arrow_pressed): sensitize the label and entry for the same
-	reason.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c (field_data): add new entries for
-	phone enums, and fill in the ecard_field with (bogus in all but a
-	few cases) strings.  these are the strings sent from wombat to
-	evolution-addressbook for supported_fields.
-	(e_card_simple_get_ecard_field): new function.
-	(e_card_simple_map_phone_to_field): new function.
-	(e_card_simple_map_email_to_field): new function.
-	(e_card_simple_map_address_to_field): new function.
-
-	* backend/ebook/e-card-simple.h: add a few phone entries to the
-	ECardSimpleField enum, and add prototypes for mapping the list
-	types (phone, email, address) to ECardSimpleField.  Also, add
-	prototype for e_card_simple_get_ecard_field.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): don't build the EList
-	here, it's already built.
-
-	* backend/ebook/e-book-listener.h: change fields from the CORBA
-	sequence to the EList in our reponse struct.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): we make the
-	EList here, since after we return the CORBA list is freed up.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): implement
-	properly, we support everything.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Oops, we do need to be able to write to
-	"text" after all (for things like Reply-to: to work properly).
-	Fixed.
-	(impl_SelectNames_get_entry_for_section): Made "text" a writeable
-	property again.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Increment pos so that
-	we don't reverse strings when length > 1 (a particularly amusing
-	bug).
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): Check for NULL before calling
-	gtk_object_unref (GTK_OBJECT (---)), to get rid of annoying error
-	messages.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-	
-	* gui/component/select-names/e-select-names-completion.c: I am an
-	idiot.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Change for new EDestination/ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_get_source): Added.  A function for
-	looking up the ESelectNamesModel by id.  (I didn't end up using
-	this function, but it might come in handy later.)
-	(e_select_names_manager_get_cards): #if 0/#endif out this
-	function.
-	(e_select_names_manager_create_entry): Modified to attach an
-	ESelectNamesCompletion to the entry we create.
-	(completion_handler): A post-completion handler for our EEntry, to
-	take the completion's extra data (an EDestination) and properly
-	stick it into our ESelectNamesModel.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Changed to operate on EDestinations rather
-	than ECards and to use the new ESelectNamesModel API.  This leads
-	to a rather nice code simplication.
-	(remove_address): Changed for new ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Rather than just passing the entry's text
-	through the property bag, get the "address text" from the model.
-	This returns a nice, verbose string of addresses with names
-	expanded when the address is tied to an ECard (i.e. "Jon
-	Trowbridge <trow@ximian.com>").
-	(impl_SelectNames_get_entry_for_section): Make the text property
-	read-only.
-	(entry_set_property_fn): ...and since it is read-only now, chop
-	out the setter code.
-	
-	* gui/component/select-names/e-select-names-text-model.h: 
-	* gui/component/select-names/e-select-names-text-model.c: Again,
-	this code has been (pretty much) totally rewritten to convert all
-	text operations into changes on the ESelectNamesModel.  This lets
-	us give the associated EEntry some (IMHO) nice semantics regarding
-	whitespace, etc.  Includes object activation, so destinations tied
-	to ECards are underlined and can be double-clicked to bring up a
-	contact editor.
-
-	* gui/component/select-names/e-select-names-model.h: 
-	* gui/component/select-names/e-select-names-model.c: I've heavily
-	modified this object to both hide all implementation details
-	(which the old version exposed a bit too much for my peculiar
-	tastes) and to act as an EDestination container.  The old code put
-	the text model operations here.  I've moved them all to
-	ESelectNamesTextModel --- so the text model actions (insert,
-	delete, etc.) are all done through the API rather than operating on
-	ESelectNamesModel internals.
-
-	* gui/component/select-names/e-select-names-completion.c: Added.  A
-	fairly complicated object derived from ECompletion that searches
-	our local addressbook in various and sundry ways.
-
-	* gui/component/select-names/e-select-names-completion.h: 
-
-	* backend/ebook/e-destination.h: 
-	* backend/ebook/e-destination.c: Added.  This object encapsulates
-	a place to sent an email to, which can either be just a address as
-	a string ("trow@ximian.com"), a fancier string ("Jon Trowbridge
-	<trow@ximian.com>"), or an ECard and a specific address within
-	that ECard.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Used
-	ESelectionModelSimple and the changes to EReflow and EReflowSorted
-	to get multiple selection in the minicard view.
-
-	* gui/widgets/test-reflow.c: Changed this to get it to compile
-	with the changes to EReflow.
-
-2001-02-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
-	this pay attention to the return value of e_sexp_parse.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Fixed a const
-	inconsistency here.
-
-2001-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):
-	new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): track
-	change to idl.
-	(pas_book_respond_get_supported_fields): new function.
-
-	* backend/pas/pas-book.h: add GetSupportedFields to the
-	PASOperation enum.  Also, add a stringlist field to the PASRequest
-	struct.  lastly, add a prototype for
-	pas_book_respond_get_supported_fields.
-	
-	* backend/pas/pas-backend.h: remove prototype for
-	pas_backend_get_supported_fields, and remove it from the vtable.
-
-	* backend/pas/pas-backend.c (pas_backend_get_supported_fields):
-	remove.
-	(pas_backend_class_init): no vtable entry for get_supported_fields
-	anymore.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_supported_fields): new function.
-	(pas_backend_ldap_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_ldap_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): new function.
-	(pas_backend_file_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_file_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/idl/addressbook.idl: Book::getSupportedFields now
-	returns void and add BookListener::notifySupportedFields.
-
-	* backend/ebook/test-client.c (get_fields_cb): new function.
-	(auth_user_cb): track change to e_book_get_supported_fields.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): new function.
-	(e_book_check_listener_queue): add case
-	GetSupportedFieldsResponse.
-	(e_book_get_supported_fields): switch to async model.
-
-	* backend/ebook/e-book.h: switch e_book_get_supported_fields to an
-	async model.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): new
-	function.
-	(impl_BookListener_response_get_supported_fields): new function.
-	(e_book_listener_get_epv): fill in epv's "notifySupportedFields"
-
-	* backend/ebook/e-book-listener.h: add an async response for
-	GetSupportedFields and add a stringlist member to the
-	EBookListenerResponse struct.
-
-2001-02-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Moved the register_factory() code to here, since it was the only
-	thing being called anyways.
-	(PasBookFactoryPrivate): Added a "registered" flag.
-	(pas_book_factory_activate): Set the registered flag.
-	(pas_book_factory_destroy): Deactivate the factory when we go away.
-
-2001-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_supported_fields): new function.
-
-	* backend/ebook/e-book.h: add e-book interface to getting
-	supported fields.
-
-	* backend/ebook/test-client.c (auth_user_cb): shoe-horn in some
-	spew about supported fields.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Remove PISOCK_LIBDIR
-
-2001-02-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): When creating the entry,
-	open up an ebook (corresponding to the local addressbook) and make
-	the entry use an EAddressCompletion.
-	(completion_handler): Added; this is the actual completion
-	handler, which manipulates the entry when the user selects
-	something from the drop-down.
-
-	* gui/component/select-names/e-select-names-model.c: Various hacks
-	by clahey to unbreak e_select_names_model_add_item,
-	e_select_names_model_replace_item (which I added) and
-	e_select_names_model_remove_item.
-	
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_obj_count,
-	e_select_names_text_model_get_nth_obj): Make chunks of text that
-	correspond to ECards in the ESelectNamesModel be embedded objects.
-	(e_select_names_text_model_activate_obj): On activation, pop up a
-	contact editor for the embedded object's card.
-	(e_select_names_text_model_model_changed): Fixed to work with
-	ETextModel API changes.
-	(e_select_names_text_model_set_text): Make const correct.
-	(e_select_names_text_model_insert): Make const correct.
-	(e_select_names_text_model_insert_length): Make const correct.
-
-	* backend/ebook/e-address-completion.h,
-	backend/ebook/e-address-completion.c: Added.  EAddressCompletion
-	is a derived class of ECompletion that does asynchronous address
-	lookups for completions.
-
-2001-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add sequence<string> typedef, and
-	add getSupportedFields method.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): new
-	function.
-
-	* backend/pas/pas-backend.c (pas_backend_class_init): init
-	get_supported_fields = NULL.
-	(pas_backend_get_supported_fields): new function.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_fields.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): new function.
-	(pas_backend_file_class_init): fill in get_supported_fields.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_supported_fields): new function.
-	(pas_backend_ldap_class_init): fill in get_supported_fields.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Undefine E_STRING_PROP and
-	E_LIST_PROP here.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h (e_contact_editor_raise): Added
-	this function.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(e_minicard_event): Added an editor field to the EMinicard object.
-	Made it so that if you double click on the same card twice, it
-	doesn't open a new window, but instead raises the old.
-
-2001-02-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	Free the ldap.binddn.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Free the dir strings.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Set the
-	header on the category dialog we pop up.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in: Translations.
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
-	Marked strings for translation in this newly created file.
-	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
-	xml-i18n-tools framework.
-	* gui/component/Makefile.am: Same as above.
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
-	too.
-	
-2001-02-11  Jason Leach  <jasonleach@usa.net>
-
-	* gui/component/addressbook.c: Removed an ancient #include
-	<libgnorba/gnorba.h>
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-	
-	* conduit/e-address-conduit-control-applet.desktop: removed.
-	* conduit/e-address-conduit-control-applet.desktop.in: added empty.
-	* conduit/Makefile.am: reflect above changes, merge translations.
-	
-	* contact-editor/e-contact-editor-strings.h,
-	contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,
-	contact-editor/e-contact-editor-confirm-delete.glade.h,
-	gui/component/select-names/select-names.glade.h:
-	removed these files, xml-i18n-extract takes care of strings itself.
-	
-	* contact-editor/*.glade,
-	gui/component/select-names/select-names.glade,
-	gui/widgets/alphabet.glade, printing/e-contact-print.glade:
-	changed project options to not output_translatable_strings.
-	
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am,
-	gui/component/select-names/Makefile.am, printing/Makefile.am:
-	do not include removed files in EXTRA_DIST.
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh
-	out this check.  #ifdef the entire thing OPENLDAP2, as it only
-	works with the new schema stuff in openldap 2.x (both on server
-	and client, so upgrade your server.)
-	
-2001-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Added N_("* Click here to add
-	a contact *").
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	set the DEBUG_LEVEL if we're OPENLDAP2.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_compare): return TRUE if
-	equal, FALSE otherwise.
-	(business_compare): same.
-	(homephone_compare): same.
-	(email_ber): return NULL if there are no elements in our list.
-	(homephone_ber): same.
-	(business_ber): same.
-	(build_mods_from_ecards): add smarts to handle list elements
-	properly (like email, business_phone, home_phone.)  now we'll
-	properly send updates if any element in the list changes.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): Added
-	-DEVOLUTION_DATADIR=\""$(datadir)"\".
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Changed the local and system
-	directories.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): doh,
-	didn't mean to commit this.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolveperson.schema: new file.  this will eventually
-	form the suggested additions to an existing openldap server that,
-	along with support for inetorgperson, will allow people to store
-	all evolution attributes in ldap.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_init): don't
-	need the = NULL's since we g_new0.
-	(check_for_evolve_person): new function.
-	(pas_backend_ldap_connect): check to see if the evolvePerson
-	objectclass is there.
-	(build_mods_from_ecards): right now, just silently skip the extra
-	attributes if we don't support evolvePerson.
-	(add_objectclass_mod): new function, add both inetOrgPerson and
-	(if it's available) evolvePerson as objectclasses.
-	(pas_backend_ldap_process_authenticate_user): also check to see if
-	evolvePerson is there, if we couldn't do it (due to auth reasons)
-	in the connect method.
-	(prop_info): change the telephoneNumber LDAP attribute to be used
-	for evolution's business phone numbers.  the primary phone number
-	will be a single valued attribute on evolvePerson.
-	(business_populate): new function.
-	(business_ber): new function.
-	(business_compare): new function.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): err,
-	allocate 2 char*s when i assign 2 char*s.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): switch to
-	ldap_modify_ext_s if OPENLDAP2, as ldap_modify_s is deprecated.
-	(build_mods_from_ecards): don't include the mod if the value is ""
-	- this isn't valid on schema checking ldap servers.
-	(homephone_populate): new function.
-	(homephone_ber): new function.
-	(homephone_compare): new function.
-	(create_card_handler): add spew when adding cards so I can see
-	what's going on.
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-config.c (table_add_elem): Save the
-	help_text in the closure.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Added
-	gal-view-factory-minicard.c, gal-view-factory-minicard.h,
-	gal-view-minicard.c, and gal-view-minicard.h.
-
-	* gui/widgets/gal-view-factory-minicard.c,
-	gui/widgets/gal-view-factory-minicard.h,
-	gui/widgets/gal-view-minicard.c, and
-	gui/widgets/gal-view-minicard.h: New classes for minicard view
-	type.
-
-	* gui/widgets/e-addressbook-view.c: Deploy gal-view stuff
-	properly.
-	
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Make the Note field
-	be quoted printable.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): This should be a close button,
-	not a cancel button.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Call
-	e_select_names_set_default when appropriate.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added support for
-	double clicking sending the selected contacts to the default
-	section.  Added a set_default function.  Made multiple selection
-	work.
-
-2001-01-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_source_label): #ifdef INCLUDE_FILE_SOURCE.
-	(table_add_elem): add help_text parameter and set up focus_in
-	events to display the help in the dialog's html area.
-	(focus_help): new function, calls put_html on the help text.
-	(addressbook_ldap_auth_item_new): add help texts.
-	(addressbook_source_item_new): add help texts.
-	(addressbook_source_dialog): add help texts.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Remove the butt-ugly arrow icon and
-	replace it with a less invasive "->" icon.
-
-2001-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_mods_from_ecards): add
-	comment about the else block here.
-	(prop_info): add home_address, business_address, business_fax,
-	assistant, and isdn.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Made
-	this only add the initial VCard if it finds a file
-	"create-initial" in the directory it's creating the database in.
-
-	* gui/component/addressbook-component.c (factory_fn): Added a
-	create_folder function.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Fixed an unused variable
-	warning.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Setup the view collection
-	properly and handle the "display_view" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-	
-	* gui/component/addressbook.c (update_pixmaps): Consider the
-	placeholder in the path for the "Print" item.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Set the icon for
-	"/Toolbar/Find" to "24_find_contact.xpm".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_pixmap): New.
-	(update_pixmaps): New function, setting the pixmaps for the items
-	of type "pixbuf", using `set_pixmap'.
-	(control_activate): Call it.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: esexp api change fixes.
-
-	* backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes.
-	(vcard_matches_search): esexp api fixes.
-	(pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object).
-
-2001-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_ber_func): make sure to
-	add the lengths here (include the \0?  anyone?).
-	(build_mods_from_ecards): if we're filling in mod->mod_bvalues,
-	set mod_op |= LDAP_MOD_BVALUES.
-
-2001-01-23  Jason Leach  <jasonleach@usa.net>
-	
-	(Fix #1225: advanced search cancel/close)
-	
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Set it up with Search and a
-	Cancel button, Search is still the default.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): properly ref
-	the ecard. still need to kill some memory leaks.
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: remove vfs dependency
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (delete_record):  Remove
-	deleted records from the pilot map so we don't have dupes in the future
-	
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): 
-	* gui/widgets/e-minicard.c (e_minicard_event): Update for
-	e_popup_menu_run prototype change.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Adding a boolean "entry_changed" BonoboPropertyBag arg)
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Use a gtk_object_set_data to set the
-	property to TRUE here.
-
-	(entry_changed): New function, calls bonobo_control_set_property
-	if entry_changed hasn't been set to TRUE yet.
-	
-	(impl_SelectNames_get_entry_for_section): Connect "changed" on
-	each entry_widget to the new entry_changed() func.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): always free 
-	the delivery elements and correct embarrassingly stupid memory error 
-	that was causing the addressbook conduit problems.
-
-	* backend/ebook/e-book-view-listener.c 
-	(e_book_view_listener_check_queue): ref/unref ourself when processing 
-	in case someone we signal unrefs us.
-
-	* conduit/address-conduit.c (sequence_complete): disconnect signals
-	when complete
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate): Made
-	it return a gboolean; it was completely ignoring the return value
-	from register_factory().
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/ebook/.cvsignore: add evolution-gnomecard-importer.
-
-	* backend/ebook/Makefile.am (oaf_DATA): don't require the pine
-	oainfo file until it is actually added to the repository.  We need
-	to keep the build working for nightlies to work.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): s/Helix
-	Code/Ximian/ for the initial contact card.
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (print_local): prevent segfaults and 
-	buffer overflows
-	(print_remote): ditto
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: pass -module and -avoid-version to conduit
-	linker
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @copy_folder_fn arg to `evolution_shell_component_new'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: added i18n for etable.
-
-2001-01-11  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_create_card): get a book view from
-	somewhere so we can give status messages - choose the first one in
-	the list.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_remove_card): same.
-	(prop_info): add more properties, like home_phone, mobile, pager,
-	uri, org_unit, office, title, and manager.
-
-2001-01-09  Miguel de Icaza  <miguel@gnu.org>
-
-	* gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME
-	libraries at the end to make the thing compile.
-
-	* printing/Makefile.am: Order LDADD flags correctly so it compiles.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	connect with the EAddressbookView's status_message signal.
-	(set_status_message): set the status message on the ShellView
-	Interface associated with our control.
-	(retrieve_shell_view_interface_from_control): new function.  get
-	the shell view inteface associated with a control.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): register status_message signal.
-	(status_message): new function, emit our status_message signal.
-	(change_view_type): connect with the view->object's
-	"status_message" signal.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add status_message signal.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): register our status_message
-	signal.
-	(status_message): new function, emit our status_message signal.
-	(e_minicard_view_widget_realize): connect to the EMinicardView's
-	status_message signal.
-
-	* gui/widgets/e-minicard-view-widget.h: add status_message signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init):
-	register our status_message signal.
-	(e_minicard_view_init): init status_message_id.
-	(status_message): new function, emit our status_message signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal.
-	(disconnect_signals): disconnect status_message_id.
-
-	* gui/widgets/e-minicard-view.h: add status_mesage_id, and
-	status_message signal.
-
-	* gui/widgets/e-addressbook-model.c (status_message): new
-	function, emit our status_message.
-	(e_addressbook_model_class_init): register our "status_message"
-	signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal, so we can chain it to our parent.
-	(e_addressbook_model_init): init status_message_id.
-	(remove_book_view): disconnect status_message_id.
-
-	* gui/widgets/e-addressbook-model.h: add status_message_id, and
-	status_message signal.
-
-	* backend/pas/pas-backend-ldap.c change the objectclass we create
-	objects with to "inetOrgPerson" as it encompasses the fields we
-	use.
-	(create_dn_from_ecard): remove the mail/org handling from
-	here.  we just prepend cn=$cn onto the base dn.
-	(create_card_handler): remove the NULL that build_mods_from_ecards
-	adds at the end, and insert our objectClass.
-	(modify_card_handler): call search_for_dn to get the ECardSimple
-	of the old card, since it might (and does in the current code)
-	doing a brute force search.
-	(search_for_dn): new function, to search for an entry by its dn.
-	right now we brute force (objectclass=*) under the base dn and
-	compare dn's.  going to add a first pass that explodes the dn and
-	searches that way, using (objectclass=*) as a last resort.  also,
-	here's where we'd put the extensibleMatch code if we want to go
-	that route.
-
-	* backend/ebook/e-card.c (e_card_set_arg): if we're setting the
-	full name regenerate ecard->name.
-
-2001-01-04  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_authentication_response): new function.
-	(impl_BookListener_respond_authentication_result): new function.
-	(e_book_listener_get_epv): fill in
-	epv->notifyAuthenticationResult.
-
-	* backend/ebook/e-book-listener.h: add AuthenticationResponse to
-	EBookListenerOperation.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_authenticate_user.
-
-	* backend/idl/addressbook.idl (GNOME:Evolution:Addressbook:Book):
-	add authenticateUser method.
-	(GNOME:Evolution:Addressbook:BookListener): add
-	AuthenticationFailed and AuthenticationRequired to CallStatus.
-	also add notifyAuthenticationResult method.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_authenticate_user): dummy
-	authenticate_user function that always succeeds.
-	(pas_backend_file_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	gtk_object_unref(sexp) => s_exp_unref(sexp).
-	(pas_backend_ldap_process_authenticate_user): fill in to use
-	ldap_simple_bind_s.
-	(pas_backend_ldap_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): new
-	function.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): new
-	function.
-	(pas_book_respond_authenticate_user): new function.
-	(pas_book_get_epv): fill in epv->authenticateUser.
-
-	* backend/pas/pas-book.h: add AuthenticateUser operation type, and
-	add user/passwd to the PASRequest struct.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_get_source_by_uri): new function.  should use
-	a hashtable, perhaps, but the lists will generally be small
-	anyway.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_storage_get_source_by_uri.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the binddn if the
-	auth page is shown.
-
-	* gui/component/addressbook.c (book_open_cb): shoe-horn
-	authentication in here.  if the source was configured to use
-	authentication, authenticate the user after opening the ebook.
-	also, be paranoid and clear out the password after authenticating.
-	(book_auth_cb): callback for auth.  set the "book" arg on the
-	view->view here.
-	(passwd_cb): set the view's passwd that'll be used in
-	book_open_cb.
-	(addressbook_view_free): g_free view->passwd.
-
-2001-01-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c,
-	gui/component/addressbook-component.h
-	(addressbook_component_get_shell_client): Added this function.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added code for the
-	ability to switch between different folders.  This doesn't work
-	yet.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Added an option
-	menu to this dialog.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Fix hard coded library names that were 
-	accidentally committed (i'm looking at you miggie)
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Reflect
-	renaming.
-
-	* contact-editor/e-contact-editor-categories.[hc]: These are
-	living in gal now
-	
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Need to e_sexp_unref the the sexp, not gtk_object_unref it.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view): check
-	capabilities is valid before doing a strstr.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search):
-	g_strdup things we g_free.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): Make sure this
-	won't crash if the given contact is removed from the database
-	while this function is being called.
-
-	* gui/widgets/e-minicard.c: Made sure this won't crash if the
-	given contact is removed from the database while the right click
-	menu is being displayed.
-
-2000-12-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook-config.c (edit_source_clicked): copy
-	the dialog's source, destroy the dialog after we're done, and make
-	sure to update both columns in the clist.
-	(add_source_clicked): copy the dialog's source, and destroy the
-	dialog when we're done.
-	(addressbook_source_dialog_destroy): free up all the dialog's
-	memory.
-
-	* gui/component/addressbook.c (set_prop): allow file: uri's that
-	point to files, not just dirs that contain addressbook.db.  The
-	rule is the addressbook file has to end in .db.
-
-	* gui/component/addressbook-storage.c (file_source_foreach):
-	contactserver => contactfile.  cut and paste error.
-	(addressbook_storage_init_source_uri): use file://%s to build the
-	uri.
-
-	* gui/component/e-ldap-server-dialog.[ch]: forgot to remove these
-	in my last commit.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (config_cb): new function, calling
-	our new config ui code.
-	(control_activate): no longer load evolution-addressbook-ldap.xml,
-	as it's not there.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	setup_ldap_storage => addressbook_storage_setup.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove e-ldap-storage.[ch] and add addressbook-storage.[ch].
-	(glade_DATA): remove ldap-server-dialog.glade and add
-	addressbook-config.glade.
-	(EXTRA_DIST): same.
-
-	* gui/component/addressbook-config.[ch]: add another dialog to
-	give a list of our sources and offer the Add/Delete/Edit
-	interface.  This plugs into the previous dialog work (the source
-	editor.)
-
-	* gui/component/addressbook-storage.[ch]: new files, containing
-	the remains of e-ldap-storage.[ch] and adding the new
-	AddressbookSource type and it's subordinates.  Also, the xml
-	format has changed slightly and the file name is no longer
-	~/evolution/ldap-servers.xml - it's
-	~/evolution/addressbook-sources.xml.
-
-	* gui/component/addressbook-config.glade: new file, new config
-	interface.
-
-	* gui/component/ldap-server-dialog.glade: removed.
-
-	* gui/component/e-ldap-storage.[ch]: removed.
-
-2000-12-28  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	addressbook-config.[ch].
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: new files, containing at the
-	moment a beautiful "new/edit source dialog" inspired by the
-	mail-config-gui code.  It'll be ready for prime time after rev'ing
-	the .xml file the addressbook uses to store it's "other sources"
-	to include files, and the addition of the ldap auth stuff.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): Set draw
-	background to FALSE.
-	
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.
-	(e_minicard_label_construct): ditto
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Added Ms. and Miss to the prefix
-	drop down box.  Patch submitted by Martin Hicks <mort@bork.org>.
-
-2000-12-21  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Ref the cards that get put
-	in the change list
-	(next_changed_item): util function to get the real next changed item
-	(compute_status): really compute the status of the record
-	(local_record_from_uid): Set the id of the temporary card
-	(check_for_slow_setting): Make this check a little saner
-	(card_added): Only record the CardObjectChange if the card is not
-	archived
-	(card_changed): ditto
-	(card_removed): ditto
-	(set_status_cleared): actually clear the status
-	(for_each_modified): Clean out cruft and use next_changed_item
-	(add_record): Set the new id properly in our local card copy
-	(replace_record): handle the case where the record has been deleted
-	and we need to call add.  need to update the changed_hash entry
-	(delete_record): Don't panic if the card is not found, its already
-	been deleted.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	The change_context no longer has a del_cards member
-	(pas_backend_file_book_view_free): ditto
-	(pas_backend_file_process_get_changes): ditto
-	(pas_backend_file_changes_foreach_key): just record the id
-	(pas_backend_file_changes): notify_remove needs an id not a vcard
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (match): Use my own wrapper
-	functions instead of trying to *directly* access the the data 
-	structures my self
-	(post_sync): Put in hack to prevent syncing the same records twice
-	(local_record_from_uid): set the card id when creating a blank one
-	(add_record): Set the id of the card we have and don't go to the
-	server to get the latest version
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Convert
-	pilot strings to utf for the e-cards.
-	
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Convert ecard
-	strings to pilot encodings
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (delete): Made it so that if
-	you select multiple contacts, the right click menu to delete
-	deletes them all.
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): always
-	use LDAP_NAME_ERROR (in the openldap1 case it's #defined to
-	NAME_ERROR).
-	(build_card_from_entry): ldap_get_values can return NULL.  also,
-	openldap2 keeps us from getting at ldap->ld_errno, so we can't
-	tell if there was a decoding error like we used to.  the double
-	free problem where ldap would free the ber if there was a decoding
-	problem might be fixed now..  further investigation is needed.
-	for now we leak in openldap2.
-	(ldap_search_handler): the ldap structure is opaque, so use
-	ldap_search_ext to give the extra information (the max responses,
-	timeout, etc.) in the openldap2 case.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test
-	for the existance of LDAP_NAME_ERROR and if it exists as a macro,
-	use it instead of NAME_ERROR.
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut
-	and paste description error.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* gui/widgets/e-minicard-control.c (stream_read): NULL-terminate
-	the returned vcard so we don't sometimes end up with trailing
-	junk that makes libversit unhappy.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_add_section): Make the -> into a GNOME stock image.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Connect to the "cursor_change" signal on
-	the ETable here instead of the ETableScrolled.
-	(remove_address): Added the col and event parameters to this
-	callback to match the added parameters to the double click signal.
-	(e_select_names_add_section): Connect to the "double_click" signal
-	on the ETable here instead of the ETableScrolled.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): When setting the "name"
-	argument, copy the incoming name.  This fixes a crash.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made editing the name using
-	the full name button set the file as entry properly.  Made it
-	so that the address parse that the user chooses after
-	clicking on the Full Address... button gets saved.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Made it
-	so that the editor->name is set after the entry is changed.  This
-	means that the reparse that the person chose is saved.
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL
-	as the @toplevel_node_handler_id argument to
-	`evolution_storage_new'.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed some formatting.
-
-	* contact-editor/e-contact-editor-categories.h: Removed an
-	unneeded #include.
-
-	* gui/widgets/e-addressbook-view.c: Connect to the signals on the
-	ETable instead of the ETableScrolled.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Pass "" rather
-	than NULL to e_card_new.
-	(local_record_from_ecard): Make sure ecard->name is valid
-	(check_for_slow_setting): Remove hard coded test value
-	(card_added): g_strdup the resul of e_card_get_id
-	(card_changed): ditto
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Got rid of code referencing
-	the ETableScrolled proxy functions.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Moved the gal view menu stuff from
-	here to EAddressbookView.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New function to set up the menus
-	for the EAddressbookView.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Another conduit build fix
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes_foreach_key): 
-	Create an empty vcard with the appropriate id for deleted cards
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Ensure the
-	address fields are added sensibly
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Updated the
-	call to `evolution_storage_new()': pass NULL for
-	@toplevel_node_uri.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(view_cb): kill warning
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Remove "complete" field
-
-	* conduit/address-conduit.c (print_local): Make it print useful debug
-	info
-	(print_remote): ditto
-	(local_record_from_ecard): Make sure phone numbers get out to the pilot
-	(ecard_from_remote_record): Set phone strings to "" if they are null
-	(sequence_complete): unref the book view
-	(view_cb): ref the book view
-	(free_prepare): do nothing
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Destroy the card lists with the rest of the view.
-	(pas_backend_file_changes): Don't destroy the card lists here
-	(pas_backend_file_book_view_free): Free the card/id lists in the
-	change context here, the correct place.
-	(pas_backend_file_changes): instead of here...
-
-2000-11-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Set view.change_context to NULL
-	in pas_backend_file_process_get_book_view.  Changed
-	pas_backend_file_book_view_copy a bit.
-
-	* backend/pas/pas-backend-ldap.c: Got rid of a warning.
-
-2000-11-18  Matt Bissiri  <matt@bissiri.org>
-
-	* gui/component/Makefile.am:
-	Add widgets/menus/libmenus.la to evolution_addressbook_LDADD
-	so that it will link properly now that gal-view-menus.[ch]
-	was moved from gal into evolution.
-
-2000-11-15  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Initialize destination struct with '0's.
-
-2000-11-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Changed the mime type from "text/vcard"
-	to "text/x-vcard".
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* backend/ebook/.cvsignore: Add idl-generated files.
-	* backend/ebook/e-book.c: (e_book_do_response_get_changes):
-	* backend/ebook/e-card.c: (e_card_send):
-	s/Evolution_/GNOME_Evolution_/g;
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Link in composer bonobo code.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	send mail to an ECard or send an ECard as a VCard attachment.
-
-	* contact-editor/e-contact-editor.c: Add verbs to send the contact
-	as a VCard or send mail to the contact.
-
-	* gui/search/e-addressbook-search-dialog.c: Removed some unused
-	variables.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c:
-	Added menu items to send the contact as a VCard or send mail to
-	the contact.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/component/addressbook.oafinfo:
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Fixed a warning.
-
-	* gui/component/addressbook.c: Put in gal view menus for testing
-	purposes.
-
-	* printing/e-contact-print-envelope.c: Fixed up envelope printing
-	a bit.  Added code for printing return addresses.
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Add changed_hash, change list and complete bool
-
-	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks
-	(card_added): callback for book view
-	(card_changed): ditto
-	(card_removed): ditto
-	(sequence_complete): ditto
-	(view_cb): callback for the get changes call
-	(pre_sync): force synchronous loading of book view
-	(for_each): we already have the card so create the local record directly
-	(for_each_modified): Uncomment and fix
-	(delete_record): ditto
-
-	* conduit/Makefile.am: link against gal for ebook - needs fixing
-
-	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond
-	to a get_changes call
-	(e_book_check_listener_queue): define the get changes response operation
-
-	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):
-	Queue up a get changes response
-	(impl_BookListener_respond_get_changes): Implement the get_changes method
-	(e_book_listener_get_epv): add get_changes implementation to epv
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only
-	copy the search_context and change_context elements if they actually exist
-	(pas_backend_file_changes): Hard code a path for now, only notify if
-	there is something to notify about
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-book.h: Update PASRequest structure
-
-	* backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name
-	(pas_book_queue_get_changes): Use PASRequest change_id slot
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Properly copy change_id and change_context
-	(pas_backend_file_book_view_free): Free change_id/change_context
-	(pas_backend_file_changes_foreach_key): Callback to figure out the
-	deleted cards
-	(pas_backend_file_changes): Use new e-dbhash stuff to implement.
-	Write out updated hash
-
-	* backend/idl/addressbook.idl: Rename get_changes param
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Switched from EAddressbookSearch to
-	ESearchBar.
-
-	* gui/widgets/Makefile.am, gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Removed EAddressbookSearch.
-	This has been moved to filter/ and renamed ESearchBar.
-
-	* printing/e-contact-print-envelope.c: Forgot to set the font.
-	This works for me now.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_get_entry_for_section): Duplicate the object
-	reference before returning.
-
-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/E-CARD-NEEDED-FIELDS b/addressbook/E-CARD-NEEDED-FIELDS
deleted file mode 100644
index e227d1b130..0000000000
--- a/addressbook/E-CARD-NEEDED-FIELDS
+++ /dev/null
@@ -1,9 +0,0 @@
-I will add these fields as I get a chance to.
-
-Thanks,
-    Chris Lahey
-
-X-EVOLUTION-LIST			boolean if this is a mailing list.
-X-EVOLUTION-LIST-SHOW-ADDRESSES		boolean whether to list all email addresses in the To: line or to treat the list kind of like a BCC.
-X-EVOLUTION-RELATED-CONTACTS		EDestionationList of related contacts.
-REV					last changed date.
-\ No newline at end of file
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
deleted file mode 100644
index 9aad9c1b30..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	backend printing 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 deec6ea2e7..0000000000
--- a/addressbook/backend/ebook/.cvsignore
+++ /dev/null
@@ -1,25 +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
-evolution-vcard-importer
-evolution-gnomecard-importer
-evolution-ldif-importer
-Evolution-Composer-stubs.c
-Evolution-Composer-skels.c
-Evolution-Composer-common.c
-Evolution-Composer.h
-GNOME_Evolution_Addressbook_VCard_Importer.oaf
-GNOME_Evolution_Addressbook_LDIF_Importer.oaf
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
deleted file mode 100644
index b022dcde67..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-	    type="exe"
-	    location="evolution-ldif-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import LDIF files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports LDIF files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in
deleted file mode 100644
index 9cd4699633..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-	    type="exe"
-	    location="evolution-vcard-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import VCard files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports VCard files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
deleted file mode 100644
index 29430d93f4..0000000000
--- a/addressbook/backend/ebook/Makefile.am
+++ /dev/null
@@ -1,179 +0,0 @@
-noinst_PROGRAMS = test-card test-client test-client-list
-
-bin_PROGRAMS =	evolution-vcard-importer 	\
-		evolution-ldif-importer		\
-		load-pine-addressbook		\
-		load-gnomecard-addressbook
-
-CORBA_SOURCE =				\
-	addressbook.h			\
-	addressbook-common.c		\
-	addressbook-stubs.c		\
-	addressbook-skels.c		\
-        Evolution-Composer.h            \
-        Evolution-Composer-common.c     \
-        Evolution-Composer-skels.c      \
-        Evolution-Composer-stubs.c
-
-idls =								\
-	$(srcdir)/../idl/addressbook.idl			\
-	$(srcdir)/../../../composer/Evolution-Composer.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"        	\
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/ename		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/ename		\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-        $(EVOLUTION_ADDRESSBOOK_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-book-util.c					\
-	e-card-cursor.c					\
-	e-card-simple.c					\
-	e-card.c					\
-	e-card-compare.c				\
-	e-destination.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-book-util.h					\
-	e-card-cursor.h					\
-	e-card-simple.h					\
-	e-card-types.h					\
-	e-card.h					\
-	e-card-compare.h				\
-	e-destination.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					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libversit/libversit.a		\
-	$(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					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
-
-test_card_SOURCES =					\
-	test-card.c
-
-test_card_LDADD =					\
-	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_vcard_importer_SOURCES = \
-	evolution-vcard-importer.c
-
-evolution_vcard_importer_LDADD =				\
-	libebook.la						\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_ldif_importer_SOURCES = \
-	evolution-ldif-importer.c
-
-evolution_ldif_importer_LDADD =					\
-	libebook.la						\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/libeutil.la
-
-load_pine_addressbook_SOURCES =				\
-	load-pine-addressbook.c
-
-load_pine_addressbook_LDADD =				\
-	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_gnomecard_addressbook_SOURCES =			\
-	load-gnomecard-addressbook.c
-
-load_gnomecard_addressbook_LDADD =			\
-	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES    = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-oafdir = $(datadir)/oaf
-oaf_in_files =	GNOME_Evolution_Addressbook_VCard_Importer.oaf.in \
-		GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-# add this back when you add the file to the archive ;)
-#	GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
-
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
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 ce85ed75ba..0000000000
--- a/addressbook/backend/ebook/e-book-listener.c
+++ /dev/null
@@ -1,830 +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@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-listener.h"
-
-static EBookStatus e_book_listener_convert_status (GNOME_Evolution_Addressbook_BookListener_CallStatus status);
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_listener_parent_class;
-POA_GNOME_Evolution_Addressbook_BookListener__vepv  e_book_listener_vepv;
-
-struct _EBookListenerPrivate {
-	GList   *response_queue;
-	gint     timeout_id;
-
-	guint timeout_lock : 1;
-	guint stopped      : 1;
-};
-
-static void
-response_free (EBookListenerResponse *resp)
-{
-	if (resp == NULL)
-		return;
-
-	g_free (resp->msg);
-	g_free (resp->id);
-
-	if (resp->book != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-		
-		CORBA_exception_init (&ev);
-		
-		bonobo_object_release_unref (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);
-		
-		bonobo_object_release_unref (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);
-		
-		bonobo_object_release_unref (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);
-}
-
-static gboolean
-e_book_listener_check_queue (EBookListener *listener)
-{
-	if (listener->priv->timeout_lock)
-		return TRUE;
-
-	listener->priv->timeout_lock = TRUE;
-
-	if (listener->priv->response_queue != NULL && !listener->priv->stopped) {
-		gtk_signal_emit (GTK_OBJECT (listener), e_book_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL || listener->priv->stopped) {
-		listener->priv->timeout_id = 0;
-		listener->priv->timeout_lock = FALSE;
-		bonobo_object_unref (BONOBO_OBJECT (listener)); /* release the timeout's reference */
-		return FALSE;
-	}
-
-	listener->priv->timeout_lock = FALSE;
-	return TRUE;
-}
-
-static void
-e_book_listener_queue_response (EBookListener         *listener,
-				EBookListenerResponse *response)
-{
-	if (response == NULL)
-		return;
-
-	if (listener->priv->stopped) {
-		response_free (response);
-		return;
-	}
-
-	listener->priv->response_queue = g_list_append (listener->priv->response_queue, response);
-
-	if (listener->priv->timeout_id == 0) {
-
-		/* 20 == an arbitrary small integer */
-		listener->priv->timeout_id = g_timeout_add (20, (GSourceFunc) e_book_listener_check_queue, listener);
-
-		/* Hold a reference on behalf of the timeout */
-		bonobo_object_ref (BONOBO_OBJECT (listener));
-		
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_listener_queue_generic_response (EBookListener          *listener,
-					EBookListenerOperation  op,
-					EBookStatus             status)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	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,
-				     GNOME_Evolution_Addressbook_Book  book)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	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;
-
-	if (listener->priv->stopped)
-		return;
-
-	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;
-
-	if (listener->priv->stopped)
-		return;
-
-	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_vcard_response (EBookListener        *listener,
-					  EBookStatus           status,
-					  const char           *vcard)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	resp         = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetCardResponse;
-	resp->status = status;
-	resp->vcard  = g_strdup (vcard);
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_cursor_response (EBookListener        *listener,
-					   EBookStatus           status,
-					   GNOME_Evolution_Addressbook_CardCursor  cursor)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	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,
-					 GNOME_Evolution_Addressbook_BookView    book_view)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	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_get_changes_response (EBookListener        *listener,
-					    EBookStatus           status,
-					    GNOME_Evolution_Addressbook_BookView book_view)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = GetChangesResponse;
-	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;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = LinkStatusEvent;
-	resp->connected = connected;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_writable_status (EBookListener *listener,
-				       gboolean       writable)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = WritableStatusEvent;
-	resp->writable  = writable;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_authentication_response (EBookListener *listener,
-					       EBookStatus    status)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = AuthenticationResponse;
-	resp->status = status;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_supported_fields_response (EBookListener *listener,
-						     EBookStatus status,
-						     const GNOME_Evolution_Addressbook_stringlist *fields)
-{
-	EBookListenerResponse *resp;
-	int i;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetSupportedFieldsResponse;
-	resp->status = status;
-	resp->fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	for (i = 0; i < fields->_length; i ++) {
-		e_list_append (resp->fields, fields->_buffer[i]);
-	}
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				       const GNOME_Evolution_Addressbook_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 GNOME_Evolution_Addressbook_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 GNOME_Evolution_Addressbook_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_vcard (PortableServer_Servant servant,
-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				     const GNOME_Evolution_Addressbook_VCard card,
-				     CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_get_vcard_response (
-		listener,
-		e_book_listener_convert_status (status),
-		g_strdup (card));
-}
-
-static void
-impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
-				      const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				      const GNOME_Evolution_Addressbook_CardCursor cursor,
-				      CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_CardCursor  cursor_copy;
-
-	cursor_copy = bonobo_object_dup_ref (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 GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				    const GNOME_Evolution_Addressbook_BookView book_view,
-				    CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_BookView    book_view_copy;
-
-	book_view_copy = bonobo_object_dup_ref (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_get_changes (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       const GNOME_Evolution_Addressbook_BookView book_view,
-				       CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_BookView    book_view_copy;
-
-	book_view_copy = bonobo_object_dup_ref (book_view, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating BookView.\n");
-		return;
-	}
-
-	e_book_listener_queue_get_changes_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_view_copy);
-}
-
-static void
-impl_BookListener_respond_open_book (PortableServer_Servant servant,
-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				     const GNOME_Evolution_Addressbook_Book book,
-				     CORBA_Environment *ev)
-{
-	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_Book  book_copy;
-
-	book_copy = bonobo_object_dup_ref (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_respond_authentication_result (PortableServer_Servant servant,
-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-						 CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_authentication_response (
-				       listener, status);
-}
-
-static void
-impl_BookListener_response_get_supported_fields (PortableServer_Servant servant,
-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-						 const GNOME_Evolution_Addressbook_stringlist *fields,
-						 CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_get_supported_fields_response (
-				     listener, status, fields);
-}
-
-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);
-}
-
-static void
-impl_BookListener_report_writable (PortableServer_Servant servant,
-				   const CORBA_boolean writable,
-				   CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_writable_status (listener, writable);
-}
-
-/**
- * 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 GNOME_Evolution_Addressbook_BookListener_CallStatus status)
-{
-	switch (status) {
-	case GNOME_Evolution_Addressbook_BookListener_Success:
-		return E_BOOK_STATUS_SUCCESS;
-	case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline:
-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;
-	case GNOME_Evolution_Addressbook_BookListener_AuthenticationFailed:
-		return E_BOOK_STATUS_AUTHENTICATION_FAILED;
-	case GNOME_Evolution_Addressbook_BookListener_PermissionDenied:
-		return E_BOOK_STATUS_PERMISSION_DENIED;
-	case GNOME_Evolution_Addressbook_BookListener_CardNotFound:
-		return E_BOOK_STATUS_CARD_NOT_FOUND;
-	case GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists:
-		return E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS;
-	case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported:
-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
-	case GNOME_Evolution_Addressbook_BookListener_TLSNotAvailable:
-		return E_BOOK_STATUS_TLS_NOT_AVAILABLE;
-	case GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_BookListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_LISTENER (listener));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_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");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_listener_init (EBookListener *listener)
-{
-	listener->priv = g_new0 (EBookListenerPrivate, 1);
-}
-
-void
-e_book_listener_stop (EBookListener *listener)
-{
-	g_return_if_fail (E_IS_BOOK_LISTENER (listener));
-
-	listener->priv->stopped = TRUE;
-}
-
-static void
-e_book_listener_destroy (GtkObject *object)
-{
-	EBookListener *listener = E_BOOK_LISTENER (object);
-	GList *l;
-
-	/* Remove our response queue handler: In theory, this can never happen since we
-	 always hold a reference to the listener while the timeout is running. */
-	if (listener->priv->timeout_id) {
-		g_source_remove (listener->priv->timeout_id);
-	}
-
-	/* Clean up anything still sitting in response_queue */
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookListenerResponse *resp = l->data;
-
-		response_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
-}
-
-POA_GNOME_Evolution_Addressbook_BookListener__epv *
-e_book_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;
-
-	epv                             = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);
-
-	epv->notifyOpenBookProgress     = impl_BookListener_report_open_book_progress;
-	epv->notifyBookOpened           = impl_BookListener_respond_open_book;
-
-	epv->notifyCardCreated          = impl_BookListener_respond_create_card;
-	epv->notifyCardRemoved          = impl_BookListener_respond_remove_card;
-	epv->notifyCardModified         = impl_BookListener_respond_modify_card;
-
-	epv->notifyAuthenticationResult = impl_BookListener_respond_authentication_result;
-	epv->notifySupportedFields      = impl_BookListener_response_get_supported_fields;
-
-	epv->notifyCardRequested        = impl_BookListener_respond_get_vcard;
-	epv->notifyCursorRequested      = impl_BookListener_respond_get_cursor;
-	epv->notifyViewRequested        = impl_BookListener_respond_get_view;
-	epv->notifyChangesRequested     = impl_BookListener_respond_get_changes;
-
-	epv->notifyConnectionStatus     = impl_BookListener_report_connection_status;
-	epv->notifyWritable             = impl_BookListener_report_writable;
-
-	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.GNOME_Evolution_Addressbook_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 f546c9a029..0000000000
--- a/addressbook/backend/ebook/e-book-listener.h
+++ /dev/null
@@ -1,109 +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@ximian.com)
- *
- * Copyright 2000, Ximian, 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>
-#include <e-util/e-list.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,
-	GetCardResponse,
-	GetCursorResponse,
-	GetBookViewResponse,
-	GetChangesResponse,
-	AuthenticationResponse,
-	GetSupportedFieldsResponse,
-
-	/* Async events */
-	LinkStatusEvent,
-	WritableStatusEvent,
-	OpenProgressEvent,
-} EBookListenerOperation;
-
-typedef struct {
-	EBookListenerOperation  op;
-
-	/* For most Response notifications */
-	EBookStatus             status;
-
-	/* For OpenBookResponse */
-	GNOME_Evolution_Addressbook_Book          book;
-
-	/* For GetCursorResponse */
-	GNOME_Evolution_Addressbook_CardCursor    cursor;
-
-	/* For GetBookViewReponse */
-	GNOME_Evolution_Addressbook_BookView      book_view;
-
-	/* For GetSupportedFields */
-	EList                                    *fields;
-
-	/* For OpenProgressEvent */
-	char                   *msg;
-	short                   percent;
-
-	/* For LinkStatusEvent */
-	gboolean                connected;
-
-	/* For WritableStatusEvent */
-	gboolean                writable;
-
-	/* For Card[Added|Removed|Modified]Event */
-	char                   *id;
-	char                   *vcard;
-} 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);
-void                   e_book_listener_stop           (EBookListener *listener);
-
-POA_GNOME_Evolution_Addressbook_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 398e46d74c..0000000000
--- a/addressbook/backend/ebook/e-book-types.h
+++ /dev/null
@@ -1,41 +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@ximian.com)
- *
- * Copyright 2000, Ximian, 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_CARD_ID_ALREADY_EXISTS,
-	E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED,
-	E_BOOK_STATUS_CANCELLED,
-	E_BOOK_STATUS_AUTHENTICATION_FAILED,
-	E_BOOK_STATUS_TLS_NOT_AVAILABLE,
-	E_BOOK_STATUS_OTHER_ERROR
-} EBookStatus;
-
-typedef enum {
-	E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS,
-	E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED,
-	E_BOOK_SIMPLE_QUERY_STATUS_OTHER_ERROR
-} EBookSimpleQueryStatus;
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
deleted file mode 100644
index d3de9840f8..0000000000
--- a/addressbook/backend/ebook/e-book-util.c
+++ /dev/null
@@ -1,759 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 "e-book-util.h"
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include "e-card-compare.h"
-
-typedef struct _CommonBookInfo CommonBookInfo;
-struct _CommonBookInfo {
-	EBookCommonCallback cb;
-	gpointer closure;
-};
-
-char *
-e_book_expand_uri (const char *uri)
-{
-	char *new_uri;
-
-	if (!strncmp (uri, "file:", 5)) {
-		if (strlen (uri + 7) > 3
-		    && !strcmp (uri + strlen(uri) - 3, ".db")) {
-			/* it's a .db file */
-			new_uri = g_strdup (uri);
-		}
-		else {
-			char *file_name;
-			/* we assume it's a dir and glom addressbook.db onto the end. */
-			file_name = g_concat_dir_and_file(uri + 7, "addressbook.db");
-			new_uri = g_strdup_printf("file://%s", file_name);
-			g_free(file_name);
-		}
-	}
-	else {
-		new_uri = g_strdup (uri);
-	}
-
-	return new_uri;
-}
-
-static void
-got_uri_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	CommonBookInfo *info = (CommonBookInfo *) closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		info->cb (book, info->closure);
-	} else {
-		info->cb (NULL, info->closure);
-	}
-	g_free (info);
-}
-
-gboolean
-e_book_load_address_book_by_uri (EBook *book, const char *uri, EBookCallback open_response, gpointer closure)
-{
-	gboolean rv;
-	char *real_uri;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	real_uri = e_book_expand_uri (uri);
-
-	rv = e_book_load_uri (book, real_uri, open_response, closure);
-
-	if (!rv) {
-		g_warning ("Couldn't load addressbook %s", real_uri);
-	}
-
-	g_free (real_uri);
-
-	return rv;
-}
-
-void
-e_book_use_address_book_by_uri (const char *uri, EBookCommonCallback cb, gpointer closure)
-{
-	EBook *book;
-	CommonBookInfo *info;
-
-	g_return_if_fail (cb != NULL);
-
-	info = g_new0 (CommonBookInfo, 1);
-	info->cb = cb;
-	info->closure = closure;
-
-	book = e_book_new ();
-	if (! e_book_load_address_book_by_uri (book, uri, got_uri_book_cb, info)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		g_free (info);
-	}
-}
-
-Bonobo_ConfigDatabase
-e_book_get_config_database (CORBA_Environment *ev)
-{
-	static Bonobo_ConfigDatabase config_db;
-
-	if (config_db == NULL)
-		config_db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", ev);
-
-	return config_db;
-}
-
-gboolean
-e_book_load_local_address_book (EBook *book, EBookCallback open_response, gpointer closure)
-{
-	gchar *filename;
-	gchar *uri;
-	gboolean rv;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	filename = gnome_util_prepend_user_home ("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", filename);
-
-	rv = e_book_load_uri (book, uri, open_response, closure);
-
-	if (!rv) {
-		g_warning ("Couldn't load local addressbook %s", uri);
-	}
-
-	g_free (filename);
-	g_free (uri);
-
-	return rv;
-}
-
-static EBook *common_local_book = NULL;
-
-static void
-got_local_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	CommonBookInfo *info = (CommonBookInfo *) closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-
-		/* We try not to leak in a race condition where the
-		   local book got loaded twice. */
-
-		if (common_local_book) {
-			gtk_object_unref (GTK_OBJECT (book));
-			book = common_local_book;
-		}
-		
-		info->cb (book, info->closure);
-
-		if (common_local_book == NULL) {
-			common_local_book = book;
-		}
-		
-	} else {
-
-		info->cb (NULL, info->closure);
-
-	}
-	g_free (info);
-}
-
-void
-e_book_use_local_address_book (EBookCommonCallback cb, gpointer closure)
-{
-	EBook *book;
-	CommonBookInfo *info;
-
-	g_return_if_fail (cb != NULL);
-
-	if (common_local_book != NULL) {
-		cb (common_local_book, closure);
-		return;
-	}
-
-	info = g_new0 (CommonBookInfo, 1);
-	info->cb = cb;
-	info->closure = closure;
-
-	book = e_book_new ();
-	if (! e_book_load_local_address_book (book, got_local_book_cb, info)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		g_free (info);
-	}
-}
-
-typedef struct {
-	gpointer closure;
-	EBookCallback open_response;
-} DefaultBookClosure;
-
-static void
-e_book_default_book_open (EBook *book, EBookStatus status, gpointer closure)
-{
-	DefaultBookClosure *default_book_closure = closure;
-	gpointer user_closure = default_book_closure->closure;
-	EBookCallback user_response = default_book_closure->open_response;
-
-	g_free (default_book_closure);
-
-	/* special case the protocol not supported error, since we
-	   really only want to failover to the local book in the case
-	   where there's no installed backend for that protocol.  all
-	   other errors (failure to connect, etc.) should get reported
-	   to the caller as normal. */
-	if (status == E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED) {
-		e_book_load_local_address_book (book, user_response, user_closure);
-	}
-	else {
-		user_response (book, status, user_closure);
-	}
-}
-
-gboolean
-e_book_load_default_book (EBook *book, EBookCallback open_response, gpointer closure)
-{
-	char *val, *uri;
-	gboolean rv;
-	CORBA_Environment ev;
-	Bonobo_ConfigDatabase config_db;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	CORBA_exception_init (&ev);
-	config_db = e_book_get_config_database (&ev);
-	val = bonobo_config_get_string (config_db, "/DefaultFolders/contacts_uri", &ev);
-	CORBA_exception_free (&ev);
-
-	if (val) {
-		DefaultBookClosure *default_book_closure = g_new (DefaultBookClosure, 1);
-		default_book_closure->closure = closure;
-		default_book_closure->open_response = open_response;
-
-		/* Sigh. FIXME. */
-		if (!strncmp (val, "file:", 5))
-			uri = g_strconcat (val, "/addressbook.db", NULL);
-		else
-			uri = g_strdup (val);
-		rv = e_book_load_uri (book, uri,
-				      e_book_default_book_open, default_book_closure);
-		g_free (uri);
-		g_free (val);
-	}
-	else {
-		rv = e_book_load_local_address_book (book, open_response, closure);
-	}
-
-	if (!rv) {
-		g_warning ("Couldn't load default addressbook");
-	}
-
-	return rv;
-}
-
-/*
- *
- * Simple Query Stuff
- *
- */
-
-typedef struct _SimpleQueryInfo SimpleQueryInfo;
-struct _SimpleQueryInfo {
-	guint tag;
-	EBook *book;
-	gchar *query;
-	EBookSimpleQueryCallback cb;
-	gpointer closure;
-	EBookView *view;
-	guint add_tag;
-	guint seq_complete_tag;
-	GList *cards;
-	gboolean cancelled;
-};
-
-static void
-book_add_simple_query (EBook *book, SimpleQueryInfo *info)
-{
-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");
-	pending = g_list_prepend (pending, info);
-	gtk_object_set_data (GTK_OBJECT (book), "sq_pending", pending);
-}
-
-static SimpleQueryInfo *
-book_lookup_simple_query (EBook *book, guint tag)
-{
-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");
-	while (pending) {
-		SimpleQueryInfo *sq = pending->data;
-		if (sq->tag == tag)
-			return sq;
-		pending = g_list_next (pending);
-	}
-	return NULL;
-}
-
-static void
-book_remove_simple_query (EBook *book, SimpleQueryInfo *info)
-{
-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");
-	GList *i;
-
-	for (i=pending; i != NULL; i = g_list_next (i)) {
-		if (i->data == info) {
-			pending = g_list_remove_link (pending, i);
-			g_list_free_1 (i);
-			break;
-		}
-	}
-	gtk_object_set_data (GTK_OBJECT (book), "sq_pending", pending);
-}
-
-static guint
-book_issue_tag (EBook *book)
-{
-	gpointer ptr = gtk_object_get_data (GTK_OBJECT (book), "sq_tag");
-	guint tag = GPOINTER_TO_UINT (ptr);
-	if (tag == 0)
-		tag = 1;
-	gtk_object_set_data (GTK_OBJECT (book), "sq_tag", GUINT_TO_POINTER (tag+1));
-	return tag;
-}
-
-static SimpleQueryInfo *
-simple_query_new (EBook *book, const char *query, EBookSimpleQueryCallback cb, gpointer closure)
-{
-	SimpleQueryInfo *sq = g_new0 (SimpleQueryInfo, 1);
-
-	sq->tag = book_issue_tag (book);
-	sq->book = book;
-	gtk_object_ref (GTK_OBJECT (book));
-	sq->query = g_strdup (query);
-	sq->cb = cb;
-	sq->closure = closure;
-	sq->cancelled = FALSE;
-
-	/* Automatically add ourselves to the EBook's pending list. */
-	book_add_simple_query (book, sq);
-
-	return sq;
-}
-
-static void
-simple_query_disconnect (SimpleQueryInfo *sq)
-{
-	if (sq->add_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (sq->view), sq->add_tag);
-		sq->add_tag = 0;
-	}
-
-	if (sq->seq_complete_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (sq->view), sq->seq_complete_tag);
-		sq->seq_complete_tag = 0;
-	}
-
-	if (sq->view) {
-		gtk_object_unref (GTK_OBJECT (sq->view));
-		sq->view = NULL;
-	}
-}
-
-static void
-simple_query_free (SimpleQueryInfo *sq)
-{
-	simple_query_disconnect (sq);
-
-	/* Remove ourselves from the EBook's pending list. */
-	book_remove_simple_query (sq->book, sq);
-
-	g_free (sq->query);
-
-	if (sq->book)
-		gtk_object_unref (GTK_OBJECT (sq->book));
-
-	g_list_foreach (sq->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (sq->cards);
-
-	g_free (sq);
-}
-
-static void
-simple_query_card_added_cb (EBookView *view, const GList *cards, gpointer closure)
-{
-	SimpleQueryInfo *sq = closure;
-
-	if (sq->cancelled)
-		return;
-
-	sq->cards = g_list_concat (sq->cards, g_list_copy ((GList *) cards));
-	g_list_foreach ((GList *) cards, (GFunc) gtk_object_ref, NULL);
-}
-
-static void
-simple_query_sequence_complete_cb (EBookView *view, gpointer closure)
-{
-	SimpleQueryInfo *sq = closure;
-
-	/* Disconnect signals, so that we don't pick up any changes to the book that occur
-	   in our callback */
-	simple_query_disconnect (sq);
-	if (! sq->cancelled)
-		sq->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS, sq->cards, sq->closure);
-	simple_query_free (sq);
-}
-
-static void
-simple_query_book_view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	SimpleQueryInfo *sq = closure;
-
-	if (sq->cancelled) {
-		simple_query_free (sq);
-		return;
-	}
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		simple_query_disconnect (sq);
-		sq->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_OTHER_ERROR, NULL, sq->closure);
-		simple_query_free (sq);
-		return;
-	}
-
-	sq->view = book_view;
-	gtk_object_ref (GTK_OBJECT (book_view));
-
-	sq->add_tag = gtk_signal_connect (GTK_OBJECT (sq->view),
-					  "card_added",
-					  GTK_SIGNAL_FUNC (simple_query_card_added_cb),
-					  sq);
-	sq->seq_complete_tag = gtk_signal_connect (GTK_OBJECT (sq->view),
-						   "sequence_complete",
-						   GTK_SIGNAL_FUNC (simple_query_sequence_complete_cb),
-						   sq);
-}
-
-guint
-e_book_simple_query (EBook *book, const char *query, EBookSimpleQueryCallback cb, gpointer closure)
-{
-	SimpleQueryInfo *sq;
-
-	g_return_val_if_fail (book && E_IS_BOOK (book), 0);
-	g_return_val_if_fail (query, 0);
-	g_return_val_if_fail (cb, 0);
-
-	sq = simple_query_new (book, query, cb, closure);
-	e_book_get_book_view (book, (gchar *) query, simple_query_book_view_cb, sq);
-
-	return sq->tag;
-}
-
-void
-e_book_simple_query_cancel (EBook *book, guint tag)
-{
-	SimpleQueryInfo *sq;
-
-	g_return_if_fail (book && E_IS_BOOK (book));
-
-	sq = book_lookup_simple_query (book, tag);
-
-	if (sq) {
-		sq->cancelled = TRUE;
-		sq->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED, NULL, sq->closure);
-	} else {
-		g_warning ("Simple query tag %d is unknown", tag);
-	}
-}
-
-/*
- *
- * Specialized Queries
- *
- */
-
-typedef struct _NameEmailQueryInfo NameEmailQueryInfo;
-struct _NameEmailQueryInfo {
-	gchar *name;
-	gchar *email;
-	EBookSimpleQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-name_email_query_info_free (NameEmailQueryInfo *info)
-{
-	if (info) {
-		g_free (info->name);
-		g_free (info->email);
-		g_free (info);
-	}
-}
-
-static void
-name_and_email_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	NameEmailQueryInfo *info = closure;
-	GList *filtered_cards = NULL;
-
-	while (cards) {
-		ECard *card = E_CARD (cards->data);
-		if ((info->name == NULL || e_card_compare_name_to_string (card, info->name) >= E_CARD_MATCH_VAGUE)
-		    && (info->email == NULL || e_card_email_match_string (card, info->email))) {
-			filtered_cards = g_list_append (filtered_cards, card);
-		}
-		cards = g_list_next (cards);
-	}
-
-	info->cb (book, status, filtered_cards, info->closure);
-
-	g_list_free (filtered_cards);
-
-	name_email_query_info_free (info);
-}
-
-guint
-e_book_name_and_email_query (EBook *book,
-			     const gchar *name,
-			     const gchar *email,
-			     EBookSimpleQueryCallback cb,
-			     gpointer closure)
-{
-	NameEmailQueryInfo *info;
-	gchar *email_query=NULL, *name_query=NULL, *query;
-	guint tag;
-
-	g_return_val_if_fail (book && E_IS_BOOK (book), 0);
-	g_return_val_if_fail (cb != NULL, 0);
-
-	if (name && !*name)
-		name = NULL;
-	if (email && !*email)
-		email = NULL;
-
-	if (name == NULL && email == NULL)
-		return 0;
-
-	/* Build our e-mail query.
-	 * We only query against the username part of the address, to avoid not matching
-	 * fred@foo.com and fred@mail.foo.com.  While their may be namespace collisions
-	 * in the usernames of everyone out there, it shouldn't be that bad.  (Famous last words.)
-	 */
-	if (email) {
-		const gchar *t = email;
-		while (*t && *t != '@')
-			++t;
-		if (*t == '@') {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", t-email, email);
-
-		} else {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", email);
-		}
-	}
-
-	/* Build our name query.
-	 * We only do name-query stuff if we don't have an e-mail address.  Our basic assumption
-	 * is that the username part of the email is good enough to keep the amount of stuff returned
-	 * in the query relatively small.
-	 */
-	if (name && !email) {
-		gchar *name_cpy = g_strdup (name), *qjoined;
-		gchar **namev;
-		gint i, count=0;
-
-		g_strstrip (name_cpy);
-		namev = g_strsplit (name_cpy, " ", 0);
-		for (i=0; namev[i]; ++i) {
-			if (*namev[i]) {
-				char *str = namev[i];
-
-				namev[i] = g_strdup_printf ("(contains \"file_as\" \"%s\")", namev[i]);
-				++count;
-
-				g_free (str);
-			}
-		}
-
-		qjoined = g_strjoinv (" ", namev);
-		if (count > 1) {
-			name_query = g_strdup_printf ("(or %s)", qjoined);
-		} else {
-			name_query = qjoined;
-			qjoined = NULL;
-		}
-		
-		g_free (name_cpy);
-		g_strfreev (namev);
-		g_free (qjoined);
-	}
-
-	/* Assemble our e-mail & name queries */
-	if (email_query && name_query) {
-		query = g_strdup_printf ("(and %s %s)", email_query, name_query);
-	} else if (email_query) {
-		query = email_query;
-		email_query = NULL;
-	} else if (name_query) {
-		query = name_query;
-		name_query = NULL;
-	} else
-		return 0;
-
-	info = g_new0 (NameEmailQueryInfo, 1);
-	info->name = g_strdup (name);
-	info->email = g_strdup (email);
-	info->cb = cb;
-	info->closure = closure;
-
-	tag = e_book_simple_query (book, query, name_and_email_cb, info);
-
-	g_free (email_query);
-	g_free (name_query);
-	g_free (query);
-
-	return tag;
-}
-
-/*
- * Simple nickname query
- */
-
-typedef struct _NicknameQueryInfo NicknameQueryInfo;
-struct _NicknameQueryInfo {
-	gchar *nickname;
-	EBookSimpleQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-nickname_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	NicknameQueryInfo *info = closure;
-
-	if (info->cb)
-		info->cb (book, status, cards, info->closure);
-
-	g_free (info->nickname);
-	g_free (info);
-}
-
-guint
-e_book_nickname_query (EBook *book,
-		       const char *nickname,
-		       EBookSimpleQueryCallback cb,
-		       gpointer closure)
-{
-	NicknameQueryInfo *info;
-	gchar *query;
-	guint retval;
-
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-	g_return_val_if_fail (nickname != NULL, 0);
-
-	/* The empty-string case shouldn't generate a warning. */
-	if (! *nickname)
-		return 0;
-
-	info = g_new0 (NicknameQueryInfo, 1);
-	info->nickname = g_strdup (nickname);
-	info->cb = cb;
-	info->closure = closure;
-
-	query = g_strdup_printf ("(is \"nickname\" \"%s\")", info->nickname);
-
-	retval = e_book_simple_query (book, query, nickname_cb, info);
-
-	g_free (query);
-
-	return retval;
-}
-
-/*
- *  Convenience routine to check for addresses in the local address book.
- */
-
-typedef struct _HaveAddressInfo HaveAddressInfo;
-struct _HaveAddressInfo {
-	gchar *email;
-	EBookHaveAddressCallback cb;
-	gpointer closure;
-};
-
-static void
-have_address_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-	
-	info->cb (book, 
-		  info->email,
-		  cards && (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) ? E_CARD (cards->data) : NULL,
-		  info->closure);
-
-	g_free (info->email);
-	g_free (info);
-}
-
-static void
-have_address_book_open_cb (EBook *book, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-
-	if (book) {
-
-		e_book_name_and_email_query (book, NULL, info->email, have_address_query_cb, info);
-
-	} else {
-
-		info->cb (NULL, info->email, NULL, info->closure);
-
-		g_free (info->email);
-		g_free (info);
-
-	}
-}
-
-void
-e_book_query_address_locally (const gchar *email,
-			      EBookHaveAddressCallback cb,
-			      gpointer closure)
-{
-	HaveAddressInfo *info;
-
-	g_return_if_fail (email != NULL);
-	g_return_if_fail (cb != NULL);
-
-	info = g_new0 (HaveAddressInfo, 1);
-	info->email = g_strdup (email);
-	info->cb = cb;
-	info->closure = closure;
-
-	e_book_use_local_address_book (have_address_book_open_cb, info);
-}
diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h
deleted file mode 100644
index 33f90c399f..0000000000
--- a/addressbook/backend/ebook/e-book-util.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_BOOK_UTIL_H__
-#define __E_BOOK_UTIL_H__
-
-#include <libgnome/gnome-defs.h>
-#include "e-book.h"
-#include <bonobo-conf/bonobo-config-database.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-
-BEGIN_GNOME_DECLS
-
-/* Callbacks for asynchronous functions. */
-typedef void (*EBookCommonCallback)      (EBook *book, gpointer closure);
-typedef void (*EBookSimpleQueryCallback) (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure);
-typedef void (*EBookHaveAddressCallback) (EBook *book, const gchar *addr, ECard *card, gpointer closure);
-
-/* expand file:///foo/foo/ to file:///foo/foo/addressbook.db */
-char                  *e_book_expand_uri                (const char               *uri);
-gboolean               e_book_load_address_book_by_uri  (EBook                    *book,
-							 const char               *uri,
-							 EBookCallback             open_response,
-							 gpointer                  closure);
-void                   e_book_use_address_book_by_uri   (const char               *uri,
-							 EBookCommonCallback       cb,
-							 gpointer                  closure);
-
-gboolean               e_book_load_local_address_book   (EBook                    *book,
-							 EBookCallback             open_response,
-							 gpointer                  closure);
-void                   e_book_use_local_address_book    (EBookCommonCallback       cb,
-							 gpointer                  closure);
-gboolean               e_book_load_default_book         (EBook                    *book,
-							 EBookCallback             open_response,
-							 gpointer                  closure);
-
-/* Bonoboconf database interface. */
-Bonobo_ConfigDatabase  e_book_get_config_database       (CORBA_Environment        *ev);
-
-/* Simple Query Interface. */
-guint                  e_book_simple_query              (EBook                    *book,
-							 const char               *query,
-							 EBookSimpleQueryCallback  cb,
-							 gpointer                  closure);
-void                   e_book_simple_query_cancel       (EBook                    *book,
-							 guint                     tag);
-
-/* Specialized Name/Email Queries */
-guint                  e_book_name_and_email_query      (EBook                    *book,
-							 const char               *name,
-							 const char               *email,
-							 EBookSimpleQueryCallback  cb,
-							 gpointer                  closure);
-guint                  e_book_nickname_query            (EBook                    *book,
-							 const char               *nickname,
-							 EBookSimpleQueryCallback  cb,
-							 gpointer                  closure);
-
-/* Returns the ECard associated to email in the callback,
-   or NULL if no match is found in the local address book. */
-void                   e_book_query_address_locally     (const gchar              *email,
-							 EBookHaveAddressCallback  cb,
-							 gpointer                  closure);
-
-END_GNOME_DECLS
-
-
-#endif /* __E_BOOK_UTIL_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 9981375631..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ /dev/null
@@ -1,483 +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@ximian.com)
- *
- * Copyright 2000, Ximian, 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_GNOME_Evolution_Addressbook_BookViewListener__vepv  e_book_view_listener_vepv;
-
-struct _EBookViewListenerPrivate {
-	GList   *response_queue;
-	gint     timeout_id;
-
-	guint timeout_lock : 1;
-	guint stopped      : 1;
-};
-
-static gboolean
-e_book_view_listener_check_queue (EBookViewListener *listener)
-{
-	if (listener->priv->timeout_lock)
-		return TRUE;
-
-	listener->priv->timeout_lock = TRUE;
-
-	if (listener->priv->response_queue != NULL && !listener->priv->stopped) {
-		gtk_signal_emit (GTK_OBJECT (listener), e_book_view_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL || listener->priv->stopped) {
-		listener->priv->timeout_id = 0;
-		listener->priv->timeout_lock = FALSE;
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return FALSE;
-	}
-
-	listener->priv->timeout_lock = FALSE;
-	return TRUE;
-}
-
-static void
-e_book_view_listener_queue_response (EBookViewListener         *listener,
-				     EBookViewListenerResponse *response)
-{
-	if (response == NULL)
-		return;
-
-	if (listener->priv->stopped) {
-		/* Free response and return */
-		g_free (response->id);
-		g_list_foreach (response->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free (response->cards);
-		g_free (response->message);
-		g_free (response);
-		return;
-	}
-
-	/* a slight optimization for huge ldap queries.  if there's an
-	   existing Add response on the end of the queue, and we're an
-	   Add response, we just glom the two lists of cards
-	   together */
-	if (response->op == CardAddedEvent) {
-		GList *last = g_list_last (listener->priv->response_queue);
-		EBookViewListenerResponse *last_resp = NULL;
-
-		if (last) last_resp = last->data;
-
-		if (last_resp && last_resp->op == CardAddedEvent ) {
-			response->cards = g_list_concat (last_resp->cards, response->cards);
-			g_free (response);
-			/* there should already be a timeout since the
-			   queue isn't empty, so we'll just return
-			   here */
-			return;
-		}
-		else
-			listener->priv->response_queue = g_list_append (last, response);
-	}
-	else
-		listener->priv->response_queue = g_list_append (listener->priv->response_queue, response);
-
-	if (listener->priv->timeout_id == 0) {
-
-		/* Here, 20 == an arbitrary small number */		
-		listener->priv->timeout_id = g_timeout_add (20, (GSourceFunc) e_book_view_listener_check_queue, listener);
-
-		/* Hold a reference to the listener on behalf of the timeout */
-		bonobo_object_ref (BONOBO_OBJECT (listener));
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
-					EBookViewListenerOperation  op)
-{
-	EBookViewListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	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;
-
-	if (listener->priv->stopped)
-		return;
-
-	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 GNOME_Evolution_Addressbook_VCardList  *cards)
-{
-	EBookViewListenerResponse *resp;
-	int i;
-
-	if (listener->priv->stopped)
-		return;
-
-	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;
-
-	if (listener->priv->stopped)
-		return;
-
-	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_notify_card_added (PortableServer_Servant servant,
-					 const GNOME_Evolution_Addressbook_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_notify_card_removed (PortableServer_Servant servant,
-					   const GNOME_Evolution_Addressbook_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_notify_card_changed (PortableServer_Servant servant,
-					   const GNOME_Evolution_Addressbook_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_notify_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_notify_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_GNOME_Evolution_Addressbook_BookViewListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookViewListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_view_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_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");
-		bonobo_object_unref (BONOBO_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->timeout_id     = 0;
-	listener->priv->timeout_lock   = FALSE;
-	listener->priv->stopped        = FALSE;
-}
-
-void
-e_book_view_listener_stop (EBookViewListener *listener)
-{
-	g_return_if_fail (E_IS_BOOK_VIEW_LISTENER (listener));
-	listener->priv->stopped = TRUE;
-}
-
-static void
-e_book_view_listener_destroy (GtkObject *object)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (object);
-	GList *l;
-	
-	/* Remove our response queue handler: In theory, this can never happen since we
-	 always hold a reference to the listener while the timeout is running. */
-	if (listener->priv->timeout_id) {
-		g_source_remove (listener->priv->timeout_id);
-	}
-
-	/* Clear out the queue */
-	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);
-		resp->cards = NULL;
-
-		g_free (resp->message);
-		resp->message = NULL;
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-	
-	g_free (listener->priv);
-	listener->priv = NULL;
-	
-	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
-}
-
-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *
-e_book_view_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookViewListener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookViewListener__epv, 1);
-
-	epv->notifyCardChanged      = impl_BookViewListener_notify_card_changed;
-	epv->notifyCardRemoved      = impl_BookViewListener_notify_card_removed;
-	epv->notifyCardAdded        = impl_BookViewListener_notify_card_added;
-	epv->notifySequenceComplete = impl_BookViewListener_notify_sequence_complete;
-	epv->notifyStatusMessage    = impl_BookViewListener_notify_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.GNOME_Evolution_Addressbook_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 d373872ad0..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ /dev/null
@@ -1,78 +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@ximian.com)
- *
- * Copyright 2000, Ximian, 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);
-void                       e_book_view_listener_stop           (EBookViewListener *listener);
-
-POA_GNOME_Evolution_Addressbook_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 1af893bcd6..0000000000
--- a/addressbook/backend/ebook/e-book-view.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, 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"
-#include "e-book.h"
-
-GtkObjectClass *e_book_view_parent_class;
-
-struct _EBookViewPrivate {
-	GNOME_Evolution_Addressbook_BookView     corba_book_view;
-
-	EBook                 *book;
-	
-	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
-add_book_iterator (gpointer data, gpointer closure)
-{
-	ECard *card = E_CARD (data);
-	EBook *book = E_BOOK (closure);
-
-	e_card_set_book (card, book);
-}
-
-static void
-e_book_view_do_added_event (EBookView                 *book_view,
-			    EBookViewListenerResponse *resp)
-{
-	if (book_view->priv->book)
-		g_list_foreach (resp->cards, add_book_iterator, book_view->priv->book);
-
-	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)
-{
-	if (book_view->priv->book)
-		g_list_foreach (resp->cards, add_book_iterator, book_view->priv->book);
-
-	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);
-		break;
-	}
-
-	g_free (resp);
-}
-
-static gboolean
-e_book_view_construct (EBookView *book_view, GNOME_Evolution_Addressbook_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 = bonobo_object_dup_ref(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);
-		book_view->priv->corba_book_view = NULL;
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book_view->priv->listener = 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);
-
-	bonobo_object_ref(BONOBO_OBJECT(book_view->priv->listener));
-
-	return TRUE;
-}
-
-/**
- * e_book_view_new:
- */
-EBookView *
-e_book_view_new (GNOME_Evolution_Addressbook_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;
-}
-
-void
-e_book_view_set_book (EBookView *book_view, EBook *book)
-{
-	g_return_if_fail (book_view && E_IS_BOOK_VIEW (book_view));
-	g_return_if_fail (book && E_IS_BOOK (book));
-	g_return_if_fail (book_view->priv->book == NULL);
-
-	book_view->priv->book = book;
-	gtk_object_ref (GTK_OBJECT (book));
-}
-
-void
-e_book_view_stop (EBookView *book_view)
-{
-	g_return_if_fail (book_view && E_IS_BOOK_VIEW (book_view));
-	if (book_view->priv->listener)
-		e_book_view_listener_stop (book_view->priv->listener);
-}
-
-static void
-e_book_view_init (EBookView *book_view)
-{
-	book_view->priv                      = g_new0 (EBookViewPrivate, 1);
-	book_view->priv->book                = NULL;
-	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->book) {
-		gtk_object_unref (GTK_OBJECT (book_view->priv->book));
-	}
-
-	if (book_view->priv->corba_book_view) {
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref (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);
-		e_book_view_listener_stop (book_view->priv->listener);
-		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 86326ca5b7..0000000000
--- a/addressbook/backend/ebook/e-book-view.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, 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 _EBook;  /* Forward reference */
-
-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                    (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
-
-GtkType            e_book_view_get_type               (void);
-
-void               e_book_view_set_book               (EBookView *book_view, struct _EBook *book);
-
-void               e_book_view_stop                   (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 28308a7016..0000000000
--- a/addressbook/backend/ebook/e-book.c
+++ /dev/null
@@ -1,1500 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-#include <libgnome/gnome-defs.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:GNOME_Evolution_Wombat_ServerFactory"
-
-typedef enum {
-	URINotLoaded,
-	URILoading,
-	URILoaded
-} EBookLoadState;
-
-struct _EBookPrivate {
-	GList *book_factories;
-	GList *iter;
-
-	EBookListener	      *listener;
-
-	GNOME_Evolution_Addressbook_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;
-
-	guint op_tag;
-
-	gchar *uri;
-};
-
-enum {
-	OPEN_PROGRESS,
-	WRITABLE_STATUS,
-	LINK_STATUS,
-	LAST_SIGNAL
-};
-
-static guint e_book_signals [LAST_SIGNAL];
-
-typedef struct {
-	guint     tag;
-	gboolean  active;
-	gpointer  cb;
-	gpointer  closure;
-	EBookViewListener *listener;
-} EBookOp;
-
-/*
- * Local response queue management.
- */
-
-static void
-e_book_op_free (EBookOp *op)
-{
-	if (op->listener) {
-		bonobo_object_unref (BONOBO_OBJECT (op->listener));
-		op->listener = NULL;
-	}
-	g_free (op);
-}
-
-static guint
-e_book_queue_op (EBook    *book,
-		 gpointer  cb,
-		 gpointer  closure,
-		 EBookViewListener *listener)
-{
-	EBookOp *op;
-
-	op           = g_new0 (EBookOp, 1);
-	op->tag      = book->priv->op_tag++;
-	op->active   = TRUE;
-	op->cb       = cb;
-	op->closure  = closure;
-	op->listener = listener;
-
-	if (op->listener)
-		bonobo_object_ref (BONOBO_OBJECT (op->listener));
-
-	book->priv->pending_ops =
-		g_list_append (book->priv->pending_ops, op);
-
-	return op->tag;
-}
-
-/*
- * Local response queue management.
- */
-static void
-e_book_unqueue_op (EBook    *book)
-{
-	EBookOp *op;
-	GList *removed;
-
-	removed = g_list_last (book->priv->pending_ops);
-
-	if (removed) {
-		book->priv->pending_ops = g_list_remove_link (book->priv->pending_ops,
-							      removed);
-		op = removed->data;
-		e_book_op_free (op);
-		g_list_free_1 (removed);
-		book->priv->op_tag--;
-	}
-}
-
-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 gboolean
-e_book_cancel_op (EBook *book, guint tag)
-{
-	GList *iter;
-	gboolean cancelled = FALSE;
-
-	for (iter = book->priv->pending_ops; iter != NULL && !cancelled; iter = g_list_next (iter)) {
-		EBookOp *op = iter->data;
-		if (op->tag == tag) {
-			op->active = FALSE;
-			cancelled = TRUE;
-		}
-	}
-	
-	return cancelled;
-}
-
-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);
-	e_book_op_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);
-
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_get_vcard (EBook                 *book,
-			      EBookListenerResponse *resp)
-{
-	EBookOp *op;
-	ECard *card;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_vcard: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-	if (resp->vcard != NULL) {
-
-		card = e_card_new(resp->vcard);
-
-		if (card != NULL) {
-			e_card_set_book (card, book);
-			if (op->cb) {
-				if (op->active)
-					((EBookCardCallback) op->cb) (book, resp->status, card, op->closure);
-				else
-					((EBookCardCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-			}
-
-			gtk_object_unref(GTK_OBJECT(card));
-		} else {
-			((EBookCursorCallback) op->cb) (book, resp->status, NULL, op->closure);
-		}
-	} else {
-		((EBookCardCallback) op->cb) (book, resp->status, NULL, op->closure);
-	}
-
-	g_free (resp->vcard);
-	e_book_op_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 (cursor != NULL) {
-		if (op->cb) {
-			if (op->active)
-				((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
-			else
-				((EBookCursorCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-		}
-
-		/*
-		 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-		 */
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref (resp->cursor, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_do_response_get_cursor: Exception releasing "
-				   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
-		}
-
-		CORBA_exception_free (&ev);
-
-		gtk_object_unref(GTK_OBJECT(cursor));
-	} else {
-		((EBookCursorCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-	
-	e_book_op_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 (book_view != NULL) {
-		e_book_view_set_book (book_view, book);
-
-		/* Only execute the callback if the operation is still flagged as active (i.e. hasn't
-		   been cancelled.  This is mildly wasteful since we unnecessaryily create the
-		   book_view, etc... but I'm leery of tinkering with the CORBA magic. */
-		if (op->cb) {
-			if (op->active)
-				((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-			else
-				((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-		}
-	
-		/*
-		 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-		 */
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref  (resp->book_view, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_do_response_get_view: Exception releasing "
-				   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-		}
-
-		CORBA_exception_free (&ev);
-
-		gtk_object_unref(GTK_OBJECT(book_view));
-	} else {
-		e_book_view_listener_stop (op->listener);
-		((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_get_changes (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_changes: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	book_view = e_book_view_new (resp->book_view, op->listener);
-
-	if (book_view != NULL) {
-		e_book_view_set_book (book_view, book);
-	
-		if (op->cb) {
-			if (op->active)
-				((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-			else
-				((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-		}
-
-		/*
-		 * Release the remote GNOME_Evolution_Addressbook_BookView in the PAS.
-		 */
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref  (resp->book_view, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_do_response_get_changes: Exception releasing "
-				   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-		}
-
-		CORBA_exception_free (&ev);
-
-		gtk_object_unref(GTK_OBJECT(book_view));
-	} else {
-		e_book_view_listener_stop (op->listener);
-		((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-
-	e_book_op_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);
-	e_book_op_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);
-}
-
-static void
-e_book_do_writable_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [WRITABLE_STATUS],
-			 resp->writable);
-}
-
-static void
-e_book_do_response_get_supported_fields (EBook                 *book,
-					 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_supported_fields: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb) {
-		if (op->active)
-			((EBookFieldsCallback) op->cb) (book, resp->status, resp->fields, op->closure);
-		else
-			((EBookFieldsCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-
-	e_book_op_free (op);
-}
-
-/*
- * 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:
-	case AuthenticationResponse:
-		e_book_do_response_generic (book, resp);
-		break;
-	case GetCardResponse:
-		e_book_do_response_get_vcard (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 GetChangesResponse:
-		e_book_do_response_get_changes(book, resp);
-		break;
-	case OpenBookResponse:
-		e_book_do_response_open (book, resp);
-		break;
-	case GetSupportedFieldsResponse:
-		e_book_do_response_get_supported_fields (book, resp);
-		break;
-
-	case OpenProgressEvent:
-		e_book_do_progress_event (book, resp);
-		break;
-	case LinkStatusEvent:
-		e_book_do_link_event (book, resp);
-		break;
-	case WritableStatusEvent:
-		e_book_do_writable_event (book, resp);
-		break;
-	default:
-		g_error ("EBook: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-/**
- * e_book_load_uri:
- */
-
-typedef struct {
-	char                      *uri;
-	EBookCallback              open_response;
-	gpointer                   closure;
-} EBookLoadURIData;
-
-static void e_book_load_uri_from_factory (EBook *book,
-					  GNOME_Evolution_Addressbook_BookFactory factory,
-					  EBookLoadURIData *load_uri_data);
-
-static void
-e_book_load_uri_step (EBook *book, EBookStatus status, EBookLoadURIData *data)
-{
-	/* iterate to the next possible CardFactory, or fail
-	   if it's the last one */
-	book->priv->iter = book->priv->iter->next;
-	if (book->priv->iter) {
-		GNOME_Evolution_Addressbook_BookFactory factory = book->priv->iter->data;
-		e_book_load_uri_from_factory (book, factory, data);
-	}
-	else {
-		EBookCallback cb = data->open_response;
-		gpointer closure = data->closure;
-		
-		/* reset the load_state to NotLoaded so people can
-                   attempt another load_uri on the book. */
-		book->priv->load_state = URINotLoaded;
-
-		g_free (data);
-
-		cb (book, status, closure);
-	}
-}
-
-static void
-e_book_load_uri_open_cb (EBook *book, EBookStatus status, EBookLoadURIData *data)
-{
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		EBookCallback cb = data->open_response;
-		gpointer closure = data->closure;
-
-		g_free (data);
-
-		cb (book, status, closure);
-	}
-	else {
-		e_book_load_uri_step (book, status, data);
-	}
-}
-
-static void
-e_book_load_uri_from_factory (EBook *book,
-			      GNOME_Evolution_Addressbook_BookFactory factory,
-			      EBookLoadURIData *load_uri_data)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, e_book_load_uri_open_cb, load_uri_data, NULL);
-
-	GNOME_Evolution_Addressbook_BookFactory_openBook (
-		factory, book->priv->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");
-		e_book_unqueue_op (book);
-		CORBA_exception_free (&ev);
-		e_book_load_uri_step (book, E_BOOK_STATUS_OTHER_ERROR, load_uri_data);
-	}
-
-	CORBA_exception_free (&ev);
-
-}
-
-static gboolean
-activate_factories_for_uri (EBook *book, const char *uri)
-{
-	CORBA_Environment ev;
-	OAF_ServerInfoList *info_list = NULL;
-	int i;
-	char *protocol, *query, *colon;
-	gboolean retval = FALSE;
-
-	colon = strchr (uri, ':');
-	if (!colon) {
-		g_warning ("e_book_load_uri: Unable to determine protocol in the URI\n");
-		return FALSE;
-	}
-
-	protocol = g_strndup (uri, colon-uri);
-	query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/BookFactory:1.0')"
-				 " AND addressbook:supported_protocols.has ('%s')", protocol
-				 );
-
-	CORBA_exception_init (&ev);
-	
-	info_list = oaf_query (query, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Eeek!  Cannot perform OAF query for book factories.");
-		CORBA_exception_free (&ev);
-		goto shutdown;
-	}
-
-	if (info_list->_length == 0) {
-		g_warning ("Can't find installed BookFactory that handles protocol '%s'.", protocol);
-		g_free (protocol);
-		g_free (query);
-		CORBA_exception_free (&ev);
-		goto shutdown;
-	}
-
-	CORBA_exception_free (&ev);
-
-	for (i = 0; i < info_list->_length; i ++) {
-		const OAF_ServerInfo *info;
-		GNOME_Evolution_Addressbook_BookFactory factory;
-
-		info = info_list->_buffer + i;
-
-		factory = oaf_activate_from_id (info->iid, 0, NULL, NULL);
-
-		if (factory == CORBA_OBJECT_NIL)
-			g_warning ("e_book_construct: Could not obtain a handle "
-				   "to the Personal Addressbook Server with IID `%s'\n", info->iid);
-		else
-			book->priv->book_factories = g_list_append (book->priv->book_factories,
-								    factory);
-	}
-
-	if (!book->priv->book_factories) {
-		g_warning ("Couldn't activate any book factories.");
-		goto shutdown;
-	}
-
-	retval = TRUE;
-
- shutdown:
-	if (info_list)
-		CORBA_free (info_list);
-	g_free (query);
-	g_free (protocol);
-
-	return retval;
-}
-
-gboolean
-e_book_load_uri (EBook                     *book,
-		 const char                *uri,
-		 EBookCallback              open_response,
-		 gpointer                   closure)
-{
-	EBookLoadURIData *load_uri_data;
-	GNOME_Evolution_Addressbook_BookFactory factory;
-
-	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;
-	}
-
-	/* try to find a list of factories that can handle the protocol */
-	if (!activate_factories_for_uri (book, uri)) {
-		open_response (NULL, E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED, closure);
-		return FALSE;
-	}
-		
-	g_free (book->priv->uri);
-	book->priv->uri = g_strdup (uri);
-
-	/*
-	 * 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_uri_data = g_new (EBookLoadURIData, 1);
-	load_uri_data->open_response = open_response;
-	load_uri_data->closure = closure;
-
-	/* initialize the iterator, and load from the first one*/
-	book->priv->iter = book->priv->book_factories;
-
-	factory = book->priv->iter->data;
-
-	e_book_load_uri_from_factory (book, factory, load_uri_data);
-
-	book->priv->load_state = URILoading;
-
-	/* 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 GNOME_Evolution_Addressbook_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	bonobo_object_release_unref  (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);
-
-	e_book_listener_stop (book->priv->listener);
-	bonobo_object_unref (BONOBO_OBJECT (book->priv->listener));
-
-	book->priv->listener   = NULL;
-	book->priv->load_state = URINotLoaded;
-}
-
-const char *
-e_book_get_uri (EBook *book)
-{
-	g_return_val_if_fail (book && E_IS_BOOK (book), NULL);
-
-	return book->priv->uri;
-}
-
-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 = GNOME_Evolution_Addressbook_Book_getStaticCapabilities(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;
-}
-
-guint
-e_book_get_supported_fields (EBook              *book,
-			     EBookFieldsCallback cb,
-			     gpointer            closure)
-{
-	CORBA_Environment ev;
-	guint tag;
-
-	CORBA_exception_init (&ev);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return 0;
-	}
-
-	tag = e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_getSupportedFields(book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_supported_fields: Exception "
-			   "during get_supported_fields!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-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);
-
-	book->priv->book_factories = NULL;
-
-	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;
-}
-
-/* User authentication. */
-
-void
-e_book_authenticate_user (EBook         *book,
-			  const char    *user,
-			  const char    *passwd,
-			  const char    *auth_method,
-			  EBookCallback cb,
-			  gpointer      closure)
-{
-	CORBA_Environment  ev;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_authenticate_user: No URI loaded!\n");
-		return;
-	}
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_authenticateUser (book->priv->corba_book,
-							   user,
-							   passwd,
-							   auth_method,
-							   &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_authenticate_user: Exception authenticating user with the PAS!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Fetching cards */
-
-/**
- * e_book_get_card:
- */
-guint
-e_book_get_card (EBook             *book,
-		 const char        *id,
-		 EBookCardCallback  cb,
-		 gpointer           closure)
-{
-	CORBA_Environment ev;
-	guint tag;
-
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_card: No URI loaded!\n");
-		return 0;
-	}
-
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_getVCard (book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_card: Exception "
-			   "getting card!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-/* 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);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_removeCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_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);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	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_assume_utf8 (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);
-
-	if (card->book && card->book != book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	card->book = book;
-	gtk_object_ref (GTK_OBJECT (card->book));
-
-	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);
-
-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_addCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_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);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	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_assume_utf8 (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);
-
-	if (card->book && card->book != book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	card->book = book;
-	gtk_object_ref (GTK_OBJECT (card->book));
-
-	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);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_modifyCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_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);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	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);
-
-	GNOME_Evolution_Addressbook_Book_checkConnection (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;
-}
-
-guint
-e_book_get_cursor       (EBook               *book,
-			 gchar               *query,
-			 EBookCursorCallback  cb,
-			 gpointer             closure)
-{
-	CORBA_Environment ev;
-	guint tag;
-  
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return 0;
-	}
-	
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, NULL);
-	
-	GNOME_Evolution_Addressbook_Book_getCursor (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);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-guint
-e_book_get_book_view       (EBook                 *book,
-			    const gchar           *query,
-			    EBookBookViewCallback  cb,
-			    gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-	guint tag;
-  
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_book_view: No URI loaded!\n");
-		return 0;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, listener);
-	
-	GNOME_Evolution_Addressbook_Book_getBookView (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);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-guint
-e_book_get_changes         (EBook                 *book,
-			    gchar                 *changeid,
-			    EBookBookViewCallback  cb,
-			    gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-	guint tag;
-  
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	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);
-
-	tag = e_book_queue_op (book, cb, closure, listener);
-	
-	GNOME_Evolution_Addressbook_Book_getChanges (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);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-/**
- * e_book_cancel
- */
-
-void
-e_book_cancel (EBook *book, guint tag)
-{
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-	g_return_if_fail (tag != 0);
-
-	/* In an attempt to be useful, we take a bit of extra care in reporting
-	   errors.  This might come in handy someday. */
-	if (tag >= book->priv->op_tag)
-		g_warning ("Attempt to cancel unassigned operation (%u)", tag);
-	else if (! e_book_cancel_op (book, tag))
-		g_warning ("Attempt to cancel unknown operation (%u)", tag); 
-}
-
-/**
- * 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 = GNOME_Evolution_Addressbook_Book_getName (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;
-	book->priv->op_tag     = 1;
-	book->priv->uri        = NULL;
-}
-
-static void
-e_book_destroy (GtkObject *object)
-{
-	EBook             *book = E_BOOK (object);
-	CORBA_Environment  ev;
-	GList *l;
-
-	if (book->priv->load_state == URILoaded)
-		e_book_unload_uri (book);
-
-	CORBA_exception_init (&ev);
-
-	for (l = book->priv->book_factories; l; l = l->next) {
-		CORBA_Object_release ((CORBA_Object)l->data, &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->uri);
-
-	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);
-
-	e_book_signals [WRITABLE_STATUS] =
-		gtk_signal_new ("writable_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookClass, writable_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 1403a23f60..0000000000
--- a/addressbook/backend/ebook/e-book.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, 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);
-	void (* writable_status) (EBook *book, gboolean writable);
-};
-
-/* 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 (*EBookCardCallback)     (EBook *book, EBookStatus status, ECard *card, 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);
-typedef void (*EBookFieldsCallback)   (EBook *book, EBookStatus status, EList *fields, 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);
-
-const char *e_book_get_uri                (EBook                 *book);
-
-char     *e_book_get_static_capabilities  (EBook                 *book);
-
-guint     e_book_get_supported_fields     (EBook                 *book,
-					   EBookFieldsCallback    cb,
-					   gpointer               closure);
-
-
-/* User authentication. */
-void      e_book_authenticate_user        (EBook                 *book,
-					   const char            *user,
-					   const char            *passwd,
-					   const char            *auth_method,
-					   EBookCallback         cb,
-					   gpointer              closure);
-
-/* Fetching cards. */
-guint     e_book_get_card                 (EBook                 *book,
-					   const char            *id,
-					   EBookCardCallback      cb,
-					   gpointer               closure);
-
-/* 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);
-guint     e_book_get_cursor               (EBook                 *book,
-					   char                  *query,
-					   EBookCursorCallback    cb,
-					   gpointer               closure);
-
-guint     e_book_get_book_view            (EBook                 *book,
-					   const gchar           *query,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-guint     e_book_get_changes              (EBook                 *book,
-					   char                  *changeid,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-/* Cancel a pending operation. */
-void      e_book_cancel                   (EBook                 *book,
-					   guint                  tag);
-
-
-/* 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-compare.c b/addressbook/backend/ebook/e-card-compare.c
deleted file mode 100644
index a022c4e394..0000000000
--- a/addressbook/backend/ebook/e-card-compare.c
+++ /dev/null
@@ -1,704 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-card-compare.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <gal/unicode/gunicode.h>
-#include "e-book-util.h"
-#include "e-card-compare.h"
-
-/* This is an "optimistic" combiner: the best of the two outcomes is
-   selected. */
-static ECardMatchType
-combine_comparisons (ECardMatchType prev,
-		     ECardMatchType new_info)
-{
-	if (new_info == E_CARD_MATCH_NOT_APPLICABLE)
-		return prev;
-	return (ECardMatchType) MAX ((gint) prev, (gint) new_info);
-}
-
-
-/*** Name comparisons ***/
-
-/* This *so* doesn't belong here... at least not implemented in a
-   sucky way like this.  But it can be fixed later. */
-
-/* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
-	{ "jon", "john" },   /* Ah, the hacker's perogative */
-	{ "joseph", "joe" },
-	{ "robert", "bob" },
-	{ "gene", "jean" },
-	{ "jesse", "jessie" },
-	{ "ian", "iain" },
-	{ "richard", "dick" },
-	{ "william", "bill" },
-	{ "william", "will" },
-	{ "anthony", "tony" },
-	{ "michael", "mike" },
-	{ "eric", "erik" },
-	{ "elizabeth", "liz" },
-	{ "jeff", "geoff" },
-	{ "jeff", "geoffrey" },
-	{ "tom", "thomas" },
-	{ "dave", "david" },
-	{ "jim", "james" },
-	{ "abigal", "abby" },
-	{ "amanda", "amy" },
-	{ "amanda", "manda" },
-	{ "jennifer", "jenny" },
-	{ "christopher", "chris" },
-	{ "rebecca", "becca" },
-	{ "rebecca", "becky" },
-	{ "anderson", "andersen" },
-	{ "johnson", "johnsen" },
-	/* We could go on and on... */
-	/* We should add soundex here. */
-	{ NULL, NULL }
-};
-	
-static gboolean
-name_fragment_match (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint len;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	/* If we are in 'strict' mode, b must match the beginning of a.
-	   So "Robert", "Rob" would match, but "Robert", "Robbie" wouldn't.
-
-	   If strict is FALSE, it is sufficient for the strings to share
-	   some leading characters.  In this case, "Robert" and "Robbie"
-	   would match, as would "Dave" and "Dan". */
-	
-	if (strict) {
-		len = g_utf8_strlen (b, -1);
-	} else {
-		len = MIN (g_utf8_strlen (a, -1), g_utf8_strlen (b, -1));
-	}
-
-	return !g_utf8_strncasecmp (a, b, len);
-}
-
-static gboolean
-name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint i;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	if (name_fragment_match (a, b, strict))
-		return TRUE;
-
-	/* Check for nicknames.  Yes, the linear search blows. */
-	for (i=0; name_synonyms[i][0]; ++i) {
-
-		if (!g_utf8_strcasecmp (name_synonyms[i][0], a)
-		    && !g_utf8_strcasecmp (name_synonyms[i][1], b))
-			return TRUE;
-		
-		if (!g_utf8_strcasecmp (name_synonyms[i][0], b)
-		    && !g_utf8_strcasecmp (name_synonyms[i][1], a))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-ECardMatchType
-e_card_compare_name_to_string (ECard *card, const gchar *str)
-{
-	return e_card_compare_name_to_string_full (card, str, FALSE, NULL, NULL, NULL);
-}
-
-ECardMatchType
-e_card_compare_name_to_string_full (ECard *card, const gchar *str, gboolean allow_partial_matches,
-				    gint *matched_parts_out, ECardMatchPart *first_matched_part_out, gint *matched_character_count_out)
-{
-	gchar **namev, **givenv = NULL, **addv = NULL, **familyv = NULL;
-
-	gint matched_parts = E_CARD_MATCH_PART_NONE;
-	ECardMatchPart first_matched_part = E_CARD_MATCH_PART_NONE;
-	ECardMatchPart this_part_match = E_CARD_MATCH_PART_NOT_APPLICABLE;
-	ECardMatchType match_type;
-
-	gint match_count = 0, matched_character_count = 0, fragment_count;
-	gint i, j;
-	gchar *str_cpy, *s;
-
-	g_return_val_if_fail (E_IS_CARD (card), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card->name != NULL, E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (str != NULL, E_CARD_MATCH_NOT_APPLICABLE);
-
-	str_cpy = s = g_strdup (str);
-	while (*s) {
-		if (*s == ',' || *s == '"')
-			*s = ' ';
-		++s;
-	}
-	namev   = g_strsplit (str_cpy, " ", 0);
-	g_free (str_cpy);
-
-	if (card->name->given)
-		givenv = g_strsplit (card->name->given, " ", 0);
-	if (card->name->additional)
-		addv = g_strsplit (card->name->additional, " ", 0);
-	if (card->name->family)
-		familyv = g_strsplit (card->name->family, " ", 0);
-
-	fragment_count = 0;
-	for (i = 0; givenv && givenv[i]; ++i)
-		++fragment_count;
-	for (i = 0; addv && addv[i]; ++i)
-		++fragment_count;
-	for (i = 0; familyv && familyv[i]; ++i)
-		++fragment_count;
-	
-	for (i = 0; namev[i] && this_part_match != E_CARD_MATCH_PART_NONE; ++i) {
-
-		if (*namev[i]) {
-
-			this_part_match = E_CARD_MATCH_PART_NONE;
-
-			/* When we are allowing partials, we are strict about the matches we allow.
-			   Does this make sense?  Not really, but it does the right thing for the purposes
-			   of completion. */
-
-			if (givenv && this_part_match == E_CARD_MATCH_PART_NONE) {
-				for (j = 0; givenv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (givenv[j], namev[i], allow_partial_matches)) {
-
-						this_part_match = E_CARD_MATCH_PART_GIVEN_NAME;
-
-						/* We remove a piece of a name once it has been matched against, so
-						   that "john john" won't match "john doe". */
-						g_free (givenv[j]);
-						givenv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (addv && this_part_match == E_CARD_MATCH_PART_NONE) {
-				for (j = 0; addv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (addv[j], namev[i], allow_partial_matches)) {
-						
-						this_part_match = E_CARD_MATCH_PART_ADDITIONAL_NAME;
-
-						g_free (addv[j]);
-						addv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (familyv && this_part_match == E_CARD_MATCH_PART_NONE) {
-				for (j = 0; familyv[j]; ++j) {
-					if (allow_partial_matches ? name_fragment_match_with_synonyms (familyv[j], namev[i], allow_partial_matches)
-					    : !g_utf8_strcasecmp (familyv[j], namev[i])) {
-
-						this_part_match = E_CARD_MATCH_PART_FAMILY_NAME;
-
-						g_free (familyv[j]);
-						familyv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (this_part_match != E_CARD_MATCH_PART_NONE) {
-				++match_count;
-				matched_character_count += g_utf8_strlen (namev[i], -1);
-				matched_parts |= this_part_match;
-				if (first_matched_part == E_CARD_MATCH_PART_NONE)
-					first_matched_part = this_part_match;
-			}
-		}
-	}
-
-	match_type = E_CARD_MATCH_NONE;
-
-	if (this_part_match != E_CARD_MATCH_PART_NONE) {
-
-		if (match_count > 0)
-			match_type = E_CARD_MATCH_VAGUE;
-		
-		if (fragment_count == match_count) {
-
-			match_type = E_CARD_MATCH_EXACT;
-
-		} else if (fragment_count == match_count + 1) {
-
-			match_type = E_CARD_MATCH_PARTIAL;
-
-		}
-	}
-
-	if (matched_parts_out)
-		*matched_parts_out = matched_parts;
-	if (first_matched_part_out)
-		*first_matched_part_out = first_matched_part;
-	if (matched_character_count_out)
-		*matched_character_count_out = matched_character_count;
-
-	g_strfreev (namev);
-	g_strfreev (givenv);
-	g_strfreev (addv);
-	g_strfreev (familyv);
-
-	return match_type;
-}
-
-ECardMatchType
-e_card_compare_name (ECard *card1, ECard *card2)
-{
-	ECardName *a, *b;
-	gint matches=0, possible=0;
-	gboolean given_match = FALSE, additional_match = FALSE, family_match = FALSE;
-
-	g_return_val_if_fail (E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	a = card1->name;
-	b = card2->name;
-
-	if (a == NULL || b == NULL)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	if (a->given && b->given) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->given, b->given, FALSE /* both inputs are complete */)) {
-			++matches;
-			given_match = TRUE;
-		}
-	}
-
-	if (a->additional && b->additional) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->additional, b->additional, FALSE /* both inputs are complete */)) {
-			++matches;
-			additional_match = TRUE;
-		}
-	}
-
-	if (a->family && b->family) {
-		++possible;
-		/* We don't allow "loose matching" (i.e. John vs. Jon) on family names */
-		if (! g_utf8_strcasecmp (a->family, b->family)) {
-			++matches;
-			family_match = TRUE;
-		}
-	}
-
-	/* Now look at the # of matches and try to intelligently map
-	   an E_CARD_MATCH_* type to it.  Special consideration is given
-	   to family-name matches. */
-
-	if (possible == 0)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	if (possible == 1)
-		return family_match ? E_CARD_MATCH_VAGUE : E_CARD_MATCH_NONE;
-
-	if (possible == matches)
-		return family_match ? E_CARD_MATCH_EXACT : E_CARD_MATCH_PARTIAL;
-
-	if (possible == matches+1)
-		return family_match ? E_CARD_MATCH_VAGUE : E_CARD_MATCH_NONE;
-
-	return E_CARD_MATCH_NONE;
-}
-
-
-/*** Nickname Comparisons ***/
-
-ECardMatchType
-e_card_compare_nickname (ECard *card1, ECard *card2)
-{
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	return E_CARD_MATCH_NOT_APPLICABLE;
-}
-
-
-
-/*** E-mail Comparisons ***/
-
-static gboolean
-match_email_username (const gchar *addr1, const gchar *addr2)
-{
-	gint c1, c2;
-	if (addr1 == NULL || addr2 == NULL)
-		return FALSE;
-
-	while (*addr1 && *addr2 && *addr1 != '@' && *addr2 != '@') {
-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;
-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;
-		if (c1 != c2)
-			return FALSE;
-		++addr1;
-		++addr2;
-	}
-
-	return *addr1 == *addr2;
-}
-
-static gboolean
-match_email_hostname (const gchar *addr1, const gchar *addr2)
-{
-	gint c1, c2;
-	gboolean seen_at1, seen_at2;
-	if (addr1 == NULL || addr2 == NULL)
-		return FALSE;
-
-	/* Walk to the end of each string. */
-	seen_at1 = FALSE;
-	if (*addr1) {
-		while (*addr1) {
-			if (*addr1 == '@')
-				seen_at1 = TRUE;
-			++addr1;
-		}
-		--addr1;
-	}
-
-	seen_at2 = FALSE;
-	if (*addr2) {
-		while (*addr2) {
-			if (*addr2 == '@')
-				seen_at2 = TRUE;
-			++addr2;
-		}
-		--addr2;
-	}
-
-	if (!seen_at1 && !seen_at2)
-		return TRUE;
-	if (!seen_at1 || !seen_at2)
-		return FALSE;
-
-	while (*addr1 != '@' && *addr2 != '@') {
-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;
-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;
-		if (c1 != c2)
-			return FALSE;
-		--addr1;
-		--addr2;
-	}
-
-	/* This will match bob@foo.ximian.com and bob@ximian.com */
-	return *addr1 == '.' || *addr2 == '.';
-}
-
-static ECardMatchType
-compare_email_addresses (const gchar *addr1, const gchar *addr2)
-{
-	if (addr1 == NULL || addr2 == NULL)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	if (match_email_username (addr1, addr2)) 
-		return match_email_hostname (addr1, addr2) ? E_CARD_MATCH_EXACT : E_CARD_MATCH_VAGUE;
-
-	return E_CARD_MATCH_NONE;
-}
-
-ECardMatchType
-e_card_compare_email (ECard *card1, ECard *card2)
-{
-	EIterator *i1, *i2;
-	ECardMatchType match = E_CARD_MATCH_NOT_APPLICABLE;
-
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	if (card1->email == NULL || card2->email == NULL)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	i1 = e_list_get_iterator (card1->email);
-	i2 = e_list_get_iterator (card2->email);
-
-	/* Do pairwise-comparisons on all of the e-mail addresses.  If
-	   we find an exact match, there is no reason to keep
-	   checking. */
-	e_iterator_reset (i1);
-	while (e_iterator_is_valid (i1) && match != E_CARD_MATCH_EXACT) {
-		const gchar *addr1 = (const gchar *) e_iterator_get (i1);
-
-		e_iterator_reset (i2);
-		while (e_iterator_is_valid (i2) && match != E_CARD_MATCH_EXACT) {
-			const gchar *addr2 = (const gchar *) e_iterator_get (i2);
-
-			match = combine_comparisons (match, compare_email_addresses (addr1, addr2));
-			
-			e_iterator_next (i2);
-		}
-
-		e_iterator_next (i1);
-	}
-
-	gtk_object_unref (GTK_OBJECT (i1));
-	gtk_object_unref (GTK_OBJECT (i2));
-
-	return match;
-}
-
-ECardMatchType
-e_card_compare_address (ECard *card1, ECard *card2)
-{
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return E_CARD_MATCH_NOT_APPLICABLE;
-}
-
-ECardMatchType
-e_card_compare_telephone (ECard *card1, ECard *card2)
-{
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return E_CARD_MATCH_NOT_APPLICABLE;
-}
-
-ECardMatchType
-e_card_compare (ECard *card1, ECard *card2)
-{
-	ECardMatchType result;
-
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	result = E_CARD_MATCH_NONE;
-	result = combine_comparisons (result, e_card_compare_name      (card1, card2));
-	result = combine_comparisons (result, e_card_compare_nickname  (card1, card2));
-	result = combine_comparisons (result, e_card_compare_email     (card1, card2));
-	result = combine_comparisons (result, e_card_compare_address   (card1, card2));
-	result = combine_comparisons (result, e_card_compare_telephone (card1, card2));
-
-	return result;
-}
-
-typedef struct _MatchSearchInfo MatchSearchInfo;
-struct _MatchSearchInfo {
-	ECard *card;
-	GList *avoid;
-	ECardMatchQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-match_search_info_free (MatchSearchInfo *info)
-{
-	if (info) {
-		gtk_object_unref (GTK_OBJECT (info->card));
-
-		/* This should already have been deallocated, but just in case... */
-		if (info->avoid) {
-			g_list_foreach (info->avoid, (GFunc) gtk_object_unref, NULL);
-			g_list_free (info->avoid);
-			info->avoid = NULL;
-		}
-
-		g_free (info);
-	}
-}
-
-static void
-simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	ECardMatchType best_match = E_CARD_MATCH_NONE;
-	ECard *best_card = NULL;
-	GList *remaining_cards = NULL;
-	const GList *i;
-
-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) {
-		info->cb (info->card, NULL, E_CARD_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	/* remove the cards we're to avoid from the list, if they're present */
-	for (i = cards; i != NULL; i = g_list_next (i)) {
-		ECard *this_card = E_CARD (i->data);
-		GList *iterator;
-		gboolean avoid = FALSE;
-		for (iterator = info->avoid; iterator; iterator = iterator->next) {
-			if (!strcmp (e_card_get_id (iterator->data), e_card_get_id (this_card))) {
-				avoid = TRUE;
-				break;
-			}
-		}
-		if (!avoid)
-			remaining_cards = g_list_prepend (remaining_cards, this_card);
-	}
-
-	remaining_cards = g_list_reverse (remaining_cards);
-
-	for (i = remaining_cards; i != NULL; i = g_list_next (i)) {
-		ECard *this_card = E_CARD (i->data);
-		ECardMatchType this_match = e_card_compare (info->card, this_card);
-		if ((gint)this_match > (gint)best_match) {
-			best_match = this_match;
-			best_card  = this_card;
-		}
-	}
-
-	g_list_free (remaining_cards);
-
-	info->cb (info->card, best_card, best_match, info->closure);
-	match_search_info_free (info);
-}
-
-#define MAX_QUERY_PARTS 10
-static void
-use_common_book_cb (EBook *book, gpointer closure)
-{
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	ECard *card = info->card;
-	gchar *query_parts[MAX_QUERY_PARTS];
-	gint p=0;
-	gchar *query, *qj;
-	int i;
-
-	if (book == NULL) {
-		info->cb (info->card, NULL, E_CARD_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	if (card->nickname)
-		query_parts[p++] = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", card->nickname);
-
-
-	if (card->name->given && strlen (card->name->given) > 1)
-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card->name->given);
-
-	if (card->name->additional && strlen (card->name->additional) > 1)
-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card->name->additional);
-
-	if (card->name->family && strlen (card->name->family) > 1)
-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card->name->family);
-
-		
-	if (card->email) {
-		EIterator *iter = e_list_get_iterator (card->email);
-		while (e_iterator_is_valid (iter) && p < MAX_QUERY_PARTS) {
-			gchar *addr = g_strdup (e_iterator_get (iter));
-			if (addr) {
-				gchar *s = addr;
-				while (*s) {
-					if (*s == '@') {
-						*s = '\0';
-						break;
-					}
-					++s;
-				}
-				query_parts[p++] = g_strdup_printf ("(beginswith \"email\" \"%s\")", addr);
-				g_free (addr);
-			}
-			e_iterator_next (iter);
-		}
-	}
-
-	
-	
-	/* Build up our full query from the parts. */
-	query_parts[p] = NULL;
-	qj = g_strjoinv (" ", query_parts);
-	for(i = 0; query_parts[i] != NULL; i++)
-		g_free(query_parts[i]);
-	if (p > 0) {
-		query = g_strdup_printf ("(or %s)", qj);
-		g_free (qj);
-	} else {
-		query = qj;
-	}
-
-	e_book_simple_query (book, query, simple_query_cb, info);
-
-	g_free (query);
-}
-
-void
-e_card_locate_match (ECard *card, ECardMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->card = card;
-	gtk_object_ref (GTK_OBJECT (card));
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = NULL;
-
-	e_book_use_local_address_book (use_common_book_cb, info);
-}
-
-/**
- * e_card_locate_match_full:
- * @book: The book to look in.  If this is NULL, use the main local
- * addressbook.
- * @card: The card to compare to.
- * @avoid: A list of cards to not match.  These will not show up in the search.
- * @cb: The function to call.
- * @closure: The closure to add to the call.
- * 
- * Look for the best match and return it using the ECardMatchQueryCallback.
- **/
-void
-e_card_locate_match_full (EBook *book, ECard *card, GList *avoid, ECardMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->card = card;
-	gtk_object_ref (GTK_OBJECT (card));
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = g_list_copy (avoid);
-	g_list_foreach (info->avoid, (GFunc) gtk_object_ref, NULL);
-
-	if (book)
-		use_common_book_cb (book, info);
-	else
-		e_book_use_local_address_book (use_common_book_cb, info);
-}
-
diff --git a/addressbook/backend/ebook/e-card-compare.h b/addressbook/backend/ebook/e-card-compare.h
deleted file mode 100644
index 07ccb54e89..0000000000
--- a/addressbook/backend/ebook/e-card-compare.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-card-compare.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_CARD_COMPARE_H__
-#define __E_CARD_COMPARE_H__
-
-#include "e-book.h"
-#include "e-card.h"
-
-typedef enum {
-	E_CARD_MATCH_NOT_APPLICABLE = 0,
-	E_CARD_MATCH_NONE           = 1,
-	E_CARD_MATCH_VAGUE          = 2,
-	E_CARD_MATCH_PARTIAL        = 3,
-	E_CARD_MATCH_EXACT          = 4
-} ECardMatchType;
-
-typedef enum {
-	E_CARD_MATCH_PART_NOT_APPLICABLE   = -1,
-	E_CARD_MATCH_PART_NONE             = 0,
-	E_CARD_MATCH_PART_GIVEN_NAME       = 1<<0,
-	E_CARD_MATCH_PART_ADDITIONAL_NAME  = 1<<2,
-	E_CARD_MATCH_PART_FAMILY_NAME      = 1<<3
-} ECardMatchPart;
-
-typedef void (*ECardMatchQueryCallback) (ECard *card, ECard *match, ECardMatchType type, gpointer closure);
-
-ECardMatchType e_card_compare_name_to_string      (ECard *card, const gchar *str);
-
-ECardMatchType e_card_compare_name_to_string_full (ECard *card, const gchar *str,
-						   gboolean allow_partial_matches,
-						   gint *matched_parts, ECardMatchPart *first_matched_part,
-						   gint *matched_character_count);
-
-ECardMatchType e_card_compare_name      (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_nickname  (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_email     (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_address   (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_telephone (ECard *card1, ECard *card2);
-
-ECardMatchType e_card_compare           (ECard *card1, ECard *card2);
-
-void           e_card_locate_match      (ECard *card, ECardMatchQueryCallback cb, gpointer closure);
-void           e_card_locate_match_full (EBook *book, ECard *card, GList *avoid, ECardMatchQueryCallback cb, gpointer closure);
-
-
-
-#endif /* __E_CARD_COMPARE_H__ */
-
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
deleted file mode 100644
index 171f83d736..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@ximian.com.
- */
-
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include "addressbook.h"
-#include "e-card-cursor.h"
-
-struct _ECardCursorPrivate {
-	GNOME_Evolution_Addressbook_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);
-
-	GNOME_Evolution_Addressbook_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 = GNOME_Evolution_Addressbook_CardCursor_count (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 = GNOME_Evolution_Addressbook_CardCursor_getNth(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 #GNOME_Evolution_Addressbook_CardCursor
- *
- * Wraps an #GNOME_Evolution_Addressbook_CardCursor object inside the #ECardCursor
- * @cursor object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_construct (ECardCursor          *cursor,
-			 GNOME_Evolution_Addressbook_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);
-	}
-	
-	GNOME_Evolution_Addressbook_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 #GNOME_Evolution_Addressbook_CardCursor to be wrapped
- *
- * Creates a new #ECardCursor, which wraps an #GNOME_Evolution_Addressbook_CardCursor
- * object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_new (GNOME_Evolution_Addressbook_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 e042268635..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@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __E_CARD_CURSOR_H__
-#define __E_CARD_CURSOR_H__
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.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       (GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
-				      GNOME_Evolution_Addressbook_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 f82f948ebb..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 version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_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 2bf06c8cd9..0000000000
--- a/addressbook/backend/ebook/e-card-simple.c
+++ /dev/null
@@ -1,1274 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkobject.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/util/e-util.h>
-
-#include <libversit/vcc.h>
-#include "e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-
-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,
-	E_CARD_SIMPLE_INTERNAL_TYPE_BOOL,
-};
-
-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. */
-
-/* the ecard_field data below should only be used for TYPE_STRING,
-   TYPE_DATE, and TYPE_SPECIAL fields.  that is, it's only valid for
-   e-cards for those types.  it is used as a unique name for fields
-   for the get_supported functionality.  */
-static ECardSimpleFieldData field_data[] =
-{
-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",         N_("File As"),       "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",       N_("Name"),          N_("Name"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "email",           N_("Email"),         N_("Email"),    E_CARD_SIMPLE_EMAIL_ID_EMAIL,        E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone",   N_("Primary"),       N_("Prim"),     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", N_("Assistant"),     N_("Assistant"),E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone",  N_("Business"),      N_("Bus"),      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone",  N_("Callback"),      N_("Callback"), E_CARD_SIMPLE_PHONE_ID_CALLBACK,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone",   N_("Company"),       N_("Comp"),     E_CARD_SIMPLE_PHONE_ID_COMPANY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone",      N_("Home"),          N_("Home"),     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",             N_("Organization"),  N_("Org"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "business_address",N_("Business"),      N_("Bus"),      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "home_address",    N_("Home"),          N_("Home"),     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone",    N_("Mobile"),        N_("Mobile"),   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone",       N_("Car"),           N_("Car"),      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax",    N_("Business Fax"),  N_("Bus Fax"),  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax",        N_("Home Fax"),      N_("Home Fax"), E_CARD_SIMPLE_PHONE_ID_HOME_FAX,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,   "business_phone_2",N_("Business 2"),    N_("Bus 2"),    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "home_phone_2",    N_("Home 2"),        N_("Home 2"),   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn",            N_("ISDN"),          N_("ISDN"),     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone",     N_("Other"),         N_("Other"),    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,    "other_fax",       N_("Other Fax"),     N_("Other Fax"), E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager",           N_("Pager"),         N_("Pager"),    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio",           N_("Radio"),         N_("Radio"),    E_CARD_SIMPLE_PHONE_ID_RADIO,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex",           N_("Telex"),         N_("Telex"),    E_CARD_SIMPLE_PHONE_ID_TELEX,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,       "tty",             N_("TTY"),           N_("TTY"),      E_CARD_SIMPLE_PHONE_ID_TTYTDD,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "other_address",   N_("Other"),         N_("Other"),    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "email_2",         N_("Email 2"),       N_("Email 2"),  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "email_3",         N_("Email 3"),       N_("Email 3"),  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_URL,                "url",             N_("Web Site"),      N_("Url"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",        N_("Department"),    N_("Dep"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",          N_("Office"),        N_("Off"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",           N_("Title"),         N_("Title"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",            N_("Profession"),    N_("Prof"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",         N_("Manager"),       N_("Man"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",       N_("Assistant"),     N_("Ass"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",        N_("Nickname"),      N_("Nick"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",          N_("Spouse"),        N_("Spouse"),   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",            N_("Note"),          N_("Note"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
- 	{ E_CARD_SIMPLE_FIELD_CALURI,             "caluri",          N_("Calendar URI"),  N_("CALUri"),   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",           N_("Free-busy URL"), N_("FBUrl"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary",     N_("Anniversary"),   N_("Anniv"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",      N_("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 },
-	{ E_CARD_SIMPLE_FIELD_CATEGORIES,         "categories",      N_("Categories"),    N_("Categories"), 0,                                 E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name",     N_("Family Name"),   N_("Family Name"), 0,                                E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_GIVEN_NAME,         "given_name",      "Given Name",    "Given Name",  0,                                E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME,    "additional_name",  "Additional Name", "Additional Name",  0,                        E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_NAME_SUFFIX,        "name_suffix",     "Name Suffix",   "Name Suffix",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_WANTS_HTML,         "wants_html",      "Wants HTML",    "Wants HTML",   0,                               E_CARD_SIMPLE_INTERNAL_TYPE_BOOL },
- 	{ E_CARD_SIMPLE_FIELD_IS_LIST,            "list",            "Is List",       "Is List",      0,                               E_CARD_SIMPLE_INTERNAL_TYPE_BOOL },
-};
-static int field_data_count = sizeof (field_data) / sizeof (field_data[0]);
-
-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[] = {
-	E_CARD_PHONE_ASSISTANT, /* 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, */
-	E_CARD_PHONE_CALLBACK, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	E_CARD_PHONE_CAR, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */
-	E_CARD_PHONE_WORK, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */
-	E_CARD_PHONE_HOME, /* 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_SIMPLE_PHONE_ID_MOBILE,	   */
-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */
-	E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	E_CARD_PHONE_PAGER, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */
-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */
-	E_CARD_PHONE_RADIO, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	E_CARD_PHONE_TELEX, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	E_CARD_PHONE_TTYTDD, /* E_CARD_SIMPLE_PHONE_ID_TTYTDD,	   */
-};
-
-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_TTYTDD,	   */
-};
-
-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_TTYTDD,	   */
-};
-
-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)
-{
-	ECard *card = simple->card ? e_card_duplicate (simple->card) : e_card_new ("");
-	ECardSimple *new_simple = e_card_simple_new(card);
-	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.
- */
-const 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("");
-}
-
-/**
- * e_card_simple_get_vcard_assume_utf8:
- * @simple: an #ECardSimple
- *
- * Returns: a string in vcard format, which is wrapped by the @simple.
- */
-char *
-e_card_simple_get_vcard_assume_utf8 (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_vcard_assume_utf8(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++)
-		e_card_phone_unref (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++)
-		e_card_address_label_unref(simple->address[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_delivery_address_unref(simple->delivery[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);
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) simple->card;
-		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;
-
-	simple->changed = TRUE;
-}
-
-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_unref(simple->phone[i]);
-			simple->phone[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			gboolean found = FALSE;
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_ref(phone);
-					found = TRUE;
-					break;
-				}
-			}
-			if (found)
-				continue;
-			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_ref(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_unref(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_ref(address);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_delivery_address_unref(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_ref(delivery);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		e_card_free_empty_lists (card);
-	}
-}
-
-void
-e_card_simple_sync_card(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card && simple->changed) {
-		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;
-
-		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); e_iterator_next(iterator) ) {
-			int i;
-			gboolean found = FALSE;
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (phone->flags == 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);
-						}
-						e_card_phone_unref(simple->phone[i]);
-						simple->phone[i] = NULL;
-						found = TRUE;
-						break;
-					}
-				}
-			}
-			if (found)
-				continue;
-			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);
-						}
-						e_card_phone_unref(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_unref(simple->phone[i]);
-				simple->phone[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {
-			int i;
-			email = e_iterator_get(iterator);
-			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);
-					}
-					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); e_iterator_next(iterator) ) {
-			int i;
-			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]) {
-					if (simple->address[i]) {
-						simple->address[i]->flags &= ~E_CARD_ADDR_MASK;
-						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);
-						}
-						e_card_address_label_unref(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 &= ~E_CARD_ADDR_MASK;
-				simple->address[i]->flags |= addr_correspondences[i];
-				e_list_append(address_list, simple->address[i]);
-				e_card_address_label_unref(simple->address[i]);
-				simple->address[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {
-			int i;
-			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]) {
-					if (simple->delivery[i]) {
-						simple->delivery[i]->flags &= ~E_CARD_ADDR_MASK;
-						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);
-						}
-						e_card_delivery_address_unref(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 &= ~E_CARD_ADDR_MASK;
-				simple->delivery[i]->flags |= addr_correspondences[i];
-				e_list_append(delivery_list, simple->delivery[i]);
-				e_card_delivery_address_unref(simple->delivery[i]);
-				simple->delivery[i] = NULL;
-			}
-		}
-		fill_in_info(simple);
-		e_card_free_empty_lists (card);
-	}
-
-	simple->changed = FALSE;
-}
-
-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)
-{
-	e_card_phone_unref(simple->phone[id]);
-	simple->phone[id] = e_card_phone_ref(phone);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_email   (ECardSimple          *simple,
-					   ECardSimpleEmailId    id,
-					   const char                 *email)
-{
-	g_free(simple->email[id]);
-	simple->email[id] = g_strdup(email);
-	simple->changed = TRUE;
-}
-
-void
-e_card_simple_set_address (ECardSimple *simple, ECardSimpleAddressId id, const ECardAddrLabel *address)
-{
-	e_card_address_label_unref(simple->address[id]);
-	simple->address[id] = e_card_address_label_ref(address);
-	e_card_delivery_address_unref(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_from_label(simple->address[id]);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_delivery_address (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardDeliveryAddress *delivery)
-{
-	e_card_delivery_address_unref(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_ref(delivery);
-	simple->changed = TRUE;
-}
-
-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:
-		if (simple->card) {
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, &string,
-				       NULL);
-			return g_strdup(string);
-		} else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		if (simple->card) {
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, &date,
-				       NULL);
-			if (date != NULL) {
-				char buf[26];
-				struct tm then;
-				then.tm_year = date->year;
-				then.tm_mon  = date->month - 1;
-				then.tm_mday = date->day;
-				then.tm_hour = 12;
-				then.tm_min  = 0;
-				then.tm_sec  = 0;
-				e_strftime_fix_am_pm (buf, 26, _("%x"), &then);
-				return g_strdup (buf);
-			} else {
-				return NULL;
-			}
-		} else
-			return NULL;
-	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_BOOL:
-		if (simple->card) {
-			gboolean boole;
-			gtk_object_get (GTK_OBJECT (simple->card),
-					field_data[field].ecard_field, &boole,
-					NULL);
-			if (boole)
-				return "true";
-			else
-				return NULL;
-		} else {
-			return NULL;
-		}
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
-			if (simple->card) {
-				gtk_object_get(GTK_OBJECT(simple->card),
-					       "file_as", &string,
-					       NULL);
-				if (string && *string)
-					return g_strdup(string);
-				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);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->family);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_GIVEN_NAME:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->given);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->additional);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_NAME_SUFFIX:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->suffix);
-			} else
-				return NULL;
-		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 *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-	ECardName *name = NULL;
-	int i;
-	int style;
-	style = 0;
-	if (!company)
-		company = g_strdup("");
-	if (filestring) {
-		gtk_object_get (GTK_OBJECT (simple->card),
-				"name", &name,
-				NULL);
-		
-		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(company);
-	
-	return style;
-}
-
-static void
-file_as_set_style(ECardSimple *simple, int style)
-{
-	if (style != -1) {
-		char *string;
-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-		ECardName *name;
-
-		if (!company)
-			company = g_strdup("");
-		gtk_object_get (GTK_OBJECT (simple->card),
-				"name", &name,
-				NULL);
-		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(company);
-	}
-}
-
-void            e_card_simple_set            (ECardSimple          *simple,
-					      ECardSimpleField      field,
-					      const char           *data)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	ECardAddrLabel *address;
-	ECardPhone *phone;
-	int style;
-	simple->changed = TRUE;
-	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 = g_strdup (data);
-			e_card_simple_set_address(simple,
-						  field_data[field].list_type_index,
-						  address);
-			e_card_address_label_unref(address);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-			phone = e_card_phone_new();
-			phone->number = g_strdup (data);
-			e_card_simple_set_phone(simple,
-						field_data[field].list_type_index,
-						phone);
-			e_card_phone_unref(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;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:
-			if (simple->card) {
-				gboolean boole = TRUE;
-				if (data == NULL)
-					boole = FALSE;
-				else if (!strcasecmp (data, "false"))
-					boole = FALSE;
-				gtk_object_set (GTK_OBJECT (simple->card),
-						field_data[field].ecard_field, boole,
-						NULL);
-			}
-			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_BOOL:
-		return E_CARD_SIMPLE_TYPE_BOOL;
-
-	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_ecard_field (ECardSimple         *simple,
-					       ECardSimpleField     field)
-{
-	return field_data[field].ecard_field;
-}
-
-const char     *e_card_simple_get_name       (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return U_(field_data[field].name);
-}
-
-gboolean
-e_card_simple_get_allow_newlines (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_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-	default:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NOTE:
-			return TRUE;
-		default:
-			return FALSE;
-		}
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-		return TRUE;
-	}
-}
-
-const char     *e_card_simple_get_short_name (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return U_(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);
-		}
-		e_card_free_empty_lists (simple->card);
-	}
-}
-
-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;
-		}
-		e_card_free_empty_lists (simple->card);
-	}
-	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;
-
-		simple->changed = TRUE;
-		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_unref(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_unref(new_arb);
-	}
-}
-
-void
-e_card_simple_set_name (ECardSimple *simple, ECardName *name)
-{
-	int style;
-	style = file_as_get_style(simple);
-	gtk_object_set (GTK_OBJECT (simple->card),
-			"name", name,
-			NULL);
-	file_as_set_style(simple, style);
-}
-
-/* These map between the individual list types and ECardSimpleField */
-ECardSimpleField
-e_card_simple_map_phone_to_field (ECardSimplePhoneId phone_id)
-{
-	int i;
-
-	g_return_val_if_fail (phone_id < E_CARD_SIMPLE_PHONE_ID_LAST, 0);
-
-	for (i = 0; i < field_data_count; i ++)
-		if (field_data[i].list_type_index == phone_id
-		    && field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_PHONE)
-			return i;
-
-	g_warning ("couldn't find phone id %d, returning 0 (which is almost assuredly incorrect)\n", phone_id);
-
-	return 0;
-}
-
-ECardSimpleField
-e_card_simple_map_email_to_field (ECardSimpleEmailId email_id)
-{
-	int i;
-
-	g_return_val_if_fail (email_id < E_CARD_SIMPLE_EMAIL_ID_LAST, 0);
-
-	for (i = 0; i < field_data_count; i ++)
-		if (field_data[i].list_type_index == email_id
-		    && field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL)
-			return i;
-
-	g_warning ("couldn't find email id %d, returning 0 (which is almost assuredly incorrect)\n", email_id);
-	return 0;
-}
-
-ECardSimpleField
-e_card_simple_map_address_to_field (ECardSimpleAddressId address_id)
-{
-	int i;
-
-	g_return_val_if_fail (address_id < E_CARD_SIMPLE_ADDRESS_ID_LAST, 0);
-
-	for (i = 0; i < field_data_count; i ++)
-		if (field_data[i].list_type_index == address_id
-		    && field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS)
-			return i;
-
-	g_warning ("couldn't find address id %d, returning 0 (which is almost assuredly incorrect)\n", address_id);
-	return 0;
-}
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
deleted file mode 100644
index f0a5b2d613..0000000000
--- a/addressbook/backend/ebook/e-card-simple.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, 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_TTYTDD,
-	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,
-	E_CARD_SIMPLE_TYPE_BOOL,
-};
-
-enum _ECardSimpleField {
-	E_CARD_SIMPLE_FIELD_FILE_AS,
-        E_CARD_SIMPLE_FIELD_FULL_NAME,
-        E_CARD_SIMPLE_FIELD_EMAIL,
-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-        E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,
-        E_CARD_SIMPLE_FIELD_PHONE_COMPANY,
-        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_OTHER_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-        E_CARD_SIMPLE_FIELD_PHONE_RADIO,
-        E_CARD_SIMPLE_FIELD_PHONE_TELEX,
-        E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,
-        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_CALURI,
-        E_CARD_SIMPLE_FIELD_FBURL,
-	/* If you add after FBURL, make sure to move LAST_SIMPLE_STRING */
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING = 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_CATEGORIES,
-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,
-        E_CARD_SIMPLE_FIELD_GIVEN_NAME,
-        E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME,
-        E_CARD_SIMPLE_FIELD_NAME_SUFFIX,
-	E_CARD_SIMPLE_FIELD_WANTS_HTML,
-	E_CARD_SIMPLE_FIELD_IS_LIST,
-        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];
-
-	gboolean changed;
-};
-
-struct _ECardSimpleClass {
-	GtkObjectClass parent_class;
-};
-
-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
-ECardSimple                *e_card_simple_new                    (ECard                        *card);
-const 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);
-char                       *e_card_simple_get_vcard_assume_utf8  (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_ecard_field        (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);
-gboolean                    e_card_simple_get_allow_newlines     (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_set_name               (ECardSimple                  *simple,
-								  ECardName                    *name);
-void                        e_card_simple_sync_card              (ECardSimple                  *simple);
-
-/* These map between the individual list types and ECardSimpleField */
-ECardSimpleField            e_card_simple_map_phone_to_field     (ECardSimplePhoneId            phone_id);
-ECardSimpleField            e_card_simple_map_email_to_field     (ECardSimpleEmailId            email_id);
-ECardSimpleField            e_card_simple_map_address_to_field   (ECardSimpleAddressId          address_id);
-
-/* 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 8d35c54924..0000000000
--- a/addressbook/backend/ebook/e-card-types.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Arturo Espinosa
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_TYPES_H__
-#define __E_CARD_TYPES_H__
-
-/* IDENTIFICATION PROPERTIES */
-
-typedef struct {
-	gint  ref_count;
-	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,
-	E_CARD_PHONE_ASSISTANT = 1 << 13,
-	E_CARD_PHONE_CALLBACK  = 1 << 14,
-	E_CARD_PHONE_RADIO     = 1 << 15,
-	E_CARD_PHONE_TELEX     = 1 << 16,
-	E_CARD_PHONE_TTYTDD    = 1 << 17,
-} ECardPhoneFlags;
-
-typedef struct {
-	gint ref_count;
-	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_MASK    = 7,
-	E_CARD_ADDR_PARCEL  = 1 << 3, 
-	E_CARD_ADDR_DOM     = 1 << 4,
-	E_CARD_ADDR_INTL    = 1 << 5, 
-	E_CARD_ADDR_DEFAULT = 1 << 6
-} ECardAddressFlags;
-
-typedef struct {
-	gint ref_count;
-	ECardAddressFlags  flags;
-
-	char     	  *po;
-	char     	  *ext;
-	char     	  *street;
-	char     	  *city;
-	char     	  *region;
-	char     	  *code;
-	char     	  *country;
-} ECardDeliveryAddress;
-
-typedef struct {
-	gint ref_count;
-	ECardAddressFlags  flags;
-	char              *data;
-} ECardAddrLabel;
-
-/* ARBITRARY PROPERTIES */
-
-typedef struct {
-	gint ref_count;
-	char *key;
-	char *type;
-	char *value;
-} ECardArbitrary;
-
-#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 4fd0bb623d..0000000000
--- a/addressbook/backend/ebook/e-card.c
+++ /dev/null
@@ -1,2857 +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@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-
-#include "e-card.h"
-
-#include <gal/util/e-i18n.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-
-#include <gtk/gtkobject.h>
-#include <bonobo/bonobo-object-client.h>
-#include <gal/util/e-util.h>
-
-#include <libversit/vcc.h>
-#include "e-util/ename/e-name-western.h"
-#include "e-util/ename/e-address-western.h"
-#include "e-book.h"
-#include "e-destination.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_WANTS_HTML "X-MOZILLA-HTML"
-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"
-#define XEV_LIST "X-EVOLUTION-LIST"
-#define XEV_LIST_SHOW_ADDRESSES "X-EVOLUTION-LIST-SHOW_ADDRESSES"
-#define XEV_RELATED_CONTACTS "X-EVOLUTION-RELATED_CONTACTS"
-
-/* 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_CALURI,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_RELATED_CONTACTS,
-	ARG_CATEGORIES,
-	ARG_CATEGORY_LIST,
-	ARG_WANTS_HTML,
-	ARG_WANTS_HTML_SET,
-	ARG_EVOLUTION_LIST,
-	ARG_EVOLUTION_LIST_SHOW_ADDRESSES,
-	ARG_ARBITRARY,
-	ARG_ID,
-	ARG_LAST_USE,
-	ARG_USE_SCORE,
-};
-
-static void parse(ECard *card, VObject *vobj, char *default_charset);
-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 *default_charset, char **string);
-
-char *e_v_object_get_child_value(VObject *vobj, char *name, char *default_charset);
-
-static void parse_bday(ECard *card, VObject *object, char *default_charset);
-static void parse_full_name(ECard *card, VObject *object, char *default_charset);
-static void parse_file_as(ECard *card, VObject *object, char *default_charset);
-static void parse_name(ECard *card, VObject *object, char *default_charset);
-static void parse_email(ECard *card, VObject *object, char *default_charset);
-static void parse_phone(ECard *card, VObject *object, char *default_charset);
-static void parse_address(ECard *card, VObject *object, char *default_charset);
-static void parse_address_label(ECard *card, VObject *object, char *default_charset);
-static void parse_url(ECard *card, VObject *object, char *default_charset);
-static void parse_org(ECard *card, VObject *object, char *default_charset);
-static void parse_office(ECard *card, VObject *object, char *default_charset);
-static void parse_title(ECard *card, VObject *object, char *default_charset);
-static void parse_role(ECard *card, VObject *object, char *default_charset);
-static void parse_manager(ECard *card, VObject *object, char *default_charset);
-static void parse_assistant(ECard *card, VObject *object, char *default_charset);
-static void parse_nickname(ECard *card, VObject *object, char *default_charset);
-static void parse_spouse(ECard *card, VObject *object, char *default_charset);
-static void parse_anniversary(ECard *card, VObject *object, char *default_charset);
-static void parse_mailer(ECard *card, VObject *object, char *default_charset);
-static void parse_caluri(ECard *card, VObject *object, char *default_charset);
-static void parse_fburl(ECard *card, VObject *object, char *default_charset);
-static void parse_note(ECard *card, VObject *object, char *default_charset);
-static void parse_related_contacts(ECard *card, VObject *object, char *default_charset);
-static void parse_categories(ECard *card, VObject *object, char *default_charset);
-static void parse_wants_html(ECard *card, VObject *object, char *default_charset);
-static void parse_list(ECard *card, VObject *object, char *default_charset);
-static void parse_list_show_addresses(ECard *card, VObject *object, char *default_charset);
-static void parse_arbitrary(ECard *card, VObject *object, char *default_charset);
-static void parse_id(ECard *card, VObject *object, char *default_charset);
-static void parse_last_use(ECard *card, VObject *object, char *default_charset);
-static void parse_use_score(ECard *card, VObject *object, char *default_charset);
-
-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, char *default_charset);
-
-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 },
-	{ "CALURI",                  parse_caluri },
-	{ "FBURL",                   parse_fburl },
-	{ VCNoteProp,                parse_note },
-	{ XEV_RELATED_CONTACTS,      parse_related_contacts },
-	{ "CATEGORIES",              parse_categories },
-	{ XEV_WANTS_HTML,            parse_wants_html },
-	{ XEV_ARBITRARY,             parse_arbitrary },
-	{ VCUniqueStringProp,        parse_id },
-	{ "X-EVOLUTION-LAST-USE",    parse_last_use },
-	{ "X-EVOLUTION-USE-SCORE",   parse_use_score },
-	{ XEV_LIST,                  parse_list },
-	{ XEV_LIST_SHOW_ADDRESSES,   parse_list_show_addresses },
-	{ 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;
-}
-
-ECard *
-e_card_new_with_default_charset (char *vcard, char *default_charset)
-{
-	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, default_charset);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-	}
-	if (card->name == NULL)
-		card->name = e_card_name_new();
-	if (card->file_as == NULL)
-		card->file_as = g_strdup("");
-	if (card->fname == NULL)
-		card->fname = g_strdup("");
-	return card;
-}
-
-/**
- * e_card_new:
- * @vcard: a string in vCard format
- *
- * Returns: a new #ECard that wraps the @vcard.
- */
-ECard *
-e_card_new (char *vcard)
-{
-	return e_card_new_with_default_charset (vcard, "UTF-8");
-}
-
-ECard *
-e_card_duplicate(ECard *card)
-{
-	char *vcard = e_card_get_vcard_assume_utf8(card);
-	ECard *new_card = e_card_new(vcard);
-	g_free (vcard);
-	
-	if (card->book) {
-		new_card->book = card->book;
-		gtk_object_ref (GTK_OBJECT (new_card->book));
-	}
-
-	return new_card;
-}
-
-static void
-e_card_get_today (GDate *dt)
-{
-	time_t now;
-	struct tm *now_tm;
-	if (dt == NULL)
-		return;
-	
-	time (&now);
-	now_tm = localtime (&now);
-
-	g_date_set_dmy (dt, now_tm->tm_mday, now_tm->tm_mon + 1, now_tm->tm_year + 1900);
-}
-
-float
-e_card_get_use_score(ECard *card)
-{
-	GDate today, last_use;
-	gint days_since_last_use;
-
-	g_return_val_if_fail (card != NULL && E_IS_CARD (card), 0);
-
-	if (card->last_use == NULL)
-		return 0.0;
-
-	e_card_get_today (&today);
-	g_date_set_dmy (&last_use, card->last_use->day, card->last_use->month, card->last_use->year);
-
-	days_since_last_use = g_date_julian (&today) - g_date_julian (&last_use);
-	
-	/* Apply a seven-day "grace period" to the use score decay. */
-	days_since_last_use -= 7;
-	if (days_since_last_use < 0)
-		days_since_last_use = 0;
-
-	return MAX (card->raw_use_score, 0) * exp (- days_since_last_use / 30.0);
-}
-
-void
-e_card_touch(ECard *card)
-{
-	GDate today;
-	double use_score;
-
-	g_return_if_fail (card != NULL && E_IS_CARD (card));
-
-	e_card_get_today (&today);
-	use_score = e_card_get_use_score (card);
-
-	if (card->last_use == NULL)
-		card->last_use = g_new (ECardDate, 1);
-
-	card->last_use->day   = g_date_day (&today);
-	card->last_use->month = g_date_month (&today);
-	card->last_use->year  = g_date_year (&today);
-
-	card->raw_use_score   = use_score + 1.0;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- *
- * Returns: a string representing the id of the card, which is unique
- * within its book.
- */
-const char *
-e_card_get_id (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), NULL);
-
-	return card->id ? 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)
-{
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	if ( card->id )
-		g_free(card->id);
-	card->id = g_strdup(id ? id : "");
-}
-
-EBook *
-e_card_get_book (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), NULL);
-
-	return card->book;
-}
-
-void
-e_card_set_book (ECard *card, EBook *book)
-{
-	g_return_if_fail (card && E_IS_CARD (card));
-	
-	if (card->book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	card->book = book;
-	if (card->book)
-		gtk_object_ref (GTK_OBJECT (card->book));
-}
-
-gchar *
-e_card_date_to_string (ECardDate *dt)
-{
-	if (dt) 
-		return g_strdup_printf ("%04d-%02d-%02d",
-					CLAMP(dt->year, 1000, 9999),
-					CLAMP(dt->month, 1, 12),
-					CLAMP(dt->day, 1, 31));
-	else
-		return NULL;
-}
-
-static VObject *
-addPropValueUTF8(VObject *o, const char *p, const char *v)
-{
-	VObject *prop = addPropValue (o, p, v);
-	for (; *v; v++) {
-		if ((*v) & 0x80) {
-			addPropValue (prop, "CHARSET", "UTF-8");
-			for (; *v; v++) {
-				if (*v == '\n') {
-					addProp(prop, VCQuotedPrintableProp);
-					return prop;
-				}
-			}
-			return prop;
-		}
-		if (*v == '\n') {
-			addProp(prop, VCQuotedPrintableProp);
-			for (; *v; v++) {
-				if ((*v) & 0x80) {
-					addPropValue (prop, "CHARSET", "UTF-8");
-					return prop;
-				}
-			}
-			return prop;
-		}
-	}
-	return prop;
-}
-
-static VObject *
-addPropValueQP(VObject *o, const char *p, const char *v)
-{
-	VObject *prop = addPropValue (o, p, v);
-	for (; *v; v++) {
-		if (*v == '\n') {
-			addProp(prop, VCQuotedPrintableProp);
-			break;
-		}
-	}
-	return prop;
-}
-
-static void
-addPropValueSets (VObject *o, const char *p, const char *v, gboolean assumeUTF8, gboolean *is_ascii, gboolean *has_return)
-{
-	addPropValue (o, p, v);
-	if (*has_return && (assumeUTF8 || !*is_ascii))
-		return;
-	if (*has_return) {
-		for (; *v; v++) {
-			if (*v & 0x80) {
-				*is_ascii = FALSE;
-				return;
-			}
-		}
-		return;
-	}
-	if (assumeUTF8 || !*is_ascii) {
-		for (; *v; v++) {
-			if (*v == '\n') {
-				*has_return = TRUE;
-				return;
-			}
-		}
-		return;
-	}
-	for (; *v; v++) {
-		if (*v & 0x80) {
-			*is_ascii = FALSE;
-			for (; *v; v++) {
-				if (*v == '\n') {
-					*has_return = TRUE;
-					return;
-				}
-			}
-			return;
-		}
-		if (*v == '\n') {
-			*has_return = TRUE;
-			for (; *v; v++) {
-				if (*v & 0x80) {
-					*is_ascii = FALSE;
-					return;
-				}
-			}
-			return;
-		}
-	}
-	return;
-}
-
-#define ADD_PROP_VALUE(o, p, v)              (assumeUTF8 ? (addPropValueQP ((o), (p), (v))) : addPropValueUTF8 ((o), (p), (v)))
-#define ADD_PROP_VALUE_SET_IS_ASCII(o, p, v) (addPropValueSets ((o), (p), (v), assumeUTF8, &is_ascii, &has_return))
-
-
-static VObject *
-e_card_get_vobject (const ECard *card, gboolean assumeUTF8)
-{
-	VObject *vobj;
-	
-	vobj = newVObject (VCCardProp);
-
-	if (card->file_as && *card->file_as)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-FILE-AS", card->file_as);
-	else if (card->file_as)
-		addProp(vobj, "X-EVOLUTION-FILE_AS");
-
-	if (card->fname && *card->fname)
-		ADD_PROP_VALUE(vobj, VCFullNameProp, card->fname);
-	else if (card->fname)
-		addProp(vobj, VCFullNameProp);
-
-	if ( card->name && (card->name->prefix || card->name->given || card->name->additional || card->name->family || card->name->suffix) ) {
-		VObject *nameprop;
-		gboolean is_ascii = TRUE;
-		gboolean has_return = FALSE;
-		nameprop = addProp(vobj, VCNameProp);
-		if ( card->name->prefix )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCNamePrefixesProp, card->name->prefix);
-		if ( card->name->given ) 
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCGivenNameProp, card->name->given);
-		if ( card->name->additional )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCAdditionalNamesProp, card->name->additional);
-		if ( card->name->family )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCFamilyNameProp, card->name->family);
-		if ( card->name->suffix )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCNameSuffixesProp, card->name->suffix);
-		if (has_return)
-			addProp(nameprop, VCQuotedPrintableProp);
-		if (!(is_ascii || assumeUTF8))
-			addPropValue (nameprop, "CHARSET", "UTF-8");
-	}
-	else if (card->name)
-		addProp(vobj, VCNameProp);
-
-
-	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);
-			gboolean is_ascii = TRUE;
-			gboolean has_return = FALSE;
-
-			addressprop = addProp(vobj, VCAdrProp);
-			
-			set_address_flags (addressprop, address->flags);
-			if (address->po)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCPostalBoxProp, address->po);
-			if (address->ext)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCExtAddressProp, address->ext);
-			if (address->street)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCStreetAddressProp, address->street);
-			if (address->city)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCCityProp, address->city);
-			if (address->region)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCRegionProp, address->region);
-			if (address->code)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCPostalCodeProp, address->code);
-			if (address->country)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCCountryNameProp, address->country);
-
-			if (has_return)
-				addProp(addressprop, VCQuotedPrintableProp);
-			if (!(is_ascii || assumeUTF8))
-				addPropValue (addressprop, "CHARSET", "UTF-8");
-		}
-		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 = ADD_PROP_VALUE(vobj, VCDeliveryLabelProp, address_label->data);
-			else
-				labelprop = addProp(vobj, VCDeliveryLabelProp);
-			
-			set_address_flags (labelprop, address_label->flags);
-		}
-		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 = ADD_PROP_VALUE(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 = ADD_PROP_VALUE(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
-			addProp (emailprop, VCInternetProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->bday ) {
-		char *value;
-		value = e_card_date_to_string (card->bday);
-		ADD_PROP_VALUE(vobj, VCBirthDateProp, value);
-		g_free(value);
-	}
-
-	if (card->url)
-		ADD_PROP_VALUE(vobj, VCURLProp, card->url);
-
-	if (card->org || card->org_unit) {
-		VObject *orgprop;
-		gboolean is_ascii = TRUE;
-		gboolean has_return = FALSE;
-		orgprop = addProp(vobj, VCOrgProp);
-		
-		if (card->org)
-			ADD_PROP_VALUE_SET_IS_ASCII(orgprop, VCOrgNameProp, card->org);
-		if (card->org_unit)
-			ADD_PROP_VALUE_SET_IS_ASCII(orgprop, VCOrgUnitProp, card->org_unit);
-
-		if (has_return)
-			addProp(orgprop, VCQuotedPrintableProp);
-		if (!(is_ascii || assumeUTF8))
-			addPropValue (orgprop, "CHARSET", "UTF-8");
-	}
-	
-	if (card->office)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-OFFICE", card->office);
-
-	if (card->title)
-		ADD_PROP_VALUE(vobj, VCTitleProp, card->title);
-
-	if (card->role)
-		ADD_PROP_VALUE(vobj, VCBusinessRoleProp, card->role);
-	
-	if (card->manager)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-MANAGER", card->manager);
-	
-	if (card->assistant)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-ASSISTANT", card->assistant);
-	
-	if (card->nickname)
-		ADD_PROP_VALUE(vobj, "NICKNAME", card->nickname);
-
-	if (card->spouse)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-SPOUSE", card->spouse);
-
-	if ( card->anniversary ) {
-		char *value;
-		value = e_card_date_to_string (card->anniversary);
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-ANNIVERSARY", value);
-		g_free(value);
-	}
-
-	if (card->mailer) {
-		ADD_PROP_VALUE(vobj, VCMailerProp, card->mailer);
-	}
-	
-	if (card->caluri)
-		addPropValueQP(vobj, "CALURI", card->caluri);
-
-	if (card->fburl)
-		ADD_PROP_VALUE(vobj, "FBURL", card->fburl);
-	
-	if (card->note) {
-		VObject *noteprop;
-
-		noteprop = ADD_PROP_VALUE(vobj, VCNoteProp, card->note);
-	}
-
-	if (card->last_use) {
-		char *value;
-		value = e_card_date_to_string (card->last_use);
-		ADD_PROP_VALUE (vobj, "X-EVOLUTION-LAST-USE", value);
-		g_free (value);
-	}
-
-	if (card->raw_use_score > 0) {
-		char *value;
-		value = g_strdup_printf ("%f", card->raw_use_score);
-		ADD_PROP_VALUE (vobj, "X-EVOLUTION-USE-SCORE", value);
-		g_free (value);
-	}
-
-	if (card->related_contacts && *card->related_contacts) {
-		ADD_PROP_VALUE(vobj, XEV_RELATED_CONTACTS, card->related_contacts);
-	}
-
-	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;
-		}
-		ADD_PROP_VALUE (vobj, "CATEGORIES", string);
-		g_free(string);
-	}
-
-	if (card->wants_html_set) {
-		ADD_PROP_VALUE (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE");
-	}
-
-	if (card->list) {
-		ADD_PROP_VALUE (vobj, XEV_LIST, "TRUE");
-		ADD_PROP_VALUE (vobj, XEV_LIST_SHOW_ADDRESSES, card->list_show_addresses ? "TRUE" : "FALSE");
-	}
-
-	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 = ADD_PROP_VALUE (vobj, XEV_ARBITRARY, arbitrary->value);
-			} else {
-				arb_object = addProp (vobj, XEV_ARBITRARY);
-			}
-			if (arbitrary->type) {
-				ADD_PROP_VALUE (arb_object, "TYPE", arbitrary->type);
-			}
-			if (arbitrary->key) {
-				addProp (arb_object, arbitrary->key);
-			}
-		}
-	}
-
-	addPropValueQP (vobj, VCUniqueStringProp, (card->id ? card->id : ""));
-
-	return vobj;
-}
-
-/**
- * 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;
-	char *temp, *ret_val;
-
-	vobj = e_card_get_vobject (card, FALSE);
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-char *
-e_card_get_vcard_assume_utf8 (ECard *card)
-{
-	VObject *vobj;
-	char *temp, *ret_val;
-
-	vobj = e_card_get_vobject (card, TRUE);
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-/**
- * e_card_list_get_vcard:
- * @list: a list of #ECards
- *
- * Returns: a string in vCard format.
- */
-char *
-e_card_list_get_vcard (const GList *list)
-{
-	VObject *vobj;
-
-	char *temp, *ret_val;
-
-	vobj = NULL;
-
-	for (; list; list = list->next) {
-		VObject *tempvobj;
-		ECard *card = list->data;
-
-		tempvobj = e_card_get_vobject (card, FALSE);
-		addList (&vobj, tempvobj);
-	}
-	temp = writeMemVObjects(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObjects(vobj);
-	return ret_val;
-}
-
-static void
-parse_file_as(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->file_as )
-		g_free(card->file_as);
-	assign_string(vobj, default_charset, &(card->file_as));
-}
-
-static void
-parse_name(ECard *card, VObject *vobj, char *default_charset)
-{
-	e_card_name_unref(card->name);
-
-	card->name = e_card_name_new();
-
-	card->name->family     = e_v_object_get_child_value (vobj, VCFamilyNameProp,      default_charset);
-	card->name->given      = e_v_object_get_child_value (vobj, VCGivenNameProp,       default_charset);
-	card->name->additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp, default_charset);
-	card->name->prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp,    default_charset);
-	card->name->suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp,    default_charset);
-}
-
-static void
-parse_full_name(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->fname )
-		g_free(card->fname);
-	assign_string(vobj, default_charset, &(card->fname));
-}
-
-static void
-parse_email(ECard *card, VObject *vobj, char *default_charset)
-{
-	char *next_email;
-	EList *list;
-
-	assign_string(vobj, default_charset, &next_email);
-	gtk_object_get(GTK_OBJECT(card),
-		       "email", &list,
-		       NULL);
-	e_list_append(list, next_email);
-	g_free (next_email);
-}
-
-/* Deal with charset */
-static void
-parse_bday(ECard *card, VObject *vobj, char *default_charset)
-{
-	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, char *default_charset)
-{
-	ECardPhone *next_phone = e_card_phone_new ();
-	EList *list;
-
-	assign_string(vobj, default_charset, &(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_unref (next_phone);
-}
-
-static void
-parse_address(ECard *card, VObject *vobj, char *default_charset)
-{
-	ECardDeliveryAddress *next_addr = e_card_delivery_address_new ();
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	next_addr->po      = e_v_object_get_child_value (vobj, VCPostalBoxProp,     default_charset);
-	next_addr->ext     = e_v_object_get_child_value (vobj, VCExtAddressProp,    default_charset);
-	next_addr->street  = e_v_object_get_child_value (vobj, VCStreetAddressProp, default_charset);
-	next_addr->city    = e_v_object_get_child_value (vobj, VCCityProp,          default_charset);
-	next_addr->region  = e_v_object_get_child_value (vobj, VCRegionProp,        default_charset);
-	next_addr->code    = e_v_object_get_child_value (vobj, VCPostalCodeProp,    default_charset);
-	next_addr->country = e_v_object_get_child_value (vobj, VCCountryNameProp,   default_charset);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_delivery_address_unref (next_addr);
-}
-
-static void
-parse_address_label(ECard *card, VObject *vobj, char *default_charset)
-{
-	ECardAddrLabel *next_addr = e_card_address_label_new ();
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	assign_string(vobj, default_charset, &next_addr->data);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address_label", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_address_label_unref (next_addr);
-}
-
-static void
-parse_url(ECard *card, VObject *vobj, char *default_charset)
-{
-	if (card->url)
-		g_free(card->url);
-	assign_string(vobj, default_charset, &(card->url));
-}
-
-static void
-parse_org(ECard *card, VObject *vobj, char *default_charset)
-{
-	char *temp;
-	
-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp, default_charset);
-	g_free(card->org);
-	card->org = temp;
-
-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp, default_charset);
-	g_free(card->org_unit);
-	card->org_unit = temp;
-}
-
-static void
-parse_office(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->office )
-		g_free(card->office);
-	assign_string(vobj, default_charset, &(card->office));
-}
-
-static void
-parse_title(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->title )
-		g_free(card->title);
-	assign_string(vobj, default_charset, &(card->title));
-}
-
-static void
-parse_role(ECard *card, VObject *vobj, char *default_charset)
-{
-	if (card->role)
-		g_free(card->role);
-	assign_string(vobj, default_charset, &(card->role));
-}
-
-static void
-parse_manager(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->manager )
-		g_free(card->manager);
-	assign_string(vobj, default_charset, &(card->manager));
-}
-
-static void
-parse_assistant(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->assistant )
-		g_free(card->assistant);
-	assign_string(vobj, default_charset, &(card->assistant));
-}
-
-static void
-parse_nickname(ECard *card, VObject *vobj, char *default_charset)
-{
-	if (card->nickname)
-		g_free(card->nickname);
-	assign_string(vobj, default_charset, &(card->nickname));
-}
-
-static void
-parse_spouse(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->spouse )
-		g_free(card->spouse);
-	assign_string(vobj, default_charset, &(card->spouse));
-}
-
-/* Deal with charset */
-static void
-parse_anniversary(ECard *card, VObject *vobj, char *default_charset)
-{
-	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, char *default_charset)
-{
-	if ( card->mailer )
-		g_free(card->mailer);
-	assign_string(vobj, default_charset, &(card->mailer));
-}
-
-static void
-parse_caluri(ECard *card, VObject *vobj, char *default_charset)
-{
- 	g_free(card->caluri);
- 	assign_string(vobj, default_charset, &(card->caluri));
-}
-
-static void
-parse_fburl(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->fburl);
-	assign_string(vobj, default_charset, &(card->fburl));
-}
-
-static void
-parse_note(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->note);
-	assign_string(vobj, default_charset, &(card->note));
-}
-
-static void
-parse_related_contacts(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->related_contacts);
-	assign_string(vobj, default_charset, &(card->related_contacts));
-}
-
-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);
-}
-
-/* Deal with charset */
-static void
-parse_categories(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		do_parse_categories(card, str);
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_wants_html(ECard *card, VObject *vobj, char *default_charset)
-{
-	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);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_list(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->list = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->list = FALSE;
-		}
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_list_show_addresses(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->list_show_addresses = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->list_show_addresses = FALSE;
-		}
-		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, char *default_charset)
-{
-	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, default_charset, &(arbitrary->type));
-		} else {
-			g_free(arbitrary->key);
-			arbitrary->key = g_strdup(name);
-		}
-	}
-
-	assign_string(vobj, default_charset, &(arbitrary->value));
-	
-	gtk_object_get(GTK_OBJECT(card),
-		       "arbitrary", &list,
-		       NULL);
-	e_list_append(list, arbitrary);
-	e_card_arbitrary_unref(arbitrary);
-}
-
-static void
-parse_id(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->id);
-	assign_string(vobj, default_charset, &(card->id));
-}
-
-/* Deal with charset */
-static void
-parse_last_use(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->last_use )
-			g_free(card->last_use);
-		card->last_use = g_new(ECardDate, 1);
-		*(card->last_use) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_use_score(ECard *card, VObject *vobj, char *default_charset)
-{
-	card->raw_use_score = 0;
-	
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->raw_use_score = MAX(0, atof (str));
-		free (str);
-	}
-}
-
-static void
-parse_attribute(ECard *card, VObject *vobj, char *default_charset)
-{
-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)->klass)->attribute_jump_table, vObjectName(vobj));
-	if ( function )
-		function(card, vobj, default_charset);
-}
-
-static void
-parse(ECard *card, VObject *vobj, char *default_charset)
-{
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		parse_attribute(card, nextVObject(&iterator), default_charset);
-	}
-	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::caluri",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CALURI);
-	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::related_contacts",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_RELATED_CONTACTS);
-	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::list",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EVOLUTION_LIST);
-	gtk_object_add_arg_type ("ECard::list_show_addresses",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EVOLUTION_LIST_SHOW_ADDRESSES);
-	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);
-	gtk_object_add_arg_type ("ECard::last_use",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_LAST_USE);
-	gtk_object_add_arg_type ("ECard::use_score",
-				 GTK_TYPE_FLOAT, GTK_ARG_READWRITE, ARG_USE_SCORE);
-
-
-	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->ref_count = 1;
-	newphone->number = NULL;
-	newphone->flags = 0;
-	
-	return newphone;
-}
-
-void
-e_card_phone_unref (ECardPhone *phone)
-{
-	if (phone) {
-		phone->ref_count --;
-		if (phone->ref_count == 0) {
-			g_free(phone->number);
-			g_free(phone);
-		}
-	}
-}
-
-ECardPhone *
-e_card_phone_ref (const ECardPhone *phone)
-{
-	ECardPhone *phone_mutable = (ECardPhone *) phone;
-	if (phone_mutable)
-		phone_mutable->ref_count ++;
-	return phone_mutable;
-}
-
-ECardPhone *
-e_card_phone_copy (const ECardPhone *phone)
-{
-	if ( phone ) {
-		ECardPhone *phone_copy = e_card_phone_new();
-		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->ref_count = 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_unref (ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		addr->ref_count --;
-		if (addr->ref_count == 0) {
-			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_ref (const ECardDeliveryAddress *addr)
-{
-	ECardDeliveryAddress *addr_mutable = (ECardDeliveryAddress *) addr;
-	if (addr_mutable)
-		addr_mutable->ref_count ++;
-	return addr_mutable;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		ECardDeliveryAddress *addr_copy = e_card_delivery_address_new ();
-		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 = e_card_delivery_address_new ();
-	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->ref_count = 1;
-	newaddr->data = NULL;
-	newaddr->flags = 0;
-	
-	return newaddr;
-}
-
-void
-e_card_address_label_unref (ECardAddrLabel *addr)
-{
-	if (addr) {
-		addr->ref_count --;
-		if (addr->ref_count == 0) {
-			g_free(addr->data);
-			g_free(addr);
-		}
-	}
-}
-
-ECardAddrLabel *
-e_card_address_label_ref (const ECardAddrLabel *addr)
-{
-	ECardAddrLabel *addr_mutable = (ECardAddrLabel *) addr;
-	if (addr_mutable)
-		addr_mutable->ref_count ++;
-	return addr_mutable;
-}
-
-ECardAddrLabel *
-e_card_address_label_copy (const ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		ECardAddrLabel *addr_copy = e_card_address_label_new ();
-		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->ref_count  = 1;
-	newname->prefix     = NULL;
-	newname->given      = NULL;
-	newname->additional = NULL;
-	newname->family     = NULL;
-	newname->suffix     = NULL;
-
-	return newname;
-}
-
-void
-e_card_name_unref(ECardName *name)
-{
-	if (name) {
-		name->ref_count --;
-		if (name->ref_count == 0) {
-			g_free (name->prefix);
-			g_free (name->given);
-			g_free (name->additional);
-			g_free (name->family);
-			g_free (name->suffix);
-			g_free (name);
-		}
-	}
-}
-
-ECardName *
-e_card_name_ref(const ECardName *name)
-{
-	ECardName *name_mutable = (ECardName *) name;
-	if (name_mutable)
-		name_mutable->ref_count ++;
-	return name_mutable;
-}
-
-ECardName *
-e_card_name_copy(const ECardName *name)
-{
-	if (name) {
-		ECardName *newname = e_card_name_new ();
-               
-		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 = e_card_name_new ();
-	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->ref_count = 1;
-	arbitrary->key = NULL;
-	arbitrary->type = NULL;
-	arbitrary->value = NULL;
-	return arbitrary;
-}
-
-void
-e_card_arbitrary_unref(ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		arbitrary->ref_count --;
-		if (arbitrary->ref_count == 0) {
-			g_free(arbitrary->key);
-			g_free(arbitrary->type);
-			g_free(arbitrary->value);
-			g_free(arbitrary);
-		}
-	}
-}
-
-ECardArbitrary *
-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		ECardArbitrary *arb_copy = e_card_arbitrary_new ();
-		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;
-}
-
-ECardArbitrary *
-e_card_arbitrary_ref(const ECardArbitrary *arbitrary)
-{
-	ECardArbitrary *arbitrary_mutable = (ECardArbitrary *) arbitrary;
-	if (arbitrary_mutable)
-		arbitrary_mutable->ref_count ++;
-	return arbitrary_mutable;
-}
-
-/* EMail matching */
-static gboolean
-e_card_email_match_single_string (const gchar *a, const gchar *b)
-{
-	const gchar *xa = NULL, *xb = NULL;
-	gboolean match = TRUE;
-
-	for (xa=a; *xa && *xa != '@'; ++xa);
-	for (xb=b; *xb && *xb != '@'; ++xb);
-
-	if (xa-a != xb-b || *xa != *xb || g_strncasecmp (a, b, xa-a))
-		return FALSE;
-
-	if (*xa == '\0')
-		return TRUE;
-	
-	/* Find the end of the string, then walk through backwards comparing.
-	   This is so that we'll match joe@foobar.com and joe@mail.foobar.com.
-	*/
-	while (*xa)
-		++xa;
-	while (*xb)
-		++xb;
-
-	while (match && *xa != '@' && *xb != '@') {
-		match = (tolower (*xa) == tolower (*xb));
-		--xa;
-		--xb;
-	}
-
-	match = match && ((tolower (*xa) == tolower (*xb)) || (*xa == '.') || (*xb == '.'));
-
-	return match;
-}
-
-gboolean
-e_card_email_match_string (const ECard *card, const gchar *str)
-{
-	EIterator *iter;
-	
-	g_return_val_if_fail (card && E_IS_CARD (card), FALSE);
-	g_return_val_if_fail (str != NULL, FALSE);
-
-	iter = e_list_get_iterator (card->email);
-	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		if (e_card_email_match_single_string (e_iterator_get (iter), str))
-			return TRUE;
-	}
-	gtk_object_unref (GTK_OBJECT (iter));
-
-	return FALSE;
-}
-
-gint
-e_card_email_find_number (const ECard *card, const gchar *email)
-{
-	EIterator *iter;
-	gint count = 0;
-
-	g_return_val_if_fail (E_IS_CARD (card), -1);
-	g_return_val_if_fail (email != NULL, -1);
-
-	iter = e_list_get_iterator (card->email);
-	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		if (!g_strcasecmp (e_iterator_get (iter), email))
-			goto finished;
-		++count;
-	}
-	count = -1;
-
- finished:
-	gtk_object_unref (GTK_OBJECT (iter));
-
-	return count;
-}
-
-/*
- * ECard lifecycle management and vCard loading/saving.
- */
-
-static void
-e_card_destroy (GtkObject *object)
-{
-	ECard *card = E_CARD(object);
-	g_free(card->id);
-	if (card->book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	g_free(card->file_as);
-	g_free(card->fname);
-	e_card_name_unref(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->caluri);
-	g_free(card->fburl);
-	g_free(card->note);
-	g_free(card->related_contacts);
-
-	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));
-		if (card->file_as == NULL)
-			card->file_as = g_strdup("");
-		break;
-
-	case ARG_FULL_NAME:
-		g_free(card->fname);
-		card->fname = g_strdup(GTK_VALUE_STRING(*arg));
-		if (card->fname == NULL)
-			card->fname = g_strdup("");
-
-		e_card_name_unref (card->name);
-		card->name = e_card_name_from_string (card->fname);
-		break;
-	case ARG_NAME:
-		e_card_name_unref (card->name);
-		card->name = e_card_name_ref(GTK_VALUE_POINTER(*arg));
-		if (card->name == NULL)
-			card->name = e_card_name_new();
-		if (card->fname == NULL) {
-			card->fname = e_card_name_to_string(card->name);
-		}
-		if (card->file_as == NULL) {
-			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;
-		}
-		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);
-		if (GTK_VALUE_POINTER (*arg)) {
-			card->bday = g_new (ECardDate, 1);
-			memcpy (card->bday, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
-		} else {
-			card->bday = NULL;
-		}
-		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);
-		if (GTK_VALUE_POINTER (*arg)) {
-			card->anniversary = g_new (ECardDate, 1);
-			memcpy (card->anniversary, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
-		} else {
-			card->anniversary = NULL;
-		}
-		break;
-	case ARG_MAILER:
-		g_free(card->mailer);
-		card->mailer = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_CALURI:
-		g_free(card->caluri);
-		card->caluri = 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_RELATED_CONTACTS:
-		g_free (card->related_contacts);
-		card->related_contacts = 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_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));
-		if (card->id == NULL)
-			card->id = g_strdup ("");
-		break;
-	case ARG_LAST_USE:
-		g_free(card->last_use);
-		if (GTK_VALUE_POINTER (*arg)) {
-			card->last_use = g_new (ECardDate, 1);
-			memcpy (card->last_use, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
-		} else {
-			card->last_use = NULL;
-		}
-		break;
-	case ARG_USE_SCORE:
-		card->raw_use_score = GTK_VALUE_FLOAT(*arg);
-		break;
-	case ARG_EVOLUTION_LIST:
-		card->list = GTK_VALUE_BOOL(*arg);
-		break;
-	case ARG_EVOLUTION_LIST_SHOW_ADDRESSES:
-		card->list_show_addresses = GTK_VALUE_BOOL(*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_ref,
-						   (EListFreeFunc) e_card_delivery_address_unref,
-						   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_ref,
-							 (EListFreeFunc) e_card_address_label_unref,
-							 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_ref,
-						 (EListFreeFunc) e_card_phone_unref,
-						 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_CALURI:
-		GTK_VALUE_STRING(*arg) = card->caluri;
-		break;
-	case ARG_FBURL:
-		GTK_VALUE_STRING(*arg) = card->fburl;
-		break;
-	case ARG_NOTE:
-		GTK_VALUE_STRING(*arg) = card->note;
-		break;
-	case ARG_RELATED_CONTACTS:
-		GTK_VALUE_STRING(*arg) = card->related_contacts;
-		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_ARBITRARY:
-		if (!card->arbitrary)
-			card->arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_ref,
-						     (EListFreeFunc) e_card_arbitrary_unref,
-						     NULL);
-
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->arbitrary);
-		break;
-	case ARG_ID:
-		GTK_VALUE_STRING(*arg) = card->id;
-		break;
-	case ARG_LAST_USE:
-		GTK_VALUE_POINTER(*arg) = card->last_use;
-		break;
-
-	case ARG_USE_SCORE:
-		GTK_VALUE_FLOAT(*arg) = e_card_get_use_score (card);
-		break;
-	case ARG_EVOLUTION_LIST:
-		GTK_VALUE_BOOL(*arg) = card->list;
-		break;
-	case ARG_EVOLUTION_LIST_SHOW_ADDRESSES:
-		GTK_VALUE_BOOL(*arg) = card->list_show_addresses;
-		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->caluri              = NULL;
-	card->fburl               = NULL;
-	card->note                = NULL;
-	card->related_contacts    = NULL;
-	card->categories          = NULL;
-	card->wants_html          = FALSE;
-	card->wants_html_set      = FALSE;
-	card->list                = FALSE;
-	card->list_show_addresses = FALSE;
-	card->arbitrary           = NULL;
-	card->last_use            = NULL;
-	card->raw_use_score       = 0;
-}
-
-GList *
-e_card_load_cards_from_file_with_default_charset(const char *filename, char *default_charset)
-{
-	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, default_charset);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-GList *
-e_card_load_cards_from_file(const char *filename)
-{
-	return e_card_load_cards_from_file_with_default_charset (filename, "UTF-8");
-}
-
-GList *
-e_card_load_cards_from_string_with_default_charset(const char *str, char *default_charset)
-{
-	VObject *vobj = Parse_MIME(str, strlen (str));
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj, default_charset);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-GList *
-e_card_load_cards_from_string(const char *str)
-{
-	return e_card_load_cards_from_string_with_default_charset (str, "UTF-8");
-}
-
-void
-e_card_free_empty_lists (ECard *card)
-{
-	if (card->address && e_list_length (card->address) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->address));
-		card->address = NULL;
-	}
-
-	if (card->address_label && e_list_length (card->address_label) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->address_label));
-		card->address_label = NULL;
-	}
-
-	if (card->phone && e_list_length (card->phone) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->phone));
-		card->phone = NULL;
-	}
-
-	if (card->email && e_list_length (card->email) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->email));
-		card->email = NULL;
-	}
-
-	if (card->categories && e_list_length (card->categories) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->categories));
-		card->categories = NULL;
-	}
-
-	if (card->arbitrary && e_list_length (card->arbitrary) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->arbitrary));
-		card->arbitrary = NULL;
-	}
-}
-
-static void
-assign_string(VObject *vobj, char *default_charset, char **string)
-{
-	int type = vObjectValueType(vobj);
-	char *str;
-	char *charset = default_charset;
-	gboolean free_charset = FALSE;
-	VObject *charset_obj;
-
-	if ((charset_obj = isAPropertyOf (vobj, "CHARSET"))) {
-		switch (vObjectValueType (charset_obj)) {
-		case VCVT_STRINGZ:
-			charset = (char *) vObjectStringZValue(charset_obj);
-			break;
-		case VCVT_USTRINGZ:
-			charset = fakeCString (vObjectUStringZValue (charset_obj));
-			free_charset = TRUE;
-			break;
-		}
-	}
-
-	switch(type) {
-	case VCVT_STRINGZ:
-		if (strcmp (charset, "UTF-8"))
-			*string = e_utf8_from_charset_string (charset, vObjectStringZValue(vobj));
-		else
-			*string = g_strdup(vObjectStringZValue(vobj));
-		break;
-	case VCVT_USTRINGZ:
-		str = fakeCString (vObjectUStringZValue (vobj));
-		if (strcmp (charset, "UTF-8"))
-			*string = e_utf8_from_charset_string (charset, str);
-		else
-			*string = g_strdup(str);
-		free(str);
-		break;
-	default:
-		*string = g_strdup("");
-		break;
-	}
-
-	if (free_charset) {
-		free (charset);
-	}
-}
-
-
-ECardDate
-e_card_date_from_string (const 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 *default_charset)
-{
-	char *ret_val;
-	VObjectIterator iterator;
-	gboolean free_charset = FALSE;
-	VObject *charset_obj;
-
-	if ((charset_obj = isAPropertyOf (vobj, "CHARSET"))) {
-		switch (vObjectValueType (charset_obj)) {
-		case VCVT_STRINGZ:
-			default_charset = (char *) vObjectStringZValue(charset_obj);
-			break;
-		case VCVT_USTRINGZ:
-			default_charset = fakeCString (vObjectUStringZValue (charset_obj));
-			free_charset = TRUE;
-			break;
-		}
-	}
-
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		VObject *attribute = nextVObject(&iterator);
-		const char *id = vObjectName(attribute);
-		if ( ! strcmp(id, name) ) {
-			assign_string(attribute, default_charset, &ret_val);
-			return ret_val;
-		}
-	}
-	if (free_charset)
-		free (default_charset);
-
-	return NULL;
-}
-
-static 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 },
-	{ "X-EVOLUTION-ASSISTANT", E_CARD_PHONE_ASSISTANT },
-	{ "X-EVOLUTION-CALLBACK",  E_CARD_PHONE_CALLBACK  },
-	{ "X-EVOLUTION-RADIO",     E_CARD_PHONE_RADIO     },
-	{ "X-EVOLUTION-TELEX",     E_CARD_PHONE_TELEX     },
-	{ "X-EVOLUTION-TTYTDD",    E_CARD_PHONE_TTYTDD    },
-};
-
-static ECardPhoneFlags
-get_phone_flags (VObject *vobj)
-{
-	ECardPhoneFlags ret = 0;
-	int i;
-
-	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;
-
-	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 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 },
-	{ "PREF", E_CARD_ADDR_DEFAULT },
-};
-
-static ECardAddressFlags
-get_address_flags (VObject *vobj)
-{
-	ECardAddressFlags ret = 0;
-	int i;
-	
-	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;
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (flags & addr_pairs[i].flag) {
-			addProp (vobj, addr_pairs[i].id);
-		}
-	}
-}
-
-#include <Evolution-Composer.h>
-
-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-void
-e_card_list_send (GList *cards, ECardDisposition disposition)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-
-	if (cards == NULL)
-		return;
-	
-	/* 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));
-
-	CORBA_exception_init (&ev);
-
-	if (disposition == E_CARD_DISPOSITION_AS_TO) {
-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-		CORBA_char *subject;
-		int to_i, bcc_i;
-		GList *iter;
-		gint to_length = 0, bcc_length = 0;
-
-		/* Figure out how many addresses of each kind we have. */
-		for (iter = cards; iter != NULL; iter = g_list_next (iter)) {
-			ECard *card = E_CARD (iter->data);
-			if (e_card_evolution_list (card)) {
-				gint len = card->email ? e_list_length (card->email) : 0;
-				if (e_card_evolution_list_show_addresses (card))
-					to_length += len;
-				else
-					bcc_length += len;
-			} else {
-				if (card->email != NULL)
-					++to_length;
-			}
-		}
-
-		/* Now I have to make a CORBA sequences that represents a recipient list with
-		   the right number of entries, for the cards. */
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_length;
-		to_list->_length = to_length;
-		if (to_length > 0) {
-			to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to_length);
-		}
-
-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		cc_list->_maximum = cc_list->_length = 0;
-		
-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		bcc_list->_maximum = bcc_length;
-		bcc_list->_length = bcc_length;
-		if (bcc_length > 0) {
-			bcc_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc_length);
-		}
-
-		to_i = 0;
-		bcc_i = 0;
-		while (cards != NULL) {
-			ECard *card = cards->data;
-			EIterator *iterator;
-			gchar *name, *addr;
-			gboolean is_list, is_hidden, free_name_addr;
-			GNOME_Evolution_Composer_Recipient *recipient;
-
-			if (card->email != NULL) {
-
-				is_list = e_card_evolution_list (card);
-				is_hidden = is_list && !e_card_evolution_list_show_addresses (card);
-			
-				for (iterator = e_list_get_iterator (card->email); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-					
-					if (is_hidden) {
-						recipient = &(bcc_list->_buffer[bcc_i]);
-						++bcc_i;
-					} else {
-						recipient = &(to_list->_buffer[to_i]);
-						++to_i;
-					}
-					
-					name = "";
-					addr = "";
-					free_name_addr = FALSE;
-					if (e_iterator_is_valid (iterator)) {
-						
-						if (is_list) {
-							/* We need to decode the list entries, which are XMLified EDestinations. */
-							EDestination *dest = e_destination_import (e_iterator_get (iterator));
-							if (dest != NULL) {
-								name = g_strdup (e_destination_get_name (dest));
-								addr = g_strdup (e_destination_get_email (dest));
-								free_name_addr = TRUE;
-								gtk_object_unref (GTK_OBJECT (dest));
-							}
-							
-						} else { /* is just a plain old card */
-							if (card->name)
-								name = e_card_name_to_string (card->name);
-							addr = g_strdup ((char *) e_iterator_get (iterator));
-							free_name_addr = TRUE;
-						}
-					}
-					
-					recipient->name    = CORBA_string_dup (name ? name : "");
-					recipient->address = CORBA_string_dup (addr ? addr : "");
-					
-					if (free_name_addr) {
-						g_free ((gchar *) name);
-						g_free ((gchar *) addr);
-					}
-					
-					/* If this isn't a list, we quit after the first (i.e. the default) address. */
-					if (!is_list)
-						break;
-					
-				}
-				gtk_object_unref (GTK_OBJECT (iterator));
-			}
-
-			cards = g_list_next (cards);
-		}
-
-		subject = CORBA_string_dup ("");
-
-		GNOME_Evolution_Composer_setHeaders (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;
-		}
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	}
-
-	if (disposition == E_CARD_DISPOSITION_AS_ATTACHMENT) {
-		CORBA_char *content_type, *filename, *description;
-		GNOME_Evolution_Composer_AttachmentData *attach_data;
-		CORBA_boolean show_inline;
-		char *tempstr;
-
-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-		CORBA_char *subject;
-		
-		content_type = CORBA_string_dup ("text/x-vcard");
-		filename = CORBA_string_dup ("");
-
-		if (cards->next) {
-			description = CORBA_string_dup (_("Multiple VCards"));
-		} else {
-			char *file_as;
-
-			gtk_object_get(GTK_OBJECT(cards->data),
-				       "file_as", &file_as,
-				       NULL);
-
-			tempstr = g_strdup_printf (_("VCard for %s"), file_as);
-			description = CORBA_string_dup (tempstr);
-			g_free (tempstr);
-		}
-
-		show_inline = FALSE;
-
-		tempstr = e_card_list_get_vcard (cards);
-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
-		attach_data->_maximum = attach_data->_length = strlen (tempstr);
-		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-		strcpy (attach_data->_buffer, tempstr);
-		g_free (tempstr);
-
-		GNOME_Evolution_Composer_attachData (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;
-		}
-	
-		CORBA_free (content_type);
-		CORBA_free (filename);
-		CORBA_free (description);
-		CORBA_free (attach_data);
-
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_list->_length = 0;
-		
-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		cc_list->_maximum = cc_list->_length = 0;
-
-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		bcc_list->_maximum = bcc_list->_length = 0;
-
-		if (!cards || cards->next) {
-			subject = CORBA_string_dup ("Contact information");
-		} else {
-			ECard *card = cards->data;
-			const gchar *tempstr2;
-
-			tempstr2 = NULL;
-			gtk_object_get(GTK_OBJECT(card),
-				       "file_as", &tempstr2,
-				       NULL);
-			if (!tempstr2 || !*tempstr2)
-				gtk_object_get(GTK_OBJECT(card),
-					       "full_name", &tempstr2,
-					       NULL);
-			if (!tempstr2 || !*tempstr2)
-				gtk_object_get(GTK_OBJECT(card),
-					       "org", &tempstr2,
-					       NULL);
-			if (!tempstr2 || !*tempstr2) {
-				EList *list;
-				EIterator *iterator;
-				gtk_object_get(GTK_OBJECT(card),
-					       "email", &list,
-					       NULL);
-				iterator = e_list_get_iterator (list);
-				if (e_iterator_is_valid (iterator)) {
-					tempstr2 = e_iterator_get (iterator);
-				}
-				gtk_object_unref (GTK_OBJECT (iterator));
-			}
-
-			if (!tempstr2 || !*tempstr2)
-				tempstr = g_strdup_printf ("Contact information");
-			else
-				tempstr = g_strdup_printf ("Contact information for %s", tempstr2);
-			subject = CORBA_string_dup (tempstr);
-			g_free (tempstr);
-		}
-		
-		GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	}
-
-	GNOME_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);
-}
-
-void
-e_card_send (ECard *card, ECardDisposition disposition)
-{
-	GList *list;
-	list = g_list_prepend (NULL, card);
-	e_card_list_send (list, disposition);
-	g_list_free (list);
-}
-
-gboolean
-e_card_evolution_list (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), FALSE);
-	return card->list;
-}
-
-gboolean
-e_card_evolution_list_show_addresses (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), FALSE);
-	return card->list_show_addresses;
-}
-
-typedef struct _CardLoadData CardLoadData;
-struct _CardLoadData {
-	gchar *card_id;
-	ECardCallback cb;
-	gpointer closure;
-};
-
-static void
-get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure)
-{
-	CardLoadData *data = (CardLoadData *) closure;
-
-	if (data->cb != NULL) {
-		if (status == E_BOOK_STATUS_SUCCESS)
-			data->cb (card, data->closure);
-		else
-			data->cb (NULL, data->closure);
-	}
-
-	g_free (data->card_id);
-	g_free (data);
-}
-
-static void
-card_load_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	CardLoadData *data = (CardLoadData *) closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS)
-		e_book_get_card (book, data->card_id, get_card_cb, closure);
-	else {
-		data->cb (NULL, data->closure);
-		g_free (data->card_id);
-		g_free (data);
-	}
-}
-
-void
-e_card_load_uri (const gchar *book_uri, const gchar *uid, ECardCallback cb, gpointer closure)
-{
-	CardLoadData *data;
-	EBook *book;
-	
-	data          = g_new (CardLoadData, 1);
-	data->card_id = g_strdup (uid);
-	data->cb      = cb;
-	data->closure = closure;
-
-	book = e_book_new ();
-	e_book_load_uri (book, book_uri, card_load_cb, data);
-}
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
deleted file mode 100644
index 23876bd63a..0000000000
--- a/addressbook/backend/ebook/e-card.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_H__
-#define __E_CARD_H__
-
-#include <time.h>
-#include <gtk/gtkobject.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 _EBook; /* Forward reference */
-
-struct _ECard {
-	GtkObject object;
-	char *id;
-
-	struct _EBook   *book;          /* The EBook this card is from.     */
-
-	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            *caluri;        /* Calendar URI                     */
-	char            *fburl;         /* Free Busy URL                    */
-
-	gint             timezone;      /* number of minutes from UTC as an int */
-
-	ECardDate       *last_use;
-	float            raw_use_score;
-
-	char            *related_contacts;  /* EDestinationV (serialized) of related contacts. */
-
-	EList           *categories;    /* Categories.                      */
-
-	EList           *arbitrary;     /* Arbitrary fields.                */
-
-	
-
-	guint32         wants_html : 1;     /* Wants html mail. */
-	guint32         wants_html_set : 1; /* Wants html mail. */
-	guint32		list : 1; /* If the card corresponds to a contact list */
-	guint32		list_show_addresses : 1; /* Whether to show the addresses
-						    in the To: or Bcc: field */
-
-#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.       */
-
-	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;
-};
-
-
-/* Simple functions */
-ECard                *e_card_new                                          (char                       *vcard); /* Assumes utf8 */
-ECard                *e_card_new_with_default_charset                     (char                       *vcard,
-									   char                       *default_charset);
-const char           *e_card_get_id                                       (ECard                      *card);
-void                  e_card_set_id                                       (ECard                      *card,
-									   const char                 *character);
-
-struct _EBook        *e_card_get_book                                     (ECard                      *card);
-void                  e_card_set_book                                     (ECard                      *card,
-									   struct _EBook              *book);
-char                 *e_card_get_vcard                                    (ECard                      *card);
-char                 *e_card_get_vcard_assume_utf8                        (ECard                      *card);
-char                 *e_card_list_get_vcard                               (const GList                *list);
-ECard                *e_card_duplicate                                    (ECard                      *card);
-float                 e_card_get_use_score                                (ECard                      *card);
-void                  e_card_touch                                        (ECard                      *card);
-
-/* Evolution List convenience functions */
-/*   used for encoding uids in email addresses */
-gboolean              e_card_evolution_list                               (ECard                      *card);
-gboolean              e_card_evolution_list_show_addresses                (ECard                      *card);
-
-/* ECardPhone manipulation */
-ECardPhone           *e_card_phone_new                                    (void);
-ECardPhone           *e_card_phone_copy                                   (const ECardPhone           *phone);
-ECardPhone           *e_card_phone_ref                                    (const ECardPhone           *phone);
-void                  e_card_phone_unref                                  (ECardPhone                 *phone);
-
-/* ECardDeliveryAddress manipulation */
-ECardDeliveryAddress *e_card_delivery_address_new                         (void);
-ECardDeliveryAddress *e_card_delivery_address_copy                        (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_ref                         (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_unref                       (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 manipulation */
-ECardAddrLabel       *e_card_address_label_new                            (void);
-ECardAddrLabel       *e_card_address_label_copy                           (const ECardAddrLabel       *addr);
-ECardAddrLabel       *e_card_address_label_ref                            (const ECardAddrLabel       *addr);
-void                  e_card_address_label_unref                          (ECardAddrLabel             *addr);
-
-/* ECardName manipulation */
-ECardName            *e_card_name_new                                     (void);
-ECardName            *e_card_name_copy                                    (const ECardName            *name);
-ECardName            *e_card_name_ref                                     (const ECardName            *name);
-void                  e_card_name_unref                                   (ECardName                  *name);
-char                 *e_card_name_to_string                               (const ECardName            *name);
-ECardName            *e_card_name_from_string                             (const char                 *full_name);
-
-/* ECardDate */
-ECardDate             e_card_date_from_string                             (const gchar                *str);
-gchar                *e_card_date_to_string                               (ECardDate                  *dt);
-
-/* ECardArbitrary manipulation */
-ECardArbitrary       *e_card_arbitrary_new                                (void);
-ECardArbitrary       *e_card_arbitrary_copy                               (const ECardArbitrary       *arbitrary);
-ECardArbitrary       *e_card_arbitrary_ref                                (const ECardArbitrary       *arbitrary);
-void                  e_card_arbitrary_unref                              (ECardArbitrary             *arbitrary);
-
-/* ECard email manipulation */
-gboolean              e_card_email_match_string                           (const ECard                *card,
-									   const gchar                *str);
-gint                  e_card_email_find_number                            (const ECard                *card,
-									   const gchar                *email);
-
-/* Specialized functionality */
-GList                *e_card_load_cards_from_file                         (const char                 *filename);
-GList                *e_card_load_cards_from_file_with_default_charset    (const char                 *filename,
-									   char                       *default_charset);
-GList                *e_card_load_cards_from_string                       (const char                 *str);
-GList                *e_card_load_cards_from_string_with_default_charset  (const char                 *str,
-									   char                       *default_charset);
-void                  e_card_free_empty_lists                             (ECard                      *card);
-
-enum _ECardDisposition {
-	E_CARD_DISPOSITION_AS_ATTACHMENT,
-	E_CARD_DISPOSITION_AS_TO,
-};
-typedef enum _ECardDisposition ECardDisposition;
-void                  e_card_send                           (ECard                      *card,
-							     ECardDisposition            disposition);
-void                  e_card_list_send                      (GList                      *cards,
-							     ECardDisposition            disposition);
-
-/* Getting ECards via their URIs */
-typedef void (*ECardCallback) (ECard *card, gpointer closure);
-void                  e_card_load_uri                       (const gchar                *book_uri,
-							     const gchar                *uid,
-							     ECardCallback               cb,
-							     gpointer                    closure);
-
-
-/* Standard Gtk function */
-GtkType               e_card_get_type                       (void);
-
-#endif /* ! __E_CARD_H__ */
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
deleted file mode 100644
index 5cb5fa859f..0000000000
--- a/addressbook/backend/ebook/e-destination.c
+++ /dev/null
@@ -1,1690 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-destination.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 "e-destination.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-book.h"
-#include "e-book-util.h"
-#include <gal/widgets/e-unicode.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <camel/camel-internet-address.h>
-
-#define d(x) x
-
-enum {
-	CHANGED,
-	CARDIFIED,
-	LAST_SIGNAL
-};
-
-guint e_destination_signals[LAST_SIGNAL] = { 0 };
-
-struct _EDestinationPrivate {
-	gchar *raw;
-
-	gchar *book_uri;
-	gchar *card_uid;
-	ECard *card;
-	gint card_email_num;
-
-	ECard *old_card;
-	gint old_card_email_num;
-	gchar *old_textrep;
-
-	gchar *name;
-	gchar *email;
-	gchar *addr;
-	gchar *textrep;
-
-	GList *list_dests;
-
-	guint html_mail_override : 1;
-	guint wants_html_mail : 1;
-
-	guint show_addresses : 1;
-
-	guint has_been_cardified : 1;
-	guint allow_cardify : 1;
-	guint cannot_cardify : 1;
-	guint auto_recipient : 1;
-	guint pending_cardification;
-
-	guint pending_change : 1;
-
-	EBook *cardify_book;
-
-	gint freeze_count;
-};
-
-static void e_destination_clear_card    (EDestination *);
-static void e_destination_clear_strings (EDestination *);
-
-static GtkObjectClass *parent_class;
-
-static void
-e_destination_destroy (GtkObject *obj)
-{
-	EDestination *dest = E_DESTINATION (obj);
-
-	e_destination_clear (dest);
-
-	if (dest->priv->old_card)
-		gtk_object_unref (GTK_OBJECT (dest->priv->old_card));
-	
-	if (dest->priv->cardify_book)
-		gtk_object_unref (GTK_OBJECT (dest->priv->cardify_book));
-
-	g_free (dest->priv->old_textrep);
-
-	g_free (dest->priv);
-
-	if (parent_class->destroy)
-		parent_class->destroy (obj);
-}
-
-static void
-e_destination_class_init (EDestinationClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (GTK_TYPE_OBJECT));
-
-	object_class->destroy = e_destination_destroy;
-
-	e_destination_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EDestinationClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_destination_signals[CARDIFIED] =
-		gtk_signal_new ("cardified",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EDestinationClass, cardified),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_destination_signals, LAST_SIGNAL);
-}
-
-static void
-e_destination_init (EDestination *dest)
-{
-	dest->priv = g_new0 (struct _EDestinationPrivate, 1);
-
-	dest->priv->allow_cardify = TRUE;
-	dest->priv->cannot_cardify = FALSE;
-	dest->priv->auto_recipient = FALSE;
-	dest->priv->pending_cardification = 0;
-}
-
-GtkType
-e_destination_get_type (void)
-{
-	static GtkType dest_type = 0;
-
-	if (!dest_type) {
-		GtkTypeInfo dest_info = {
-			"EDestination",
-			sizeof (EDestination),
-			sizeof (EDestinationClass),
-			(GtkClassInitFunc) e_destination_class_init,
-			(GtkObjectInitFunc) e_destination_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		dest_type = gtk_type_unique (gtk_object_get_type (), &dest_info);
-	}
-
-	return dest_type;
-}
-
-EDestination *
-e_destination_new (void)
-{
-	return E_DESTINATION (gtk_type_new (E_TYPE_DESTINATION));
-}
-
-static void
-e_destination_freeze (EDestination *dest)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (dest->priv->freeze_count >= 0);
-	
-	dest->priv->freeze_count++;
-}
-
-static void
-e_destination_thaw (EDestination *dest)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (dest->priv->freeze_count > 0);
-	
-	dest->priv->freeze_count--;
-	if (dest->priv->freeze_count == 0 && dest->priv->pending_change)
-		e_destination_changed (dest);
-}
-
-void
-e_destination_changed (EDestination *dest)
-{
-	if (dest->priv->freeze_count == 0) {
-		gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CHANGED]);
-		dest->priv->pending_change = FALSE;
-		dest->priv->cannot_cardify = FALSE;
-	
-	} else {
-		dest->priv->pending_change = TRUE;
-	}
-}
-
-EDestination *
-e_destination_copy (const EDestination *dest)
-{
-	EDestination *new_dest;
-	GList *iter;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	new_dest = e_destination_new ();
-
-	new_dest->priv->book_uri           = g_strdup (dest->priv->book_uri);
-	new_dest->priv->card_uid           = g_strdup (dest->priv->card_uid);
-	new_dest->priv->name               = g_strdup (dest->priv->name);
-	new_dest->priv->email              = g_strdup (dest->priv->email);
-	new_dest->priv->addr               = g_strdup (dest->priv->addr);
-	new_dest->priv->card_email_num     = dest->priv->card_email_num;
-	new_dest->priv->old_card_email_num = dest->priv->old_card_email_num;
-	new_dest->priv->old_textrep        = g_strdup (dest->priv->old_textrep);
-
-	new_dest->priv->card     = dest->priv->card;
-	if (new_dest->priv->card)
-		gtk_object_ref (GTK_OBJECT (new_dest->priv->card));
-
-	new_dest->priv->old_card = dest->priv->old_card;
-	if (new_dest->priv->old_card)
-		gtk_object_ref (GTK_OBJECT (new_dest->priv->old_card));
-
-	new_dest->priv->html_mail_override = dest->priv->html_mail_override;
-	new_dest->priv->wants_html_mail    = dest->priv->wants_html_mail;
-
-	for (iter = dest->priv->list_dests; iter != NULL; iter = g_list_next (iter)) {
-		new_dest->priv->list_dests = g_list_append (new_dest->priv->list_dests,
-							    e_destination_copy (E_DESTINATION (iter->data)));
-	}
-
-	return new_dest;
-}
-
-static void
-e_destination_clear_card (EDestination *dest)
-{
-	if (dest->priv->card) {
-		if (dest->priv->old_card)
-			gtk_object_unref (GTK_OBJECT (dest->priv->old_card));
-		
-		dest->priv->old_card = dest->priv->card;
-		dest->priv->old_card_email_num = dest->priv->card_email_num;
-		
-		g_free (dest->priv->old_textrep);
-		dest->priv->old_textrep = g_strdup (e_destination_get_textrep (dest));
-	}
-	
-	g_free (dest->priv->book_uri);
-	dest->priv->book_uri = NULL;
-	g_free (dest->priv->card_uid);
-	dest->priv->card_uid = NULL;
-	
-	dest->priv->card = NULL;
-	dest->priv->card_email_num = -1;
-	
-	g_list_foreach (dest->priv->list_dests, (GFunc) gtk_object_unref, NULL);
-	g_list_free (dest->priv->list_dests);
-	dest->priv->list_dests = NULL;
-	
-	dest->priv->allow_cardify = TRUE;
-	dest->priv->cannot_cardify = FALSE;
-	
-	e_destination_cancel_cardify (dest);
-	
-	e_destination_changed (dest);
-}
-
-static void
-e_destination_clear_strings (EDestination *dest)
-{
-	g_free (dest->priv->raw);
-	dest->priv->raw = NULL;
-	
-	g_free (dest->priv->name);
-	dest->priv->name = NULL;
-	
-	g_free (dest->priv->email);
-	dest->priv->email = NULL;
-	
-	g_free (dest->priv->addr);
-	dest->priv->addr = NULL;
-	
-	g_free (dest->priv->textrep);
-	dest->priv->textrep = NULL;
-	
-	e_destination_changed (dest);
-}
-
-void
-e_destination_clear (EDestination *dest)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	e_destination_freeze (dest);
-	
-	e_destination_clear_card (dest);
-	e_destination_clear_strings (dest);
-	
-	e_destination_thaw (dest);
-}
-
-static gboolean
-nonempty (const gchar *s)
-{
-	gunichar c;
-	while (*s) {
-		c = g_utf8_get_char (s);
-		if (!g_unichar_isspace (c))
-			return TRUE;
-		s = g_utf8_next_char (s);
-	}
-	return FALSE;
-}
-
-gboolean
-e_destination_is_empty (const EDestination *dest)
-
-{
-	struct _EDestinationPrivate *p;
-	
-	g_return_val_if_fail (E_IS_DESTINATION (dest), TRUE);
-	
-	p = dest->priv;
-	
-	return !(p->card != NULL
-		 || (p->book_uri && *p->book_uri)
-		 || (p->card_uid && *p->card_uid)
-		 || (p->raw && nonempty (p->raw))
-		 || (p->name && nonempty (p->name))
-		 || (p->email && nonempty (p->email))
-		 || (p->addr && nonempty (p->addr))
-		 || (p->list_dests != NULL));
-}
-
-gboolean
-e_destination_is_valid (const EDestination *dest)
-{
-	const char *email;
-	
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	
-	if (e_destination_from_card (dest))
-		return TRUE;
-	
-	email = e_destination_get_email (dest);
-	
-	/* FIXME: if we really wanted to get fancy here, we could
-           check to make sure that the address was valid according to
-           rfc822's addr-spec grammar. */
-	
-	return email && *email && strchr (email, '@');
-}
-
-gboolean
-e_destination_equal (const EDestination *a, const EDestination *b)
-{
-	const struct _EDestinationPrivate *pa, *pb;
-	const char *na, *nb;
-	
-	g_return_val_if_fail (E_IS_DESTINATION (a), FALSE);
-	g_return_val_if_fail (E_IS_DESTINATION (b), FALSE);
-	
-	if (a == b)
-		return TRUE;
-	
-	pa = a->priv;
-	pb = b->priv;
-	
-	/* Check equality of cards. */
-	if (pa->card || pb->card) {
-		if (! (pa->card && pb->card))
-			return FALSE;
-		
-		if (pa->card == pb->card || !strcmp (e_card_get_id (pa->card), e_card_get_id (pb->card)))
-			return TRUE;
-		
-		return FALSE;
-	}
-	
-	/* Just in case name returns NULL */
-	na = e_destination_get_name (a);
-	nb = e_destination_get_name (b);
-	if ((na || nb) && !(na && nb && ! g_utf8_strcasecmp (na, nb)))
-		return FALSE;
-	
-	if (!g_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))
-		return TRUE;
-	
-	return FALSE;
-}
-
-void
-e_destination_set_card (EDestination *dest, ECard *card, gint email_num)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (card && E_IS_CARD (card));
-	
-	if (dest->priv->card != card || dest->priv->card_email_num != email_num) {
-		/* We have to freeze/thaw around these operations so that the 'changed'
-		   signals don't cause the EDestination's internal state to be altered
-		   before we can finish setting ->card && ->card_email_num. */
-		e_destination_freeze (dest);
-		e_destination_clear (dest);
-		
-		dest->priv->card = card;
-		gtk_object_ref (GTK_OBJECT (dest->priv->card));
-		
-		dest->priv->card_email_num = email_num;
-		
-		e_destination_changed (dest);
-		e_destination_thaw (dest);
-	}
-}
-
-void
-e_destination_set_book_uri (EDestination *dest, const gchar *uri)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (uri != NULL);
-	
-	if (dest->priv->book_uri == NULL || strcmp (dest->priv->book_uri, uri)) {
-		g_free (dest->priv->book_uri);
-		dest->priv->book_uri = g_strdup (uri);
-		
-		/* If we already have a card, remove it unless it's uri matches the one
-		   we just set. */
-		if (dest->priv->card) {
-			EBook *book = e_card_get_book (dest->priv->card);
-			if ((!book) || strcmp (uri, e_book_get_uri (book))) {
-				gtk_object_unref (GTK_OBJECT (dest->priv->card));
-				dest->priv->card = NULL;
-			}
-		}
-		
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_card_uid (EDestination *dest, const gchar *uid, gint email_num)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (uid != NULL);
-	
-	if (dest->priv->card_uid == NULL
-	    || strcmp (dest->priv->card_uid, uid)
-	    || dest->priv->card_email_num != email_num) {
-		
-		g_free (dest->priv->card_uid);
-		dest->priv->card_uid = g_strdup (uid);
-		dest->priv->card_email_num = email_num;
-		
-		/* If we already have a card, remove it unless it's uri matches the one
-		   we just set. */
-		if (dest->priv->card && strcmp (uid, e_card_get_id (dest->priv->card))) {
-			gtk_object_unref (GTK_OBJECT (dest->priv->card));
-			dest->priv->card = NULL;
-		}
-		
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_name (EDestination *dest, const gchar *name)
-{
-	gboolean changed = FALSE;
-	
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	
-	if (name == NULL) {
-		if (dest->priv->name != NULL) {
-			g_free (dest->priv->name);
-			dest->priv->name = NULL;
-			changed = TRUE;
-		}
-	} else if (dest->priv->name == NULL || strcmp (dest->priv->name, name)) {
-		g_free (dest->priv->name);
-		dest->priv->name = g_strdup (name);
-		changed = TRUE;
-	}
-	
-	if (changed) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = NULL;
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_email (EDestination *dest, const gchar *email)
-{
-	gboolean changed = FALSE;
-	
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	
-	if (email == NULL) {
-		if (dest->priv->email != NULL) {
-			g_free (dest->priv->addr);
-			dest->priv->addr = NULL;
-			changed = TRUE;
-		}
-	} else if (dest->priv->email == NULL || strcmp (dest->priv->email, email)) {
-		g_free (dest->priv->email);
-		dest->priv->email = g_strdup (email);
-		changed = TRUE;
-	}
-	
-	if (changed) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = NULL;
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_html_mail_pref (EDestination *dest, gboolean x)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	dest->priv->html_mail_override = TRUE;
-	if (dest->priv->wants_html_mail != x) {
-		dest->priv->wants_html_mail = x;
-		e_destination_changed (dest);
-	}
-}
-
-gboolean
-e_destination_contains_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	return dest->priv->card != NULL;
-}
-
-gboolean
-e_destination_from_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	return dest->priv->card != NULL || dest->priv->book_uri != NULL || dest->priv->card_uid != NULL;
-}
-
-gboolean
-e_destination_is_auto_recipient (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	
-	return dest->priv->auto_recipient;
-}
-
-void
-e_destination_set_auto_recipient (EDestination *dest, gboolean value)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	dest->priv->auto_recipient = value;
-}
-
-typedef struct _UseCard UseCard;
-struct _UseCard {
-	EDestination *dest;
-	EDestinationCardCallback cb;
-	gpointer closure;
-};
-
-static void
-use_card_cb (ECard *card, gpointer closure)
-{
-	UseCard *uc = (UseCard *) closure;
-	
-	if (card != NULL && uc->dest->priv->card == NULL) {
-		uc->dest->priv->card = card;
-		gtk_object_ref (GTK_OBJECT (uc->dest->priv->card));
-		e_destination_changed (uc->dest);
-	}
-	
-	if (uc->cb) {
-		uc->cb (uc->dest, uc->dest->priv->card, uc->closure);
-	}
-	
-	/* We held a copy of the destination during the callback. */
-	gtk_object_unref (GTK_OBJECT (uc->dest));
-	g_free (uc);
-}
-
-void
-e_destination_use_card (EDestination *dest, EDestinationCardCallback cb, gpointer closure)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	if (dest->priv->card != NULL) {
-		if (cb)
-			cb (dest, dest->priv->card, closure);
-	} else if (dest->priv->book_uri != NULL && dest->priv->card_uid != NULL) {
-		UseCard *uc = g_new (UseCard, 1);
-		
-		uc->dest = dest;
-		/* Hold a reference to the destination during the callback. */
-		gtk_object_ref (GTK_OBJECT (uc->dest));
-		uc->cb = cb;
-		uc->closure = closure;
-		e_card_load_uri (dest->priv->book_uri, dest->priv->card_uid, use_card_cb, uc);
-	} else {
-		if (cb)
-			cb (dest, NULL, closure);
-	}
-}
-
-ECard *
-e_destination_get_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	return dest->priv->card;
-}
-
-const gchar *
-e_destination_get_card_uid (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->card_uid)
-		return dest->priv->card_uid;
-	
-	if (dest->priv->card)
-		return e_card_get_id (dest->priv->card);
-	
-	return NULL;
-}
-
-const gchar *
-e_destination_get_book_uri (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->book_uri)
-		return dest->priv->book_uri;
-	
-	if (dest->priv->card) {
-		EBook *book = e_card_get_book (dest->priv->card);
-		
-		if (book) {
-			return e_book_get_uri (book);
-		}
-	}
-	
-	return NULL;
-}
-
-gint
-e_destination_get_email_num (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), -1);
-	
-	if (dest->priv->card == NULL && (dest->priv->book_uri == NULL || dest->priv->card_uid == NULL))
-		return -1;
-	
-	return dest->priv->card_email_num;
-}
-
-const gchar *
-e_destination_get_name (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->name == NULL) {
-		if (priv->card != NULL) {
-			priv->name = e_card_name_to_string (priv->card->name);
-			
-			if (priv->name == NULL || *priv->name == '\0') {
-				g_free (priv->name);
-				priv->name = g_strdup (priv->card->file_as);
-			}
-			
-			if (priv->name == NULL || *priv->name == '\0') {
-				g_free (priv->name);
-				priv->name = g_strdup (e_destination_get_email (dest));
-			}
-		} else if (priv->raw != NULL) {
-			CamelInternetAddress *addr = camel_internet_address_new ();
-			
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				const char *camel_name = NULL;
-				
-				camel_internet_address_get (addr, 0, &camel_name, NULL);
-				priv->name = g_strdup (camel_name);
-			}
-			
-			camel_object_unref (CAMEL_OBJECT (addr));
-		}
-	}
-	
-	return priv->name;
-	
-}
-
-const gchar *
-e_destination_get_email (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->email == NULL) {
-		if (priv->card != NULL) {
-			/* Pull the address out of the card. */
-			if (priv->card->email) {
-				EIterator *iter = e_list_get_iterator (priv->card->email);
-				int n = priv->card_email_num;
-				
-				if (n >= 0) {
-					while (n > 0) {
-						e_iterator_next (iter);
-						n--;
-					}
-					
-					if (e_iterator_is_valid (iter)) {
-						gconstpointer ptr = e_iterator_get (iter);
-						priv->email = g_strdup ((char *) ptr);
-					}
-				}
-			} 
-		} else if (priv->raw != NULL) {
-			CamelInternetAddress *addr = camel_internet_address_new ();
-			
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				const gchar *camel_email = NULL;
-				camel_internet_address_get (addr, 0, NULL, &camel_email);
-				priv->email = g_strdup (camel_email);
-			}
-			
-			camel_object_unref (CAMEL_OBJECT (addr));
-		} 
-		
-		/* Force e-mail to be non-null... */
-		if (priv->email == NULL) {
-			priv->email = g_strdup ("");
-		}
-	}
-	
-	return priv->email;
-}
-
-const gchar *
-e_destination_get_address (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->addr == NULL) {
-		CamelInternetAddress *addr = camel_internet_address_new ();
-		
-		if (e_destination_is_evolution_list (dest)) {
-			GList *iter = dest->priv->list_dests;
-			
-			while (iter) {
-				EDestination *list_dest = E_DESTINATION (iter->data);
-				
-				if (!e_destination_is_empty (list_dest)) {
-					camel_internet_address_add (addr, 
-								    e_destination_get_name (list_dest),
-								    e_destination_get_email (list_dest));
-				}
-				iter = g_list_next (iter);
-			}
-			
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-		} else if (priv->raw) {
-
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-			}
-		} else {
-			camel_internet_address_add (addr,
-						    e_destination_get_name (dest),
-						    e_destination_get_email (dest));
-			
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-		}
-		
-		camel_object_unref (CAMEL_OBJECT (addr));
-	}
-	
-	return priv->addr;
-}
-
-void
-e_destination_set_raw (EDestination *dest, const gchar *raw)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (raw != NULL);
-	
-	if (dest->priv->raw == NULL || strcmp (dest->priv->raw, raw)) {
-		e_destination_freeze (dest);
-		
-		e_destination_clear (dest);
-		dest->priv->raw = g_strdup (raw);
-		e_destination_changed (dest);
-		
-		e_destination_thaw (dest);
-	}
-}
-
-const gchar *
-e_destination_get_textrep (const EDestination *dest)
-{
-	const char *name, *email;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->raw)
-		return dest->priv->raw;
-	
-	name  = e_destination_get_name (dest);
-	email = e_destination_get_email (dest);
-	
-	if (e_destination_from_card (dest) && name != NULL)
-		return name;
-	
-	/* Make sure that our address gets quoted properly */
-	if (name && email && dest->priv->textrep == NULL) {
-		CamelInternetAddress *addr = camel_internet_address_new ();
-		
-		camel_internet_address_add (addr, name, email);
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = camel_address_format (CAMEL_ADDRESS (addr));
-		camel_object_unref (CAMEL_OBJECT (addr));
-	}
-	
-	if (dest->priv->textrep != NULL)
-		return dest->priv->textrep;
-
-	if (email)
-		return email;
-	
-	return "";
-}
-
-gboolean
-e_destination_is_evolution_list (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->list_dests == NULL
-	    && dest->priv->card != NULL
-	    && dest->priv->card->email != NULL
-	    && e_card_evolution_list (dest->priv->card)) {
-		
-		EIterator *iter = e_list_get_iterator (dest->priv->card->email);
-		
-		e_iterator_reset (iter);
-		while (e_iterator_is_valid (iter)) {
-			const char *dest_xml = (const char *) e_iterator_get (iter);
-			EDestination *list_dest = e_destination_import (dest_xml);
-			
-			if (list_dest)
-				dest->priv->list_dests = g_list_append (dest->priv->list_dests, list_dest);
-			e_iterator_next (iter);
-		}
-	}
-	
-	return dest->priv->list_dests != NULL;
-}
-
-gboolean
-e_destination_list_show_addresses (const EDestination *dest)
-{
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->card != NULL)
-		return e_card_evolution_list_show_addresses (dest->priv->card);
-	
-	return dest->priv->show_addresses;
-}
-
-gboolean
-e_destination_get_html_mail_pref (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->html_mail_override || dest->priv->card == NULL)
-		return dest->priv->wants_html_mail;
-	
-	return dest->priv->card->wants_html;
-}
-
-gboolean
-e_destination_allow_cardification (const EDestination *dest)
-{
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	
-	return dest->priv->allow_cardify;
-}
-
-void
-e_destination_set_allow_cardification (EDestination *dest, gboolean x)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	
-	dest->priv->allow_cardify = x;
-}
-
-static void
-set_cardify_book (EDestination *dest, EBook *book)
-{
-	if (dest->priv->cardify_book && dest->priv->cardify_book != book) {
-		gtk_object_unref (GTK_OBJECT (dest->priv->cardify_book));
-	}
-		
-	dest->priv->cardify_book = book;
-	
-	if (book)
-		gtk_object_ref (GTK_OBJECT (book));
-}
-
-static void
-name_and_email_simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EDestination *dest = E_DESTINATION (closure);
-	
-	if (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS && g_list_length ((GList *) cards) == 1) {
-		ECard *card = E_CARD (cards->data);
-		const char *email = e_destination_get_email (dest);
-		int email_num = 0;
-		
-		if (e_destination_is_valid (dest) && email && *email) {
-			email_num = e_card_email_find_number (card, e_destination_get_email (dest));
-		}
-		
-		if (email_num >= 0) {
-			const char *book_uri;
-			
-			book_uri = e_book_get_uri (book);
-			
-			dest->priv->has_been_cardified = TRUE;
-			e_destination_set_card (dest, card, email_num);
-			e_destination_set_book_uri (dest, book_uri);
-			gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CARDIFIED]);
-		}
-	}
-	
-	if (!dest->priv->has_been_cardified) {
-		dest->priv->cannot_cardify = TRUE;
-	}
-	
-	gtk_object_unref (GTK_OBJECT (dest)); /* drop the reference held by the query */
-}
-
-
-static void
-nickname_simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EDestination *dest = E_DESTINATION (closure);
-	
-	if (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) {
-		if (g_list_length ((GList *) cards) == 1) {
-			const char *book_uri;
-			
-			book_uri = e_book_get_uri (book);
-			
-			dest->priv->has_been_cardified = TRUE;
-			e_destination_set_card (dest, E_CARD (cards->data), 0); /* Uses primary e-mail by default. */
-			e_destination_set_book_uri (dest, book_uri);
-			gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CARDIFIED]);
-			
-			gtk_object_unref (GTK_OBJECT (dest)); /* drop the reference held by the query */
-			
-		} else {
-			/* We can only end up here if we don't look at all like an e-mail address, so
-			   we do a name-only query on the textrep */
-			
-			e_book_name_and_email_query (book,
-						     e_destination_get_textrep (dest),
-						     NULL,
-						     name_and_email_simple_query_cb,
-						     dest);
-		}
-	} else {
-		/* Something went wrong with the query: drop our ref to the destination and return. */
-		gtk_object_unref (GTK_OBJECT (dest));
-	}
-}
-
-static void
-launch_cardify_query (EDestination *dest)
-{
-	if (! e_destination_is_valid (dest)) {
-		/* If it doesn't look like an e-mail address, see if it is a nickname. */
-		e_book_nickname_query (dest->priv->cardify_book,
-				       e_destination_get_textrep (dest),
-				       nickname_simple_query_cb,
-				       dest);
-
-	} else {
-		e_book_name_and_email_query (dest->priv->cardify_book,
-					     e_destination_get_name (dest),
-					     e_destination_get_email (dest),
-					     name_and_email_simple_query_cb,
-					     dest);
-	}
-}
-
-static void
-use_local_book_cb (EBook *book, gpointer closure)
-{
-	EDestination *dest = E_DESTINATION (closure);
-	if (dest->priv->cardify_book == NULL) {
-		dest->priv->cardify_book = book;
-		gtk_object_ref (GTK_OBJECT (book));
-	}
-	
-	launch_cardify_query (dest);
-}
-
-
-static gboolean
-e_destination_reverting_is_a_good_idea (EDestination *dest)
-{
-	const char *textrep;
-	int len, old_len;
-	
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	if (dest->priv->old_textrep == NULL)
-		return FALSE;
-	
-	textrep = e_destination_get_textrep (dest);
-	
-	len = g_utf8_strlen (textrep, -1);
-	old_len = g_utf8_strlen (dest->priv->old_textrep, -1);
-	
-	if (len <= old_len/2)
-		return FALSE;
-	
-	return TRUE;
-}
-
-void
-e_destination_cardify (EDestination *dest, EBook *book)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-	
-	if (e_destination_is_evolution_list (dest))
-		return;
-	
-	if (e_destination_contains_card (dest))
-		return;
-	
-	if (!dest->priv->allow_cardify)
-		return;
-	
-	if (dest->priv->cannot_cardify)
-		return;
-	
-	e_destination_cancel_cardify (dest);
-	
-	/* In some cases, we can revert to the previous card. */
-	if (!e_destination_is_valid (dest)
-	    && e_destination_reverting_is_a_good_idea (dest)
-	    && e_destination_revert (dest)) {
-		return;
-	}
-	
-	set_cardify_book (dest, book);
-	
-	/* Handle the case of an EDestination containing a card URL */
-	if (e_destination_contains_card (dest)) {
-		e_destination_use_card (dest, NULL, NULL);
-		return;
-	}
-	
-	/* If we have a book ready, proceed.  We hold a reference to ourselves
-	   until our query is complete. */
-	gtk_object_ref (GTK_OBJECT (dest));
-	if (dest->priv->cardify_book != NULL) {
-		launch_cardify_query (dest);
-	} else {
-		e_book_use_local_address_book (use_local_book_cb, dest);
-	}
-}
-
-static int
-do_cardify_delayed (gpointer ptr)
-{
-	EDestination *dest = E_DESTINATION (ptr);
-	
-	e_destination_cardify (dest, dest->priv->cardify_book);
-	return FALSE;
-}
-
-void
-e_destination_cardify_delayed (EDestination *dest, EBook *book, gint delay)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-	
-	if (delay < 0)
-		delay = 500;
-	
-	e_destination_cancel_cardify (dest);
-	
-	set_cardify_book (dest, book);
-	
-	dest->priv->pending_cardification = gtk_timeout_add (delay, do_cardify_delayed, dest);
-}
-
-void
-e_destination_cancel_cardify (EDestination *dest)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	
-	if (dest->priv->pending_cardification) {
-		gtk_timeout_remove (dest->priv->pending_cardification);
-		dest->priv->pending_cardification = 0;
-	}
-}
-
-gboolean
-e_destination_uncardify (EDestination *dest)
-{
-	char *email;
-	
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	
-	if (!e_destination_contains_card (dest))
-		return FALSE;
-	
-	email = g_strdup (e_destination_get_email (dest));
-	
-	if (email == NULL)
-		return FALSE;
-	
-	e_destination_freeze (dest);
-	e_destination_clear (dest);
-	e_destination_set_raw (dest, email);
-	g_free (email);
-	e_destination_thaw (dest);
-	
-	return TRUE;
-}
-
-gboolean
-e_destination_revert (EDestination *dest)
-{
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->old_card) {
-		ECard *card;
-		int card_email_num;
-		
-		card = dest->priv->old_card;
-		card_email_num = dest->priv->old_card_email_num;
-		
-		dest->priv->old_card = NULL;
-		g_free (dest->priv->old_textrep);
-		dest->priv->old_textrep = NULL;
-		
-		e_destination_freeze (dest);
-		e_destination_clear (dest);
-		e_destination_set_card (dest, card, card_email_num);
-		e_destination_thaw (dest);
-		
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-/*
- * Destination import/export
- */
-
-gchar *
-e_destination_get_address_textv (EDestination **destv)
-{
-	int i, j, len = 0;
-	char **strv;
-	char *str;
-	
-	g_return_val_if_fail (destv, NULL);
-	
-	/* Q: Please tell me this is only for assertion
-           reasons. If this is considered to be ok behavior then you
-           shouldn't use g_return's. Just a reminder ;-) 
-	   
-	   A: Yes, this is just an assertion.  (Though it does find the
-	   length of the vector in the process...)
-	*/
-	while (destv[len]) {
-		g_return_val_if_fail (E_IS_DESTINATION (destv[len]), NULL);
-		len++;
-	}
-	
-	strv = g_new0 (char *, len + 1);
-	for (i = 0, j = 0; destv[i]; i++) {
-		if (!e_destination_is_empty (destv[i])) {
-			const char *addr = e_destination_get_address (destv[i]);
-			strv[j++] = addr ? (char *) addr : "";
-		}
-	}
-	
-	str = g_strjoinv (", ", strv);
-	
-	g_free (strv);
-	
-	return str;
-}
-
-xmlNodePtr
-e_destination_xml_encode (const EDestination *dest)
-{
-	xmlNodePtr dest_node;
-	const char *str;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	dest_node = xmlNewNode (NULL, "destination");
-	
-	str = e_destination_get_name (dest);
-	if (str)
-		xmlNewTextChild (dest_node, NULL, "name", str);
-	
-	if (!e_destination_is_evolution_list (dest)) {
-		str = e_destination_get_email (dest);
-		if (str)
-			xmlNewTextChild (dest_node, NULL, "email", str);
-	} else {
-		GList *iter = dest->priv->list_dests;
-		
-		while (iter) {
-			EDestination *list_dest = E_DESTINATION (iter->data);
-			xmlNodePtr list_node = xmlNewNode (NULL, "list_entry");
-			
-			str = e_destination_get_name (list_dest);
-			if (str)
-				xmlNewTextChild (list_node, NULL, "name", str);
-			
-			str = e_destination_get_email (list_dest);
-			if (str)
-				xmlNewTextChild (list_node, NULL, "email", str);
-			
-			xmlAddChild (dest_node, list_node);
-			
-			iter = g_list_next (iter);
-		}
-		
-		xmlNewProp (dest_node, "is_list", "yes");
-		xmlNewProp (dest_node, "show_addresses", 
-			    e_destination_list_show_addresses (dest) ? "yes" : "no");
-	}
-	
-	str = e_destination_get_book_uri (dest);
-	if (str) {
-		xmlNewTextChild (dest_node, NULL, "book_uri", str);
-	}
-	
-	str = e_destination_get_card_uid (dest);
-	if (str) {
-		char buf[16];
-		
-		xmlNodePtr uri_node = xmlNewTextChild (dest_node, NULL, "card_uid", str);
-		g_snprintf (buf, 16, "%d", e_destination_get_email_num (dest));
-		xmlNewProp (uri_node, "email_num", buf);
-	}
-	
-	xmlNewProp (dest_node, "html_mail", e_destination_get_html_mail_pref (dest) ? "yes" : "no");
-	
-	xmlNewProp (dest_node, "auto_recipient",
-		    e_destination_is_auto_recipient (dest) ? "yes" : "no");
-	
-	return dest_node;
-}
-
-gboolean
-e_destination_xml_decode (EDestination *dest, xmlNodePtr node)
-{
-	char *name = NULL, *email = NULL, *book_uri = NULL, *card_uid = NULL;
-	gboolean is_list = FALSE, show_addr = FALSE, auto_recip = FALSE;
-	gboolean html_mail = FALSE;
-	GList *list_dests = NULL;
-	int email_num = -1;
-	char *tmp;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	g_return_val_if_fail (node != NULL, FALSE);
-	
-	if (strcmp (node->name, "destination"))
-		return FALSE;
-	
-	tmp = xmlGetProp (node, "html_mail");
-	if (tmp) {
-		html_mail = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "is_list");
-	if (tmp) {
-		is_list = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "show_addresses");
-	if (tmp) {
-		show_addr = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "auto_recipient");
-	if (tmp) {
-		auto_recip = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	node = node->xmlChildrenNode;
-	while (node) {
-		if (!strcmp (node->name, "name")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (name);
-			name = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (!is_list && !strcmp (node->name, "email")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (email);
-			email = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (is_list && !strcmp (node->name, "list_entry")) {
-			xmlNodePtr subnode = node->xmlChildrenNode;
-			char *list_name = NULL, *list_email = NULL;
-			
-			while (subnode) {
-				if (!strcmp (subnode->name, "name")) {
-					tmp = xmlNodeGetContent (subnode);
-					g_free (list_name);
-					list_name = g_strdup (tmp);
-					xmlFree (tmp);
-				} else if (!strcmp (subnode->name, "email")) {
-					tmp = xmlNodeGetContent (subnode);
-					g_free (list_email);
-					list_email = g_strdup (tmp);
-					xmlFree (tmp);
-				}
-				
-				subnode = subnode->next;
-			}
-			
-			if (list_name || list_email) {
-				EDestination *list_dest = e_destination_new ();
-				
-				if (list_name)
-					e_destination_set_name (list_dest, list_name);
-				if (list_email)
-					e_destination_set_email (list_dest, list_email);
-				
-				g_free (list_name);
-				g_free (list_email);
-				
-				list_dests = g_list_append (list_dests, list_dest);
-			}
-		} else if (!strcmp (node->name, "book_uri")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (book_uri);
-			book_uri = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (!strcmp (node->name, "card_uid")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (card_uid);
-			card_uid = g_strdup (tmp);
-			xmlFree (tmp);
-			
-			tmp = xmlGetProp (node, "email_num");
-			email_num = atoi (tmp);
-			xmlFree (tmp);
-		}
-		
-		node = node->next;
-	}
-	
-	e_destination_freeze (dest);
-	
-	e_destination_clear (dest);
-	
-	if (name) {
-		e_destination_set_name (dest, name);
-		g_free (name);
-	}
-	if (email) {
-		e_destination_set_email (dest, email);
-		g_free (email);
-	}
-	if (book_uri) {
-		e_destination_set_book_uri (dest, book_uri);
-		g_free (book_uri);
-	}
-	if (card_uid) {
-		e_destination_set_card_uid (dest, card_uid, email_num);
-		g_free (card_uid);
-	}
-	if (list_dests)
-		dest->priv->list_dests = list_dests;
-	
-	dest->priv->html_mail_override = TRUE;
-	dest->priv->wants_html_mail = html_mail;
-	
-	dest->priv->show_addresses = show_addr;
-	
-	dest->priv->auto_recipient = auto_recip;
-	
-	e_destination_thaw (dest);
-	
-	return TRUE;
-}
-
-/* FIXME: Make utf-8 safe */
-static gchar *
-null_terminate_and_remove_extra_whitespace (xmlChar *xml_in, gint size)
-{
-	gboolean skip_white = FALSE;
-	char *xml, *r, *w;
-	
-	if (xml_in == NULL || size <= 0) 
-		return NULL;
-	
-	xml = g_strndup (xml_in, size);
-	r = w = xml;
-	
-	while (*r) {
-		if (*r == '\n' || *r == '\r') {
-			skip_white = TRUE;
-		} else {
-			gboolean is_space = isspace (*r);
-			
-			*w = *r;
-			
-			if (!(skip_white && is_space))
-				w++;
-			if (!is_space)
-				skip_white = FALSE;
-		}
-		r++;
-	}
-	
-	*w = '\0';
-	
-	return xml;
-}
-
-gchar *
-e_destination_export (const EDestination *dest)
-{
-	xmlNodePtr dest_node;
-	xmlDocPtr dest_doc;
-	xmlChar *buffer = NULL;
-	int size = -1;
-	char *str;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	dest_node = e_destination_xml_encode (dest);
-	if (dest_node == NULL)
-		return NULL;
-	
-	dest_doc = xmlNewDoc (XML_DEFAULT_VERSION);
-	xmlDocSetRootElement (dest_doc, dest_node);
-	
-	xmlDocDumpMemory (dest_doc, &buffer, &size);
-	xmlFreeDoc (dest_doc);
-	
-	str = null_terminate_and_remove_extra_whitespace (buffer, size);
-	xmlFree (buffer);
-	
-	return str;
-}
-
-EDestination *
-e_destination_import (const gchar *str)
-{
-	EDestination *dest = NULL;
-	xmlDocPtr dest_doc;
-	
-	if (!(str && *str))
-		return NULL;
-	
-	dest_doc = xmlParseMemory ((char *) str, strlen (str));
-	if (dest_doc && dest_doc->xmlRootNode) {
-		dest = e_destination_new ();
-		if (! e_destination_xml_decode (dest, dest_doc->xmlRootNode)) {
-			gtk_object_unref (GTK_OBJECT (dest));
-			dest = NULL;
-		}
-	}
-	xmlFreeDoc (dest_doc);
-	
-	return dest;
-}
-
-gchar *
-e_destination_exportv (EDestination **destv)
-{
-	xmlDocPtr destv_doc;
-	xmlNodePtr destv_node;
-	xmlChar *buffer = NULL;
-	int i, size = -1;
-	char *str;
-	
-	if (destv == NULL || *destv == NULL)
-		return NULL;
-	
-	destv_doc  = xmlNewDoc (XML_DEFAULT_VERSION);
-	destv_node = xmlNewNode (NULL, "destinations");
-	xmlDocSetRootElement (destv_doc, destv_node);
-	
-	for (i = 0; destv[i]; i++) {
-		if (! e_destination_is_empty (destv[i])) {
-			xmlNodePtr dest_node = e_destination_xml_encode (destv[i]);
-			if (dest_node)
-				xmlAddChild (destv_node, dest_node);
-		}
-	}
-	
-	xmlDocDumpMemory (destv_doc, &buffer, &size);
-	xmlFreeDoc (destv_doc);
-	
-	str = null_terminate_and_remove_extra_whitespace (buffer, size);
-	xmlFree (buffer);
-	
-	return str;
-}
-
-EDestination **
-e_destination_importv (const gchar *str)
-{
-	GPtrArray *dest_array = NULL;
-	xmlDocPtr destv_doc;
-	xmlNodePtr node;
-	EDestination **destv = NULL;
-	
-	if (!(str && *str))
-		return NULL;
-	
-	destv_doc = xmlParseMemory ((char *)str, strlen (str));
-	if (destv_doc == NULL)
-		return NULL;
-	
-	node = destv_doc->xmlRootNode;
-	
-	if (strcmp (node->name, "destinations"))
-		goto finished;
-	
-	node = node->xmlChildrenNode;
-	
-	dest_array = g_ptr_array_new ();
-	
-	while (node) {
-		EDestination *dest;
-		
-		dest = e_destination_new ();
-		if (e_destination_xml_decode (dest, node) && !e_destination_is_empty (dest)) {
-			g_ptr_array_add (dest_array, dest);
-		} else {
-			gtk_object_unref (GTK_OBJECT (dest));
-		}
-		
-		node = node->next;
-	}
-	
-	/* we need destv to be NULL terminated */
-	g_ptr_array_add (dest_array, NULL);
-	
-	destv = (EDestination **) dest_array->pdata;
-	g_ptr_array_free (dest_array, FALSE);
-	
- finished:
-	xmlFreeDoc (destv_doc);
-	
-	return destv;
-}
-
-EDestination **
-e_destination_list_to_vector_sized (GList *list, int n)
-{
-	EDestination **destv;
-	int i = 0;
-	
-	if (n == -1)
-		n = g_list_length (list);
-	
-	if (n == 0)
-		return NULL;
-	
-	destv = g_new (EDestination *, n + 1);
-	while (list != NULL && i < n) {
-		destv[i] = E_DESTINATION (list->data);
-		list->data = NULL;
-		i++;
-		list = g_list_next (list);
-	}
-	destv[i] = NULL;
-	
-	return destv;
-}
-
-EDestination **
-e_destination_list_to_vector (GList *list)
-{
-	return e_destination_list_to_vector_sized (list, -1);
-}
-
-void
-e_destination_freev (EDestination **destv)
-{
-	int i;
-	
-	if (destv) {
-		for (i = 0; destv[i] != NULL; ++i) {
-			gtk_object_unref (GTK_OBJECT (destv[i]));
-		}
-		g_free (destv);
-	}
-
-}
-
-static void
-touch_cb (EBook *book, const gchar *addr, ECard *card, gpointer closure)
-{
-	if (book != NULL && card != NULL) {
-		e_card_touch (card);
-		d(g_message ("Use score for \"%s\" is now %f", addr, e_card_get_use_score (card)));
-		e_book_commit_card (book, card, NULL, NULL);
-	}
-}
-
-void
-e_destination_touch (EDestination *dest)
-{
-	const char *email;
-	
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	if (!e_destination_is_auto_recipient (dest)) {
-		email = e_destination_get_email (dest);
-		
-		if (email)
-			e_book_query_address_locally (email, touch_cb, NULL);
-	}
-}
-
-void
-e_destination_touchv (EDestination **destv)
-{
-	int i;
-	
-	g_return_if_fail (destv != NULL);
-	
-	for (i = 0; destv[i] != NULL; ++i) {
-		e_destination_touch (destv[i]);
-	}
-}
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
deleted file mode 100644
index f545794ab0..0000000000
--- a/addressbook/backend/ebook/e-destination.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-destination.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_DESTINATION_H__
-#define __E_DESTINATION_H__
-
-#include <gtk/gtkobject.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <gnome-xml/tree.h>
-
-#define E_TYPE_DESTINATION        (e_destination_get_type ())
-#define E_DESTINATION(o)          (GTK_CHECK_CAST ((o), E_TYPE_DESTINATION, EDestination))
-#define E_DESTINATION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_TYPE_DESTINATION, EDestinationClass))
-#define E_IS_DESTINATION(o)       (GTK_CHECK_TYPE ((o), E_TYPE_DESTINATION))
-#define E_IS_DESTINATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TYPE_DESTINATION))
-
-typedef struct _EDestination EDestination;
-typedef struct _EDestinationClass EDestinationClass;
-
-typedef void (*EDestinationCardCallback) (EDestination *dest, ECard *card, gpointer closure);
-
-struct _EDestinationPrivate;
-
-struct _EDestination {
-	GtkObject object;
-
-	struct _EDestinationPrivate *priv;
-};
-
-struct _EDestinationClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (EDestination *dest);	
-	void (*cardified) (EDestination *dest);
-};
-
-GtkType e_destination_get_type (void);
-
-
-EDestination  *e_destination_new                (void);
-void           e_destination_changed            (EDestination *);
-EDestination  *e_destination_copy               (const EDestination *);
-void           e_destination_clear              (EDestination *);
-
-gboolean       e_destination_is_empty           (const EDestination *);
-gboolean       e_destination_is_valid           (const EDestination *);
-gboolean       e_destination_equal              (const EDestination *a, const EDestination *b);
-
-void           e_destination_set_card           (EDestination *, ECard *card, gint email_num);
-void           e_destination_set_book_uri       (EDestination *, const gchar *uri); 
-void           e_destination_set_card_uid       (EDestination *, const gchar *uid, gint email_num); 
-
-void           e_destination_set_name           (EDestination *, const gchar *name);
-void           e_destination_set_email          (EDestination *, const gchar *email);
-
-void           e_destination_set_html_mail_pref (EDestination *, gboolean);
-
-gboolean       e_destination_contains_card      (const EDestination *);
-gboolean       e_destination_from_card          (const EDestination *);
-
-gboolean       e_destination_is_auto_recipient  (const EDestination *);
-void           e_destination_set_auto_recipient (EDestination *, gboolean value);
-
-void           e_destination_use_card           (EDestination *, EDestinationCardCallback cb, gpointer closure);
-
-ECard         *e_destination_get_card           (const EDestination *);
-const gchar   *e_destination_get_book_uri       (const EDestination *);
-const gchar   *e_destination_get_card_uid       (const EDestination *);
-gint           e_destination_get_email_num      (const EDestination *);
-
-const gchar   *e_destination_get_name           (const EDestination *);  /* "Jane Smith" */
-const gchar   *e_destination_get_email          (const EDestination *);  /* "jane@assbarn.com" */
-const gchar   *e_destination_get_address        (const EDestination *);  /* "Jane Smith <jane@assbarn.com>" (or a comma-sep set of such for a list) */
-
-void           e_destination_set_raw            (EDestination *, const gchar *free_form_string);
-const gchar   *e_destination_get_textrep        (const EDestination *);  /* "Jane Smith" or "jane@assbarn.com" */
-
-gboolean       e_destination_is_evolution_list   (const EDestination *);
-gboolean       e_destination_list_show_addresses (const EDestination *);
-
-/* If true, they want HTML mail. */
-gboolean       e_destination_get_html_mail_pref (const EDestination *);
-
-gboolean       e_destination_allow_cardification     (const EDestination *);
-void           e_destination_set_allow_cardification (EDestination *, gboolean);
-void           e_destination_cardify                 (EDestination *, EBook *);
-void           e_destination_cardify_delayed         (EDestination *, EBook *, gint delay); /* delay < 0: "default" */
-void           e_destination_cancel_cardify          (EDestination *);
-gboolean       e_destination_uncardify               (EDestination *);
-
-gboolean       e_destination_revert                  (EDestination *);
-
-gchar         *e_destination_get_address_textv  (EDestination **);
-
-xmlNodePtr     e_destination_xml_encode         (const EDestination *dest);
-gboolean       e_destination_xml_decode         (EDestination *dest, xmlNodePtr node);
-
-gchar         *e_destination_export             (const EDestination *);
-EDestination  *e_destination_import             (const gchar *str);
-
-gchar         *e_destination_exportv            (EDestination **);
-EDestination **e_destination_importv            (const gchar *str);
-
-EDestination **e_destination_list_to_vector_sized (GList *, int n);
-EDestination **e_destination_list_to_vector       (GList *);
-
-void           e_destination_freev              (EDestination **);
-
-void           e_destination_touch              (EDestination *);
-void           e_destination_touchv             (EDestination **);
-
-
-#endif /* __E_DESTINATION_H__ */
-
diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c
deleted file mode 100644
index 60ac899e81..0000000000
--- a/addressbook/backend/ebook/evolution-ldif-importer.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * LDIF importer.  LDIF is the file format of an exported Netscape
- * addressbook.
- *
- * Framework copied from evolution-gnomecard-importer.c
- *
- * Michael M. Morrison (mmorrison@kqcorp.com)
- *
- * Multi-line value support, mailing list support, base64 support, and
- * various fixups: Chris Toshok (toshok@ximian.com)
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <e-book.h>
-#include <e-card-simple.h>
-#include <e-destination.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-static GHashTable *dn_card_hash;
-
-typedef struct {
-	char *filename;
-	GList *cardlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} LDIFImporter;
-
-static struct {
-	char *ldif_attribute;
-	ECardSimpleField simple_field;
-#define FLAG_ADDRESS 0x01
-	int flags;
-}
-ldif_fields[] = {
-	{ "cn", E_CARD_SIMPLE_FIELD_FULL_NAME },
-	{ "mail", E_CARD_SIMPLE_FIELD_EMAIL },
-#if 0
-	{ "givenname", E_CARD_SIMPLE_FIELD_GIVEN_NAME },
-#endif
-	{ "sn", E_CARD_SIMPLE_FIELD_FAMILY_NAME },
-	{ "xmozillanickname", E_CARD_SIMPLE_FIELD_NICKNAME },
-	{ "o", E_CARD_SIMPLE_FIELD_ORG },
-	{ "locality", 0, FLAG_ADDRESS},
-	{ "st", 0, FLAG_ADDRESS },
-	{ "streetaddress", 0, FLAG_ADDRESS },
-	{ "title", E_CARD_SIMPLE_FIELD_TITLE },
-	{ "postalcode", 0, FLAG_ADDRESS },
-	{ "countryname", 0, FLAG_ADDRESS },
-	{ "telephonenumber", E_CARD_SIMPLE_FIELD_PHONE_BUSINESS},
-	{ "homephone", E_CARD_SIMPLE_FIELD_PHONE_HOME },
-	{ "facsimiletelephonenumber", E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX },
-	{ "ou", E_CARD_SIMPLE_FIELD_ORG_UNIT },
-	{ "pagerphone", E_CARD_SIMPLE_FIELD_PHONE_PAGER },
-	{ "cellphone", E_CARD_SIMPLE_FIELD_PHONE_MOBILE },
-	{ "homeurl", E_CARD_SIMPLE_FIELD_URL },
-	{ "description", E_CARD_SIMPLE_FIELD_NOTE },
-	{ "xmozillausehtmlmail", E_CARD_SIMPLE_FIELD_WANTS_HTML }
-};
-static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]);
-
-static unsigned char 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,
-};
-
-/**
- * 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
- **/
-static 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 = 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 (base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=')
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-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);
-}
-
-static GString *
-getValue( char **src )
-{
-	GString *dest = g_string_new("");
-	char *s = *src;
-	gboolean need_base64 = (*s == ':');
-
- copy_line:
-	while( *s != 0 && *s != '\n' && *s != '\r' )
-		dest = g_string_append_c (dest, *s++);
-
-	if (*s == '\r') s++;
-	if (*s == '\n')	s++;
-
-	/* check for continuation here */
-	if (*s == ' ') {
-		s++;
-		goto copy_line;
-	}
-
-	if (need_base64) {
-		int new_len;
-		/* it's base64 encoded */
-		dest = g_string_erase (dest, 0, 2);
-		new_len = base64_decode_simple (dest->str, strlen (dest->str));
-		dest = g_string_truncate (dest, new_len);
-	}
-
-	*src = s;
-
-	return dest;
-}
-
-static gboolean
-parseLine( ECardSimple *simple, ECardDeliveryAddress *address, char **buf )
-{
-	char *ptr;
-	char *colon, *value;
-	gboolean field_handled;
-	GString *ldif_value;
-
-	ptr = *buf;
-
-	/* if the string is empty, return */
-	if (*ptr == '\0') {
-		*buf = NULL;
-		return TRUE;
-	}
-
-	/* skip comment lines */
-	if (*ptr == '#') {
-		ptr = strchr (ptr, '\n');
-		if (!ptr)
-			*buf = NULL;
-		else
-			*buf = ptr + 1;
-		return TRUE;
-	}
-
-	/* first, check for a 'continuation' line */
-	if( ptr[0] == ' ' && ptr[1] != '\n' ) {
-		g_warning ("unexpected continuation line");
-		return FALSE;
-	}
-
-	colon = (char *)strchr( ptr, ':' );
-	if (colon) {
-		int i;
-
-		*colon = 0;
-		value = colon + 1;
-		while ( isspace(*value) )
-			value++;
-
-		ldif_value = getValue(&value );
-
-		field_handled = FALSE;
-		for (i = 0; i < num_ldif_fields; i ++) {
-			if (!g_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {
-				if (ldif_fields[i].flags & FLAG_ADDRESS) {
-					if (!g_strcasecmp (ptr, "locality"))
-						address->city = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "countryname"))
-						address->country = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "postalcode"))
-						address->code = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "st"))
-						address->region = g_strdup (ldif_value->str);
-					else if (!g_strcasecmp (ptr, "streetaddress"))
-						address->street = g_strdup (ldif_value->str);
-				}
-				else {
-					e_card_simple_set (simple, ldif_fields[i].simple_field, ldif_value->str);
-					printf ("set %s to %s\n", ptr, ldif_value->str);
-				}
-				field_handled = TRUE;
-				break;
-			}
-		}
-
-		/* handle objectclass/dn/member out here */
-		if (!field_handled) {
-			if (!g_strcasecmp (ptr, "dn"))
-				g_hash_table_insert (dn_card_hash, g_strdup(ldif_value->str), simple->card);
-			else if (!g_strcasecmp (ptr, "objectclass") && !g_strcasecmp (ldif_value->str, "groupofnames")) {
-				e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_IS_LIST, "true");
-			}
-			else if (!g_strcasecmp (ptr, "member")) {
-				EList *email;
-				gtk_object_get (GTK_OBJECT (simple->card),
-						"email", &email,
-						NULL);
-				e_list_append (email, ldif_value->str);
-			}
-		}
-
-		/* put the colon back the way it was, just for kicks */
-		*colon = ':';
-
-		g_string_free (ldif_value, TRUE);
-	}
-	else {
-		g_warning ("unrecognized entry %s", ptr);
-		return FALSE;
-	}
-
-	*buf = value;
-
-	return TRUE;
-}
-
-static ECard *
-getNextLDIFEntry( FILE *f )
-{
-	ECard *card;
-	ECardAddrLabel *label;
-	ECardSimple *simple;
-	ECardDeliveryAddress *address;
-	GString *str;
-	char line[1024];
-	char *buf;
-
-	str = g_string_new ("");
-	/* read from the file until we get to a blank line (or eof) */
-	while (!feof (f)) {
-		if (!fgets (line, sizeof(line), f))
-			break;
-		if (line[0] == '\n')
-			break;
-		str = g_string_append (str, line);
-	}
-
-	if (strlen (str->str) == 0) {
-		g_string_free (str, TRUE);
-		return NULL;
-	}
-
-	/* now parse that entry */
-	card = e_card_new ("");
-	simple = e_card_simple_new (card);
-	address = e_card_delivery_address_new ();
-
-	buf = str->str;
-	while (buf) {
-		if (!parseLine (simple, address, &buf)) {
-			/* parsing error */
-			gtk_object_unref (GTK_OBJECT (simple));
-			e_card_delivery_address_unref (address);
-			return NULL;
-		}
-	}
-
-
-	/* fill in the address */
-	address->flags = E_CARD_ADDR_HOME;
-
-	label = e_card_delivery_address_to_label (address);
-	e_card_delivery_address_unref (address);
-
-	e_card_simple_set_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME, label);
-
-	e_card_address_label_unref (label);
-
-	e_card_simple_sync_card (simple);
-
-	g_string_free (str, TRUE);
-
-	return card;
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard;
-
-	e_card_set_id (card, id);
-
-	vcard = e_card_get_vcard(card);	
-
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-}
-
-static void
-resolve_list_card (LDIFImporter *gci, ECard *card)
-{
-	EList *email;
-	EIterator *email_iter;
-	char *full_name;
-
-	if (!e_card_evolution_list (card))
-		return;
-
-	gtk_object_get (GTK_OBJECT (card),
-			"email", &email,
-			"full_name", &full_name,
-			NULL);
-
-	/* set file_as to full_name so we don't later try and figure
-           out a first/last name for the list. */
-	if (full_name)
-		gtk_object_set (GTK_OBJECT (card),
-				"file_as", full_name,
-				NULL);
-
-	email_iter = e_list_get_iterator (email);
-	while (e_iterator_is_valid (email_iter)) {
-		const char *dn = e_iterator_get (email_iter);
-		ECard *dn_card = g_hash_table_lookup (dn_card_hash, dn);
-
-		/* break list chains here, since we don't support them just yet */
-		if (dn_card && !e_card_evolution_list (dn_card)) {
-			EDestination *dest = e_destination_new ();
-			gchar *dest_xml;
-			e_destination_set_card (dest, dn_card, 0);  /* Hard-wired for default e-mail, since netscape only exports 1 email address */
-			dest_xml = e_destination_export (dest);
-			gtk_object_unref (GTK_OBJECT (dest));
-			if (dest_xml) {
-				e_iterator_set (email_iter, dest_xml);
-				g_free (dest_xml);
-				e_iterator_next (email_iter);
-			}
-			else {
-				e_iterator_delete (email_iter);
-			}
-		}
-		else {
-			e_iterator_delete (email_iter);
-		}
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LDIFImporter *gci = (LDIFImporter *) closure;
-	GList * list = NULL;
-	GList * list_list = NULL;
-	FILE * file;
-	ECard *card;
-
-	if(!( file = fopen( gci->filename, "r" ) )) {
-		g_warning("!!!Can't open .ldif file");
-		return;
-	}
-
-	dn_card_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	while ((card = getNextLDIFEntry (file))) {
-
-		if (e_card_evolution_list (card))
-			list_list = g_list_append (list_list, card);
-		else
-			list = g_list_append (list, card);
-	}
-
-	fclose( file );
-
-	list = g_list_reverse( list );
-	list_list = g_list_reverse (list_list);
-	list = g_list_concat (list, list_list);
-
-	gci->cardlist = list;
-	gci->ready = TRUE;
-}
-
-static void
-ebook_create (LDIFImporter *gci)
-{
-	gchar *path, *uri;
-	
-	gci->book = e_book_new ();
-
-	if (!gci->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);
-
-	if (! e_book_load_uri (gci->book, uri, book_open_cb, gci)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	LDIFImporter *gci = (LDIFImporter *) closure;
-	ECard *card;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->cardlist;
-
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-
-	card = gci->iterator->data;
-	if (e_card_evolution_list (card))
-		resolve_list_card (gci, card);
-	e_book_add_card (gci->book, card, add_card_cb, card);
-
-	gci->iterator = gci->iterator->next;
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[2] = {
-	".ldif", NULL
-};
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return FALSE;
-	}
-
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     LDIFImporter *gci)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      const char *folderpath,
-	      void *closure)
-{
-	LDIFImporter *gci;
-
-	gci = (LDIFImporter *) closure;
-	gci->filename = g_strdup (filename);
-	gci->cardlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	ebook_create (gci);
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	LDIFImporter *gci;
-
-	gci = g_new (LDIFImporter, 1);
-	importer = evolution_importer_new (support_format_fn, load_file_fn, 
-					   process_item_fn, NULL, gci);
-	
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);
-	
-	return BONOBO_OBJECT (importer);
-}
-
-static void
-importer_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					      factory_fn, NULL);
-
-	if (factory == NULL) {
-		g_error ("Unable to create factory");
-	}
-
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-}
-
-int
-main (int argc,
-      char **argv)
-{
-	CORBA_ORB orb;
-	
-	gnome_init_with_popt_table ("Evolution-LDIF-Importer",
-				    "0.0", 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.");
-	}
-
-	importer_init ();
-	bonobo_main ();
-
-	return 0;
-}
-
-
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
deleted file mode 100644
index e32593b4fb..0000000000
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <stdio.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-main.h>
-
-#include <e-book.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-
-#include <e-util/e-path.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-typedef struct {
-	char *filename;
-	char *folderpath;
-	GList *cardlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} VCardImporter;
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	VCardImporter *gci = (VCardImporter *) closure;
-
-	gci->cardlist = e_card_load_cards_from_file_with_default_charset(gci->filename, "ISO-8859-1");
-	gci->ready = TRUE;
-}
-
-static void
-ebook_create (VCardImporter *gci)
-{
-	gchar *path, *uri;
-	gchar *epath;
-	
-	gci->book = e_book_new ();
-
-	if (!gci->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");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	epath = e_path_to_physical (uri, gci->folderpath);
-	g_free (uri);
-	uri = g_strdup_printf ("%s/addressbook.db", epath);
-	g_free (epath);
-
-	if (! e_book_load_uri (gci->book, uri, book_open_cb, gci)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	VCardImporter *gci = (VCardImporter *) closure;
-	ECard *card;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->cardlist;
-	
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-	
-	card = gci->iterator->data;
-	e_book_add_card (gci->book, card, add_card_cb, card);
-	
-	gci->iterator = gci->iterator->next;
-	
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[3] = {
-	".vcf",
-	".gcrd",
-	NULL
-};
-
-/* Actually check the contents of this file */
-static gboolean
-check_file_is_vcard (const char *filename)
-{
-	FILE *handle;
-	char line[4096];
-	gboolean result;
-
-	handle = fopen (filename, "r");
-	if (handle == NULL) {
-		g_print ("\n");
-		return FALSE;
-	}
-		
-	fgets (line, 4096, handle);
-	if (line == NULL) {
-		fclose (handle);
-		g_print ("\n");
-		return FALSE;
-	}
-
-	if (strncmp (line, "BEGIN:VCARD", 11) == 0) {
-		result = TRUE;
-	} else {
-		result = FALSE;
-	}
-
-	fclose (handle);
-	return result;
-}
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return check_file_is_vcard (filename);
-	}
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return check_file_is_vcard (filename);
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     VCardImporter *gci)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      const char *folderpath,
-	      void *closure)
-{
-	VCardImporter *gci;
-
-	if (check_file_is_vcard (filename) == FALSE) {
-		return FALSE;
-	}
-
-	gci = (VCardImporter *) closure;
-	gci->filename = g_strdup (filename);
-	gci->folderpath = g_strdup (folderpath);
-	gci->cardlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	ebook_create (gci);
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	VCardImporter *gci;
-
-	gci = g_new (VCardImporter, 1);
-	importer = evolution_importer_new (support_format_fn, load_file_fn, 
-					   process_item_fn, NULL, gci);
-	
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);
-	
-	return BONOBO_OBJECT (importer);
-}
-
-static void
-importer_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					      factory_fn, NULL);
-
-	if (factory == NULL) {
-		g_error ("Unable to create factory");
-	}
-
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-}
-
-int
-main (int argc,
-      char **argv)
-{
-	CORBA_ORB orb;
-	
-	gnome_init_with_popt_table ("Evolution-VCard-Importer",
-				    PACKAGE, 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.");
-	}
-
-	importer_init ();
-	bonobo_main ();
-
-	return 0;
-}
-
-
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
deleted file mode 100644
index 6f592a4664..0000000000
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-init.h>
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.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_assume_utf8(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_with_default_charset("gnomecard.vcf", "ISO-8859-1");
-	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 c1d58a88bf..0000000000
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-init.h>
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.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_assume_utf8(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]);
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_strfreev(strings);
-}
-
-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 b17dc62174..0000000000
--- a/addressbook/backend/ebook/test-card.c
+++ /dev/null
@@ -1,206 +0,0 @@
-#include <string.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-card.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Ximian, 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@ximian.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;
-	EList *arbitrary;
-	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_with_default_charset (cardstr, "ISO-8859-1");
-	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,
-		       "arbitrary",  &arbitrary,
-		       "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 ( arbitrary ) {
-	  iterator = e_list_get_iterator(arbitrary);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-            ECardArbitrary *arbitrary = (ECardArbitrary *) e_iterator_get(iterator);
-	    printf("Arbitrary : %s, %s\n", arbitrary->key, arbitrary->value);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	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_assume_utf8(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 8a38ccf4e1..0000000000
--- a/addressbook/backend/ebook/test-client-list.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-main.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_assume_utf8(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 04f2c5b0e3..0000000000
--- a/addressbook/backend/ebook/test-client.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-#include "e-book-util.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@ximian.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_assume_utf8(card);
-		printf("Get all cards callback: [%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure)
-{
-	char *vcard;
-
-	vcard = e_card_get_vcard_assume_utf8(card);
-	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
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	GTimer *timer;
-
-	printf ("Status: %d\n", status);
-
-	printf ("Id: %s\n", id);
-
-	timer = g_timer_new ();
-	g_timer_start (timer);
-	e_book_get_card (book, id, get_card_cb, closure);
-	g_timer_stop (timer);
-	printf ("%g\n", g_timer_elapsed (timer, NULL));
-}
-
-static void
-get_fields_cb (EBook *book, EBookStatus status, EList *fields, gpointer closure)
-{
-	if (fields) {
-		EIterator *iter = e_list_get_iterator (fields);
-
-		printf ("Supported fields:\n");
-
-		for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {
-			printf (" %s\n", (char*)e_iterator_get (iter));
-		}
-
-		gtk_object_unref(GTK_OBJECT(fields));
-	}
-	else {
-		printf ("No supported fields?\n");
-	}
-
-	e_book_add_vcard(book, cardstr, add_card_cb, NULL);
-}
-
-
-static void
-auth_user_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("user authenticated\n");
-	e_book_get_supported_fields (book, get_fields_cb, closure);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	e_book_authenticate_user (book, "username", "password", "auth_method", auth_user_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_default_book (book, 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 f708026424..0000000000
--- a/addressbook/backend/idl/addressbook.idl
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-	typedef string CardId;
-	typedef string VCard;
-	typedef sequence<VCard> VCardList;
-	typedef sequence<string> stringlist;
-
-	interface CardCursor : Bonobo::Unknown {
-		long   count  ();
-		string getNth (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 notifyCardAdded        (in VCardList cards);
-		void notifyCardRemoved      (in CardId id);
-		void notifyCardChanged      (in VCardList cards);
-		void notifySequenceComplete ();
-		void notifyStatusMessage    (in string message);
-	};
-	
-	interface BookView : Bonobo::Unknown {
-	};
-
-	interface Book : Bonobo::Unknown {
-		/*
-		 * Fetching cards in the addresbook.
-		 */
-		void getVCard (in CardId id);
-
-		void authenticateUser (in string user, in string passwd,
-				       in string authMethod);
-
-		/*
-		 * Adding and deleting cards in the book.
-		 */
-		void addCard    (in VCard vcard);
-		void removeCard (in CardId Id);
-	        
-		/*
-		 * Modifying cards in the addressbook.
-		 */
-		void modifyCard (in VCard vcard);
-		
-		/*
-		 * This function returns a cursor to the book
-		 * listener.  This is for people who want a snapshot
-		 * of the addressbook.
-		 */
-		void getCursor (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 getBookView (in BookViewListener listener, in string query);
-
-		void getChanges  (in BookViewListener listener, in string change_id);
-
-		void checkConnection ();
-
-		void getSupportedFields ();
-
-		string getStaticCapabilities ();
-
-		string getName ();
-	};
-
-	interface BookListener : Bonobo::Unknown {
-
-		enum CallStatus {
-			Success,
-			RepositoryOffline,
-			PermissionDenied,
-			CardNotFound,
-			CardIdAlreadyExists,
-			ProtocolNotSupported,
-			AuthenticationFailed,
-			AuthenticationRequired,
-			UnsupportedField,
-
-			TLSNotAvailable,
-
-			OtherError
-		};
-
-		void notifyCardCreated  (in CallStatus status, in CardId Id);
-
-		void notifyCardRemoved  (in CallStatus status);
-
-		void notifyCardModified (in CallStatus status);
-		
-		void notifyOpenBookProgress (in string status_message, in short percent);
-
-		void notifyBookOpened       (in CallStatus status, in Book book);
-
-		void notifyCardRequested    (in CallStatus status, in VCard card);
-
-		void notifyCursorRequested  (in CallStatus status, in CardCursor cursor);
-
-		void notifyViewRequested    (in CallStatus status, in BookView view);
-
-		void notifyChangesRequested (in CallStatus status, in BookView view);
-
-		void notifyAuthenticationResult (in CallStatus status);
-
-		void notifySupportedFields (in CallStatus status, in stringlist fields);
-
-		/**
-		 * notifyConnectionStatus:
-		 *
-		 * 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 notifyConnectionStatus (in boolean connected);
-
-		/**
-		 * notifyWritable:
-		 *
-		 * Used to report whether or not a backend can write
-		 * to a given addressbook.  All books default to
-		 * read-only, so unless you receive a notification
-		 * saying otherwise, treat the book as read-only.  It
-		 * is presumed that this notification will be sent
-		 * early (just after a connection is opened, usually),
-		 * but it may also be sent later, if/when the backend
-		 * notices a change.
-		 */
-		void notifyWritable (in boolean writable);
-	};
-
-	interface BookFactory : Bonobo::Unknown {
-		exception ProtocolNotSupported {};
-
-		void openBook (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 3f9a2627cd..0000000000
--- a/addressbook/backend/pas/Makefile.am
+++ /dev/null
@@ -1,62 +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) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-	$(DB3_CFLAGS)					\
-	$(LDAP_CFLAGS)					\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"wombat-pas\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-        $(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-LDAP_SCHEMA =						\
-	evolutionperson.schema
-
-LDAP_BACKEND_FILES = pas-backend-ldap.c pas-backend-ldap.h
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_FILES)
-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-card-sexp.c				\
-	pas-backend-card-sexp.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)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-EXTRA_DIST = $(LDAP_BACKEND_FILES) $(LDAP_SCHEMA)
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/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema
deleted file mode 100644
index f0f3a394df..0000000000
--- a/addressbook/backend/pas/evolutionperson.schema
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# Depends upon
-#   Definition of an X.500 Attribute Type and an Object Class to Hold
-#   Uniform Resource Identifiers (URIs) [RFC2079]
-#	(core.schema)
-#   
-#   A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256]
-#	(core.schema)
-#
-#   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
-#
-#   The Internet Organizational Person Schema (inetorgperson)
-#
-# OIDs are broken up into the following:
-#   1.3.6.1.4.1.8506.1.?
-#                     .1  Syntaxes
-#                     .2  Attributes
-#                     .3  Objectclasses
-   
-# primaryPhone
-attributetype ( 1.3.6.1.4.1.8506.1.2.1
-	NAME 'primaryPhone'
-	DESC 'preferred phone number used to contact a person'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-	SINGLE-VALUE )
-
-# carPhone
-attributetype ( 1.3.6.1.4.1.8506.1.2.2
-	NAME 'carPhone'
-	DESC 'car phone telephone number of the person'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.3
-	NAME ( 'homeFacsimileTelephoneNumber' 'homeFax' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.4
-	NAME 'otherPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.5
-	NAME 'businessRole'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.6
-	NAME 'managerName'
-	SUP name )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.7
-	NAME 'assistantName'
-	SUP name )
-
-# spouseName
-# single valued (/me smirks)
-attributetype ( 1.3.6.1.4.1.8506.1.2.8
-	NAME 'spouseName'
-	SUP name
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.9
-	NAME 'otherPostalAddress'
-	EQUALITY caseIgnoreListMatch
-	SUBSTR caseIgnoreListSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.10
-	NAME ( 'mailer' 'mua' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.11
-	NAME ( 'birthDate' 'dob' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.12
-	NAME 'anniversary'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.13
-	NAME 'note'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.14
-	NAME 'evolutionArbitrary'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )
-	)
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.15
-	NAME 'fileAs'
-	SUP name )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.16
-	NAME 'assistantPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.17
-	NAME 'companyPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.18
-	NAME 'callbackPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.19
-	NAME ( 'otherFacsimileTelephoneNumber' 'otherFax' )
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.20
-	NAME 'radio'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.21
-	NAME 'telex'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.22
-	NAME 'tty'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.23
-	NAME 'categories'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.24
-	NAME 'contact'
-        EQUALITY distinguishedNameMatch
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.25
-	NAME 'listName'
-	SUP name
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.26
-	NAME 'calendarURI'
-        EQUALITY caseExactIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.27
-	NAME 'freeBusyURI'
-        EQUALITY caseExactIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-# evolutionPerson
-objectclass	( 1.3.6.1.4.1.8506.1.3.1
-    NAME 'evolutionPerson'
-	DESC 'Objectclass geared to Evolution Usage'
-    SUP inetOrgPerson
-    STRUCTURAL
-	MAY (
-	        fileAs $ primaryPhone $ carPhone $ homeFacsimileTelephoneNumber $ 
-		otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $
-		otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $
-		note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $
-		radio $ telex $ tty $ categories $ calendarURI $ freeBusyURI )
-	)
-
-# evolutionPersonList
-objectclass	( 1.3.6.1.4.1.8506.1.3.2
-    NAME 'evolutionPersonList'
-	DESC 'Objectclass geared to Evolution Contact Lists'
-    SUP top
-    STRUCTURAL
-	MUST (
-		listName )
-	MAY (
-		mail $ contact )
-	)
diff --git a/addressbook/backend/pas/pas-backend-card-sexp.c b/addressbook/backend/pas/pas-backend-card-sexp.c
deleted file mode 100644
index ea217fa052..0000000000
--- a/addressbook/backend/pas/pas-backend-card-sexp.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * pas-backend-card-sexp.c
- * Copyright 1999, 2000, 2001, Ximian, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "pas-backend-card-sexp.h"
-
-#include <string.h>
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-#include <gal/widgets/e-unicode.h>
-
-static GtkObjectClass *parent_class;
-
-typedef struct _SearchContext SearchContext;
-
-struct _PASBackendCardSExpPrivate {
-	ESExp *search_sexp;
-	SearchContext *search_context;
-};
-
-struct _SearchContext {
-	ECardSimple *card;
-};
-
-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_name (ECardSimple *card, const char *str,
-	      char *(*compare)(const char*, const char*))
-{
-	const char *name;
-
-	name = e_card_simple_get_const (card, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	if (name && compare (name, str))
-		return TRUE;
-
-	name = e_card_simple_get_const (card, E_CARD_SIMPLE_FIELD_FAMILY_NAME);
-	if (name && compare (name, 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 gboolean
-compare_category (ECardSimple *card, const char *str,
-		  char *(*compare)(const char*, const char*))
-{
-	EList *categories;
-	EIterator *iterator;
-	ECard *ecard;
-	gboolean ret_val = FALSE;
-
-	gtk_object_get (GTK_OBJECT (card),
-			"card", &ecard,
-			NULL);
-	gtk_object_get (GTK_OBJECT (ecard),
-			"category_list", &categories,
-			NULL);
-
-	for (iterator = e_list_get_iterator(categories); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-		const char *category = e_iterator_get (iterator);
-
-		if (compare(category, str)) {
-			ret_val = TRUE;
-			break;
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (iterator));
-	e_card_free_empty_lists (ecard);
-	return ret_val;
-}
-
-static gboolean
-compare_arbitrary (ECardSimple *card, const char *str,
-		   char *(*compare)(const char*, const char*))
-{
-	EList *list;
-	EIterator *iterator;
-	ECard *ecard;
-	gboolean ret_val = FALSE;
-
-	gtk_object_get (GTK_OBJECT (card),
-			"card", &ecard,
-			NULL);
-	gtk_object_get (GTK_OBJECT (ecard),
-			"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 (compare(arbitrary->key, str)) {
-			ret_val = TRUE;
-			break;
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (iterator));
-	e_card_free_empty_lists (ecard);
-	return ret_val;
-}
-
-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
-#define PROP_TYPE_ID 0x04
-	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 ID_PROP {0, "id", NULL, PROP_TYPE_ID, 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" ),
-	LIST_PROP ( "full_name", "full_name", compare_name), /* not really a list, but we need to compare both full and surname */
-	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"),
-	ID_PROP,
-	LIST_PROP ( "email", "email", compare_email ),
-	LIST_PROP ( "phone", "phone", compare_phone ),
-	LIST_PROP ( "address", "address", compare_address ),
-	LIST_PROP ( "category", "category", compare_category ),
-	LIST_PROP ( "arbitrary", "arbitrary", compare_arbitrary )
-};
-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);
-
-static ESExpResult *
-entry_compare(SearchContext *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;
-					}
-					g_free (prop);
-				} 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);
-				} else if (info->prop_type == PROP_TYPE_ID) {
-					const char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_get_id (ctx->card->card);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-				}
-
-				/* 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(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	SearchContext *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)
-{
-	SearchContext *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 = (char*)e_utf8_strstrcase(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)
-{
-	SearchContext *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 = (char*)e_utf8_strstrcase(s1, s2))
-	    && (p == s1))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	SearchContext *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 },
-};
-
-gboolean
-pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard)
-{
-	ECard *card;
-	ESExpResult *r;
-	gboolean retval;
-
-	card = e_card_new ((char*)vcard);
-	sexp->priv->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 (!sexp->priv->search_context->card)
-		return FALSE;
-
-	r = e_sexp_eval(sexp->priv->search_sexp);
-
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
-
-	gtk_object_unref(GTK_OBJECT(sexp->priv->search_context->card));
-
-	e_sexp_result_free(sexp->priv->search_sexp, r);
-
-	return retval;
-}
-
-
-
-/**
- * pas_backend_card_sexp_new:
- */
-PASBackendCardSExp *
-pas_backend_card_sexp_new (const char *text)
-{
-	PASBackendCardSExp *sexp = gtk_type_new (pas_backend_card_sexp_get_type ());
-	int esexp_error;
-	int i;
-
-	sexp->priv->search_sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(sexp->priv->search_sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, sexp->priv->search_context);
-		} else {
-			e_sexp_add_function(sexp->priv->search_sexp, 0, symbols[i].name,
-					    symbols[i].func, sexp->priv->search_context);
-		}
-	}
-
-	e_sexp_input_text(sexp->priv->search_sexp, text, strlen(text));
-	esexp_error = e_sexp_parse(sexp->priv->search_sexp);
-
-	if (esexp_error == -1) {
-		gtk_object_unref (GTK_OBJECT (sexp));
-		sexp = NULL;
-	}
-
-	return sexp;
-}
-
-static void
-pas_backend_card_sexp_destroy (GtkObject *object)
-{
-	PASBackendCardSExp *sexp = PAS_BACKEND_CARD_SEXP (object);
-	e_sexp_unref(sexp->priv->search_sexp);
-
-	g_free (sexp->priv->search_context);
-	g_free (sexp->priv);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_card_sexp_class_init (PASBackendCardSExpClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	/* Set the virtual methods. */
-
-	object_class->destroy = pas_backend_card_sexp_destroy;
-}
-
-static void
-pas_backend_card_sexp_init (PASBackendCardSExp *sexp)
-{
-	PASBackendCardSExpPrivate *priv;
-
-	priv             = g_new0 (PASBackendCardSExpPrivate, 1);
-
-	sexp->priv = priv;
-	priv->search_context = g_new (SearchContext, 1);
-}
-
-/**
- * pas_backend_card_sexp_get_type:
- */
-GtkType
-pas_backend_card_sexp_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendCardSExp",
-			sizeof (PASBackendCardSExp),
-			sizeof (PASBackendCardSExpClass),
-			(GtkClassInitFunc)  pas_backend_card_sexp_class_init,
-			(GtkObjectInitFunc) pas_backend_card_sexp_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-card-sexp.h b/addressbook/backend/pas/pas-backend-card-sexp.h
deleted file mode 100644
index ee51a75dab..0000000000
--- a/addressbook/backend/pas/pas-backend-card-sexp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * pas-backend-card-sexp.h
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef __PAS_BACKEND_CARD_SEXP_H__
-#define __PAS_BACKEND_CARD_SEXP_H__
-
-#include <gtk/gtk.h>
-
-typedef struct _PASBackendCardSExpPrivate PASBackendCardSExpPrivate;
-
-typedef struct {
-	GtkObject parent_object;
-	PASBackendCardSExpPrivate *priv;
-} PASBackendCardSExp;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} PASBackendCardSExpClass;
-
-PASBackendCardSExp *pas_backend_card_sexp_new      (const char *text);
-GtkType             pas_backend_card_sexp_get_type (void);
-
-gboolean            pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard);
-
-#define PAS_BACKEND_CARD_SEXP_TYPE        (pas_backend_card_sexp_get_type ())
-#define PAS_BACKEND_CARD_SEXP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_CARD_SEXP_TYPE, PASBackendCardSExp))
-#define PAS_BACKEND_CARD_SEXP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendCardSExpClass))
-#define PAS_IS_BACKEND_CARD_SEXP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_CARD_SEXP_TYPE))
-#define PAS_IS_BACKEND_CARD_SEXP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_CARD_SEXP_TYPE))
-
-#endif /* __PAS_BACKEND_CARD_SEXP_H__ */
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
deleted file mode 100644
index 2848fcda71..0000000000
--- a/addressbook/backend/pas/pas-backend-file.c
+++ /dev/null
@@ -1,1515 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include "config.h"  
-#include "pas-backend-file.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <db.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <e-util/e-db3-utils.h>
-
-#if DB_VERSION_MAJOR != 3 || \
-    DB_VERSION_MINOR != 1 || \
-    DB_VERSION_PATCH != 17
-#error Including wrong DB3.  Need libdb 3.1.17.
-#endif
-
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <ebook/e-card-simple.h>
-#include <e-util/e-dbhash.h>
-#include <e-util/e-db3-utils.h>
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-#include "pas-backend-card-sexp.h"
-
-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
-#define PAS_BACKEND_FILE_VERSION "0.2"
-
-#define PAS_ID_PREFIX "pas-id-"
-
-static PASBackendClass *pas_backend_file_parent_class;
-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;
-typedef struct _PASBackendFileBookView PASBackendFileBookView;
-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;
-typedef struct _PasBackendFileChangeContext PASBackendFileChangeContext;
-
-struct _PASBackendFilePrivate {
-	GList    *clients;
-	gboolean  loaded;
-	char     *uri;
-	char     *filename;
-	DB       *file_db;
-	EList    *book_views;
-	gboolean  writable;
-	GHashTable *address_lists;
-};
-
-struct _PASBackendFileCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	guint32    num_elements;
-};
-
-struct _PASBackendFileBookView {
-	PASBookView                 *book_view;
-	gchar                       *search;
-	PASBackendCardSExp          *card_sexp;
-	gchar                       *change_id;
-	PASBackendFileChangeContext *change_context;
-};
-
-struct _PasBackendFileChangeContext {
-	DB *db;
-
-	GList *add_cards;
-	GList *add_ids;
-	GList *mod_cards;
-	GList *mod_ids;
-	GList *del_ids;
-};
-
-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->card_sexp = book_view->card_sexp;
-	if (new_book_view->card_sexp)
-		gtk_object_ref(GTK_OBJECT(new_book_view->card_sexp));
-	
-	new_book_view->change_id = g_strdup(book_view->change_id);
-	if (book_view->change_context) {
-		new_book_view->change_context = g_new(PASBackendFileChangeContext, 1);
-		new_book_view->change_context->db = book_view->change_context->db;
-		new_book_view->change_context->add_cards = book_view->change_context->add_cards;
-		new_book_view->change_context->add_ids = book_view->change_context->add_ids;
-		new_book_view->change_context->mod_cards = book_view->change_context->mod_cards;
-		new_book_view->change_context->mod_ids = book_view->change_context->mod_ids;
-		new_book_view->change_context->del_ids = book_view->change_context->del_ids;
-	} else
-		new_book_view->change_context = NULL;
-	
-	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->card_sexp)
-		gtk_object_unref (GTK_OBJECT(book_view->card_sexp));
-
-	g_free(book_view->change_id);
-	if (book_view->change_context) {
-		g_list_foreach (book_view->change_context->add_cards, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->add_ids, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->mod_cards, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->mod_ids, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->del_ids, (GFunc)g_free, NULL);
-		g_list_free (book_view->change_context->add_cards);
-		g_list_free (book_view->change_context->add_ids);
-		g_list_free (book_view->change_context->mod_cards);
-		g_list_free (book_view->change_context->mod_ids);
-		g_list_free (book_view->change_context->del_ids);
-	}
-	g_free(book_view->change_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;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_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)
-{
-	PASBook           *book = (PASBook *)data;
-	PASBackendFile    *bf;
-	EIterator         *iterator;
-	gboolean success = FALSE;
-
-	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);
-			success = TRUE;
-			break;
-		}
-	}
-	if (!success)
-		g_warning ("Failed to remove from book_views list");
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	bonobo_object_unref(BONOBO_OBJECT(book));
-}
-
-static void
-string_to_dbt(const char *str, DBT *dbt)
-{
-	memset (dbt, 0, sizeof (*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_PREFIX "%08lX%08X", time(NULL), c++);
-}
-
-static gboolean
-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
-{
-	/* If this is not a search context view, it doesn't match be default */
-	if (view->card_sexp == NULL)
-		return FALSE;
-
-	return pas_backend_card_sexp_match_vcard (view->card_sexp, vcard_string);
-}
-
-static void
-pas_backend_file_search (PASBackendFile  	      *bf,
-			 PASBook         	      *book,
-			 const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	GList   *cards = NULL;
-	gint    card_count = 0, card_threshold = 20, card_threshold_max = 1000;
-	DB      *db = bf->priv->file_db;
-	DBC     *dbc;
-	DBT     id_dbt, vcard_dbt;
-	int     file_version_name_len;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-	gboolean search_needed;
-
-	if (!bf->priv->loaded)
-		return;
-
-	search_needed = TRUE;
-
-	if ( ! strcmp (view->search, "(contains \"x-evolution-any-field\" \"\")"))
-		search_needed = FALSE;
-
-	if (search_needed)
-		pas_book_view_notify_status_message (view->book_view, _("Searching..."));
-	else
-		pas_book_view_notify_status_message (view->book_view, _("Loading..."));
-
-	if (view->card_sexp)
-		gtk_object_unref (GTK_OBJECT(view->card_sexp));
-
-	view->card_sexp = pas_backend_card_sexp_new (view->search);
-	
-	if (!view->card_sexp) {
-		/* need a different error message here. */
-		pas_book_view_notify_status_message (view->book_view, _("Error in search expression."));
-		pas_book_view_notify_complete (view->book_view);
-		return;
-	}
-
-	file_version_name_len = strlen (PAS_BACKEND_FILE_VERSION_NAME);
-
-	db_error = db->cursor (db, NULL, &dbc, 0);
-
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	if (db_error != 0) {
-		g_warning ("pas_backend_file_search: error building list\n");
-	} else {
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
-
-		while (db_error == 0) {
-
-			/* don't include the version in the list of cards */
-			if (id_dbt.size != file_version_name_len+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 ((!search_needed) || vcard_matches_search (view, vcard_string)) {
-					cards = g_list_prepend (cards, g_strdup (vcard_string));
-					card_count ++;
-				}
-
-				/* If we've accumulated a number of checks, pass them off to the client. */
-				if (card_count >= card_threshold) {
-					cards = g_list_reverse (cards);
-					pas_book_view_notify_add (view->book_view, cards);
-					/* Clean up the handed-off data. */
-					g_list_foreach (cards, (GFunc)g_free, NULL);
-					g_list_free (cards);
-					cards = NULL;
-					card_count = 0;
-
-					/* Yeah, this scheme is overly complicated.  But I like it. */
-					if (card_threshold < card_threshold_max) {
-						card_threshold = MIN (2*card_threshold, card_threshold_max);
-					}
-				}
-			}
-
-			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-		}
-		dbc->c_close (dbc);
-
-		if (db_error != DB_NOTFOUND) {
-			g_warning ("pas_backend_file_search: error building list\n");
-		}
-	}
-
-	if (card_count)
-		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);
-}
-
-static void
-pas_backend_file_changes_foreach_key (const char *key, gpointer user_data)
-{
-	PASBackendFileChangeContext *ctx = user_data;
-	DB      *db = ctx->db;
-	DBT     id_dbt, vcard_dbt;
-	int     db_error = 0;
-	
-	string_to_dbt (key, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	
-	if (db_error != 0) {
-		char *id = id_dbt.data;
-		
-		ctx->del_ids = g_list_append (ctx->del_ids, g_strdup (id));
-	}
-}
-
-static void
-pas_backend_file_changes (PASBackendFile  	      *bf,
-			  PASBook         	      *book,
-			  const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	DBT     id_dbt, vcard_dbt;
-	char    *filename;
-	EDbHash *ehash;
-	GList *i, *v;
-	DB      *db = bf->priv->file_db;
-	DBC *dbc;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-	PASBackendFileChangeContext *ctx = cnstview->change_context;
-	char *dirname, *slash;
-
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	if (!bf->priv->loaded)
-		return;
-
-	/* Find the changed ids */
-	dirname = g_strdup (bf->priv->filename);
-	slash = strrchr (dirname, '/');
-	*slash = '\0';
-
-	filename = g_strdup_printf ("%s/%s.db", dirname, view->change_id);
-	ehash = e_dbhash_new (filename);
-	g_free (filename);
-	g_free (dirname);
-
-	db_error = db->cursor (db, NULL, &dbc, 0);
-
-	if (db_error != 0) {
-		g_warning ("pas_backend_file_changes: error building list\n");
-	} else {
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_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)) {
-				ECard *card;
-				char *id = id_dbt.data;
-				char *vcard_string;
-				
-				/* Remove fields the user can't change
-				 * and can change without the rest of the
-				 * card changing 
-				 */
-				card = e_card_new (vcard_dbt.data);
-				gtk_object_set (GTK_OBJECT (card), "last_use", NULL, "use_score", 0.0, NULL);
-				vcard_string = e_card_get_vcard_assume_utf8 (card);
-				gtk_object_unref (GTK_OBJECT (card));
-				
-				/* check what type of change has occurred, if any */
-				switch (e_dbhash_compare (ehash, id, vcard_string)) {
-				case E_DBHASH_STATUS_SAME:
-					break;
-				case E_DBHASH_STATUS_NOT_FOUND:
-					ctx->add_cards = g_list_append (ctx->add_cards, 
-									g_strdup(vcard_string));
-					ctx->add_ids = g_list_append (ctx->add_ids, g_strdup(id));
-					break;
-				case E_DBHASH_STATUS_DIFFERENT:
-					ctx->mod_cards = g_list_append (ctx->mod_cards, 
-									g_strdup(vcard_string));
-					ctx->mod_ids = g_list_append (ctx->mod_ids, g_strdup(id));
-					break;
-				}
-			}
-
-			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-		}
-		dbc->c_close (dbc);
-	}
-
-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)pas_backend_file_changes_foreach_key, view->change_context);
-
-	/* Send the changes */
-	if (db_error != DB_NOTFOUND) {
-		g_warning ("pas_backend_file_changes: error building list\n");
-	} else {
-  		if (ctx->add_cards != NULL)
-  			pas_book_view_notify_add (view->book_view, ctx->add_cards);
-		
-		if (ctx->mod_cards != NULL)
-			pas_book_view_notify_change (view->book_view, ctx->mod_cards);
-
-		for (v = ctx->del_ids; v != NULL; v = v->next){
-			char *id = v->data;
-			pas_book_view_notify_remove (view->book_view, id);
-		}
-		
-		pas_book_view_notify_complete (view->book_view);
-	}
-
-	/* Update the hash */
-	for (i = ctx->add_ids, v = ctx->add_cards; i != NULL; i = i->next, v = v->next){
-		char *id = i->data;
-		char *vcard = v->data;
-
-		e_dbhash_add (ehash, id, vcard);
-		g_free (i->data);
-		g_free (v->data);		
-	}	
-	for (i = ctx->mod_ids, v = ctx->mod_cards; i != NULL; i = i->next, v = v->next){
-		char *id = i->data;
-		char *vcard = v->data;
-
-		e_dbhash_add (ehash, id, vcard);
-		g_free (i->data);
-		g_free (v->data);		
-	}	
-	for (i = ctx->del_ids; i != NULL; i = i->next){
-		char *id = i->data;
-
-		e_dbhash_remove (ehash, id);
-		g_free (i->data);
-	}
-
-	e_dbhash_write (ehash);
-  	e_dbhash_destroy (ehash);
-}
-
-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_assume_utf8(card);
-
-	string_to_dbt (vcard, &vcard_dbt);
-
-	db_error = db->put (db, NULL, &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 {
-		g_free (id);
-		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,
-				      PASCreateCardRequest *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)) {
-				bonobo_object_ref (BONOBO_OBJECT (view->book_view));
-				pas_book_view_notify_add_1 (view->book_view, vcard);
-				pas_book_view_notify_complete (view->book_view);
-				bonobo_object_unref (BONOBO_OBJECT (view->book_view));
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		pas_book_respond_create (
-			book,
-			GNOME_Evolution_Addressbook_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,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound,
-				 "");
-	}
-}
-
-static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRemoveCardRequest *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;
-	const char    *id;
-
-	id = req->id;
-	string_to_dbt (id, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		return;
-	}
-	
-	db_error = db->del (db, NULL, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		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)) {
-			bonobo_object_ref (BONOBO_OBJECT (view->book_view));
-			pas_book_view_notify_remove (view->book_view, req->id);
-			pas_book_view_notify_complete (view->book_view);
-			bonobo_object_unref (BONOBO_OBJECT (view->book_view));
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-	
-	pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-}
-
-static void
-pas_backend_file_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASModifyCardRequest *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;
-	const char    *id, *lookup_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);
-
-	/* This is disgusting, but for a time cards were added with
-           ID's that are no longer used (they contained both the uri
-           and the id.) If we recognize it as a uri (file:///...) trim
-           off everything before the last '/', and use that as the
-           id.*/
-	if (!strncmp (id, "file:///", strlen ("file:///"))) {
-		lookup_id = strrchr (id, '/') + 1;
-	}
-	else
-		lookup_id = id;
-
-	string_to_dbt (lookup_id, &id_dbt);	
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	/* get the old ecard - the one that's presently in the db */
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		return;
-	}
-	old_vcard_string = g_strdup(vcard_dbt.data);
-
-	string_to_dbt (req->vcard, &vcard_dbt);	
-
-	db_error = db->put (db, NULL, &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,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	}
-	else {
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-	}
-
-	g_free(old_vcard_string);
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-pas_backend_file_build_cards_list(PASBackend *backend,
-				  PASBackendFileCursorPrivate *cursor_data,
-				  char *search)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBC            *dbc;
-	int            db_error;
-	DBT  id_dbt, vcard_dbt;
-	PASBackendCardSExp *card_sexp = NULL;
-	gboolean search_needed;
-	
-	cursor_data->elements = NULL;
-
-	search_needed = TRUE;
-
-	if (!strcmp (search, "(contains \"x-evolution-any-field\" \"\")"))
-		search_needed = FALSE;
-
-	card_sexp = pas_backend_card_sexp_new (search);
-	
-	if (!card_sexp)
-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-
-	db_error = db->cursor (db, NULL, &dbc, 0);
-
-	if (db_error != 0) {
-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	}
-
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_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)) {
-
-			if ((!search_needed) || (card_sexp != NULL && pas_backend_card_sexp_match_vcard  (card_sexp, vcard_dbt.data))) {
-				cursor_data->elements = g_list_prepend (cursor_data->elements, g_strdup (vcard_dbt.data));
-			}
-		}
-
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-
-	}
-
-	if (db_error != DB_NOTFOUND) {
-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	}
-	else {
-		cursor_data->num_elements = g_list_length (cursor_data->elements);
-		cursor_data->elements = g_list_reverse (cursor_data->elements);
-	}
-}
-
-static void
-pas_backend_file_process_get_vcard (PASBackend *backend,
-				    PASBook    *book,
-				    PASGetVCardRequest *req)
-{
-	PASBackendFile *bf;
-	DB             *db;
-	DBT             id_dbt, vcard_dbt;
-	int             db_error = 0;
-	char           *card;
-	GNOME_Evolution_Addressbook_BookListener_CallStatus status;	
-
-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));
-	db = bf->priv->file_db;
-
-	string_to_dbt (req->id, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-
-	if (db_error == 0) {
-		card = vcard_dbt.data;
-		status = GNOME_Evolution_Addressbook_BookListener_Success;
-	} else {
-		card = NULL;
-		status = GNOME_Evolution_Addressbook_BookListener_CardNotFound;
-	}
-
-	pas_book_respond_get_vcard (book,
-				    status,
-				    card);
-}
-
-static void
-pas_backend_file_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASGetCursorRequest *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;
-	GNOME_Evolution_Addressbook_Book corba_book;
-
-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_file_build_cards_list(backend, cursor_data, req->search);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_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 
-		 ? GNOME_Evolution_Addressbook_BookListener_Success 
-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound),
-		cursor);
-}
-
-static void
-pas_backend_file_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASGetBookViewRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	PASBookView       *book_view;
-	PASBackendFileBookView view;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-	
-	bonobo_object_ref(BONOBO_OBJECT(book));
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	view.book_view = book_view;
-	view.search = g_strdup (req->search);
-	view.card_sexp = NULL;
-	view.change_id = NULL;
-	view.change_context = NULL;	
-
-	e_list_append(bf->priv->book_views, &view);
-
-	pas_book_respond_get_book_view (book,
-		   (book_view != NULL
-		    ? GNOME_Evolution_Addressbook_BookListener_Success 
-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		   book_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));
-}
-
-static void
-pas_backend_file_process_get_changes (PASBackend *backend,
-				      PASBook    *book,
-				      PASGetChangesRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	PASBookView       *book_view;
-	PASBackendFileBookView view;
-	PASBackendFileChangeContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	bonobo_object_ref(BONOBO_OBJECT(book));
-
-	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
-		    ? GNOME_Evolution_Addressbook_BookListener_Success 
-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.change_id = req->change_id;
-	view.change_context = &ctx;
-	ctx.db = bf->priv->file_db;
-	ctx.add_cards = NULL;
-	ctx.add_ids = NULL;
-	ctx.mod_cards = NULL;
-	ctx.mod_ids = NULL;
-	ctx.del_ids = NULL;
-	view.search = NULL;
-	view.card_sexp = 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_changes (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-pas_backend_file_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASCheckConnectionRequest *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 void
-pas_backend_file_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASAuthenticateUserRequest *req)
-{
-	pas_book_respond_authenticate_user (book,
-					    GNOME_Evolution_Addressbook_BookListener_Success);
-}
-
-static void
-pas_backend_file_process_get_supported_fields (PASBackend *backend,
-					       PASBook    *book,
-					       PASGetSupportedFieldsRequest *req)
-{
-	EList *fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-	ECardSimple *simple;
-	ECard *card;
-	int i;
-
-	/* we support everything, so instantiate an e-card, and loop
-           through all fields, adding their ecard_fields. */
-
-	card = e_card_new ("");
-	simple = e_card_simple_new (card);
-
-	for (i = 0; i < E_CARD_SIMPLE_FIELD_LAST; i ++)
-		e_list_append (fields, e_card_simple_get_ecard_field (simple, i));
-
-	gtk_object_unref (GTK_OBJECT (card));
-	gtk_object_unref (GTK_OBJECT (simple));
-
-	pas_book_respond_get_supported_fields (book,
-					       GNOME_Evolution_Addressbook_BookListener_Success,
-					       fields);
-}
-
-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, (PASCreateCardRequest*)req);
-		break;
-
-	case RemoveCard:
-		pas_backend_file_process_remove_card (backend, book, (PASRemoveCardRequest*)req);
-		break;
-
-	case ModifyCard:
-		pas_backend_file_process_modify_card (backend, book, (PASModifyCardRequest*)req);
-		break;
-
-	case CheckConnection:
-		pas_backend_file_process_check_connection (backend, book, (PASCheckConnectionRequest*)req);
-		break;
-
-	case GetVCard:
-		pas_backend_file_process_get_vcard (backend, book, (PASGetVCardRequest*)req);
-		break;
-		
-	case GetCursor:
-		pas_backend_file_process_get_cursor (backend, book, (PASGetCursorRequest*)req);
-		break;
-		
-	case GetBookView:
-		pas_backend_file_process_get_book_view (backend, book, (PASGetBookViewRequest*)req);
-		break;
-
-	case GetChanges:
-		pas_backend_file_process_get_changes (backend, book, (PASGetChangesRequest*)req);
-		break;
-
-	case AuthenticateUser:
-		pas_backend_file_process_authenticate_user (backend, book, (PASAuthenticateUserRequest*)req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_file_process_get_supported_fields (backend, book, (PASGetSupportedFieldsRequest*)req);
-		break;
-	}
-
-	pas_book_free_request (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);
-}
-
-/*
-** versions:
-**
-** 0.0 just a list of cards
-**
-** 0.1 same as 0.0, but with the version tag
-**
-** 0.2 not a real format upgrade, just a hack to fix broken ids caused
-**     by a bug in early betas, but we only need to convert them if
-**     the previous version is 0.1, since the bug existed after 0.1
-**     came about.
-*/
-static gboolean
-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)
-{
-	DB  *db = bf->priv->file_db;
-	int db_error;
-	DBT version_name_dbt, version_dbt;
-	
-	if (strcmp (old_version, "0.0")
-	    && strcmp (old_version, "0.1")) {
-		g_warning ("unsupported version '%s' found in PAS backend file\n",
-			   old_version);
-		return FALSE;
-	}
-
-	if (!strcmp (old_version, "0.1")) {
-		/* we just loop through all the cards in the db,
-                   giving them valid ids if they don't have them */
-		DBT  id_dbt, vcard_dbt;
-		DBC *dbc;
-		int  card_failed = 0;
-
-		db_error = db->cursor (db, NULL, &dbc, 0);
-		if (db_error != 0) {
-			g_warning ("unable to get cursor");
-			return FALSE;
-		}
-
-		memset (&id_dbt, 0, sizeof (id_dbt));
-		memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
-
-		while (db_error == 0) {
-			if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-				ECard *card;
-
-				card = e_card_new (vcard_dbt.data);
-
-				/* the cards we're looking for are
-				   created with a normal id dbt, but
-				   with the id field in the vcard set
-				   to something that doesn't match.
-				   so, we need to modify the card to
-				   have the same id as the the dbt. */
-				if (strcmp (id_dbt.data, e_card_get_id (card))) {
-					char *vcard;
-
-					e_card_set_id (card, id_dbt.data);
-
-					vcard = e_card_get_vcard (card);
-					string_to_dbt (vcard, &vcard_dbt);
-
-					db_error = db->put (db, NULL,
-							    &id_dbt, &vcard_dbt, 0);
-
-					g_free (vcard);
-
-					if (db_error != 0)
-						card_failed++;
-				}
-
-				gtk_object_unref (GTK_OBJECT(card));
-			}
-
-			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-		}
-
-		if (card_failed) {
-			g_warning ("failed to update %d cards\n", card_failed);
-			return FALSE;
-		}
-	}
-
-	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, NULL, &version_name_dbt, &version_dbt, 0);
-	if (db_error == 0)
-		return TRUE;
-	else
-		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);
-	memset (&version_dbt, 0, sizeof (version_dbt));
-
-	db_error = db->get (db, NULL, &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:Ximian, Inc.\n\
-LABEL;WORK;QUOTED-PRINTABLE:401 Park Drive  3 West=0ABoston, MA 02215=0AUSA\n\
-TEL;WORK;VOICE:(617) 236-0442\n\
-TEL;WORK;FAX:(617) 236-8630\n\
-EMAIL;INTERNET:hello@ximian.com\n\
-URL:www.ximian.com/\n\
-ORG:Ximian, Inc.;\n\
-NOTE:Welcome to the Ximian Addressbook.\n\
-END:VCARD"
-
-static GNOME_Evolution_Addressbook_BookListener_CallStatus
-pas_backend_file_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char           *filename;
-	gboolean        writable = FALSE;
-	int             db_error;
-	DB *db;
-	int major, minor, patch;
-
-	g_assert (bf->priv->loaded == FALSE);
-
-	db_version (&major, &minor, &patch);
-
-	if (major != 3 ||
-	    minor != 1 ||
-	    patch != 17) {
-		g_warning ("Wrong version of libdb.");
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-	}
-
-	filename = pas_backend_file_extract_path_from_uri (uri);
-
-	db_error = e_db3_utils_maybe_recover (filename);
-	if (db_error != 0)
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-
-	db_error = db_create (&db, NULL, 0);
-	if (db_error != 0)
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-
-	db_error = db->open (db, filename, NULL, DB_HASH, 0, 0666);
-
-	if (db_error == DB_OLD_VERSION) {
-		db_error = e_db3_utils_upgrade_format (filename);
-
-		if (db_error != 0)
-			return GNOME_Evolution_Addressbook_BookListener_OtherError;
-
-		db_error = db->open (db, filename, NULL, DB_HASH, 0, 0666);
-	}
-
-	bf->priv->file_db = db;
-
-	if (db_error == 0) {
-		writable = TRUE;
-	} else {
-		db_error = db->open (db, filename, NULL, DB_HASH, DB_RDONLY, 0666);
-
-		if (db_error != 0) {
-			db_error = db->open (db, filename, NULL, DB_HASH, DB_CREATE, 0666);
-
-			if (db_error == 0) {
-				char *create_initial_file;
-				char *dir;
-
-				dir = g_dirname(filename);
-				create_initial_file = g_concat_dir_and_file(dir, "create-initial");
-
-				if (g_file_exists(create_initial_file)) {
-					char *id;
-					id = do_create(backend, INITIAL_VCARD, NULL);
-					g_free (id);
-				}
-
-				g_free(create_initial_file);
-				g_free(dir);
-
-				writable = TRUE;
-			}
-		}
-	}
-
-	if (db_error != 0) {
-		bf->priv->file_db = NULL;
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-	}
-
-	bf->priv->writable = writable;
-
-	if (pas_backend_file_maybe_upgrade_db (bf))
-		bf->priv->loaded = TRUE;
-	else {
-		db->close (db, 0);
-		bf->priv->file_db = NULL;
-		bf->priv->writable = FALSE;
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-	}
-
-	g_free(bf->priv->uri);
-	bf->priv->uri = g_strdup (uri);
-
-	g_free (bf->priv->filename);
-	bf->priv->filename = filename;
-
-	return GNOME_Evolution_Addressbook_BookListener_Success;
-}
-
-/* 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,
-			     GNOME_Evolution_Addressbook_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);
-
-	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, GNOME_Evolution_Addressbook_BookListener_Success);
-		if (bf->priv->writable)
-			pas_book_report_writable (book, bf->priv->writable);
-	} else {
-		pas_book_respond_open (
-		       book, GNOME_Evolution_Addressbook_BookListener_OtherError);
-	}
-
-	bonobo_object_unref (BONOBO_OBJECT (book));
-	
-	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);
-	g_free (bf->priv->filename);
-
-	g_free (bf->priv);
-
-	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;
-	priv->writable   = FALSE;
-
-	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 6c29c8b7a2..0000000000
--- a/addressbook/backend/pas/pas-backend-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Ximian, 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 ee41bfcb69..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ /dev/null
@@ -1,3271 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#define DEBUG
-
-#include "config.h"  
-#include <fcntl.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#ifdef DEBUG
-#define LDAP_DEBUG
-#define LDAP_DEBUG_ADD
-#endif
-#include <ldap.h>
-#ifdef DEBUG
-#undef LDAP_DEBUG
-#endif
-
-#if LDAP_VENDOR_VERSION > 20000
-#define OPENLDAP2
-#else
-#define OPENLDAP1
-#endif
-
-#ifdef OPENLDAP2
-#include <ldap_schema.h>
-#endif
-
-#include <sys/time.h>
-
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-
-#include "pas-backend-ldap.h"
-#include "pas-backend-card-sexp.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-#include <stdlib.h>
-
-typedef enum {
-	PAS_BACKEND_LDAP_TLS_NO,
-	PAS_BACKEND_LDAP_TLS_ALWAYS,
-	PAS_BACKEND_LDAP_TLS_WHEN_POSSIBLE,
-} PASBackendLDAPUseTLS;
-
-/* interval for our poll_ldap timeout */
-#define LDAP_POLL_INTERVAL 20
-
-/* timeout for ldap_result */
-#define LDAP_RESULT_TIMEOUT_MILLIS 10
-
-/* smart grouping stuff */
-#define GROUPING_INITIAL_SIZE 1
-#define GROUPING_MAXIMUM_SIZE 200
-
-/* the next two are in milliseconds */
-#define GROUPING_MINIMUM_WAIT 0  /* we never send updates faster than this, to avoid totally spamming the UI */
-#define GROUPING_MAXIMUM_WAIT 250 /* we always send updates (if there are pending cards) when we hit this */
-
-#define TV_TO_MILLIS(timeval) ((timeval).tv_sec * 1000 + (timeval).tv_usec / 1000)
-
-/* the objectClasses we need */
-#define TOP                  "top"
-#define PERSON               "person"
-#define ORGANIZATIONALPERSON "organizationalPerson"
-#define INETORGPERSON        "inetOrgPerson"
-#define EVOLUTIONPERSON      "evolutionPerson"
-
-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;   /* the hostname of the server */
-	int      ldap_port;    /* the port of the server */
-	char     *schema_dn;   /* the base dn for schema information */
-	gchar    *ldap_rootdn; /* the base dn of our searches */
-	int      ldap_scope;   /* the scope used for searches */
-	int      ldap_limit;   /* the search limit */
-	int      ldap_timeout; /* the search timeout */
-
-	gboolean ldap_v3;      /* TRUE if the server supports protocol
-                                  revision 3 (necessary for TLS) */
-	gboolean starttls;     /* TRUE if the *library* supports
-                                  starttls.  will be false if openssl
-                                  was not built into openldap. */
-	PASBackendLDAPUseTLS use_tls;
-
-	GList    *book_views;
-
-	LDAP     *ldap;
-
-	EList    *supported_fields;
-
-	/* whether or not there's support for the objectclass we need
-           to store all our additional fields */
-	gboolean evolutionPersonSupported;
-	gboolean schema_checked;
-
-	gboolean writable;
-
-	/* our operations */
-	GHashTable *id_to_op;
-	int active_ops;
-	int                   poll_timeout;
-};
-
-struct _PASBackendLDAPCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	long       num_elements;
-};
-
-struct _PASBackendLDAPBookView {
-	PASBookView           *book_view;
-	PASBackendLDAPPrivate *blpriv;
-	gchar                 *search;
-	PASBackendCardSExp    *card_sexp;
-
-	LDAPOp                *search_op;
-};
-
-typedef void (*LDAPOpHandler)(LDAPOp *op, LDAPMessage *res);
-typedef void (*LDAPOpDtor)(LDAPOp *op);
-
-struct LDAPOp {
-	LDAPOpHandler handler;
-	LDAPOpDtor    dtor;
-	PASBackend    *backend;
-	PASBook       *book;
-	PASBookView   *view;
-	int            id;
-};
-
-static void     ldap_op_add (LDAPOp *op, PASBackend *backend, PASBook *book,
-			     PASBookView *view, int id, LDAPOpHandler handler, LDAPOpDtor dtor);
-static void     ldap_op_finished (LDAPOp *op);
-
-static void     ldap_search_op_timeout (LDAPOp *op, glong cur_millis);
-
-static gboolean poll_ldap (PASBackendLDAP *bl);
-
-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasses);
-
-static void email_populate (ECardSimple *card, char **values);
-struct berval** email_ber (ECardSimple *card);
-static gboolean email_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void homephone_populate (ECardSimple *card, char **values);
-struct berval** homephone_ber (ECardSimple *card);
-static gboolean homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void business_populate (ECardSimple *card, char **values);
-struct berval** business_ber (ECardSimple *card);
-static gboolean business_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void anniversary_populate (ECardSimple *card, char **values);
-struct berval** anniversary_ber (ECardSimple *card);
-static gboolean anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void birthday_populate (ECardSimple *card, char **values);
-struct berval** birthday_ber (ECardSimple *card);
-static gboolean birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-struct prop_info {
-	ECardSimpleField field_id;
-	char *query_prop;
-	char *ldap_attr;
-#define PROP_TYPE_STRING   0x01
-#define PROP_TYPE_COMPLEX     0x02
-#define PROP_DN            0x04
-#define PROP_EVOLVE        0x08
-	int prop_type;
-
-	/* the remaining items are only used for the TYPE_COMPLEX 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 COMPLEX_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_COMPLEX, ctor, ber, cmp}
-#define E_COMPLEX_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_COMPLEX | PROP_EVOLVE, ctor, ber, cmp}
-#define STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING}
-#define E_STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING | PROP_EVOLVE}
-
-
-	/* name fields */
-	STRING_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME,   "full_name", "cn" ),
-	STRING_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),
-
-	/* email addresses */
-	COMPLEX_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate, email_ber, email_compare),
-
-	/* phone numbers */
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone", "primaryPhone"),
-	COMPLEX_PROP     (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone", "telephoneNumber", business_populate, business_ber, business_compare),
-	COMPLEX_PROP     (E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone", "homePhone", homephone_populate, homephone_ber, homephone_compare),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone", "mobile"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone", "carPhone"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax", "facsimileTelephoneNumber"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax", "homeFacsimileTelephoneNumber"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone", "otherPhone"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_fax", "otherFacsimileTelephoneNumber"), 
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn", "internationaliSDNNumber"), 
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager", "pager"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio", "radio"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex", "telex"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", "assistantPhone"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone", "companyPhone"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone", "callbackPhone"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,       "tty", "tty"),
-
-	/* org information */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG,       "org",       "o"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG_UNIT,  "org_unit",  "ou"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_OFFICE,    "office",    "roomNumber"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_TITLE,     "title",     "title"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ROLE,      "role",      "businessRole"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MANAGER,   "manager",   "managerName"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistantName"), 
-
-	/* addresses */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS, "business_address", "postalAddress"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_HOME,     "home_address",     "homePostalAddress"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,    "other_address",    "otherPostalAddress"),
-
-	/* misc fields */
-	STRING_PROP (E_CARD_SIMPLE_FIELD_URL,           "url", "labeledURI"),
-	/* map nickname to displayName */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_NICKNAME,    "nickname",  "displayName"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_SPOUSE,      "spouse", "spouseName"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_NOTE,        "note", "note"), 
-	E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_ANNIVERSARY, "anniversary", "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), 
-	E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_BIRTH_DATE,  "birth_date", "birthDate", birthday_populate, birthday_ber, birthday_compare), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MAILER,      "mailer", "mailer"), 
-
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS,     "file_as", "fileAs"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES,  "categories", "categories"),
-
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_CALURI,      "caluri", "calendarURI"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_FBURL,       "fburl", "freeBusyURI")
-
-/*  	E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */
-
-
-#undef E_STRING_PROP
-#undef STRING_PROP
-#undef E_COMPLEX_PROP
-#undef COMPLEX_PROP
-};
-
-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);
-
-static void
-remove_view (int msgid, LDAPOp *op, PASBookView *view)
-{
-	if (op->view == view)
-		op->view = NULL;
-}
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_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 we have an active search, interrupt it */
-			if (view->search_op)
-				ldap_op_finished (view->search_op);
-			/* and remove us as the view for any other
-                           operations that might be using us to spew
-                           status messages to the gui */
-			g_hash_table_foreach (bl->priv->id_to_op, (GHFunc)remove_view, view->book_view);
-			g_free (view->search);
-			gtk_object_unref (GTK_OBJECT (view->card_sexp));
-			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);
-
-	GNOME_Evolution_Addressbook_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
-add_to_supported_fields (PASBackendLDAP *bl, char **attrs, GHashTable *attr_hash)
-{
-	int i;
-	for (i = 0; attrs[i]; i ++) {
-		char *query_prop = g_hash_table_lookup (attr_hash, attrs[i]);
-
-		if (query_prop) {
-			e_list_append (bl->priv->supported_fields, query_prop);
-
-			/* handle the list attributes here */
-			if (!strcmp (query_prop, "email")) {
-				e_list_append (bl->priv->supported_fields, "email_2");
-				e_list_append (bl->priv->supported_fields, "email_3");
-			}
-			else if (!strcmp (query_prop, "business_phone")) {
-				e_list_append (bl->priv->supported_fields, "business_phone_2");
-			}
-			else if (!strcmp (query_prop, "home_phone")) {
-				e_list_append (bl->priv->supported_fields, "home_phone_2");
-			}
-		}
-	}
-}
-
-static void
-add_oc_attributes_to_supported_fields (PASBackendLDAP *bl, LDAPObjectClass *oc)
-{
-	int i;
-	GHashTable *attr_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	for (i = 0; i < num_prop_infos; i ++)
-		g_hash_table_insert (attr_hash, prop_info[i].ldap_attr, prop_info[i].query_prop);
-
-	if (oc->oc_at_oids_must)
-		add_to_supported_fields (bl, oc->oc_at_oids_must, attr_hash);
-
-	if (oc->oc_at_oids_may)
-		add_to_supported_fields (bl, oc->oc_at_oids_may, attr_hash);
-
-	g_hash_table_destroy (attr_hash);
-}
-
-static void
-check_schema_support (PASBackendLDAP *bl)
-{
-	char *attrs[2];
-	LDAPMessage *resp;
-	LDAP *ldap = bl->priv->ldap;
-
-	if (!bl->priv->schema_dn)
-		return;
-
-	bl->priv->schema_checked = TRUE;
-
-	attrs[0] = "objectClasses";
-	attrs[1] = NULL;
-
-	if (ldap_search_ext_s (ldap, bl->priv->schema_dn, LDAP_SCOPE_BASE,
-			       "(objectClass=subschema)", attrs, 0,
-			       NULL, NULL, NULL, 0, &resp) == LDAP_SUCCESS) {
-		char **values;
-
-		values = ldap_get_values (ldap, resp, "objectClasses");
-
-		if (values) {
-			int i;
-			for (i = 0; values[i]; i ++) {
-				int j;
-				int code;
-				const char *err;
-				LDAPObjectClass *oc = ldap_str2objectclass (values[i], &code, &err, 0);
-
-				if (!oc)
-					continue;
-
-				for (j = 0; oc->oc_names[j]; j++)
-					if (!g_strcasecmp (oc->oc_names[j], EVOLUTIONPERSON)) {
-						g_print ("support found on ldap server for objectclass evolutionPerson\n");
-						bl->priv->evolutionPersonSupported = TRUE;
-
-						add_oc_attributes_to_supported_fields (bl, oc);
-					}
-					else if (!g_strcasecmp (oc->oc_names[j], INETORGPERSON)
-						 || !g_strcasecmp (oc->oc_names[j], ORGANIZATIONALPERSON)
-						 || !g_strcasecmp (oc->oc_names[j], PERSON)) {
-						add_oc_attributes_to_supported_fields (bl, oc);
-					}
-
-				ldap_objectclass_free (oc);
-			}
-
-			ldap_value_free (values);
-		}
-
-		ldap_msgfree (resp);
-	}
-}
-
-static void
-get_ldap_library_info ()
-{
-	LDAPAPIInfo info;
-	LDAP *ldap;
-
-	if (LDAP_SUCCESS != ldap_create (&ldap)) {
-		g_warning ("couldn't create LDAP* for getting at the client lib api info");
-		return;
-	}
-
-	info.ldapai_info_version = LDAP_API_INFO_VERSION;
-
-	if (LDAP_OPT_SUCCESS != ldap_get_option (ldap, LDAP_OPT_API_INFO, &info)) {
-		g_warning ("couldn't get ldap api info");
-	}
-	else {
-		int i;
-		g_message ("libldap vendor/version: %s %2d.%02d.%02d",
-			   info.ldapai_vendor_name,
-			   info.ldapai_vendor_version / 10000,
-			   (info.ldapai_vendor_version % 10000) / 1000,
-			   info.ldapai_vendor_version % 1000);
-
-		g_message ("extensions present:");
-		/* yuck.  we have to free these? */
-		for (i = 0; info.ldapai_extensions[i]; i++) {
-			char *extension = info.ldapai_extensions[i];
-			g_message (extension);
-			ldap_memfree (extension);
-		}
-		ldap_memfree (info.ldapai_extensions);
-		ldap_memfree (info.ldapai_vendor_name);
-	}
-
-	ldap_unbind_ext_s (ldap, NULL, NULL);
-}
-
-static void
-query_ldap_root_dse (PASBackendLDAP *bl)
-{
-#define MAX_DSE_ATTRS 20
-	LDAP *ldap = bl->priv->ldap;
-	LDAPMessage *resp;
-	int ldap_error;
-	char *attrs[MAX_DSE_ATTRS], **values;
-	int i = 0;
-	struct timeval timeout;
-
-	attrs[i++] = "supportedControl";
-	attrs[i++] = "supportedExtension";
-	attrs[i++] = "supportedFeatures";
-	attrs[i++] = "supportedSASLMechanisms";
-	attrs[i++] = "supportedLDAPVersion";
-	attrs[i++] = "subschemaSubentry"; /* OpenLDAP's dn for schema information */
-	attrs[i++] = "schemaNamingContext"; /* Active directory's dn for schema information */
-	attrs[i] = NULL;
-
-	timeout.tv_sec = 0;
-	timeout.tv_usec = LDAP_RESULT_TIMEOUT_MILLIS * 1000;
-
-	ldap_error = ldap_search_ext_s (ldap,
-					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
-					"(objectclass=*)",
-					attrs, 0, NULL, NULL, NULL, 0, &resp);
-	if (ldap_error != LDAP_SUCCESS) {
-		g_warning ("could not perform query on Root DSE");
-		return;
-	}
-
-	values = ldap_get_values (ldap, resp, "supportedControl");
-	if (values) {
-		for (i = 0; values[i]; i++)
-			g_message ("supported server control: %s", values[i]);
-		ldap_value_free (values);
-	}
-
-	values = ldap_get_values (ldap, resp, "supportedExtension");
-	if (values) {
-		for (i = 0; values[i]; i++) {
-			g_message ("supported server extension: %s", values[i]);
-			if (!strcmp (values[i], LDAP_EXOP_START_TLS)) {
-				g_message ("server reports LDAP_EXOP_START_TLS");
-			}
-		}
-		ldap_value_free (values);
-	}
-
-	values = ldap_get_values (ldap, resp, "supportedSASLMechanisms");
-	if (values) {
-		for (i = 0; values[i]; i++)
-			g_message ("supported SASL mechanism: %s", values[i]);
-		ldap_value_free (values);
-	}
-
-
-	values = ldap_get_values (ldap, resp, "supportedLDAPVersion");
-	if (values) {
-		for (i = 0; values[i]; i++)
-			if (LDAP_VERSION3 == atoi (values[i]))
-				bl->priv->ldap_v3 = TRUE;
-		ldap_value_free (values);
-	}
-
-	values = ldap_get_values (ldap, resp, "subschemaSubentry");
-	if (!values || !values[0]) {
-		if (values) ldap_value_free (values);
-		values = ldap_get_values (ldap, resp, "schemaNamingContext");
-	}
-	if (values && values[0]) {
-		bl->priv->schema_dn = g_strdup (values[0]);
-	}
-	else {
-		g_warning ("could not determine location of schema information on LDAP server");
-	}
-	if (values)
-		ldap_value_free (values);
-
-	ldap_msgfree (resp);
-}
-
-static GNOME_Evolution_Addressbook_BookListener_CallStatus
-pas_backend_ldap_connect (PASBackendLDAP *bl)
-{
-	PASBackendLDAPPrivate *blpriv = bl->priv;
-
-	/* close connection first if it's open first */
-	if (blpriv->ldap)
-		ldap_unbind (blpriv->ldap);
-
-	blpriv->ldap = ldap_init (blpriv->ldap_host, blpriv->ldap_port);
-#if defined (DEBUG) && defined (LDAP_OPT_DEBUG_LEVEL)
-	{
-		int debug_level = 4;
-		ldap_set_option (blpriv->ldap, LDAP_OPT_DEBUG_LEVEL, &debug_level);
-	}
-#endif
-
-	if (NULL != blpriv->ldap) {
-		int ldap_error;
-
-		if (bl->priv->use_tls) {
-			ldap_error = ldap_start_tls_s (blpriv->ldap, NULL, NULL);
-			if (LDAP_SUCCESS != ldap_error) {
-				if (bl->priv->use_tls == PAS_BACKEND_LDAP_TLS_ALWAYS) {
-					g_message ("TLS not available (fatal version), (ldap_error 0x%02x)", ldap_error);
-					ldap_unbind (blpriv->ldap);
-					blpriv->ldap = NULL;
-					return GNOME_Evolution_Addressbook_BookListener_TLSNotAvailable;
-				}
-				else {
-					g_message ("TLS not available (ldap_error 0x%02x)", ldap_error);
-				}
-			}
-			else
-				g_message ("TLS active");
-		}
-
-		query_ldap_root_dse (bl);
-
-		if (bl->priv->ldap_v3) {
-			int protocol_version = LDAP_VERSION3;
-			ldap_error = ldap_set_option (blpriv->ldap, LDAP_OPT_PROTOCOL_VERSION, &protocol_version);
-			if (LDAP_OPT_SUCCESS != ldap_error) {
-				g_warning ("failed to set protocol version to LDAPv3");
-				bl->priv->ldap_v3 = FALSE;
-			}
-		}
-
-		blpriv->connected = TRUE;
-
-		/* check to see if evolutionPerson is supported, if we can (me
-		   might not be able to if we can't authenticate.  if we
-		   can't, try again in auth_user.) */
-		check_schema_support (bl);
-
-		return GNOME_Evolution_Addressbook_BookListener_Success;
-	}
-	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;
-		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;
-	}
-}
-
-static void
-ldap_op_add (LDAPOp *op, PASBackend *backend,
-	     PASBook *book, PASBookView *view,
-	     int id,
-	     LDAPOpHandler handler, LDAPOpDtor dtor)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	op->backend = backend;
-	op->book = book;
-	op->view = view;
-	op->id = id;
-	op->handler = handler;
-	op->dtor = dtor;
-
-	g_hash_table_insert (bl->priv->id_to_op,
-			     &op->id, op);
-
-	bl->priv->active_ops ++;
-
-	if (bl->priv->poll_timeout == -1)
-		bl->priv->poll_timeout = g_timeout_add (LDAP_POLL_INTERVAL,
-							(GSourceFunc) poll_ldap,
-							bl);
-}
-
-static void
-ldap_op_finished (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_hash_table_remove (bl->priv->id_to_op, &op->id);
-
-	/* should handle errors here */
-	ldap_abandon (bl->priv->ldap, op->id);
-
-	op->dtor (op);
-
-	bl->priv->active_ops--;
-	if (bl->priv->active_ops == 0) {
-		if (bl->priv->poll_timeout != -1)
-			g_source_remove (bl->priv->poll_timeout);
-		bl->priv->poll_timeout = -1;
-	}
-}
-
-static void
-ldap_op_change_id (LDAPOp *op, int msg_id)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_hash_table_remove (bl->priv->id_to_op, &op->id);
-
-	op->id = msg_id;
-
-	g_hash_table_insert (bl->priv->id_to_op,
-			     &op->id, op);
-}
-
-static int
-ldap_error_to_response (int ldap_error)
-{
-	if (ldap_error == LDAP_SUCCESS)
-		return GNOME_Evolution_Addressbook_BookListener_Success;
-	else if (LDAP_NAME_ERROR (ldap_error))
-		return GNOME_Evolution_Addressbook_BookListener_CardNotFound;
-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
-		return GNOME_Evolution_Addressbook_BookListener_PermissionDenied;
-	else if (ldap_error == LDAP_SERVER_DOWN)
-		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;
-	else if (ldap_error == LDAP_ALREADY_EXISTS)
-		return GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists;
-	else
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-}
-
-
-static char *
-create_dn_from_ecard (ECardSimple *card, const char *root_dn)
-{
-	char *cn, *cn_part = NULL;
-	char *dn;
-
-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	if (cn) {
-		if (strchr (cn, ',')) {
-			/* need to escape commas */
-			char *new_cn = g_malloc0 (strlen (cn) * 3 + 1);
-			int i, j;
-
-			for (i = 0, j = 0; i < strlen (cn); i ++) {
-				if (cn[i] == ',') {
-					sprintf (new_cn + j, "%%%02X", cn[i]);
-					j += 3;
-				}
-				else {
-					new_cn[j++] = cn[i];
-				}
-			}
-			cn_part = g_strdup_printf ("cn=%s", new_cn);
-			g_free (new_cn);
-		}
-		else {
-			cn_part = g_strdup_printf ("cn=%s", cn);
-		}
-	}
-	else {
-		cn_part = g_strdup ("");
-	}
-
-	dn = g_strdup_printf ("%s%s%s", cn_part,
-			      (root_dn && strlen(root_dn)) ? "," : "",
-			      (root_dn && strlen(root_dn)) ? root_dn: "");
-
-	g_free (cn_part);
-
-	g_print ("generated dn: %s\n", dn);
-
-	return dn;
-}
-
-static void
-free_mods (GPtrArray *mods)
-{
-	int i = 0;
-	LDAPMod *mod;
-
-	while ((mod = g_ptr_array_index (mods, i++))) {
-		int j;
-		g_free (mod->mod_type);
-
-		if (mod->mod_op & LDAP_MOD_BVALUES) {
-			for (j = 0; mod->mod_bvalues[j]; j++) {
-				g_free (mod->mod_bvalues[j]->bv_val);
-				g_free (mod->mod_bvalues[j]);
-			}
-		}
-		else {
-			for (j = 0; mod->mod_values[j]; j++)
-				g_free (mod->mod_values[j]);
-		}
-		g_free (mod);
-	}
-
-	g_ptr_array_free (mods, TRUE);
-}
-
-static GPtrArray*
-build_mods_from_ecards (PASBackendLDAP *bl, 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 ++) {
-		gboolean include;
-		gboolean new_prop_present = FALSE;
-		gboolean current_prop_present = FALSE;
-		struct berval** new_prop_bers = NULL;
-		char *new_prop = NULL;
-		char *current_prop = NULL;
-
-		/* XXX if it's an evolutionPerson prop and the ldap
-                   server doesn't support that objectclass, skip it. */
-		if (prop_info[i].prop_type & PROP_EVOLVE && !bl->priv->evolutionPersonSupported)
-			continue;
-
-		/* 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. */
-		if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-			new_prop = e_card_simple_get (new, prop_info[i].field_id);
-			new_prop_present = (new_prop != NULL);
-		}
-		else {
-			new_prop_bers = prop_info[i].ber_func (new);
-			new_prop_present = (new_prop_bers != NULL);
-		}
-
-		/* 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 */
-			if (prop_info[i].prop_type & PROP_TYPE_STRING)
-				include = (new_prop_present && *new_prop); /* empty strings cause problems */
-			else
-				include = new_prop_present;
-		}
-		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. */
-			if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-				current_prop = e_card_simple_get (current, prop_info[i].field_id);
-				current_prop_present = (current_prop != NULL);
-
-				if (new_prop && current_prop)
-					include = *new_prop && strcmp (new_prop, current_prop);
-				else
-					include = (!!new_prop != !!current_prop);
-			}
-			else {
-				int j;
-				struct berval **current_prop_bers = prop_info[i].ber_func (current);
-
-				current_prop_present = (current_prop_bers != NULL);
-
-				/* free up the current_prop_bers */
-				if (current_prop_bers) {
-					for (j = 0; current_prop_bers[j]; j++) {
-						g_free (current_prop_bers[j]->bv_val);
-						g_free (current_prop_bers[j]);
-					}
-					g_free (current_prop_bers);
-				}
-
-				include = !prop_info[i].compare_func (new, current);
-			}
-		}
-
-		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_present)
-					mod->mod_op = LDAP_MOD_DELETE;
-				else if (!current_prop_present)
-					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_STRING) {
-				mod->mod_values = g_new (char*, 2);
-				mod->mod_values[0] = new_prop;
-				mod->mod_values[1] = NULL;
-			}
-			else { /* PROP_TYPE_COMPLEX */
-				mod->mod_op |= LDAP_MOD_BVALUES;
-				mod->mod_bvalues = new_prop_bers;
-			}
-
-			g_ptr_array_add (result, mod);
-		}
-		
-	}
-
-	/* NULL terminate the list of modifications */
-	g_ptr_array_add (result, NULL);
-
-	return result;
-}
-
-static void
-add_objectclass_mod (PASBackendLDAP *bl, GPtrArray *mod_array, GList *existing_objectclasses)
-{
-	LDAPMod *objectclass_mod;
-
-	if (existing_objectclasses) {
-		int i = 0;
-
-		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*, bl->priv->evolutionPersonSupported ? 6 : 5);
-
-		/* yes, this is a linear search for each of our
-                   objectclasses, but really, how many objectclasses
-                   are there going to be in any sane ldap entry? */
-#define FIND_INSERT(oc) \
-	if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_strcasecmp)) \
-	         objectclass_mod->mod_values[i++] = g_strdup ((oc));
-
-		FIND_INSERT (TOP);
-		FIND_INSERT (PERSON);
-		FIND_INSERT (ORGANIZATIONALPERSON);
-		FIND_INSERT (INETORGPERSON);
-		if (bl->priv->evolutionPersonSupported)
-			FIND_INSERT (EVOLUTIONPERSON);
-		objectclass_mod->mod_values[i] = NULL;
-
-		if (i) {
-			g_ptr_array_add (mod_array, objectclass_mod);
-		}
-		else {
-			g_free (objectclass_mod->mod_type);
-			g_free (objectclass_mod->mod_values);
-			g_free (objectclass_mod);
-		}
-	}
-	else {
-		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*, bl->priv->evolutionPersonSupported ? 6 : 5);
-		objectclass_mod->mod_values[0] = g_strdup (TOP);
-		objectclass_mod->mod_values[1] = g_strdup (PERSON);
-		objectclass_mod->mod_values[2] = g_strdup (ORGANIZATIONALPERSON);
-		objectclass_mod->mod_values[3] = g_strdup (INETORGPERSON);
-		if (bl->priv->evolutionPersonSupported) {
-			objectclass_mod->mod_values[4] = g_strdup (EVOLUTIONPERSON);
-			objectclass_mod->mod_values[5] = NULL;
-		}
-		else {
-			objectclass_mod->mod_values[4] = NULL;
-		}
-		g_ptr_array_add (mod_array, objectclass_mod);
-	}
-}
-
-typedef struct {
-	LDAPOp op;
-	char *dn;
-	ECardSimple *new_card;
-} LDAPCreateOp;
-
-static void
-create_card_handler (LDAPOp *op, LDAPMessage *res)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	LDAP *ldap = bl->priv->ldap;
-	int ldap_error;
-	int response;
-
-	if (LDAP_RES_ADD != ldap_msgtype (res)) {
-		g_warning ("incorrect msg type %d passed to create_card_handler", ldap_msgtype (res));
-		pas_book_respond_create (op->book,
-					 GNOME_Evolution_Addressbook_BookListener_OtherError,
-					 create_op->dn);
-		ldap_op_finished (op);
-		return;
-	}
-
-	ldap_parse_result (ldap, res, &ldap_error,
-			   NULL, NULL, NULL, NULL, 0);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* the card was created, let's let the views know about it */
-		GList *l;
-		for (l = bl->priv->book_views; l; l = l->next) {
-			CORBA_Environment ev;
-			gboolean match;
-			PASBackendLDAPBookView *view = l->data; 
-
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-								   e_card_simple_get_vcard_assume_utf8 (create_op->new_card));
-			if (match) {
-				char *vcard = e_card_simple_get_vcard_assume_utf8 (create_op->new_card);
-				pas_book_view_notify_add_1 (view->book_view,
-							    vcard);
-				g_free (vcard);
-			}
-			pas_book_view_notify_complete (view->book_view);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-	}
-	else {
-		ldap_perror (ldap, "create_card");
-	}
-
-	if (op->view)
-		pas_book_view_notify_complete (op->view);
-
-	/* and lastly respond */
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_create (op->book,
-				 response,
-				 create_op->dn);
-
-	ldap_op_finished (op);
-}
-
-static void
-create_card_dtor (LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-
-	g_free (create_op->dn);
-	gtk_object_unref (GTK_OBJECT (create_op->new_card));
-	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);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-	int create_card_msgid;
-	ECard *new_ecard;
-	int response;
-	int err;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	printf ("vcard = %s\n", req->create.vcard);
-
-	new_ecard = e_card_new (req->create.vcard);
-	create_op->new_card = e_card_simple_new (new_ecard);
-
-	create_op->dn = create_dn_from_ecard (create_op->new_card, bl->priv->ldap_rootdn);
-	e_card_simple_set_id (create_op->new_card, create_op->dn); /* for the notification code below */
-
-	ldap = bl->priv->ldap;
-
-	/* build our mods */
-	mod_array = build_mods_from_ecards (bl, NULL, create_op->new_card, NULL);
-
-#if 0
-	if (!mod_array) {
-		/* there's an illegal field in there.  report
-                   UnsupportedAttribute back */
-		pas_book_respond_create (book,
-					 GNOME_Evolution_Addressbook_BookListener_UnsupportedField,
-					 create_op->dn);
-
-		g_free (create_op->dn);
-		gtk_object_unref (GTK_OBJECT(create_op->new_card));
-		g_free (create_op);
-		return;
-	}
-#endif
-
-	/* remove the NULL at the end */
-	g_ptr_array_remove (mod_array, NULL);
-
-	/* add our objectclass(es) */
-	add_objectclass_mod (bl, mod_array, NULL);
-
-	/* then put the NULL back */
-	g_ptr_array_add (mod_array, NULL);
-
-#ifdef LDAP_DEBUG_ADD
-	{
-		int i;
-		printf ("Sending the following to the server as ADD\n");
-
-		for (i = 0; g_ptr_array_index(mod_array, i); i ++) {
-			LDAPMod *mod = g_ptr_array_index(mod_array, i);
-			if (mod->mod_op & LDAP_MOD_DELETE)
-				printf ("del ");
-			else if (mod->mod_op & LDAP_MOD_REPLACE)
-				printf ("rep ");
-			else
-				printf ("add ");
-			if (mod->mod_op & LDAP_MOD_BVALUES)
-				printf ("ber ");
-			else
-				printf ("    ");
-
-			printf (" %s:\n", mod->mod_type);
-
-			if (mod->mod_op & LDAP_MOD_BVALUES) {
-				int j;
-				for (j = 0; mod->mod_bvalues[j] && mod->mod_bvalues[j]->bv_val; j++)
-					printf ("\t\t'%s'\n", mod->mod_bvalues[j]->bv_val);
-			}
-			else {
-				int j;
-
-				for (j = 0; mod->mod_values[j]; j++)
-					printf ("\t\t'%s'\n", mod->mod_values[j]);
-			}
-		}
-	}
-#endif
-
-	ldap_mods = (LDAPMod**)mod_array->pdata;
-
-	if (book_view)
-		pas_book_view_notify_status_message (book_view, _("Adding card to LDAP server..."));
-
-	err = ldap_add_ext (ldap, create_op->dn, ldap_mods,
-			    NULL, NULL, &create_card_msgid);
-
-	/* and clean up */
-	free_mods (mod_array);
-
-	if (LDAP_SUCCESS != err) {
-		response = ldap_error_to_response (err);
-		pas_book_respond_create (create_op->op.book,
-					 response,
-					 create_op->dn);
-		create_card_dtor ((LDAPOp*)create_op);
-		return;
-	}
-	else {
-		g_print ("ldap_add_ext returned %d\n", err);
-		ldap_op_add ((LDAPOp*)create_op, backend, book,
-			     book_view, create_card_msgid,
-			     create_card_handler, create_card_dtor);
-	}
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *id;
-} LDAPRemoveOp;
-
-static void
-remove_card_handler (LDAPOp *op, LDAPMessage *res)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	int ldap_error;
-
-	if (LDAP_RES_DELETE != ldap_msgtype (res)) {
-		g_warning ("incorrect msg type %d passed to remove_card_handler", ldap_msgtype (res));
-		pas_book_respond_remove (op->book,
-					 GNOME_Evolution_Addressbook_BookListener_OtherError);
-		ldap_op_finished (op);
-		return;
-	}
-
-	ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-			   NULL, NULL, NULL, NULL, 0);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* the card was removed, let's let the views know about it */
-		GList *l;
-		for (l = bl->priv->book_views; l; l = l->next) {
-			CORBA_Environment ev;
-			PASBackendLDAPBookView *view = l->data; 
-					
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			pas_book_view_notify_remove (view->book_view, remove_op->id);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-	}
-	else {
-		ldap_perror (bl->priv->ldap, "remove_card");
-	}
-
-	pas_book_respond_remove (remove_op->op.book,
-				 ldap_error_to_response (ldap_error));
-
-	if (op->view)
-		pas_book_view_notify_complete (op->view);
-}
-
-static void
-remove_card_dtor (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);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-	int remove_msgid;
-	int ldap_error;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	remove_op->id = g_strdup (req->remove.id);
-
-	if (book_view)
-		pas_book_view_notify_status_message (book_view, _("Removing card from LDAP server..."));
-
-	ldap_error = ldap_delete_ext (bl->priv->ldap,
-				      remove_op->id,
-				      NULL, NULL, &remove_msgid);
-
-	if (ldap_error != LDAP_SUCCESS) {
-		pas_book_respond_remove (remove_op->op.book,
-					 ldap_error_to_response (ldap_error));
-		remove_card_dtor ((LDAPOp*)remove_op);
-		return;
-	}
-	else {
-		g_print ("ldap_delete_ext returned %d\n", ldap_error);
-		ldap_op_add ((LDAPOp*)remove_op, backend, book,
-			     book_view, remove_msgid,
-			     remove_card_handler, remove_card_dtor);
-	}
-}
-
-
-/*
-** MODIFY
-**
-** The modification request is actually composed of 2 separate
-** requests.  Since we need to get a list of theexisting objectclasses
-** used by the ldap server for the entry, and since the UI only sends
-** us the current card, we need to query the ldap server for the
-** existing card.
-**
-*/
-
-typedef struct {
-	LDAPOp op;
-	const char *id; /* the id of the card we're modifying */
-	char *current_vcard; /* current in the LDAP db */
-	ECardSimple *current_card;
-	char *vcard;         /* the VCard we want to store */
-	ECardSimple *card;
-	GList *existing_objectclasses;
-} LDAPModifyOp;
-
-static void
-modify_card_modify_handler (LDAPOp *op, LDAPMessage *res)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	LDAP *ldap = bl->priv->ldap;
-	int ldap_error;
-
-	if (LDAP_RES_MODIFY != ldap_msgtype (res)) {
-		g_warning ("incorrect msg type %d passed to modify_card_handler", ldap_msgtype (res));
-		pas_book_respond_modify (op->book,
-					 GNOME_Evolution_Addressbook_BookListener_OtherError);
-		ldap_op_finished (op);
-		return;
-	}
-
-	ldap_parse_result (ldap, res, &ldap_error,
-			   NULL, NULL, NULL, NULL, 0);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* the card was modified, let's let the views know about it */
-		GList *l;
-		for (l = bl->priv->book_views; l; l = l->next) {
-			CORBA_Environment ev;
-			gboolean old_match, new_match;
-			PASBackendLDAPBookView *view = l->data; 
-					
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			old_match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-								       modify_op->current_vcard);
-			new_match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-								       modify_op->vcard);
-			if (old_match && new_match)
-				pas_book_view_notify_change_1 (view->book_view, modify_op->vcard);
-			else if (new_match)
-				pas_book_view_notify_add_1 (view->book_view, modify_op->vcard);
-			else /* if (old_match) */
-				pas_book_view_notify_remove (view->book_view, e_card_simple_get_id (modify_op->card));
-			pas_book_view_notify_complete (view->book_view);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-	}
-	else {
-		ldap_perror (ldap, "ldap_modify_s");
-	}
-
-	/* and lastly respond */
-	pas_book_respond_modify (op->book,
-				 ldap_error_to_response (ldap_error));
-	ldap_op_finished (op);
-}
-
-static void
-modify_card_search_handler (LDAPOp *op, LDAPMessage *res)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	LDAP *ldap = bl->priv->ldap;
-	int msg_type;
-
-	/* if it's successful, we should get called with a
-	   RES_SEARCH_ENTRY and a RES_SEARCH_RESULT.  if it's
-	   unsuccessful, we should only see a RES_SEARCH_RESULT */
-
-	msg_type = ldap_msgtype (res);
-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-		LDAPMessage *e = ldap_first_entry(ldap, res);
-
-		if (!e) {
-			g_warning ("uh, this shouldn't happen");
-			pas_book_respond_modify (op->book,
-						 GNOME_Evolution_Addressbook_BookListener_OtherError);
-			ldap_op_finished (op);
-			return;
-		}
-
-		modify_op->current_card = build_card_from_entry (ldap, e,
-								 &modify_op->existing_objectclasses);
-		modify_op->current_vcard = e_card_simple_get_vcard_assume_utf8 (modify_op->current_card);
-	}
-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-		int ldap_error;
-		LDAPMod **ldap_mods;
-		GPtrArray *mod_array;
-		gboolean differences;
-		gboolean need_new_dn;
-		int modify_card_msgid;
-
-		/* grab the result code, and set up the actual modify
-                   if it was successful */
-		ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-				   NULL, NULL, NULL, NULL, 0);
-
-		if (ldap_error != LDAP_SUCCESS) {
-			/* more here i'm sure */
-			pas_book_respond_modify (op->book,
-						 ldap_error_to_response (ldap_error));
-			ldap_op_finished (op);
-			return;
-		}
-
-		/* build our mods */
-		mod_array = build_mods_from_ecards (bl, modify_op->current_card, modify_op->card, &need_new_dn);
-		differences = mod_array->len > 0;
-
-		if (differences) {
-			/* remove the NULL at the end */
-			g_ptr_array_remove (mod_array, NULL);
-
-			/* add our objectclass(es), making sure
-			   evolutionPerson is there if it's supported */
-			add_objectclass_mod (bl, mod_array, modify_op->existing_objectclasses);
-
-			/* then put the NULL back */
-			g_ptr_array_add (mod_array, NULL);
-
-			ldap_mods = (LDAPMod**)mod_array->pdata;
-
-			/* actually perform the ldap modify */
-			ldap_error = ldap_modify_ext (ldap, modify_op->id, ldap_mods,
-						      NULL, NULL, &modify_card_msgid);
-
-			if (ldap_error == LDAP_SUCCESS) {
-				op->handler = modify_card_modify_handler;
-				ldap_op_change_id ((LDAPOp*)modify_op,
-						   modify_card_msgid);
-			}
-			else {
-				g_warning ("ldap_modify_ext returned %d\n", ldap_error);
-				pas_book_respond_modify (op->book,
-							 ldap_error_to_response (ldap_error));
-				ldap_op_finished (op);
-				return;
-			}
-		}
-
-		/* and clean up */
-		free_mods (mod_array);
-	}
-	else {
-		g_warning ("unhandled result type %d returned", msg_type);
-		pas_book_respond_modify (op->book,
-					 GNOME_Evolution_Addressbook_BookListener_OtherError);
-		ldap_op_finished (op);
-	}
-}
-
-static void
-modify_card_dtor (LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-
-	g_list_foreach (modify_op->existing_objectclasses, (GFunc)g_free, NULL);
-	g_list_free (modify_op->existing_objectclasses);
-	g_free (modify_op->current_vcard);
-	if (modify_op->current_card)
-		gtk_object_unref (GTK_OBJECT (modify_op->current_card));
-	g_free (modify_op->vcard);
-	if (modify_op->card)
-		gtk_object_unref (GTK_OBJECT (modify_op->card));
-	g_free (modify_op);
-}
-
-static void
-pas_backend_ldap_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPModifyOp *modify_op = g_new0 (LDAPModifyOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	int ldap_error;
-	LDAP *ldap;
-	int modify_card_msgid;
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	modify_op->vcard = g_strdup (req->modify.vcard);
-	new_ecard = e_card_new (modify_op->vcard);
-	modify_op->card = e_card_simple_new (new_ecard);
-	gtk_object_unref (GTK_OBJECT (new_ecard));
-	modify_op->id = e_card_simple_get_id(modify_op->card);
-
-	ldap = bl->priv->ldap;
-
-	if (book_view)
-		pas_book_view_notify_status_message (book_view, _("Modifying card from LDAP server..."));
-
-	ldap_error = ldap_search_ext (ldap, modify_op->id,
-				      LDAP_SCOPE_BASE,
-				      "(objectclass=*)",
-				      NULL, 0, NULL, NULL,
-				      NULL, /* XXX timeout */
-				      1, &modify_card_msgid);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		ldap_op_add ((LDAPOp*)modify_op, backend, book,
-			     book_view, modify_card_msgid,
-			     modify_card_search_handler, modify_card_dtor);
-	}
-	else {
-		g_warning ("ldap_search_ext returned %d\n", ldap_error);
-		pas_book_respond_modify (book,
-					 GNOME_Evolution_Addressbook_BookListener_OtherError);
-		modify_card_dtor ((LDAPOp*)modify_op);
-	}
-}
-
-
-typedef struct {
-	LDAPOp op;
-} LDAPGetVCardOp;
-
-static void
-get_vcard_handler (LDAPOp *op, LDAPMessage *res)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	int msg_type;
-
-	/* the msg_type will be either SEARCH_ENTRY (if we're
-	   successful) or SEARCH_RESULT (if we're not), so we finish
-	   the op after either */
-	msg_type = ldap_msgtype (res);
-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-		LDAPMessage *e = ldap_first_entry(bl->priv->ldap, res);
-		ECardSimple *simple;
-		char *vcard;
-
-		if (!e) {
-			g_warning ("uh, this shouldn't happen");
-			pas_book_respond_get_vcard (op->book,
-						    GNOME_Evolution_Addressbook_BookListener_OtherError,
-						    "");
-			ldap_op_finished (op);
-			return;
-		}
-
-		simple = build_card_from_entry (bl->priv->ldap, e, NULL);
-		vcard = e_card_simple_get_vcard_assume_utf8 (simple);
-		pas_book_respond_get_vcard (op->book,
-					    GNOME_Evolution_Addressbook_BookListener_Success,
-					    vcard);
-		g_free (vcard);
-		gtk_object_unref (GTK_OBJECT (simple));
-		ldap_op_finished (op);
-	}
-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-		int ldap_error;
-		ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-				   NULL, NULL, NULL, NULL, 0);
-		pas_book_respond_get_vcard (op->book, ldap_error_to_response (ldap_error), "");
-		ldap_op_finished (op);
-	}
-	else {
-		g_warning ("unhandled result type %d returned", msg_type);
-		pas_book_respond_get_vcard (op->book, GNOME_Evolution_Addressbook_BookListener_OtherError,
-					    "");
-		ldap_op_finished (op);
-	}
-
-}
-
-static void
-get_vcard_dtor (LDAPOp *op)
-{
-	LDAPGetVCardOp *get_vcard_op = (LDAPGetVCardOp*)op;
-
-	g_free (get_vcard_op);
-}
-
-static void
-pas_backend_ldap_process_get_vcard (PASBackend *backend,
-				    PASBook *book,
-				    PASRequest *req)
-{
-	LDAPGetVCardOp *get_vcard_op = g_new0 (LDAPGetVCardOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP *ldap = bl->priv->ldap;
-	int get_vcard_msgid;
-	PASBookView *book_view = NULL;
-	int ldap_error;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-	
-	ldap_error = ldap_search_ext (ldap, req->get_vcard.id,
-				      LDAP_SCOPE_BASE,
-				      "(objectclass=*)",
-				      NULL, 0, NULL, NULL,
-				      NULL, /* XXX timeout */
-				      1, &get_vcard_msgid);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		ldap_op_add ((LDAPOp*)get_vcard_op, backend, book,
-			     book_view, get_vcard_msgid,
-			     get_vcard_handler, get_vcard_dtor);
-	}
-	else {
-		pas_book_respond_get_vcard (book,
-					    ldap_error_to_response (ldap_error),
-					    "");
-		get_vcard_dtor ((LDAPOp*)get_vcard_op);
-	}
-}
-
-
-typedef struct {
-	LDAPOp op;
-	PASBackendLDAPCursorPrivate *cursor_data;
-	gboolean responded; /* if FALSE, we need to free cursor_data in the dtor */
-} 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)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	if (cursor_data->book) {
-		CORBA_Environment ev;
-		GNOME_Evolution_Addressbook_Book corba_book;
-
-		corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-		CORBA_exception_init(&ev);
-
-		GNOME_Evolution_Addressbook_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
-get_cursor_handler (LDAPOp *op, LDAPMessage *res)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	LDAP *ldap = bl->priv->ldap;
-	int msg_type;
-
-	msg_type = ldap_msgtype (res);
-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-		LDAPMessage *e;
-
-		e = ldap_first_entry (ldap, res);
-		while (e) {
-			ECardSimple *simple;
-
-			simple = build_card_from_entry (ldap, e, NULL);
-			if (simple) {
-				char *vcard = e_card_simple_get_vcard_assume_utf8 (simple);
-				cursor_op->cursor_data->num_elements ++;
-				cursor_op->cursor_data->elements = g_list_prepend (cursor_op->cursor_data->elements,
-										   vcard);
-				gtk_object_unref (GTK_OBJECT (simple));
-			}
-		}
-	}
-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-		PASCardCursor *cursor = CORBA_OBJECT_NIL;
-		int ldap_error;
-		ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-				   NULL, NULL, NULL, NULL, 0);
-
-		if (ldap_error == LDAP_SUCCESS) {
-			cursor = pas_card_cursor_new(get_length,
-						     get_nth,
-						     cursor_op->cursor_data);
-
-			gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-					   GTK_SIGNAL_FUNC(cursor_destroy), cursor_op->cursor_data);
-
-			cursor_op->responded = TRUE;
-		}
-
-		pas_book_respond_get_cursor (cursor_op->cursor_data->book,
-					     ldap_error_to_response (ldap_error),
-					     cursor);
-
-		ldap_op_finished (op);
-	}
-	else {
-		g_warning ("unhandled result type %d returned", msg_type);
-		pas_book_respond_get_cursor (op->book,
-					     GNOME_Evolution_Addressbook_BookListener_OtherError,
-					     CORBA_OBJECT_NIL);
-		ldap_op_finished (op);
-	}
-}
-
-static void
-get_cursor_dtor (LDAPOp *op)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-
-	if (!cursor_op->responded) {
-		cursor_destroy (NULL, cursor_op->cursor_data);
-	}
-
-	g_free (op);
-}
-
-static void
-pas_backend_ldap_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP           *ldap = bl->priv->ldap;
-	int            ldap_error;
-	int            get_cursor_msgid;
-	LDAPGetCursorOp *cursor_op;
-
-	cursor_op = g_new0 (LDAPGetCursorOp, 1);
-	cursor_op->cursor_data = g_new0 (PASBackendLDAPCursorPrivate, 1);
-
-	ldap_error = ldap_search_ext (ldap,
-				      bl->priv->ldap_rootdn,
-				      bl->priv->ldap_scope,
-				      "(objectclass=*)",
-				      NULL, 0,
-				      NULL, NULL, NULL, /* timeout */
-				      bl->priv->ldap_limit, &get_cursor_msgid);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		CORBA_Environment ev;
-		GNOME_Evolution_Addressbook_Book corba_book;
-
-		corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-		CORBA_exception_init(&ev);
-
-		GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-
-		cursor_op->cursor_data->backend = backend;
-		cursor_op->cursor_data->book = book;
-			
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning("pas_backend_ldap_process_get_cursor: Exception reffing "
-				  "corba book.\n");
-		}
-
-		CORBA_exception_free(&ev);
-	
-
-		ldap_op_add ((LDAPOp*)cursor_op, backend, book,
-			     NULL, get_cursor_msgid, get_cursor_handler, get_cursor_dtor);
-	}
-	else {
-		pas_book_respond_get_cursor (book,
-					     ldap_error_to_response (ldap_error),
-					     CORBA_OBJECT_NIL);
-		get_cursor_dtor ((LDAPOp*)cursor_op);
-	}
-}
-
-
-/* List property functions */
-static void
-email_populate(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(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++;
-	}
-
-	if (num == 0)
-		return NULL;
-
-	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[j++]->bv_len = strlen (emails[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-static gboolean
-email_compare (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 TRUE;
-}
-
-static void
-homephone_populate(ECardSimple *card, char **values)
-{
-	if (values[0])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME, values[0]);
-	if (values[1])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2, values[1]);
-}
-
-struct berval**
-homephone_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *homephones[3];
-	int i, j, num;
-
-	num = 0;
-	if ((homephones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME)))
-		num++;
-	if ((homephones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2)))
-		num++;
-
-	if (num == 0)
-		return NULL;
-
-	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 < 2; i ++) {
-		if (homephones[i]) {
-			result[j]->bv_val = g_strdup (homephones[i]);
-			result[j++]->bv_len = strlen (homephones[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-static gboolean
-homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_HOME, E_CARD_SIMPLE_FIELD_PHONE_HOME_2 };
-	const char *phone1, *phone2;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		gboolean equal;
-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);
-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);
-
-		if (phone1 && phone2)
-			equal = !strcmp (phone1, phone2);
-		else
-			equal = (!!phone1 == !!phone2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-business_populate(ECardSimple *card, char **values)
-{
-	if (values[0])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, values[0]);
-	if (values[1])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2, values[1]);
-}
-
-struct berval**
-business_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *business_phones[3];
-	int i, j, num;
-
-	num = 0;
-	if ((business_phones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS)))
-		num++;
-	if ((business_phones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2)))
-		num++;
-
-	if (num == 0)
-		return NULL;
-
-	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 < 2; i ++) {
-		if (business_phones[i]) {
-			result[j]->bv_val = g_strdup (business_phones[i]);
-			result[j++]->bv_len = strlen (business_phones[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-static gboolean
-business_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2 };
-	const char *phone1, *phone2;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		gboolean equal;
-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);
-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);
-
-		if (phone1 && phone2)
-			equal = !strcmp (phone1, phone2);
-		else
-			equal = (!!phone1 == !!phone2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-anniversary_populate (ECardSimple *card, char **values)
-{
-	if (values[0]) {
-		ECardDate dt = e_card_date_from_string (values[0]);
-		gtk_object_set (GTK_OBJECT (card->card),
-				"anniversary", &dt,
-				NULL);
-	}
-}
-
-struct berval**
-anniversary_ber (ECardSimple *card)
-{
-	ECardDate *dt;
-	struct berval** result = NULL;
-
-	gtk_object_get (GTK_OBJECT (card->card),
-			"anniversary", &dt,
-			NULL);
-
-	if (dt) {
-		char *anniversary;
-
-		anniversary = e_card_date_to_string (dt);
-
-		result = g_new (struct berval*, 2);
-		result[0] = g_new (struct berval, 1);
-		result[0]->bv_val = anniversary;
-		result[0]->bv_len = strlen (anniversary);
-
-		result[1] = NULL;
-	}
-
-	return result;
-}
-
-static gboolean
-anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	ECardDate *dt;
-	char *date1 = NULL, *date2 = NULL;
-	gboolean equal;
-
-	gtk_object_get (GTK_OBJECT (ecard1->card),
-			"anniversary", &dt,
-			NULL);
-	if (dt)
-		date1 = e_card_date_to_string (dt);
-
-	gtk_object_get (GTK_OBJECT (ecard2->card),
-			"anniversary", &dt,
-			NULL);
-	if (dt)
-		date2 = e_card_date_to_string (dt);
-
-	if (date1 && date2)
-		equal = !strcmp (date1, date2);
-	else
-		equal = (!!date1 == !!date2);
-
-	g_free (date1);
-	g_free (date2);
-
-	return equal;
-}
-
-static void
-birthday_populate (ECardSimple *card, char **values)
-{
-	if (values[0]) {
-		ECardDate dt = e_card_date_from_string (values[0]);
-		gtk_object_set (GTK_OBJECT (card->card),
-				"birth_date", &dt,
-				NULL);
-	}
-}
-
-struct berval**
-birthday_ber (ECardSimple *card)
-{
-	ECardDate *dt;
-	struct berval** result = NULL;
-
-	gtk_object_get (GTK_OBJECT (card->card),
-			"birth_date", &dt,
-			NULL);
-
-	if (dt) {
-		char *birthday;
-
-		birthday = e_card_date_to_string (dt);
-
-		result = g_new (struct berval*, 2);
-		result[0] = g_new (struct berval, 1);
-		result[0]->bv_val = birthday;
-		result[0]->bv_len = strlen (birthday);
-
-		result[1] = NULL;
-	}
-
-	return result;
-}
-
-static gboolean
-birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	ECardDate *dt;
-	char *date1 = NULL, *date2 = NULL;
-	gboolean equal;
-
-	gtk_object_get (GTK_OBJECT (ecard1->card),
-			"birth_date", &dt,
-			NULL);
-	if (dt)
-		date1 = e_card_date_to_string (dt);
-
-	gtk_object_get (GTK_OBJECT (ecard2->card),
-			"birth_date", &dt,
-			NULL);
-	if (dt)
-		date2 = e_card_date_to_string (dt);
-
-	if (date1 && date2)
-		equal = !strcmp (date1, date2);
-	else
-		equal = (!!date1 == !!date2);
-
-	g_free (date1);
-	g_free (date2);
-
-	return equal;
-}
-
-typedef struct {
-	GList *list;
-	PASBackendLDAP *bl;
-} PASBackendLDAPSExpData;
-
-#define IS_RFC2254_CHAR(c) ((c) == '*' || (c) =='\\' || (c) == '(' || (c) == ')' || (c) == '\0')
-static char *
-rfc2254_escape(char *str)
-{
-	int i;
-	int len = strlen(str);
-	int newlen = 0;
-
-	for (i = 0; i < len; i ++) {
-		if (IS_RFC2254_CHAR(str[i]))
-			newlen += 3;
-		else
-			newlen ++;
-	}
-
-	if (len == newlen) {
-		return g_strdup (str);
-	}
-	else {
-		char *newstr = g_malloc0 (newlen + 1);
-		int j = 0;
-		for (i = 0; i < len; i ++) {
-			if (IS_RFC2254_CHAR(str[i])) {
-				sprintf (newstr + j, "\\%02x", str[i]);
-				j+= 3;
-			}
-			else {
-				newstr[j++] = str[i];
-			}
-		}
-		return newstr;
-	}
-}
-
-static ESExpResult *
-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new0(char*, argc+3);
-		strings[0] = g_strdup ("(&");
-		strings[argc+3 - 2] = g_strdup (")");
-		
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = ldap_data->list;
-			if (!list_head)
-				break;
-			strings[argc - i] = list_head->data;
-			ldap_data->list = g_list_remove_link(list_head, list_head);
-			g_list_free_1(list_head);
-		}
-
-		ldap_data->list = g_list_prepend(ldap_data->list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new0(char*, argc+3);
-		strings[0] = g_strdup ("(|");
-		strings[argc+3 - 2] = g_strdup (")");
-
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = ldap_data->list;
-			if (!list_head)
-				break;
-			strings[argc - i] = list_head->data;
-			ldap_data->list = g_list_remove_link(list_head, list_head);
-			g_list_free_1(list_head);
-		}
-
-		ldap_data->list = g_list_prepend(ldap_data->list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = data;
-	ESExpResult *r;
-
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = ldap_data->list->data;
-		ldap_data->list->data = g_strdup_printf("(!%s)", term);
-		g_free (term);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = 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 = rfc2254_escape(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 *match_str;
-
-			match_str = g_strdup_printf("=*%s%s)",
-						    str, one_star ? "" : "*");
-
-			query_length = 3; /* strlen ("(|") + strlen (")") */
-
-			for (i = 0; i < num_prop_infos; i ++) {
-				query_length += 1 /* strlen ("(") */ + strlen(prop_info[i].ldap_attr) + strlen (match_str);
-			}
-
-			big_query = g_malloc0(query_length + 1);
-			strcat (big_query, "(|");
-			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, ")");
-
-			ldap_data->list = g_list_prepend(ldap_data->list, big_query);
-
-			g_free (match_str);
-		}
-		else {
-			char *ldap_attr = query_prop_to_ldap(propname);
-
-			if (ldap_attr)
-				ldap_data->list = g_list_prepend(ldap_data->list,
-								 g_strdup_printf("(%s=*%s%s)",
-										 ldap_attr,
-										 str,
-										 one_star ? "" : "*"));
-		}
-
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = 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 = rfc2254_escape(argv[1]->value.string);
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			ldap_data->list = g_list_prepend(ldap_data->list,
-							 g_strdup_printf("(%s=%s)",
-									 ldap_attr, str));
-		else {
-			g_warning ("unknown query property\n");
-			/* we want something that'll always be false */
-			ldap_data->list = g_list_prepend(ldap_data->list,
-							 g_strdup("objectClass=MyBarnIsBiggerThanYourBarn"));
-		}
-
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = 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 = rfc2254_escape(argv[1]->value.string);
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		/* insert hack for fileAs queries, since we need to do
-		   the right thing if the server supports them or not,
-		   and for entries that have no fileAs attribute. */
-		if (ldap_attr) {
-			if (!strcmp (propname, "full_name")) {
-				ldap_data->list = g_list_prepend(ldap_data->list,
-							       g_strdup_printf(
-								       "(|(cn=%s*)(sn=%s*))",
-								       str, str));
-			}
-			else if (!strcmp (ldap_attr, "fileAs")) {
-				ldap_data->list = g_list_prepend(ldap_data->list,
-								 g_strdup_printf(
-								 "(|(fileAs=%s*)(&(!(fileAs=*))(sn=%s*)))",
-								 str, str));
-			}
-			else {
-				ldap_data->list = g_list_prepend(ldap_data->list,
-								 g_strdup_printf("(%s=%s*)",
-										 ldap_attr,
-										 str));
-			}
-		}
-
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendLDAPSExpData *ldap_data = 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 = rfc2254_escape(argv[1]->value.string);
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			ldap_data->list = g_list_prepend(ldap_data->list,
-							 g_strdup_printf("(%s=*%s)",
-									 ldap_attr,
-									 str));
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, 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 (PASBackendLDAP *bl, gchar *query)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	PASBackendLDAPSExpData data;
-	int i;
-
-	data.list = NULL;
-	data.bl = bl;
-
-	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, &data);
-		} else {
-			e_sexp_add_function(sexp, 0, symbols[i].name,
-					    symbols[i].func, &data);
-		}
-	}
-
-	e_sexp_input_text(sexp, query, strlen(query));
-	e_sexp_parse(sexp);
-
-	r = e_sexp_eval(sexp);
-
-	e_sexp_result_free(sexp, r);
-	e_sexp_unref (sexp);
-
-	if (data.list) {
-		if (data.list->next) {
-			g_warning ("conversion to ldap query string failed");
-			retval = NULL;
-			g_list_foreach (data.list, (GFunc)g_free, NULL);
-		}
-		else {
-			retval = data.list->data;
-		}
-	}
-	else {
-		g_warning ("conversion to ldap query string failed");
-		retval = NULL;
-	}
-
-	g_list_free (data.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;
-	PASBackendLDAPBookView *view;
-
-	/* grouping stuff */
-	GList    *pending_adds;        /* the cards we're sending */
-	int       num_pending_adds;    /* the number waiting to be sent */
-	int       target_pending_adds; /* the cutoff that forces a flush to the client, if it happens before the timeout */
-	int       num_sent_this_time;  /* the number of cards we sent to the client before the most recent timeout */
-	int       num_sent_last_time;  /* the number of cards we sent to the client before the previous timeout */
-	glong     grouping_time_start;
-	
-	/* used by search_handler to only send the status messages once */
-	gboolean notified_receiving_results;
-} LDAPSearchOp;
-
-static ECardSimple *
-build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasses)
-{
-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));
-	ECardSimple *card = e_card_simple_new (ecard);
-	char *dn;
-	char *attr;
-	BerElement *ber = NULL;
-
-	dn = ldap_get_dn(ldap, e);
-	e_card_simple_set_id (card, dn);
-	ldap_memfree (dn);
-
-	for (attr = ldap_first_attribute (ldap, e, &ber); attr;
-	     attr = ldap_next_attribute (ldap, e, ber)) {
-		int i;
-		struct prop_info *info = NULL;
-		char **values;
-
-		if (existing_objectclasses && !strcasecmp (attr, "objectclass")) {
-			values = ldap_get_values (ldap, e, attr);
-			for (i = 0; values[i]; i ++)
-				*existing_objectclasses = g_list_append (*existing_objectclasses, g_strdup (values[i]));
-
-			ldap_value_free (values);
-		}
-		else {
-			for (i = 0; i < num_prop_infos; i ++)
-				if (!g_strcasecmp (attr, prop_info[i].ldap_attr))
-					info = &prop_info[i];
-
-			if (info) {
-				values = ldap_get_values (ldap, e, attr);
-
-				if (values) {
-					if (info->prop_type & PROP_TYPE_STRING) {
-						/* 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_COMPLEX) {
-						/* 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);
-				}
-			}
-		}
-
-		ldap_memfree (attr);
-	}
-
-	/* XXX the openldap man page for
-	   ldap_first_attribute/ldap_next_attribute says that the ber
-	   is freed if there are no more attributes
-	   (ldap_next_attribute returns NULL), but this seems to not
-	   be the case (as of openldap-2.0.23), so free it here. */
-	if (ber)
-		ber_free (ber, 0);
-
-	e_card_simple_sync_card (card);
-
-	gtk_object_unref (GTK_OBJECT (ecard));
-
-	return card;
-}
-
-static gboolean
-poll_ldap (PASBackendLDAP *bl)
-{
-	GList *list;
-	LDAP           *ldap = bl->priv->ldap;
-	int            rc;
-	LDAPMessage    *res;
-	GTimeVal cur_time;
-	glong cur_millis;
-	struct timeval timeout;
-
-	timeout.tv_sec = 0;
-	timeout.tv_usec = LDAP_RESULT_TIMEOUT_MILLIS * 1000;
-
-	rc = ldap_result (ldap, LDAP_RES_ANY, 0, &timeout, &res);
-	if (rc != 0) {/* rc == 0 means timeout exceeded */
-#if 0
-		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;
-		}
-#endif
-		if (rc == -1) {
-			g_warning ("ldap_result returned -1");
-		}
-		else {
-			int msgid = ldap_msgid (res);
-			LDAPOp *op;
-
-			op = g_hash_table_lookup (bl->priv->id_to_op, &msgid);
-			if (!op)
-				g_error ("unknown operation, msgid = %d", msgid);
-
-			op->handler (op, res);
-
-			ldap_msgfree(res);
-		}
-	}
-
-	g_get_current_time (&cur_time);
-	cur_millis = TV_TO_MILLIS (cur_time);
-       
-	for (list = bl->priv->book_views; list; list = g_list_next(list)) {
-		PASBackendLDAPBookView *view = list->data;
-		if (view->search_op)
-			ldap_search_op_timeout (view->search_op, cur_millis);
-	}
-
-	return TRUE;
-}
-
-static void
-send_pending_adds (LDAPSearchOp *search_op)
-{
-	search_op->num_sent_this_time += search_op->num_pending_adds;
-	pas_book_view_notify_add (search_op->op.view, search_op->pending_adds);
-	g_list_foreach (search_op->pending_adds, (GFunc)g_free, NULL);
-	search_op->pending_adds = NULL;
-	search_op->num_pending_adds = 0;
-}
-
-static void
-ldap_search_op_timeout (LDAPOp *op, glong cur_millis)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*)op;
-
-	if (cur_millis - search_op->grouping_time_start > GROUPING_MINIMUM_WAIT) {
-
-		if (search_op->num_pending_adds >= search_op->target_pending_adds)
-			send_pending_adds (search_op);
-
-		if (cur_millis - search_op->grouping_time_start > GROUPING_MAXIMUM_WAIT) {
-			GTimeVal new_start;
-
-			if (search_op->num_pending_adds)
-				send_pending_adds (search_op);
-			search_op->target_pending_adds = MIN (GROUPING_MAXIMUM_SIZE,
-							 (search_op->num_sent_this_time + search_op->num_sent_last_time) / 2);
-			search_op->target_pending_adds = MAX (search_op->target_pending_adds, 1);
-
-#ifdef PERFORMANCE_SPEW
-			printf ("num sent this time %d, last time %d, target pending adds set to %d\n",
-				search_op->num_sent_this_time,
-				search_op->num_sent_last_time,
-				search_op->target_pending_adds);
-#endif
-			g_get_current_time (&new_start);
-			search_op->grouping_time_start = TV_TO_MILLIS (new_start); 
-			search_op->num_sent_last_time = search_op->num_sent_this_time;
-			search_op->num_sent_this_time = 0;
-		}
-	}
-}
-
-static void
-ldap_search_handler (LDAPOp *op, LDAPMessage *res)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-	LDAP *ldap = bl->priv->ldap;
-	LDAPMessage *e;
-	int msg_type;
-
-	if (!search_op->notified_receiving_results) {
-		search_op->notified_receiving_results = TRUE;
-		pas_book_view_notify_status_message (op->view, _("Receiving LDAP search results..."));
-	}
-
-	msg_type = ldap_msgtype (res);
-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-		e = ldap_first_entry(ldap, res);
-
-		while (NULL != e) {
-			ECardSimple *card = build_card_from_entry (ldap, e, NULL);
-
-			search_op->pending_adds = g_list_append (search_op->pending_adds,
-								 e_card_simple_get_vcard_assume_utf8 (card));
-			search_op->num_pending_adds ++;
-
-			gtk_object_unref (GTK_OBJECT(card));
-
-			e = ldap_next_entry(ldap, e);
-		}
-	}
-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {
-		/* the entry that marks the end of our search */
-		if (search_op->num_pending_adds)
-			send_pending_adds (search_op);
-		pas_book_view_notify_complete (search_op->op.view);
-		ldap_op_finished (op);
-	}
-	else {
-		g_warning ("unhandled search result type %d returned", msg_type);
-		if (search_op->num_pending_adds)
-			send_pending_adds (search_op);
-		pas_book_view_notify_complete (search_op->op.view);
-		ldap_op_finished (op);
-	}
-}
-
-static void
-ldap_search_dtor (LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	/* unhook us from our PASBackendLDAPBookView */
-	if (search_op->view)
-		search_op->view->search_op = NULL;
-
-	g_free (search_op);
-}
-
-static void
-pas_backend_ldap_search (PASBackendLDAP  	*bl,
-			 PASBook         	*book,
-			 PASBackendLDAPBookView *view)
-{
-	char *ldap_query;
-
-	pas_book_view_notify_status_message (view->book_view, _("Searching..."));
-
-	ldap_query = pas_backend_ldap_build_query(bl, view->search);
-
-	if (ldap_query != NULL) {
-		LDAP *ldap = bl->priv->ldap;
-		int ldap_err;
-		GTimeVal search_start;
-		int search_msgid;
-		
-		ldap_err = ldap_search_ext (ldap, bl->priv->ldap_rootdn,
-					    bl->priv->ldap_scope,
-					    ldap_query,
-					    NULL, 0,
-					    NULL, /* XXX */
-					    NULL, /* XXX */
-					    NULL, /* XXX timeout */
-					    bl->priv->ldap_limit, &search_msgid);
-
-		g_free (ldap_query);
-
-		if (ldap_err != LDAP_SUCCESS) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return;
-		}
-		else if (search_msgid == -1) {
-			pas_book_view_notify_status_message (view->book_view,
-							     _("Error performing search"));
-			return;
-		}
-		else {
-			LDAPSearchOp *op = g_new0 (LDAPSearchOp, 1);
-
-			op->target_pending_adds = GROUPING_INITIAL_SIZE;
-
-			g_get_current_time (&search_start);
-			op->grouping_time_start = TV_TO_MILLIS (search_start);
-
-			op->view = view;
-
-			view->search_op = (LDAPOp*)op;
-
-			ldap_op_add ((LDAPOp*)op, PAS_BACKEND(bl), book, view->book_view,
-				     search_msgid,
-				     ldap_search_handler, ldap_search_dtor);
-			
-		}
-		return;
-	}
-	else {
-		g_warning ("LDAP problem converting search query %s\n", view->search);
-		pas_book_view_notify_status_message (view->book_view, _("Could not parse query string"));
-		return;
-	}
-
-}
-
-static void
-pas_backend_ldap_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView       *book_view;
-	PASBackendLDAPBookView *view;
-
-	g_return_if_fail (req->get_book_view.listener != NULL);
-
-	book_view = pas_book_view_new (req->get_book_view.listener);
-
-	bonobo_object_ref(BONOBO_OBJECT(book));
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	view = g_new0(PASBackendLDAPBookView, 1);
-	view->book_view = book_view;
-	view->search = g_strdup(req->get_book_view.search);
-	view->card_sexp = pas_backend_card_sexp_new (view->search);
-	view->blpriv = bl->priv;
-
-	bl->priv->book_views = g_list_prepend(bl->priv->book_views, view);
-
-	pas_book_respond_get_book_view (book,
-		(book_view != NULL
-		 ? GNOME_Evolution_Addressbook_BookListener_Success 
-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		book_view);
-
-	pas_backend_ldap_search (bl, book, view);
-
-	bonobo_object_unref (BONOBO_OBJECT (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 void
-pas_backend_ldap_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int ldap_error;
-	char *dn = NULL;
-
-	if (!strcmp (req->auth_user.auth_method, "ldap/simple-email")) {
-		LDAPMessage    *res, *e;
-		char *query = g_strdup_printf ("(mail=%s)", req->auth_user.user);
-
-		ldap_error = ldap_search_s (bl->priv->ldap,
-					    bl->priv->ldap_rootdn,
-					    bl->priv->ldap_scope,
-					    query,
-					    NULL, 0, &res);
-		g_free (query);
-
-		if (ldap_error == LDAP_SUCCESS) {
-			e = ldap_first_entry (bl->priv->ldap, res);
-			dn = g_strdup(ldap_get_dn (bl->priv->ldap, e));
-			ldap_msgfree (res);
-		}
-		else {
-			pas_book_respond_authenticate_user (book,
-						    GNOME_Evolution_Addressbook_BookListener_PermissionDenied);
-			return;
-		}
-	}
-	else if (!strcmp (req->auth_user.auth_method, "ldap/simple-binddn")) {
-		dn = g_strdup (req->auth_user.user);
-	}
-
-	/* now authenticate against the DN we were either supplied or queried for */
-	printf ("authenticating as %s\n", dn);
-	ldap_error = ldap_simple_bind_s(bl->priv->ldap,
-					dn,
-					req->auth_user.passwd);
-	g_free (dn);
-
-	pas_book_respond_authenticate_user (book,
-					    ldap_error_to_response (ldap_error));
-
-	bl->priv->writable = (ldap_error == LDAP_SUCCESS);
-
-	if (!bl->priv->schema_checked)
-		check_schema_support (bl);
-
-	pas_book_report_writable (book, bl->priv->writable);
-}
-
-static void
-pas_backend_ldap_process_get_supported_fields (PASBackend *backend,
-					       PASBook    *book,
-					       PASRequest *req)
-
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	pas_book_respond_get_supported_fields (book,
-					       GNOME_Evolution_Addressbook_BookListener_Success,
-					       bl->priv->supported_fields);
-}
-
-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 GetVCard:
-		pas_backend_ldap_process_get_vcard (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;
-
-	case GetChanges:
-		/* FIXME: Code this. */
-		break;
-
-	case AuthenticateUser:
-		pas_backend_ldap_process_authenticate_user (backend, book, req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_ldap_process_get_supported_fields (backend, book, req);
-		break;
-	}
-
-	pas_book_free_request (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 GNOME_Evolution_Addressbook_BookListener_CallStatus
-pas_backend_ldap_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPURLDesc    *lud;
-	int ldap_error;
-	char **attributes;
-	int i;
-	int limit = 100;
-	int timeout = 60; /* 1 minute */
-
-	g_assert (bl->priv->connected == FALSE);
-
-	attributes = g_strsplit (uri, ";", 0);
-
-	if (attributes[0] == NULL)
-		return FALSE;
-
-	for (i = 1; attributes[i]; i++) {
-		char *equals;
-		char *value;
-		int key_length;
-		equals = strchr (attributes[i], '=');
-		if (equals) {
-			key_length = equals - attributes[i];
-			value = equals + 1;
-		} else {
-			key_length = strlen (attributes[i]);
-			value = NULL;
-		}
-		
-		if (key_length == strlen("limit") && !strncmp (attributes[i], "limit", key_length)) {
-			if (value)
-				limit = atoi(value);
-		}
-		else if (key_length == strlen("ssl") && !strncmp (attributes[i], "ssl", key_length)) {
-			if (value) {
-				if (!strncmp (value, "always", 6)) {
-					bl->priv->use_tls = PAS_BACKEND_LDAP_TLS_ALWAYS;
-				}
-				else if (!strncmp (value, "whenever_possible", 3)) {
-					bl->priv->use_tls = PAS_BACKEND_LDAP_TLS_WHEN_POSSIBLE;
-				}
-				else {
-					g_warning ("unhandled value for use_tls, not using it");
-				}
-			}
-			else {
-				bl->priv->use_tls = PAS_BACKEND_LDAP_TLS_WHEN_POSSIBLE;
-			}
-		}
-		else if (key_length == strlen("timeout") && !strncmp (attributes[i], "timeout", key_length)) {
-			if (value)
-				timeout = atoi (value);
-		}
-	}
-
-	ldap_error = ldap_url_parse ((char*)attributes[0], &lud);
-	g_strfreev (attributes);
-
-	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_limit = limit;
-		bl->priv->ldap_timeout = timeout;
-		bl->priv->ldap_scope = lud->lud_scope;
-
-		ldap_free_urldesc(lud);
-
-		return pas_backend_ldap_connect (bl);
-	} else
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-}
-
-/* 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,
-			     GNOME_Evolution_Addressbook_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);
-
-	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, GNOME_Evolution_Addressbook_BookListener_Success);
-	} else {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_OtherError);
-	}
-
-	pas_book_report_writable (book, bl->priv->writable);
-
-	bonobo_object_unref (BONOBO_OBJECT (book));
-	
-	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_capabilities (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 gboolean
-call_dtor (int msgid, LDAPOp *op, gpointer data)
-{
-	ldap_abandon (PAS_BACKEND_LDAP(op->backend)->priv->ldap, op->id);
-
-	op->dtor (op);
-
-	return TRUE;
-}
-
-static void
-pas_backend_ldap_destroy (GtkObject *object)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (object);
-
-	g_hash_table_foreach_remove (bl->priv->id_to_op, (GHRFunc)call_dtor, NULL);
-	g_hash_table_destroy (bl->priv->id_to_op);
-
-	if (bl->priv->poll_timeout != -1)
-		g_source_remove (bl->priv->poll_timeout);
-
-	if (bl->priv->supported_fields)
-		gtk_object_unref (GTK_OBJECT (bl->priv->supported_fields));
-
-	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;
-
-	/* get client side information (extensions present in the library) */
-	get_ldap_library_info ();
-
-	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_capabilities;
-
-	object_class->destroy = pas_backend_ldap_destroy;
-}
-
-static void
-pas_backend_ldap_init (PASBackendLDAP *backend)
-{
-	PASBackendLDAPPrivate *priv;
-
-	priv                   = g_new0 (PASBackendLDAPPrivate, 1);
-
-	priv->supported_fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-	priv->ldap_limit       = 100;
-	priv->id_to_op         = g_hash_table_new (g_int_hash, g_int_equal);
-	priv->poll_timeout     = -1;
-	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 9f32c58bbf..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Ximian, 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 a17e014002..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@ximian.com)
- *
- * Copyright 2000, Ximian, 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;
-}
-
-GNOME_Evolution_Addressbook_BookListener_CallStatus
-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,
-			GNOME_Evolution_Addressbook_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 cdf8f37c30..0000000000
--- a/addressbook/backend/pas/pas-backend.h
+++ /dev/null
@@ -1,79 +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
- *    GNOME_Evolution_Addressbook_Book interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, 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 */
-	GNOME_Evolution_Addressbook_BookListener_CallStatus (*load_uri) (PASBackend *backend, const char *uri);
-	const char *(* get_uri) (PASBackend *backend);
-	gboolean (*add_client) (PASBackend *backend, GNOME_Evolution_Addressbook_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);
-
-GNOME_Evolution_Addressbook_BookListener_CallStatus
-            pas_backend_load_uri                 (PASBackend             *backend,
-						  const char             *uri);
-const char *pas_backend_get_uri                  (PASBackend             *backend);
-
-gboolean    pas_backend_add_client               (PASBackend             *backend,
-						  GNOME_Evolution_Addressbook_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 9c713f5ce8..0000000000
--- a/addressbook/backend/pas/pas-book-factory.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <ctype.h>
-
-#include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
-#include "addressbook.h"
-#include "pas-book-factory.h"
-
-#define DEFAULT_PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-
-static BonoboObjectClass          *pas_book_factory_parent_class;
-POA_GNOME_Evolution_Addressbook_BookFactory__vepv   pas_book_factory_vepv;
-
-typedef struct {
-	char                              *uri;
-	GNOME_Evolution_Addressbook_BookListener             listener;
-} PASBookFactoryQueuedRequest;
-
-struct _PASBookFactoryPrivate {
-	gint        idle_id;
-	GHashTable *backends;
-	GHashTable *active_server_map;
-	GList      *queued_requests;
-
-	/* OAFIID of the factory */
-	char *iid;
-
-	/* Whether the factory has been registered with OAF yet */
-	guint       registered : 1;
-};
-
-/* 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);
-}
-
-static void
-dump_active_server_map_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-	PASBackend *backend;
-
-	uri = key;
-	backend = PAS_BACKEND (value);
-
-	g_message ("  %s: %p", uri, backend);
-}
-
-void
-pas_book_factory_dump_active_backends (PASBookFactory *factory)
-{
-	g_message ("Active PAS backends");
-
-	g_hash_table_foreach (factory->priv->active_server_map,
-			      dump_active_server_map_entry,
-			      NULL);
-
-}
-
-/* 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,
-				 GNOME_Evolution_Addressbook_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);
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_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);
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_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;
-	GNOME_Evolution_Addressbook_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) {
-		GNOME_Evolution_Addressbook_BookListener_CallStatus status;
-
-		backend = pas_book_factory_launch_backend (factory, listener, uri);
-		if (!backend)
-			goto out;
-
-		status = pas_backend_load_uri (backend, uri);
-		if (status != GNOME_Evolution_Addressbook_BookListener_Success) {
-			/* tell the listener that we failed to open the book */
-			CORBA_exception_init (&ev);
-
-			GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-					   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);
-			
-			goto out;
-		}
-
-		pas_backend_add_client (backend, listener);
-
-		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 GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBookFactoryQueuedRequest *request;
-	GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_BookFactory_openBook (PortableServer_Servant        servant,
-				      const CORBA_char             *uri,
-				      const GNOME_Evolution_Addressbook_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) {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			ev);
-
-		return;
-	}
-
-	pas_book_factory_queue_request (factory, uri, listener);
-}
-
-static gboolean
-pas_book_factory_construct (PASBookFactory *factory)
-{
-	POA_GNOME_Evolution_Addressbook_BookFactory  *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_factory_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_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;
-}
-
-/**
- * pas_book_factory_activate:
- */
-gboolean
-pas_book_factory_activate (PASBookFactory *factory, const char *iid)
-{
-	PASBookFactoryPrivate *priv;
-	CORBA_Object obj;
-	OAF_RegistrationResult result;
-	char *tmp_iid;
-
-	g_return_val_if_fail (factory != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), FALSE);
-
-	priv = factory->priv;
-
-	g_return_val_if_fail (!priv->registered, FALSE);
-
-	/* if iid is NULL, use the default factory OAFIID */
-	if (iid)
-		tmp_iid = g_strdup (iid);
-	else
-		tmp_iid = g_strdup (DEFAULT_PAS_BOOK_FACTORY_OAF_ID);
-
-	obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-
-	result = oaf_active_server_register (tmp_iid, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		priv->iid = tmp_iid;
-		return TRUE;
-	case OAF_REG_NOT_LISTED:
-		g_message ("Error registering the PAS factory: not listed");
-		break;
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("Error registering the PAS factory: already active");
-		break;
-	case OAF_REG_ERROR:
-	default:
-		g_message ("Error registering the PAS factory: generic error");
-		break;
-	}
-
-	g_free (tmp_iid);
-	return FALSE;
-}
-
-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;
-	factory->priv->registered        = FALSE;
-}
-
-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;
-
-	if (factory->priv->registered) {
-		CORBA_Object obj;
-
-		obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-		oaf_active_server_unregister (factory->priv->iid, obj);
-		factory->priv->registered = FALSE;
-	}
-
-	g_free (factory->priv->iid);
-	
-	g_free (factory->priv);
-
-	GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
-}
-
-static POA_GNOME_Evolution_Addressbook_BookFactory__epv *
-pas_book_factory_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookFactory__epv, 1);
-
-	epv->openBook = impl_GNOME_Evolution_Addressbook_BookFactory_openBook;
-
-	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.GNOME_Evolution_Addressbook_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 1936701296..0000000000
--- a/addressbook/backend/pas/pas-book-factory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2000, Ximian, 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_dump_active_backends (PASBookFactory *factory);
-
-gboolean        pas_book_factory_activate         (PASBookFactory               *factory, const char *iid);
-
-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 b5266a6b35..0000000000
--- a/addressbook/backend/pas/pas-book-view.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book-view.c
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include "pas-book-view.h"
-
-static BonoboObjectClass *pas_book_view_parent_class;
-POA_GNOME_Evolution_Addressbook_BookView__vepv pas_book_view_vepv;
-
-struct _PASBookViewPrivate {
-	GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_VCard card_sequence;
-
-	length = g_list_length((GList *) cards);
-
-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_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);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged (
-		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);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved (
-		book_view->priv->listener, (GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_VCard card_sequence;
-
-	length = g_list_length((GList *)cards);
-
-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_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);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded (
-		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);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete (
-		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);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage (
-		book_view->priv->listener, message, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_status_message: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_view_construct (PASBookView                *book_view,
-			 GNOME_Evolution_Addressbook_BookViewListener  listener)
-{
-	POA_GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_BookView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_view_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	bonobo_object_dup_ref (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to duplicate & 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 (GNOME_Evolution_Addressbook_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);
-	bonobo_object_release_unref (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		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_GNOME_Evolution_Addressbook_BookView__epv *
-pas_book_view_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookView__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_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.GNOME_Evolution_Addressbook_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 26bf360f17..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 GNOME_Evolution_Addressbook_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, 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                    (GNOME_Evolution_Addressbook_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 9bb2cd348e..0000000000
--- a/addressbook/backend/pas/pas-book.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book.c
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-util/e-list.h"
-#include "pas-book.h"
-
-static BonoboObjectClass *pas_book_parent_class;
-POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv;
-
-enum {
-	REQUESTS_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint pas_book_signals [LAST_SIGNAL];
-
-struct _PASBookPrivate {
-	PASBackend             *backend;
-	GNOME_Evolution_Addressbook_BookListener  listener;
-
-	GList                  *request_queue;
-	gint                    timeout_id;
-	
-	guint                   timeout_lock : 1;
-};
-
-static gboolean
-pas_book_check_queue (PASBook *book)
-{
-	if (book->priv->timeout_lock)
-		return TRUE;
-
-	book->priv->timeout_lock = TRUE;
-
-	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->timeout_id = 0;
-		book->priv->timeout_lock = FALSE;
-		bonobo_object_unref (BONOBO_OBJECT (book));
-		return FALSE;
-	}
-
-	book->priv->timeout_lock = 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->timeout_id == 0) {
-		bonobo_object_ref (BONOBO_OBJECT (book));
-		book->priv->timeout_id = g_timeout_add (20, (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->create.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->remove.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->modify.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->get_cursor.search = g_strdup(search);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_vcard (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = GetVCard;
-	req->get_vcard.id = g_strdup(id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_authenticate_user (PASBook *book,
-				  const char *user, const char *passwd, const char *auth_method)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = AuthenticateUser;
-	req->auth_user.user   = g_strdup(user);
-	req->auth_user.passwd = g_strdup(passwd);
-	req->auth_user.auth_method = g_strdup(auth_method);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_supported_fields (PASBook *book)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = GetSupportedFields;
-
-	pas_book_queue_request (book, req);
-}
-
-
-static void
-pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetBookView;
-	req->get_book_view.search   = g_strdup(search);
-	
-	CORBA_exception_init (&ev);
-
-	req->get_book_view.listener = bonobo_object_dup_ref(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 GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetChanges;
-	req->get_changes.change_id= g_strdup(change_id);
-	
-	CORBA_exception_init (&ev);
-
-	req->get_changes.listener = bonobo_object_dup_ref(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 void
-impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant,
-						const GNOME_Evolution_Addressbook_CardId id,
-						CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_vcard (book, id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_authenticateUser (PortableServer_Servant servant,
-							const char* user,
-							const char* passwd,
-							const char* auth_method,
-							CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_authenticate_user (book, user, passwd, auth_method);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_Book_getCursor (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_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant,
-				   const GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_BookViewListener listener,
-				 const CORBA_char *change_id,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_changes (book, listener, change_id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant,
-				      CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_check_connection (book);
-}
-
-static char *
-impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (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;
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getSupportedFields (PortableServer_Servant servant,
-							  CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_supported_fields (book);
-}
-
-/**
- * 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:
- */
-GNOME_Evolution_Addressbook_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,
-		       GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (status == GNOME_Evolution_Addressbook_BookListener_Success) {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			book->priv->listener, status,
-			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
-			&ev);
-	} else {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			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,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			 const char                        *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardCreated (
-		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,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved (
-		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,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardModified (
-		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_authenticate_user:
- */
-void
-pas_book_respond_authenticate_user (PASBook                           *book,
-				    GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyAuthenticationResult (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_authenticate_user: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-pas_book_respond_get_supported_fields (PASBook *book,
-				       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				       EList   *fields)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_stringlist stringlist;
-	int num_fields;
-	EIterator *iter;
-	int i;
-
-	CORBA_exception_init (&ev);
-
-	num_fields = e_list_length (fields);
-
-	stringlist._buffer = CORBA_sequence_CORBA_string_allocbuf (num_fields);
-	stringlist._maximum = num_fields;
-	stringlist._length = num_fields;
-
-	iter = e_list_get_iterator (fields);
-
-	for (i = 0; e_iterator_is_valid (iter); e_iterator_next (iter), i ++) {
-		stringlist._buffer[i] = CORBA_string_dup (e_iterator_get(iter));
-	}
-
-	gtk_object_unref (GTK_OBJECT (fields));
-
-	GNOME_Evolution_Addressbook_BookListener_notifySupportedFields (
-			book->priv->listener, status,
-			&stringlist,
-			&ev);
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(stringlist._buffer);
-}
-
-/**
- * pas_book_respond_get_cursor:
- */
-void
-pas_book_respond_get_cursor (PASBook                           *book,
-			     GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			     PASCardCursor                     *cursor)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested (
-		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,
-				GNOME_Evolution_Addressbook_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));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyViewRequested (
-		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_vcard (PASBook                           *book,
-			    GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			    char                              *vcard)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardRequested (
-		book->priv->listener, status, vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_card: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_changes:
- */
-void
-pas_book_respond_get_changes (PASBook                           *book,
-			      GNOME_Evolution_Addressbook_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));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested (
-		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);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus (
-		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);
-}
-
-/**
- * pas_book_report_writable:
- */
-void
-pas_book_report_writable (PASBook                           *book,
-			  gboolean                           writable)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyWritable (
-		book->priv->listener, (CORBA_boolean) writable, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_report_writable: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_construct (PASBook                *book,
-		    PASBackend             *backend,
-		    GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	POA_GNOME_Evolution_Addressbook_Book *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book      != NULL);
-	g_assert (PAS_IS_BOOK (book));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_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->backend   = backend;
-
-	return TRUE;
-}
-
-/**
- * pas_book_new:
- */
-PASBook *
-pas_book_new (PASBackend             *backend,
-	      GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBook *book;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-
-	book = gtk_type_new (pas_book_get_type ());
-
-	if (! pas_book_construct (book, backend, listener)) {
-		gtk_object_unref (GTK_OBJECT (book));
-
-		return NULL;
-	}
-
-	return book;
-}
-
-void
-pas_book_free_request (PASRequest *req)
-{
-	CORBA_Environment ev;
-	switch (req->op) {
-	case CreateCard:
-		g_free (req->create.id);
-		g_free (req->create.vcard);
-		break;
-	case RemoveCard:
-		g_free (req->remove.id);
-		break;
-	case ModifyCard:
-		g_free (req->modify.vcard);
-		break;
-	case GetVCard:
-		g_free (req->get_vcard.id);
-		break;
-	case GetCursor:
-		g_free (req->get_cursor.search);
-		break;
-	case GetBookView:
-		g_free (req->get_book_view.search);
-		CORBA_exception_init (&ev);
-		bonobo_object_release_unref (req->get_book_view.listener, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_free_request(GetBookView): could not release the listener");
-	
-		CORBA_exception_free (&ev);
-		break;
-	case GetChanges:
-		g_free (req->get_changes.change_id);
-		CORBA_exception_init (&ev);
-		bonobo_object_release_unref (req->get_changes.listener, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_free_request(GetChanges): could not release the listener");
-
-		CORBA_exception_free (&ev);
-		break;
-	case CheckConnection:
-		/* nothing to free */
-		break;
-	case AuthenticateUser:
-		g_free (req->auth_user.user);
-		g_free (req->auth_user.passwd);
-		g_free (req->auth_user.auth_method);
-		break;
-	case GetSupportedFields:
-		/* nothing to free */
-		break;
-	}
-
-	g_free (req);
-}
-
-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) {
-		pas_book_free_request ((PASRequest *)l->data);
-	}
-	g_list_free (book->priv->request_queue);
-
-	/* We should never ever have timeout_id == 0 when we get destroyed, unless there
-	   is some sort of reference counting bug.  Still, we do this to try to avoid
-	   horrible crashes in those situations. */
-	if (book->priv->timeout_id) {
-		g_warning ("PASBook destroyed with non-zero timeout_id.  This shouldn't happen.");
-		g_source_remove (book->priv->timeout_id);
-		book->priv->timeout_id = 0;
-	}
-
-	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);
-	book->priv = NULL;
-
-	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
-}
-
-static POA_GNOME_Evolution_Addressbook_Book__epv *
-pas_book_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_Book__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1);
-
-	epv->getVCard              = impl_GNOME_Evolution_Addressbook_Book_getVCard;
-	epv->authenticateUser      = impl_GNOME_Evolution_Addressbook_Book_authenticateUser;
-	epv->addCard               = impl_GNOME_Evolution_Addressbook_Book_addCard;
-	epv->removeCard            = impl_GNOME_Evolution_Addressbook_Book_removeCard;
-	epv->modifyCard            = impl_GNOME_Evolution_Addressbook_Book_modifyCard;
-	epv->checkConnection       = impl_GNOME_Evolution_Addressbook_Book_checkConnection;
-	epv->getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities;
-	epv->getSupportedFields    = impl_GNOME_Evolution_Addressbook_Book_getSupportedFields;
-	epv->getCursor             = impl_GNOME_Evolution_Addressbook_Book_getCursor;
-	epv->getBookView           = impl_GNOME_Evolution_Addressbook_Book_getBookView;
-	epv->getChanges            = impl_GNOME_Evolution_Addressbook_Book_getChanges;
-
-	return epv;
-	
-}
-
-static void
-pas_book_corba_class_init (void)
-{
-	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
-	pas_book_vepv.GNOME_Evolution_Addressbook_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->timeout_id    = 0;
-	book->priv->request_queue = NULL;
-	book->priv->timeout_id    = 0;
-	book->priv->timeout_lock  = FALSE;
-}
-
-/**
- * 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 a6f2fda3cc..0000000000
--- a/addressbook/backend/pas/pas-book.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, 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>
-#include "e-util/e-list.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,
-	GetVCard,
-	GetCursor,
-	GetBookView,
-	GetChanges,
-	CheckConnection,
-	AuthenticateUser,
-	GetSupportedFields
-} PASOperation;
-
-typedef struct {
-	PASOperation op;
-	char *id;
-	char *vcard;
-} PASCreateCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *id;
-} PASRemoveCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *vcard;
-} PASModifyCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *id;
-} PASGetVCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *search;
-} PASGetCursorRequest;
-
-typedef struct {
-	PASOperation op;
-	char *search;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-} PASGetBookViewRequest;
-
-typedef struct {
-	PASOperation op;
-	char *change_id;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-} PASGetChangesRequest;
-
-typedef struct {
-	PASOperation op;
-} PASCheckConnectionRequest;
-
-typedef struct {
-	PASOperation op;
-	char *user;
-        char *passwd;
-	char *auth_method;
-} PASAuthenticateUserRequest;
-
-typedef struct {
-	PASOperation op;
-} PASGetSupportedFieldsRequest;
-
-typedef union {
-	PASOperation               op;
-
-	PASCreateCardRequest       create;
-	PASRemoveCardRequest       remove;
-	PASModifyCardRequest       modify;
-	PASGetVCardRequest         get_vcard;
-	PASGetCursorRequest        get_cursor;
-	PASGetBookViewRequest      get_book_view;
-	PASGetChangesRequest       get_changes;
-	PASCheckConnectionRequest  check_connection;
-	PASAuthenticateUserRequest auth_user;
-	PASGetSupportedFieldsRequest get_supported_fields;
-} PASRequest;
-
-struct _PASBook {
-	BonoboObject     parent_object;
-	PASBookPrivate *priv;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Signals */
-	void (*requests_queued) (void);
-} PASBookClass;
-
-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
-
-PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 GNOME_Evolution_Addressbook_BookListener             listener);
-PASBackend             *pas_book_get_backend            (PASBook                           *book);
-GNOME_Evolution_Addressbook_BookListener  pas_book_get_listener           (PASBook                           *book);
-int                     pas_book_check_pending          (PASBook                           *book);
-PASRequest             *pas_book_pop_request            (PASBook                           *book);
-void                    pas_book_free_request           (PASRequest                        *request);
-void                    pas_book_respond_open           (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_create         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 const char                        *id);
-void                    pas_book_respond_remove         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_modify         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_authenticate_user (PASBook                           *book,
-							    GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_get_supported_fields (PASBook *book,
-							       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							       EList   *fields);
-
-void                    pas_book_respond_get_cursor     (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASCardCursor                     *cursor);
-void                    pas_book_respond_get_book_view  (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_respond_get_vcard      (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 char                              *vcard);
-void                    pas_book_respond_get_changes    (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_report_connection      (PASBook                           *book,
-							 gboolean                           connected);
-
-void                    pas_book_report_writable        (PASBook                           *book,
-							 gboolean                           writable);
-
-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 572f63f46e..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ /dev/null
@@ -1,226 +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@ximian.com.
- */
-
-#include <config.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_GNOME_Evolution_Addressbook_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_GNOME_Evolution_Addressbook_CardCursor__epv *
-pas_card_cursor_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_CardCursor__epv, 1);
-
-	/*
-	 * This is the method invoked by CORBA
-	 */
-	epv->count  = impl_pas_card_cursor_get_length;
-	epv->getNth = 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.GNOME_Evolution_Addressbook_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,
-			   GNOME_Evolution_Addressbook_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 GNOME_Evolution_Addressbook_CardCursor
-create_cursor (BonoboObject *cursor)
-{
-	POA_GNOME_Evolution_Addressbook_CardCursor *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_CardCursor *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cursor_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Addressbook_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 (GNOME_Evolution_Addressbook_CardCursor) bonobo_object_activate_servant (cursor, servant);
-}
-
-PASCardCursor *
-pas_card_cursor_new (PASCardCursorLengthFunc  get_length,
-		     PASCardCursorNthFunc     get_nth,
-		     gpointer data)
-{
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_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 70ecb5e718..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@ximian.com)
- *
- * Copyright 2000, Ximian, 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,
-					  GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
-					  PASCardCursorLengthFunc  get_length,
-					  PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-
-GtkType        pas_card_cursor_get_type  (void);
-POA_GNOME_Evolution_Addressbook_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 87b35d3be5..0000000000
--- a/addressbook/conduit/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-*.lo
-Makefile.in
-Makefile
-libeaddress_conduit.la
-e-address-conduit-control-applet
-e-address-conduit-control-applet.desktop
-e-address.conduit
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index 86be3b2fed..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(PISOCK_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-# Address Conduit
-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/ename/libename-static.la			\
-	$(top_builddir)/libversit/libversit_lt.la			\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(top_builddir)/camel/libcamel-static.la	 		\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-
-e-address.conduit: e-address.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' 				\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp 	\
-	&& mv e-address.conduit.tmp e-address.conduit
-
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-address.conduit
-
-EXTRA_DIST = \
-	e-address.conduit.in
-
-install-data-local:
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 48f3fa03d8..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1911 +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 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-address.h>
-#include <ebook/e-book.h>
-#include <ebook/e-book-util.h>
-#include <ebook/e-card-types.h>
-#include <ebook/e-card-cursor.h>
-#include <ebook/e-card.h>
-#include <ebook/e-card-simple.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-dialog-widgets.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.2"
-#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;
-} CardObjectChangeStatus;
-
-typedef enum {
-	CARD_ADDED,
-	CARD_MODIFIED,
-	CARD_DELETED
-} CardObjectChangeType;
-
-typedef struct 
-{
-	ECard *card;
-	CardObjectChangeType type;
-} CardObjectChange;
-
-enum {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_OTHER,
-	LABEL_EMAIL,
-	LABEL_MAIN,
-	LABEL_PAGER,
-	LABEL_MOBILE
-};
-
-static ECardSimpleField priority [] = {
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
-	E_CARD_SIMPLE_FIELD_EMAIL,
-	E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-	E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
-	E_CARD_SIMPLE_FIELD_EMAIL_2,
-	E_CARD_SIMPLE_FIELD_PHONE_OTHER,
-	E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,
-	E_CARD_SIMPLE_FIELD_EMAIL_3,
-	E_CARD_SIMPLE_FIELD_LAST
-};
-
-static int priority_label [] = {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_PAGER,
-	LABEL_MOBILE,
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_OTHER,
-	LABEL_MAIN,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	-1
-};
-
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-typedef struct _EAddrConduitGui EAddrConduitGui;
-typedef struct _EAddrConduitContext EAddrConduitContext;
-
-/* Local Record */
-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 address structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-
-static void
-addrconduit_destroy_record (EAddrLocalRecord *local) 
-{
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	free_Address (local->addr);
-	g_free (local->addr);
-	g_free (local);
-}
-
-/* Configuration */
-struct _EAddrConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	gboolean secret;
-	ECardSimpleAddressId default_address;
-
-	gchar *last_uri;
-};
-
-static EAddrConduitCfg *
-addrconduit_load_configuration (guint32 pilot_id) 
-{
-	EAddrConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar *address, prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	c = g_new0 (EAddrConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	address = gnome_config_get_string ("default_address=business");
-	if (!strcmp (address, "business"))
-		c->default_address = E_CARD_SIMPLE_ADDRESS_ID_BUSINESS;
-	else if (!strcmp (address, "home"))
-		c->default_address = E_CARD_SIMPLE_ADDRESS_ID_HOME;
-	else if (!strcmp (address, "other"))
-		c->default_address = E_CARD_SIMPLE_ADDRESS_ID_OTHER;
-	g_free (address);
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("secret", c->secret);
-	switch (c->default_address) {
-	case E_CARD_SIMPLE_ADDRESS_ID_BUSINESS:
-		gnome_config_set_string ("default_address", "business");
-		break;
-	case E_CARD_SIMPLE_ADDRESS_ID_HOME:
-		gnome_config_set_string ("default_address", "home");
-		break;
-	case E_CARD_SIMPLE_ADDRESS_ID_OTHER:
-		gnome_config_set_string ("default_address", "other");
-		break;
-	default:
-		g_warning ("Unknown default_address value");
-	}
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-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->pilot_id = c->pilot_id;
-
-	retval->secret = c->secret;
-	retval->default_address = c->default_address;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EAddrConduitGui {
-	GtkWidget *default_address;
-};
-
-static EAddrConduitGui *
-e_addr_gui_new (EPilotSettings *ps) 
-{
-	EAddrConduitGui *gui;
-	GtkWidget *lbl, *menu;
-	gint rows, i;
-	static const char *items[] = {"Business", "Home", "Other", NULL};
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, 
-			  E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EAddrConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Sync Address:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	gui->default_address = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	for (i = 0; items[i] != NULL; i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (items[i]);
-		gtk_widget_show (item);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-	gtk_widget_show (menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (gui->default_address), menu);
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->default_address, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->default_address);
-	
-	return gui;
-}
-
-static const int default_address_map[] = {
-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,
-	E_CARD_SIMPLE_ADDRESS_ID_HOME,
-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,
-	-1
-};
-
-static void
-e_addr_gui_fill_widgets (EAddrConduitGui *gui, EAddrConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	e_dialog_option_menu_set (gui->default_address, 
-				  cfg->default_address, 
-				  default_address_map);
-}
-
-static void
-e_addr_gui_fill_config (EAddrConduitGui *gui, EAddrConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->default_address = e_dialog_option_menu_get (gui->default_address, 
-							 default_address_map);
-}
-
-static void
-e_addr_gui_destroy (EAddrConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EAddrConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EAddrConduitCfg *cfg;
-	EAddrConduitCfg *new_cfg;
-	EAddrConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	gboolean address_load_tried;
-	gboolean address_load_success;
-
-	EPilotMap *map;
-};
-
-static EAddrConduitContext *
-e_addr_context_new (guint32 pilot_id) 
-{
-	EAddrConduitContext *ctxt = g_new0 (EAddrConduitContext, 1);
-
-	ctxt->cfg = addrconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->ebook = NULL;
-	ctxt->cards = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_addr_gui_destroy (ctxt->gui);
-	
-	if (ctxt->ebook != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->ebook));
-
-	if (ctxt->cards != NULL) {
-		for (l = ctxt->cards; l != NULL; l = l->next)
-			gtk_object_unref (GTK_OBJECT (l->data));
-		g_list_free (ctxt->cards);
-	}
-	
-	if (ctxt->changed_hash != NULL)
-		g_hash_table_destroy (ctxt->changed_hash);
-	
-	if (ctxt->changed != NULL) {
-		CardObjectChange *coc;
-		
-		for (l = ctxt->changed; l != NULL; l = l->next) {
-			coc = l->data;
-
-			gtk_object_unref (GTK_OBJECT (coc->card));
-			g_free (coc);
-		}
-		g_list_free (ctxt->changed);
-	}
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			addrconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EAddrLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->addr) {
-		g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-			    local->addr->entry[entryLastname] ?
-			    local->addr->entry[entryLastname] : "",
-			    local->addr->entry[entryFirstname] ?
-			    local->addr->entry[entryFirstname] : "",
-			    local->addr->entry[entryCompany] ?
-			    local->addr->entry[entryCompany] : "");
-		return buff;
-	}
-
-	return "";
-}
-
-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);
-
-	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-		    addr.entry[entryLastname] ?
-		    addr.entry[entryLastname] : "",
-		    addr.entry[entryFirstname] ?
-		    addr.entry[entryFirstname] : "",
-		    addr.entry[entryCompany] ?
-		    addr.entry[entryCompany] : "");
-
-	free_Address (&addr);
-
-	return buff;
-}
-
-/* Addressbok Server routines */
-static void
-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)
-{
-	CardObjectChangeStatus *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 ++) {
-			ECard *card = e_card_cursor_get_nth (cursor, i);
-			
-			if (e_card_evolution_list (card))
-				continue;
-
-			ctxt->cards = g_list_append (ctxt->cards, card);
-		}
-
-		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)
-{
-	gboolean result;
-	
-	g_return_val_if_fail(ctxt!=NULL,-2);
-
-	ctxt->ebook = e_book_new ();
-
-	result = e_book_load_default_book (ctxt->ebook, book_open_cb, ctxt);
-	
-	/* run a sub event loop to turn ebook's async loading into a
-           synchronous call */
-	gtk_main ();
-
-	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 GList *
-next_changed_item (EAddrConduitContext *ctxt, GList *changes) 
-{
-	CardObjectChange *coc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		coc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, e_card_get_id (coc->card)))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static ECardSimpleField
-get_next_mail (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_EMAIL;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_EMAIL:
-		return E_CARD_SIMPLE_FIELD_EMAIL_2;
-	case E_CARD_SIMPLE_FIELD_EMAIL_2:
-		return E_CARD_SIMPLE_FIELD_EMAIL_3;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_home (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_HOME;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
-		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_work (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_fax (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX:
-		return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;
-	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
-		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_other (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_OTHER;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_main (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_PRIMARY;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_pager (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_PAGER;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_mobile (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_MOBILE;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static void
-get_next_init (ECardSimpleField *next_mail,
-	       ECardSimpleField *next_home,
-	       ECardSimpleField *next_work,
-	       ECardSimpleField *next_fax,
-	       ECardSimpleField *next_other,
-	       ECardSimpleField *next_main,
-	       ECardSimpleField *next_pager,
-	       ECardSimpleField *next_mobile)
-{	
-	*next_mail = get_next_mail (NULL);
-	*next_home = get_next_home (NULL);
-	*next_work = get_next_work (NULL);
-	*next_fax = get_next_fax (NULL);
-	*next_other = get_next_other (NULL);
-	*next_main = get_next_main (NULL);
-	*next_pager = get_next_pager (NULL);
-	*next_mobile = get_next_mobile (NULL);
-}
-
-static gboolean
-is_next_done (ECardSimpleField field)
-{
-	if (field == E_CARD_SIMPLE_FIELD_LAST)
-		return TRUE;
-	
-	return FALSE;
-}
-
-static gboolean
-is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) 
-{	
-	ECardSimpleField next_mail, next_home, next_work, next_fax;
-	ECardSimpleField next_other, next_main, next_pager, next_mobile;
-	gboolean syncable = TRUE;
-	int i, l = 0;
-
-	/* See if there are fields we can't sync or not in priority order */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-	
-	for (i = entryPhone1; i <= entryPhone5 && syncable; i++) {
-		int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-		const char *phone_str = local->addr->entry[i];
-		gboolean empty = !(phone_str && *phone_str);
-		
-		if (empty)
-			continue;
-		
-		for ( ; priority_label[l] != -1; l++)
-			if (phonelabel == priority_label[l])
-				break;
-
-		if (priority_label[l] == -1) {
-			syncable = FALSE;
-			continue;
-		}
-		
-		if (phonelabel == LABEL_EMAIL) {
-			if (is_next_done (next_mail) || next_mail != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME) {
-			if (is_next_done (next_home) || next_home != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK) {
-			if (is_next_done (next_work) || next_work != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX) {
-			if (is_next_done (next_fax) || next_fax != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER) {
-			if (is_next_done (next_other) || next_other != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN) {
-			if (is_next_done (next_main) || next_main != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER) {
-			if (is_next_done (next_pager) || next_pager != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE) {
-			if (is_next_done (next_mobile) || next_mobile != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-	}
-
-	return syncable;
-}
-
-static char *
-get_entry_text (struct Address address, int field)
-{
-	if (address.entry[field])
-		return e_pilot_utf8_from_pchar (address.entry[field]);
-	
-	return g_strdup ("");
-}
-
-static void
-clear_entry_text (struct Address address, int field) 
-{
-	if (address.entry[field]) {
-		free (address.entry[field]);
-		address.entry[field] = NULL;
-	}
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)
-{
-	CardObjectChange *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 CARD_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case CARD_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case CARD_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-	
-	g_assert (local->addr != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	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;
-	ECardSimpleAddressId mailing_address;
-	int phone = entryPhone1;
-
-	gboolean syncable;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (ecard != NULL);
-
-	local->ecard = ecard;
-	gtk_object_ref (GTK_OBJECT (ecard));
-	simple = e_card_simple_new (ecard);
-	
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, ecard->id, TRUE);
-
-	compute_status (ctxt, local, ecard->id);
-
-	local->addr = g_new0 (struct Address, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Address addr;
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&addr, 0, sizeof (struct Address));
-			unpack_Address (&addr, record, 0xffff);
-			for (i = 0; i < 5; i++) {
-				if (addr.entry[entryPhone1 + i])
-					local->addr->entry[entryPhone1 + i] = 
-						strdup (addr.entry[entryPhone1 + i]);
-				local->addr->phoneLabel[i] = addr.phoneLabel[i];
-			}
-			local->addr->showPhone = addr.showPhone;
-			for (i = 0; i < 4; i++) {
-				if (addr.entry[entryCustom1 + i])
-					local->addr->entry[entryCustom1 + i] = 
-						strdup (addr.entry[entryCustom1 + i]);
-			}
-			free_Address (&addr);
-		}
-	}
-
-	if (ecard->name) {
-		local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (ecard->name->given);
-		local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (ecard->name->family);
-	}
-
-	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (ecard->org);
-	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (ecard->title);
-
-	mailing_address = -1;
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address;
-		
-		address = e_card_simple_get_address(simple, i);
-		if (address && (address->flags & E_CARD_ADDR_DEFAULT))
-			mailing_address = i;
-	}
-	if (mailing_address == -1)
-		mailing_address = ctxt->cfg->default_address;
-
-	delivery = e_card_simple_get_delivery_address (simple, mailing_address);
-	if (delivery) {
-		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (delivery->street);
-		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (delivery->city);
-		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (delivery->region);
-		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (delivery->code);
-		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (delivery->country);
-	}
-
-	/* Phone numbers */
-
-	/* See if everything is syncable */
-	syncable = is_syncable (ctxt, local);
-	
-	if (syncable) {
-		INFO ("Syncable");
-
-		/* Sync by priority */
-		for (i = 0, phone = entryPhone1; 
-		     priority[i] != E_CARD_SIMPLE_FIELD_LAST && phone <= entryPhone5; i++) {
-			const char *phone_str;
-			
-			phone_str = e_card_simple_get_const (simple, priority[i]);
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, phone);
-				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
-				local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
-				phone++;
-			}
-		}
-		for ( ; phone <= entryPhone5; phone++)
-			      local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
-		local->addr->showPhone = 0;
-	} else {
-		ECardSimpleField next_mail, next_home, next_work, next_fax;
-		ECardSimpleField next_other, next_main, next_pager, next_mobile;
-
-		INFO ("Not Syncable");
-		get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-			       &next_other, &next_main, &next_pager, &next_mobile);
-
-		/* Not completely syncable, so do the best we can */
-		for (i = entryPhone1; i <= entryPhone5; i++) {
-			int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-			const char *phone_str = NULL;
-			
-			if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-				phone_str = e_card_simple_get_const (simple, next_mail);
-				next_mail = get_next_mail (&next_mail);
-			} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-				phone_str = e_card_simple_get_const (simple, next_home);
-				next_home = get_next_home (&next_home);
-			} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-				phone_str = e_card_simple_get_const (simple, next_work);
-				next_work = get_next_work (&next_work);
-			} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-				phone_str = e_card_simple_get_const (simple, next_fax);
-				next_fax = get_next_fax (&next_fax);
-			} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-				phone_str = e_card_simple_get_const (simple, next_other);
-				next_other = get_next_other (&next_other);
-			} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-				phone_str = e_card_simple_get_const (simple, next_main);
-				next_main = get_next_main (&next_main);
-			} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-				phone_str = e_card_simple_get_const (simple, next_pager);
-				next_pager = get_next_pager (&next_pager);
-			} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-				phone_str = e_card_simple_get_const (simple, next_mobile);
-				next_mobile = get_next_mobile (&next_mobile);
-			}
-			
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, i);
-				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str);
-			}
-		}
-	}
-	
-	/* Note */
-	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (ecard->note);
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       const char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	ECard *ecard = NULL;
-	GList *l;
-	
-	g_assert (local != NULL);
-
-	for (l = ctxt->cards; l != NULL; l = l->next) {
-		ecard = l->data;
-		
-		if (ecard->id && !strcmp (ecard->id, uid))
-			break;
-
-		ecard = NULL;
-	}
-
-	if (ecard != NULL) {
-		local_record_from_ecard (local, ecard, ctxt);
-	} else {
-		ecard = e_card_new ("");
-		e_card_set_id (ecard, uid);
-		local_record_from_ecard (local, ecard, ctxt);
-		gtk_object_unref (GTK_OBJECT (ecard));
-	}
-}
-
-static ECard *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 ECard *in_card)
-{
-	struct Address address;
-	ECard *ecard;
-	ECardSimple *simple;
-	ECardName *name;
-	ECardDeliveryAddress *delivery;
-	ECardAddrLabel *label;
-	ECardSimpleAddressId mailing_address;
-	char *txt;
-	ECardSimpleField next_mail, next_home, next_work, next_fax;
-	ECardSimpleField next_other, next_main, next_pager, next_mobile;
-	int i;
-
-	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);
-
-	/* Name */
-	name = e_card_name_copy (ecard->name);
-	name->given = get_entry_text (address, entryFirstname);
-	name->family = get_entry_text (address, entryLastname);
-
-	simple = e_card_simple_new (ecard);
-	txt = e_card_name_to_string (name);	
-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_FULL_NAME, txt);
-	e_card_simple_set_name (simple, name);
-
-	/* File as */
-	if (!(txt && *txt))
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, 
-				  address.entry[entryCompany]);
-
-	g_free (txt);
-	e_card_name_unref (name);
-
-	/* Title and Company */
-	txt = get_entry_text (address, entryTitle);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, txt);
-	g_free (txt);
-
-	txt = get_entry_text (address, entryCompany);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, txt);
-	g_free (txt);
-
-	/* Address */
-	mailing_address = -1;
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *addr;
-
-		addr = e_card_simple_get_address(simple, i);
-		if (addr && (addr->flags & E_CARD_ADDR_DEFAULT))
-			mailing_address = i;
-	}
-	if (mailing_address == -1)
-		mailing_address = ctxt->cfg->default_address;
-
-	delivery = e_card_delivery_address_new ();
-	delivery->flags |= E_CARD_ADDR_DEFAULT;
-	delivery->street = get_entry_text (address, entryAddress);
-	delivery->city = get_entry_text (address, entryCity);
-	delivery->region = get_entry_text (address, entryState);
-	delivery->country = get_entry_text (address, entryCountry);
-	delivery->code = get_entry_text (address, entryZip);
-
-	label = e_card_address_label_new ();
-	label->flags |= E_CARD_ADDR_DEFAULT;
-	label->data = e_card_delivery_address_to_string (delivery);
-
-	e_card_simple_set_address (simple, mailing_address, label);
-	e_card_simple_set_delivery_address (simple, mailing_address, delivery);
-	
-	e_card_delivery_address_unref (delivery);
-	e_card_address_label_unref (label);
-	
-	/* Phone numbers */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		int phonelabel = address.phoneLabel[i - entryPhone1];
-		char *phonenum = get_entry_text (address, i);
-		
-		if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-			e_card_simple_set (simple, next_mail, phonenum);
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-			e_card_simple_set (simple, next_home, phonenum);
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-			e_card_simple_set (simple, next_work, phonenum);
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-			e_card_simple_set (simple, next_fax, phonenum);
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-			e_card_simple_set (simple, next_other, phonenum);
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-			e_card_simple_set (simple, next_main, phonenum);
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-			e_card_simple_set (simple, next_pager, phonenum);
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-			e_card_simple_set (simple, next_mobile, phonenum);
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-		
-		g_free (phonenum);
-	}
-
-	/* Note */
-	txt = get_entry_text (address, entryNote);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_NOTE, txt);
-	g_free (txt);
-	
-	e_card_simple_sync_card (simple);
-	gtk_object_unref(GTK_OBJECT(simple));
-
-	free_Address(&address);
-
-	return ecard;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	map_count = g_hash_table_size (ctxt->map->pid_map);	
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_book_get_uri (ctxt->ebook);
-	LOG("  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>");
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG ("    doing slow sync\n");
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-static void
-card_added (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
-{
-	const GList *l;
-
-	for (l = cards; l != NULL; l = l->next) {
-		ECard *card = E_CARD (l->data);
-		CardObjectChange *coc;
-		
-		if (e_card_evolution_list (card))
-			continue;
-		
-		coc = g_new0 (CardObjectChange, 1);
-		coc->card = card;
-		coc->type = CARD_ADDED;
-
-		gtk_object_ref (GTK_OBJECT (coc->card));
-		ctxt->changed = g_list_prepend (ctxt->changed, coc);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-	}
-}
-
-static void
-card_changed (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
-{
-	const GList *l;
-
-	for (l = cards; l != NULL; l = l->next) {
-		ECard *card = E_CARD (l->data);
-		CardObjectChange *coc;
-
-		if (e_card_evolution_list (card))
-			continue;
-		
-		coc = g_new0 (CardObjectChange, 1);		
-		coc->card = E_CARD (l->data);
-		coc->type = CARD_MODIFIED;
-
-		gtk_object_ref (GTK_OBJECT (coc->card));
-		ctxt->changed = g_list_prepend (ctxt->changed, coc);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-	}
-}
-
-
-static void
-card_removed (EBookView *book_view, const char *id, EAddrConduitContext *ctxt)
-{
-	CardObjectChange *coc;
-	gboolean archived;
-	
-	archived = e_pilot_map_uid_is_archived (ctxt->map, id);
-	
-	/* If its deleted, not in the archive and not in the map its a list */
-	if (!archived && e_pilot_map_lookup_pid (ctxt->map, id, FALSE) == 0)
-		return;	
-	
-	coc = g_new0 (CardObjectChange, 1);
-	coc->card = e_card_new ("");
-	e_card_set_id (coc->card, id);
-	coc->type = CARD_DELETED;
-
-	ctxt->changed = g_list_prepend (ctxt->changed, coc);
-	
-	if (!archived)
-		g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-	else
-		e_pilot_map_remove_by_uid (ctxt->map, id);
-}
-
-static void
-sequence_complete (EBookView *book_view, EAddrConduitContext *ctxt)
-{
-	gtk_signal_disconnect_by_data (GTK_OBJECT (book_view), ctxt);
-	gtk_object_unref (GTK_OBJECT (book_view));
-  	gtk_main_quit ();
-}
-
-static void
-view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer data)
-{
-	EAddrConduitContext *ctxt = data;
-	
-	gtk_object_ref (GTK_OBJECT (book_view));
-	
-  	gtk_signal_connect (GTK_OBJECT (book_view), "card_added", 
-			    (GtkSignalFunc) card_added, ctxt);
-	gtk_signal_connect (GTK_OBJECT (book_view), "card_changed", 
-			    (GtkSignalFunc) card_changed, ctxt);
-	gtk_signal_connect (GTK_OBJECT (book_view), "card_removed", 
-			    (GtkSignalFunc) card_removed, ctxt);
-  	gtk_signal_connect (GTK_OBJECT (book_view), "sequence_complete", 
-			    (GtkSignalFunc) sequence_complete, ctxt);
-
-}
-
-/* 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;
-	char *change_id;
-/*  	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->dbi = dbi;	
-	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);
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	e_book_get_changes (ctxt->ebook, change_id, view_cb, ctxt);
-	
-	/* Force the view loading to be synchronous */
-	gtk_main ();
-	g_free (change_id);
-	
-	/* 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); */
-
-	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);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_book_get_uri (ctxt->ebook));
-	addrconduit_save_configuration (ctxt->cfg);
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */	
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	e_book_get_changes (ctxt->ebook, change_id, view_cb, ctxt);
-	g_free (change_id);
-	gtk_main ();
-
-	LOG ("---------------------------------------------------------\n");
-	
-	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");
-	
-	g_hash_table_remove (ctxt->changed_hash, e_card_get_id (local->ecard));
-	
-        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_ecard (*local, cards->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-
-			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_ecard (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} 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 *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("for_each_modified beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CardObjectChange *coc = iterator->data;
-			
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-			 
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, coc->card, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CardObjectChange *coc = iterator->data;
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, coc->card, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("for_each_modified ending");
-
-    			/* Signal the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	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 (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-	
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	ECard *ecard;
-	CardObjectChangeStatus 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;
-	}
-
-	e_card_set_id (ecard, cons.id);
-	e_pilot_map_insert (ctxt->map, remote->ID, ecard->id, FALSE);
-
-	gtk_object_unref (GTK_OBJECT (ecard));
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	ECard *new_ecard;
-	EBookStatus commit_status;
-	CardObjectChange *coc;
-	CardObjectChangeStatus cons;
-	char *old_id;
-	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));
-
-	old_id = g_strdup (e_card_get_id (local->ecard));
-	coc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-	
-	new_ecard = ecard_from_remote_record (ctxt, remote, local->ecard);
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	local->ecard = new_ecard;
-
-	if (coc && coc->type == CARD_DELETED)
-		e_book_add_card (ctxt->ebook, local->ecard, add_card_cb, &cons);
-	else
-		e_book_commit_card (ctxt->ebook, local->ecard, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-
-	/* Adding a record causes wombat to assign a new uid so we must tidy */
-	if (coc && coc->type == CARD_DELETED) {
-		gboolean arch = e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (local->ecard));
-		
-		e_card_set_id (local->ecard, cons.id);
-		e_pilot_map_insert (ctxt->map, remote->ID, cons.id, arch);
-
-		coc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-		if (coc) {
-			g_hash_table_remove (ctxt->changed_hash, e_card_get_id (coc->card));
-			gtk_object_unref (GTK_OBJECT (coc->card));
-			gtk_object_ref (GTK_OBJECT (local->ecard));
-			coc->card = local->ecard;
-			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-		}
-		
-		commit_status = cons.status;
-	}
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS)
-		WARN ("replace_record: failed to update card in ebook\n");
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-	EBookStatus commit_status;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->ecard != NULL, -1);
-
-	LOG ("delete_record: delete %s\n", print_local (local));
-
-	e_pilot_map_remove_by_uid (ctxt->map, local->ecard->id);
-	e_book_remove_card_by_id (ctxt->ebook, local->ecard->id, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS && commit_status != E_BOOK_STATUS_CARD_NOT_FOUND)
-		WARN ("delete_record: failed to delete card in ebook\n");
-	
-	return retval;
-}
-
-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");
-
-	e_pilot_map_insert (ctxt->map, local->local.ID, local->ecard->id, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *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, TRUE);
-	
-	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);
-
-	addrconduit_destroy_record (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);
-	
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EAddrConduitContext *ctxt)
-{
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_addr_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EAddrConduitContext *ctxt)
-{
-	LOG ("create_settings_window");
-
-	ctxt->ps = e_pilot_settings_new ();
-	ctxt->gui = e_addr_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG ("display_settings");
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG ("save_settings");
-
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_addr_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-
-	addrconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG ("revert_settings");
-
-	addrconduit_save_configuration (ctxt->cfg);
-	addrconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-}
-
-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);
-
-	ctxt = e_addr_context_new (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);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, 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/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index e5a5ab765e..0000000000
--- a/addressbook/conduit/e-address.conduit.in
+++ /dev/null
@@ -1,9 +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="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
-</gnome-pilot-conduit>
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 6b0850da5d..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = contact-editor contact-list-editor merging widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index 8bcb766191..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
-GNOME_Evolution_Addressbook.oaf
-\ No newline at end of file
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 c475ef47f5..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ /dev/null
@@ -1,196 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory">
-
-	<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="Control that displays an Evolution addressbook minicard."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory">
-
-	<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:GNOME_Evolution_Addressbook_ShellComponent"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/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_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory"
-	    type="exe"
-	    location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Addressbook's address displayer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for displaying an address."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory"
-	    type="exe"
-	    location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Addressbook's address popup"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for an address popup."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"
-            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 configuration controls for the Evolution Addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"
-            type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:title" type="string"
-		       _value="Directory Servers"/>
-
-	<oaf_attribute name="evolution:config_item:description" type="string"
-		       _value="This page can be used to configure access to LDAP directory servers"/>
-
-	<oaf_attribute name="evolution:config_item:icon_name" type="string"
-		       value="evolution-contacts.png"/>
-
-	<oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/>
-    
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Addressbook Storages."/>
-
-</oaf_server>
-
-  <!-- Account Editor -->
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ConfigControl"
-            type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-	    	<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:title" type="string"
-	   	       _value="Addressbook Settings"/>
-
-	<oaf_attribute name="evolution:config_item:description" type="string"
-		       _value="This page can be used to configure Addressbook Settings"/>
-
-	<oaf_attribute name="evolution:config_item:icon_name" type="string"
-		       value="evolution-contacts.png"/>
-
-	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
-    
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Addressbook."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index bfae4c1198..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-SUBDIRS	= select-names
-
-INCLUDES =							\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/addressbook/gui/contact-editor		\
-	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\
-	-I$(top_srcdir)/addressbook/gui/minicard		\
-	-I$(top_srcdir)/addressbook/gui/widgets			\
-	-I$(top_srcdir)/addressbook/backend			\
-	-I$(top_builddir)/addressbook/backend			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
-	$(LDAP_CFLAGS)						\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-bin_PROGRAMS =	\
-	evolution-addressbook
-
-evolution_addressbook_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-config.c		\
-	addressbook-config.h		\
-	addressbook-factory.c		\
-	addressbook-storage.c		\
-	addressbook-storage.h		\
-	addressbook.c			\
-	addressbook.h			\
-	e-cardlist-model.c		\
-	e-cardlist-model.h		\
-	e-address-widget.h		\
-	e-address-widget.c		\
-	e-address-popup.h		\
-	e-address-popup.c
-
-evolution_addressbook_LDADD =								\
-	select-names/libeselectnames.la							\
-	$(top_builddir)/shell/libeshell.la						\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a				\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
-	$(top_builddir)/camel/libcamel.la						\
-	$(top_builddir)/e-util/ename/libename.la					\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a		\
-	$(top_builddir)/libversit/libversit.a						\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 					\
-	$(top_builddir)/addressbook/printing/libecontactprint.a				\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a			\
-	$(top_builddir)/addressbook/gui/merging/libecardmerging.a			\
-	$(top_builddir)/filter/libfilter.la						\
-	$(top_builddir)/e-util/libeutil.la						\
-	$(top_builddir)/widgets/menus/libmenus.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
-
-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
-
-@XML_I18N_MERGE_OAF_RULE@
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Addressbook.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = ldap-config.glade
-
-iconsdir = $(datadir)/images/evolution
-
-EXTRA_DIST = 				\
-	$(glade_DATA)			\
-	$(oaf_DATA)			\
-	$(oaf_in_files)
-
-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 590cdd26bf..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-shell-component-dnd.h"
-#include "evolution-storage.h"
-
-#include "ebook/e-book.h"
-#include "ebook/e-card.h"
-#include "ebook/e-book-util.h"
-
-#include "addressbook-config.h"
-#include "addressbook-storage.h"
-#include "addressbook-component.h"
-#include "addressbook.h"
-#include "addressbook/gui/merging/e-card-merging.h"
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-
-
-
-#define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-
-EvolutionShellClient *global_shell_client = NULL;
-
-EvolutionShellClient *
-addressbook_component_get_shell_client  (void)
-{
-	return global_shell_client;
-}
-
-static char *accepted_dnd_types[] = {
-	"text/x-vcard",
-	NULL
-};
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "contacts", "evolution-contacts.png", N_("Contacts"), N_("Folder containing contact information"),
-	  TRUE, accepted_dnd_types, NULL },
-	{ "ldap-contacts", "ldap.png", N_("LDAP Server"), N_("LDAP server containing contact information"),
-	  FALSE, accepted_dnd_types, NULL },
-	{ NULL }
-};
-
-#define IS_CONTACT_TYPE(x)  (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "ldap-contacts") == 0)
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     const char *view_info,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!IS_CONTACT_TYPE (type))
-		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 void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellComponentListener_Result result;
-
-	if (!IS_CONTACT_TYPE (type))
-		result = GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
-	else 
-		result = GNOME_Evolution_ShellComponentListener_OK;
-
-	CORBA_exception_init(&ev);
-	GNOME_Evolution_ShellComponentListener_notifyResult(listener, result, &ev);
-	CORBA_exception_free(&ev);
-}
-
-static void
-remove_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	char *addressbook_db_path, *subdir_path;
-	struct stat sb;
-	int rv;
-
-	CORBA_exception_init(&ev);
-
-	if (!IS_CONTACT_TYPE (type)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	if (!strncmp (physical_uri, "ldap://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-	if (strncmp (physical_uri, "file://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_INVALID_URI,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	subdir_path = g_concat_dir_and_file (physical_uri + 7, "subfolders");
-	rv = stat (subdir_path, &sb);
-	g_free (subdir_path);
-	if (rv != -1) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_HAS_SUBFOLDERS,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	addressbook_db_path = g_concat_dir_and_file (physical_uri + 7, "addressbook.db");
-	rv = unlink (addressbook_db_path);
-	g_free (addressbook_db_path);
-	if (rv == 0) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_OK,
-								     &ev);
-	}
-	else {
-		if (errno == EACCES || errno == EPERM)
-			GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-							     &ev);
-		else
-			GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_INVALID_URI, /*XXX*/
-							     &ev);
-	}
-	CORBA_exception_free(&ev);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* This code is cut & pasted from calendar/gui/component-factory.c */
-
-static GNOME_Evolution_ShellComponentListener_Result
-xfer_file (GnomeVFSURI *base_src_uri,
-	   GnomeVFSURI *base_dest_uri,
-	   const char *file_name,
-	   int remove_source)
-{
-	GnomeVFSURI *src_uri, *dest_uri;
-	GnomeVFSHandle *hin, *hout;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo file_info;
-	GnomeVFSFileSize size;
-	char *buffer;
-	
-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);
-
-	result = gnome_vfs_open_uri (&hin, src_uri, GNOME_VFS_OPEN_READ);
-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */
-	}
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_get_file_info_uri (src_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);
-
-	result = gnome_vfs_create_uri (&hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	/* write source file to destination file */
-	buffer = g_malloc (file_info.size);
-	result = gnome_vfs_read (hin, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_write (hout, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	if (remove_source) {
-		char *text_uri;
-
-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */
-
-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);
-		result = gnome_vfs_unlink (text_uri);
-		g_free (text_uri);
-	}
-
-	gnome_vfs_close (hin);
-	gnome_vfs_close (hout);
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-	g_free (buffer);
-
-	return GNOME_Evolution_ShellComponentListener_OK;
-}
-
-static void
-xfer_folder (EvolutionShellComponent *shell_component,
-	     const char *source_physical_uri,
-	     const char *destination_physical_uri,
-	     const char *type,
-	     gboolean remove_source,
-	     const GNOME_Evolution_ShellComponentListener listener,
-	     void *closure)
-{
-	CORBA_Environment ev;
-
-	GnomeVFSURI *src_uri;
-	GnomeVFSURI *dest_uri;
-	GnomeVFSResult result;
-
-	CORBA_exception_init (&ev);
-	
-	if (!IS_CONTACT_TYPE (type)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	if (!strncmp (source_physical_uri, "ldap://", 7)
-	    || !strncmp (destination_physical_uri, "ldap://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-							     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	if (strncmp (source_physical_uri, "file://", 7)
-	    || strncmp (destination_physical_uri, "file://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_INVALID_URI,
-							     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	/* check URIs */
-	src_uri = gnome_vfs_uri_new (source_physical_uri);
-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);
-	if (!src_uri || ! dest_uri) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	result = xfer_file (src_uri, dest_uri, "addressbook.db", remove_source);
-	
-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &ev);
-
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-
-        CORBA_exception_free (&ev);	
-}
-
-static char*
-get_dnd_selection (EvolutionShellComponent *shell_component,
-		   const char *physical_uri,
-		   int type,
-		   int *format_return,
-		   const char **selection_return,
-		   int *selection_length_return,
-		   void *closure)
-{
-	/* g_print ("should get dnd selection for %s\n", physical_uri); */
-	return NULL;
-}
-
-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;
-
-	addressbook_config_register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)));
-
-	addressbook_storage_setup (shell_component, evolution_homedir);
-}
-
-static gboolean
-gtk_main_quit_cb (gpointer closure)
-{
-	gtk_main_quit ();
-	return TRUE;
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		GNOME_Evolution_Shell shell_interface,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count == 0) {
-		g_idle_add (gtk_main_quit_cb, NULL);
-	}
-}
-
-/* FIXME We should perhaps take the time to figure out if the book is editable. */
-static void
-local_addressbook_cb (EBook *book, gpointer closure)
-{
-	gboolean is_list = GPOINTER_TO_INT (closure);
-	if (book == NULL)
-		return;
-	if (is_list)
-		e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, TRUE);
-	else
-		e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, TRUE);
-}
-
-static void
-nonlocal_addressbook_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS)
-		local_addressbook_cb (book, closure);
-	else
-		local_addressbook_cb (NULL, closure);
-}
-
-static void
-user_create_new_item_cb (EvolutionShellComponent *shell_component,
-			 const char *id,
-			 const char *parent_folder_physical_uri,
-			 const char *parent_folder_type,
-			 gpointer data)
-{
-	gboolean is_contact_list;
-	if (!strcmp (id, "contact")) {
-		is_contact_list = FALSE;
-	} else if (!strcmp (id, "contact_list")) {
-		is_contact_list = TRUE;
-	} else {
-		g_warning ("Don't know how to create item of type \"%s\"", id);
-		return;
-	}
-	if (IS_CONTACT_TYPE (parent_folder_type)) {
-		EBook *book;
-		gchar *uri;
-
-		book = e_book_new ();
-		uri = g_strdup_printf ("%s/addressbook.db", parent_folder_physical_uri);
-
-		if (addressbook_load_uri (book, uri, nonlocal_addressbook_cb, GINT_TO_POINTER (is_contact_list)) == 0)
-			g_warning ("Couldn't load addressbook %s", uri);
-
-		g_free (uri);
-	} else {
-		e_book_use_local_address_book (local_addressbook_cb, GINT_TO_POINTER (is_contact_list));
-	}
-}
-
-
-/* Destination side DnD */
-
-static CORBA_boolean
-destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *folder,
-				  const char *physical_uri,
-				  const char *folder_type,
-				  const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,
-				  GNOME_Evolution_ShellComponentDnd_Action * suggested_action_return,
-				  gpointer user_data)
-{
-	*suggested_action_return = GNOME_Evolution_ShellComponentDnd_ACTION_MOVE;
-	return TRUE;
-}
-
-static void
-dnd_drop_book_open_cb (EBook *book, EBookStatus status, GList *card_list)
-{
-	GList *l;
-
-	for (l = card_list; l; l = l->next) {
-		ECard *card = l->data;
-
-		e_card_merging_book_add_card (book, card, NULL /* XXX */, NULL);
-	}
-}
-
-static CORBA_boolean
-destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *folder,
-				const char *physical_uri,
-				const char *folder_type,
-				const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,
-				const GNOME_Evolution_ShellComponentDnd_Action action,
-				const GNOME_Evolution_ShellComponentDnd_Data * data,
-				gpointer user_data)
-{
-	EBook *book;
-	GList *card_list;
-	char *expanded_uri;
-
-	if (action == GNOME_Evolution_ShellComponentDnd_ACTION_LINK)
-		return FALSE; /* we can't create links in our addressbook format */
-
-	/* g_print ("in destination_folder_handle_drop (%s)\n", physical_uri); */
-
-	card_list = e_card_load_cards_from_string_with_default_charset (data->bytes._buffer, "ISO-8859-1");
-
-	expanded_uri = e_book_expand_uri (physical_uri);
-
-	book = e_book_new ();
-	addressbook_load_uri (book, expanded_uri,
-			      (EBookCallback)dnd_drop_book_open_cb, card_list);
-
-	g_free (expanded_uri);
-
-	return TRUE;
-}
-
-
-/* The factory function.  */
-
-static void
-add_creatable_item (EvolutionShellComponent *shell_component,
-		    const char *id,
-		    const char *description,
-		    const char *menu_description,
-		    char menu_shortcut,
-		    const char *icon_name)
-{
-	char *icon_path;
-	GdkPixbuf *icon;
-
-	if (icon_name == NULL) {
-		icon_path = NULL;
-		icon = NULL;
-	} else {
-		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
-		icon = gdk_pixbuf_new_from_file (icon_path);
-	}
-
-	evolution_shell_component_add_user_creatable_item (shell_component,
-							   id,
-							   description,
-							   menu_description,
-							   menu_shortcut,
-							   icon);
-
-	if (icon != NULL)
-		gdk_pixbuf_unref (icon);
-	g_free (icon_path);
-}
-
-static BonoboObject *
-create_component (void)
-{
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentDndDestinationFolder *destination_interface;
-
-	shell_component = evolution_shell_component_new (folder_types, NULL,
-							 create_view, create_folder,
-							 remove_folder, xfer_folder,
-							 NULL,
-							 get_dnd_selection,
-							 NULL);
-
-	destination_interface = evolution_shell_component_dnd_destination_folder_new (destination_folder_handle_motion,
-										      destination_folder_handle_drop,
-										      shell_component);
-
-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component),
-				     BONOBO_OBJECT (destination_interface));
-
-	add_creatable_item (shell_component, "contact",
-			    _("New Contact"), _("_Contact"), 'c',
-			    "evolution-contacts-mini.png");
-	add_creatable_item (shell_component, "contact_list",
-			    _("New Contact List"), _("Contact _List"), 'l',
-			    "all_contacts.xpm");
-
-	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);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
-			    GTK_SIGNAL_FUNC (user_create_new_item_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-/* FIXME this should probably be renamed as we don't use factories anymore.  */
-void
-addressbook_component_factory_init (void)
-{
-	BonoboObject *object;
-	int result;
-
-	object = create_component ();
-
-	/* FIXME: Handle errors better?  */
-
-	result = oaf_active_server_register (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID,
-					     bonobo_object_corba_objref (object));
-	if (result == OAF_REG_ERROR)
-		g_error ("Cannot register -- %s", GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID);
-}
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index 9b36873902..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-void                  addressbook_component_factory_init      (void);
-EvolutionShellClient *addressbook_component_get_shell_client  (void);
-
-#endif /* _ADDRESSBOOK_COMPONENT_H */
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
deleted file mode 100644
index 0961d81533..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,1826 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- **/
-
-/*#define STANDALONE*/
-/*#define NEW_ADVANCED_UI*/
-
-#include <config.h>
-
-#include "addressbook-config.h"
-
-#include "addressbook.h"
-#include "addressbook-storage.h"
-
-#include "evolution-config-control.h"
-#include <shell/e-folder-list.h>
-
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-table/e-table-memory-store.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <e-util/e-html-utils.h>
-
-#include <gtkhtml/gtkhtml.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-
-#include <glade/glade.h>
-
-#include <stdlib.h>
-#include <sys/time.h>
-
-#ifdef HAVE_LDAP
-#include "ldap.h"
-#include "ldap_schema.h"
-#endif
-
-#define LDAP_PORT_STRING "389"
-#define LDAPS_PORT_STRING "636"
-
-#define GLADE_FILE_NAME "ldap-config.glade"
-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"
-#define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"
-#define ADDRESSBOOK_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControl"
-
-#ifdef HAVE_LDAP
-GtkWidget* addressbook_dialog_create_sources_table (char *name, char *string1, char *string2,
-						    int num1, int num2);
-GtkWidget* supported_bases_create_table (char *name, char *string1, char *string2,
-					 int num1, int num2);
-
-#ifdef NEW_ADVANCED_UI
-GtkWidget* objectclasses_create_server_table (char *name, char *string1, char *string2,
-					      int num1, int num2);
-GtkWidget* objectclasses_create_evolution_table (char *name, char *string1, char *string2,
-						 int num1, int num2);
-#endif
-
-/* default objectclasses */
-#define TOP                  "top"
-#define PERSON               "person"
-#define ORGANIZATIONALPERSON "organizationalPerson"
-#define INETORGPERSON        "inetOrgPerson"
-#define EVOLUTIONPERSON      "evolutionPerson"
-#define CALENTRY             "calEntry"
-
-
-typedef struct {
-	GtkWidget *notebook;
-	int page_num;
-} FocusHelpClosure;
-
-static void
-focus_help (GtkWidget *w, GdkEventFocus *event, FocusHelpClosure *closure)
-{
-	gtk_notebook_set_page (GTK_NOTEBOOK(closure->notebook), closure->page_num);
-}
-
-static void
-add_focus_handler (GtkWidget *widget, GtkWidget *notebook, int page_num)
-{
-	FocusHelpClosure *focus_closure = g_new0 (FocusHelpClosure, 1);
-	focus_closure->notebook = notebook;
-	focus_closure->page_num = page_num;
-
-	gtk_signal_connect_full (GTK_OBJECT (widget),
-				 "focus_in_event" /* XXX */,
-				 (GtkSignalFunc) focus_help, NULL,
-				 focus_closure,
-				 (GtkDestroyNotify) g_free,
-				 FALSE, FALSE);
-}
-
-
-typedef struct {
-	EvolutionConfigControl *config_control;
-	GtkWidget *page;
-
-	GladeXML *gui;
-	GNOME_Evolution_Shell shell;
-
-	GtkWidget *sourcesTable;
-	ETableModel *sourcesModel;
-	GtkWidget *addSource;
-	GtkWidget *editSource;
-	GtkWidget *deleteSource;
-
-} AddressbookDialog;
-
-typedef struct {
-	AddressbookDialog *addressbook_dialog;
-	GladeXML  *gui;
-
-	GtkWidget *window;
-	GtkWidget *druid; /* only used (obviously) in the druid */
-
-	/* info page fields */
-	GtkSignalFunc general_modify_func;
-	GtkWidget *host;
-	GtkWidget *auth_optionmenu;
-	AddressbookLDAPAuthType auth; 
-	GtkWidget *auth_label_notebook;
-	GtkWidget *auth_entry_notebook;
-	GtkWidget *email;
-	GtkWidget *binddn;
-
-	/* connecting page fields */
-	GtkSignalFunc connecting_modify_func;
-	GtkWidget *port_combo;
-	GtkWidget *ssl_optionmenu;
-	AddressbookLDAPSSLType ssl;
-
-	/* searching page fields */
-	GtkSignalFunc searching_modify_func;
-	GtkWidget *rootdn;
-	AddressbookLDAPScopeType scope;
-	GtkWidget *scope_optionmenu;
-	GtkWidget *timeout_scale;
-	GtkWidget *limit_spinbutton;
-
-	/* display name page fields */
-	GtkWidget *display_name;
-	gboolean display_name_changed; /* only used in the druid */
-
-	gboolean schema_query_successful;
-
-#ifdef NEW_ADVANCED_UI
-	/* objectclasses tab fields */
-	GPtrArray *server_objectclasses;    /* the objectclasses available on the server */
-	GPtrArray *evolution_objectclasses; /* the objectclasses evolution will use */
-	GPtrArray *default_objectclasses;   /* the objectclasses we default to (actually the
-					       intersection between defaults and server_objectclasses) */
-	GtkSignalFunc objectclasses_modify_func;
-	GtkWidget *objectclasses_server_table;
-	ETableModel *objectclasses_server_model;
-	GtkWidget *objectclasses_evolution_table;
-	ETableModel *objectclasses_evolution_model;
-	GtkWidget *objectclasses_add_button;
-	GtkWidget *objectclasses_remove_button;
-
-	/* refs we keep around so we can add/hide the tabs */
-	GtkWidget *objectclasses_tab;
-	GtkWidget *objectclasses_label;
-	GtkWidget *mappings_tab;
-	GtkWidget *mappings_label;
-	GtkWidget *dn_customization_tab;
-	GtkWidget *dn_customization_label;
-#endif
-
-	/* stuff for the account editor window */
-	int source_model_row;
-	GtkWidget *ok_button;
-	GtkWidget *apply_button;
-	GtkWidget *close_button;
-	GtkWidget *advanced_button_notebook;
-	GtkWidget *notebook; /* the toplevel notebook */
-
-	gboolean advanced;
-
-} AddressbookSourceDialog;
-
-
-/* ldap api foo */
-static LDAP *
-addressbook_ldap_init (GtkWidget *window, AddressbookSource *source)
-{
-	LDAP *ldap = ldap_init (source->host, atoi(source->port));
-
-	if (!ldap) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Failed to connect to LDAP server"), GTK_WINDOW(window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		return NULL;
-	}
-
-	/* XXX do TLS if it's configured in */
-
-	return ldap;
-}
-
-static int
-addressbook_ldap_auth (GtkWidget *window, AddressbookSource *source, LDAP *ldap)
-{
-	int ldap_error;
-
-	/* XXX use auth info from source */
-	ldap_error = ldap_simple_bind_s (ldap, NULL, NULL);
-	if (LDAP_SUCCESS != ldap_error) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Failed to authenticate with LDAP server"), GTK_WINDOW (window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	}
-	return ldap_error;
-
-}
-
-static int
-addressbook_root_dse_query (GtkWidget *dialog, AddressbookSource *source, LDAP *ldap, char **attrs, LDAPMessage **resp)
-{
-	int ldap_error;
-	struct timeval timeout;
-
-	/* 3 second timeout */
-	timeout.tv_sec = 3;
-	timeout.tv_usec = 0;
-
-	ldap_error = ldap_search_ext_s (ldap,
-					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
-					"(objectclass=*)",
-					attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
-	if (LDAP_SUCCESS != ldap_error) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Could not perform query on Root DSE"), GTK_WINDOW (dialog));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	}
-
-	return ldap_error;
-}
-
-
-static AddressbookSource *
-addressbook_dialog_get_source (AddressbookSourceDialog *dialog)
-{
-	AddressbookSource *source = g_new0 (AddressbookSource, 1);
-
-	source->name       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->display_name));
-	source->host       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host));
-	source->email_addr = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->email));
-	source->binddn     = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->binddn));
-	source->port       = e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry));
-	source->rootdn     = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->rootdn));
-	source->limit      = atoi(e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->limit_spinbutton)));
-	source->scope      = dialog->scope;
-	source->auth       = dialog->auth;
-	source->ssl        = dialog->ssl;
-
-	addressbook_storage_init_source_uri (source);
-
-	return source;
-}
-
-static void
-addressbook_source_dialog_set_source (AddressbookSourceDialog *dialog, AddressbookSource *source)
-{
-	char *string;
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->display_name), source ? source->name : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->host), source ? source->host : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->email), source ? source->email_addr : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->binddn), source ? source->binddn : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry), source ? source->port : LDAP_PORT_STRING);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->rootdn), source ? source->rootdn : "");
-
-	string = g_strdup_printf ("%d", source ? source->limit : 100);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->limit_spinbutton), string);
-	g_free (string);
-
-	dialog->auth = source ? source->auth : ADDRESSBOOK_LDAP_AUTH_NONE;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->auth_optionmenu), dialog->auth);
-	if (dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog->auth_label_notebook), dialog->auth - 1);
-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog->auth_entry_notebook), dialog->auth - 1);
-	}
-	gtk_widget_set_sensitive (dialog->auth_label_notebook, dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE);
-	gtk_widget_set_sensitive (dialog->auth_entry_notebook, dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE);
-
-	dialog->scope = source ? source->scope : ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->scope_optionmenu), dialog->scope);
-
-	dialog->ssl = source ? source->auth : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->ssl_optionmenu), dialog->ssl);
-}
-
-static void
-addressbook_source_dialog_destroy (GtkWidget *widget, AddressbookSourceDialog *dialog)
-{
-#ifdef NEW_ADVANCED_UI
-#define IF_UNREF(x) if (x) gtk_object_unref (GTK_OBJECT ((x)))
-
-	int i;
-
-	if (dialog->server_objectclasses) {
-		for (i = 0; i < dialog->server_objectclasses->len; i ++)
-			ldap_objectclass_free (g_ptr_array_index (dialog->server_objectclasses, i));
-		g_ptr_array_free (dialog->server_objectclasses, TRUE);
-	}
-
-	if (dialog->evolution_objectclasses) {
-		for (i = 0; i < dialog->evolution_objectclasses->len; i ++)
-			ldap_objectclass_free (g_ptr_array_index (dialog->evolution_objectclasses, i));
-		g_ptr_array_free (dialog->evolution_objectclasses, TRUE);
-	}
-
-	if (dialog->default_objectclasses) {
-		for (i = 0; i < dialog->default_objectclasses->len; i ++)
-			ldap_objectclass_free (g_ptr_array_index (dialog->default_objectclasses, i));
-		g_ptr_array_free (dialog->default_objectclasses, TRUE);
-	}
-
-	IF_UNREF (dialog->objectclasses_server_model);
-	IF_UNREF (dialog->objectclasses_evolution_model);
-
-	IF_UNREF (dialog->objectclasses_tab);
-	IF_UNREF (dialog->objectclasses_label);
-	IF_UNREF (dialog->mappings_tab);
-	IF_UNREF (dialog->mappings_label);
-	IF_UNREF (dialog->dn_customization_tab);
-	IF_UNREF (dialog->dn_customization_label);
-
-#undef IF_UNREF
-#endif
-
-	gtk_object_destroy (GTK_OBJECT (dialog->gui));
-
-	g_free (dialog);
-}
-
-static void
-addressbook_add_server_druid_cancel (GtkWidget *widget, AddressbookSourceDialog *dialog)
-{
-	gtk_widget_destroy (dialog->window);
-}
-
-static void
-addressbook_add_server_druid_finish (GnomeDruidPage *druid_page, GtkWidget *gnome_druid, AddressbookSourceDialog *sdialog)
-{
-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);
-	AddressbookDialog *dialog = sdialog->addressbook_dialog;
-
-	printf ("in finish (%s,%s)\n", source->name, source->host);
-
-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog->sourcesModel),
-				     -1, source, source->name, source->host);
-
-	evolution_config_control_changed (dialog->config_control);
-
-	/* tear down the widgets */
-	gtk_widget_destroy (sdialog->window);
-}
-
-static void
-reparent_to_vbox (AddressbookSourceDialog *dialog, char *vbox_name, char *widget_name)
-{
-	GtkWidget *vbox, *widget;
-
-	vbox = glade_xml_get_widget (dialog->gui, vbox_name);
-	widget = glade_xml_get_widget (dialog->gui, widget_name);
-
-	gtk_widget_reparent (widget, vbox);
-	gtk_box_set_child_packing (GTK_BOX (vbox), widget, TRUE, TRUE, 0, GTK_PACK_START);
-}
-
-static void
-auth_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->auth = g_list_index (gtk_container_children (GTK_CONTAINER (item->parent)),
-				    item);
-
-	dialog->general_modify_func (item, dialog);
-
-	if (dialog->auth == 0) {
-		gtk_widget_set_sensitive (dialog->auth_label_notebook, FALSE);
-		gtk_widget_set_sensitive (dialog->auth_entry_notebook, FALSE);
-	}
-	else {
-		gtk_widget_set_sensitive (dialog->auth_label_notebook, TRUE);
-		gtk_widget_set_sensitive (dialog->auth_entry_notebook, TRUE);
-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog->auth_label_notebook), dialog->auth - 1);
-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog->auth_entry_notebook), dialog->auth - 1);
-	}
-}
-
-static void
-add_auth_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (auth_optionmenu_activated), dialog);
-}
-
-static void
-setup_general_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)
-{
-	GtkWidget *general_tab_help;
-	GtkWidget *menu;
-
-	general_tab_help = glade_xml_get_widget (dialog->gui, "general-tab-help");
-
-	dialog->general_modify_func = modify_func;
-	dialog->host = glade_xml_get_widget (dialog->gui, "server-name-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->host), "changed",
-			    modify_func, dialog);
-	add_focus_handler (dialog->host, general_tab_help, 0);
-
-	dialog->auth_label_notebook = glade_xml_get_widget (dialog->gui, "auth-label-notebook");
-	dialog->auth_entry_notebook = glade_xml_get_widget (dialog->gui, "auth-entry-notebook");
-	dialog->email = glade_xml_get_widget (dialog->gui, "email-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->email), "changed",
-			    modify_func, dialog);
-	add_focus_handler (dialog->email, general_tab_help, 1);
-	dialog->binddn = glade_xml_get_widget (dialog->gui, "dn-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->binddn), "changed",
-			    modify_func, dialog);
-	add_focus_handler (dialog->binddn, general_tab_help, 2);
-
-	dialog->auth_optionmenu = glade_xml_get_widget (dialog->gui, "auth-optionmenu");
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->auth_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_auth_activate_cb, dialog);
-	add_focus_handler (dialog->auth_optionmenu, general_tab_help, 3);
-}
-
-static gboolean
-general_tab_check (AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-	char *string;
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host));
-	if (!string || !string[0])
-		valid = FALSE;
-	g_free (string);
-
-	if (valid) {
-		if (dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
-			if (dialog->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)
-				string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->binddn));
-			else
-				string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->email));
-
-			if (!string || !string[0])
-				valid = FALSE;
-			g_free (string);
-		}
-	}
-
-	return valid;
-}
-
-static void
-druid_info_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   general_tab_check (dialog), /* next */
-					   TRUE /* cancel */);
-}
-
-static void
-druid_info_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
-{
-	druid_info_page_modify_cb (NULL, dialog);
-	/* stick the focus in the hostname field */
-	gtk_widget_grab_focus (dialog->host);
-}
-
-
-/* connecting page */
-static void
-ssl_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->ssl = g_list_index (gtk_container_children (GTK_CONTAINER (item->parent)),
-				    item);
-
-	dialog->connecting_modify_func (item, dialog);
-}
-
-static void
-ssl_optionmenu_selected (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	GtkWidget *connecting_tab_help;
-	int ssl_type = g_list_index (gtk_container_children (GTK_CONTAINER (item->parent)),
-				     item);
-
-	connecting_tab_help = glade_xml_get_widget (dialog->gui, "connecting-tab-help");
-
-	gtk_notebook_set_page (GTK_NOTEBOOK(connecting_tab_help), ssl_type + 1);
-}
-
-static void
-add_ssl_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (ssl_optionmenu_activated), dialog);
-	gtk_signal_connect (GTK_OBJECT (item), "select",
-			    GTK_SIGNAL_FUNC (ssl_optionmenu_selected), dialog);
-}
-
-static void
-port_changed_func (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	/* if the port value is ldaps, set the SSL/TLS option menu to
-	   Always and desensitize it */
-	char *string = e_utf8_gtk_entry_get_text (GTK_ENTRY (item));
-
-	dialog->connecting_modify_func (item, dialog);
-
-	if (!strcmp (string, LDAPS_PORT_STRING)) {
-		dialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;
-		gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->ssl_optionmenu),
-					     dialog->ssl);
-
-		gtk_widget_set_sensitive (dialog->ssl_optionmenu, FALSE);
-	}
-	else {
-		gtk_widget_set_sensitive (dialog->ssl_optionmenu, TRUE);
-	}
-		
-		
-	g_free (string);
-}
-
-static void
-setup_connecting_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)
-{
-	GtkWidget *menu;
-	GtkWidget *connecting_tab_help;
-
-	dialog->connecting_modify_func = modify_func;
-
-	connecting_tab_help = glade_xml_get_widget (dialog->gui, "connecting-tab-help");
-
-	dialog->port_combo = glade_xml_get_widget (dialog->gui, "port-combo");
-	add_focus_handler (dialog->port_combo, connecting_tab_help, 0);
-	add_focus_handler (GTK_COMBO(dialog->port_combo)->entry, connecting_tab_help, 0);
-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO(dialog->port_combo)->entry), "changed",
-			    modify_func, dialog);
-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO(dialog->port_combo)->entry), "changed",
-			    port_changed_func, dialog);
-	dialog->ssl_optionmenu = glade_xml_get_widget (dialog->gui, "ssl-optionmenu");
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->ssl_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_ssl_activate_cb, dialog);
-}
-
-static gboolean
-connecting_tab_check (AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-	char *string;
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry));
-	if (!string || !string[0])
-		valid = FALSE;
-	g_free (string);
-
-	return valid;
-}
-
-static void
-druid_connecting_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   connecting_tab_check (dialog), /* next */
-					   TRUE /* cancel */);
-}
-
-static void
-druid_connecting_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
-{
-	druid_connecting_page_modify_cb (NULL, dialog);
-	/* stick the focus in the port combo */
-	gtk_widget_grab_focus (GTK_COMBO(dialog->port_combo)->entry);
-}
-
-
-/* searching page */
-static ETableMemoryStoreColumnInfo bases_table_columns[] = {
-	E_TABLE_MEMORY_STORE_STRING,
-	E_TABLE_MEMORY_STORE_TERMINATOR
-};
-
-#define BASES_TABLE_SPEC \
-"<ETableSpecification cursor-mode=\"line\" no-headers=\"true\"> \
-  <ETableColumn model_col= \"0\" _title=\"Base\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableState> \
-    <column source=\"0\"/> \
-    <grouping></grouping> \
-  </ETableState> \
-</ETableSpecification>"
-
-GtkWidget*
-supported_bases_create_table (char *name, char *string1, char *string2, int num1, int num2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-
-	model = e_table_memory_store_new (bases_table_columns);
-
-	table = e_table_scrolled_new (model, NULL, BASES_TABLE_SPEC, NULL);
-
-	gtk_object_set_data (GTK_OBJECT (table), "model", model);
-
-	return table;
-}
-
-static gboolean
-do_ldap_root_dse_query (GtkWidget *dialog, ETableModel *model, AddressbookSource *source, char ***rvalues)
-{
-	LDAP* ldap;
-	char *attrs[2];
-	int ldap_error;
-	char **values;
-	LDAPMessage *resp;
-	int i;
-
-	ldap = addressbook_ldap_init (dialog, source);
-	if (!ldap)
-		return FALSE;
-
-	if (LDAP_SUCCESS != addressbook_ldap_auth (dialog, source, ldap))
-		goto fail;
-
-	attrs[0] = "namingContexts";
-	attrs[1] = NULL;
-
-	ldap_error = addressbook_root_dse_query (dialog, source, ldap, attrs, &resp);
-
-	if (ldap_error != LDAP_SUCCESS)
-		goto fail;
-
-	values = ldap_get_values (ldap, resp, "namingContexts");
-	if (!values || values[0] == NULL) {
-		GtkWidget *error_dialog;
-		error_dialog = gnome_ok_dialog_parented (_("The server responded with no supported search bases"), GTK_WINDOW (dialog));
-		gtk_window_set_modal (GTK_WINDOW (error_dialog), TRUE);
-		goto fail;
-	}
-
-	for (i = 0; values[i]; i++)
-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (model),
-					     -1, GINT_TO_POINTER(i), values[i]);
-
-	*rvalues = values;
-
-	ldap_unbind_s (ldap);
-	return TRUE;
-
- fail:
-	ldap_unbind_s (ldap);
-	return FALSE;
-}
-
-static void
-search_base_selection_model_changed (ESelectionModel *selection_model, GtkWidget *dialog)
-{
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog),
-				    0 /* OK */, e_selection_model_selected_count (selection_model) == 1);
-}
-
-static void
-query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
-{
-	ESelectionModel *selection_model;
-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);
-	GtkWidget *dialog;
-	GtkWidget *supported_bases_table;
-	ETableModel *model;
-	int id;
-	char **values;
-
-	dialog = glade_xml_get_widget (sdialog->gui, "supported-bases-dialog");
-
-	supported_bases_table = glade_xml_get_widget (sdialog->gui, "supported-bases-table");
-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(supported_bases_table)));
-	model = gtk_object_get_data (GTK_OBJECT (supported_bases_table), "model");
-
-	gtk_signal_connect (GTK_OBJECT (selection_model), "selection_changed",
-			    search_base_selection_model_changed, dialog);
-
-	search_base_selection_model_changed (selection_model, dialog);
-
-	if (do_ldap_root_dse_query (dialog, model, source, &values)) {
-		gnome_dialog_close_hides (GNOME_DIALOG(dialog), TRUE);
-
-		id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-		if (id == 0) {
-			int i;
-			/* OK was clicked */
-
-			/* ugh. */
-			for (i = 0; values[i]; i ++) {
-				if (e_selection_model_is_row_selected (selection_model, i)) {
-					e_utf8_gtk_entry_set_text (GTK_ENTRY (sdialog->rootdn), values[i]);
-					break; /* single selection, so we can quit when we've found it. */
-				}
-			}
-		}
-
-		ldap_value_free (values);
-
-		e_table_memory_store_clear (E_TABLE_MEMORY_STORE (model));
-	}
-
-	addressbook_source_free (source);
-
-	gtk_object_unref (GTK_OBJECT (selection_model));
-}
-
-static void
-scope_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->scope = g_list_index (gtk_container_children (GTK_CONTAINER (item->parent)),
-				      item);
-
-	dialog->searching_modify_func (item, dialog);
-}
-
-static void
-add_scope_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (scope_optionmenu_activated), dialog);
-}
-
-static void
-setup_searching_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)
-{
-	GtkWidget *menu;
-	GtkWidget *rootdn_button;
-	GtkWidget *searching_tab_help;
-
-	dialog->searching_modify_func = modify_func;
-
-	searching_tab_help = glade_xml_get_widget (dialog->gui, "searching-tab-help");
-
-	dialog->rootdn = glade_xml_get_widget (dialog->gui, "rootdn-entry");
-	add_focus_handler (dialog->rootdn, searching_tab_help, 0);
-	if (modify_func)
-		gtk_signal_connect (GTK_OBJECT (dialog->rootdn), "changed",
-				    modify_func, dialog);
-
-	dialog->scope_optionmenu = glade_xml_get_widget (dialog->gui, "scope-optionmenu");
-	add_focus_handler (dialog->scope_optionmenu, searching_tab_help, 1);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->scope_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_scope_activate_cb, dialog);
-
-	dialog->timeout_scale = glade_xml_get_widget (dialog->gui, "timeout-scale");
-	add_focus_handler (dialog->timeout_scale, searching_tab_help, 2);
-	if (modify_func)
-		gtk_signal_connect (GTK_OBJECT (GTK_RANGE(dialog->timeout_scale)->adjustment),
-				    "value_changed",
-				    modify_func, dialog);
-
-	dialog->limit_spinbutton = glade_xml_get_widget (dialog->gui, "download-limit-spinbutton");
-	if (modify_func)
-		gtk_signal_connect (GTK_OBJECT (dialog->limit_spinbutton), "changed",
-				    modify_func, dialog);
-
-	/* special handling for the "Show Supported Bases button" */
-	rootdn_button = glade_xml_get_widget (dialog->gui, "rootdn-button");
-	gtk_signal_connect (GTK_OBJECT (rootdn_button), "clicked",
-			    GTK_SIGNAL_FUNC(query_for_supported_bases), dialog);
-}
-
-static void
-druid_searching_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
-{
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   TRUE, /* next */
-					   TRUE /* cancel */);
-}
-
-
-/* display name page */
-static gboolean
-display_name_check (AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-	char *string;
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->display_name));
-	if (!string || !string[0])
-		valid = FALSE;
-	g_free (string);
-
-	return valid;
-}
-
-static void
-display_name_page_prepare (GtkWidget *page, GtkWidget *gnome_druid, AddressbookSourceDialog *dialog)
-{
-	if (!dialog->display_name_changed) {
-		char *server_name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host));
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->display_name), server_name);
-		g_free (server_name);
-	}
-
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   display_name_check (dialog), /* next */
-					   TRUE /* cancel */);
-}
-
-static void
-druid_display_name_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->display_name_changed = TRUE;
-	display_name_page_prepare (NULL, NULL, dialog);
-}
-
-
-#ifdef NEW_ADVANCED_UI
-/* objectclasses page */
-static ETableMemoryStoreColumnInfo objectclasses_table_columns[] = {
-	E_TABLE_MEMORY_STORE_STRING,
-	E_TABLE_MEMORY_STORE_TERMINATOR
-};
-
-#define OBJECTCLASSES_TABLE_SPEC \
-"<ETableSpecification cursor-mode=\"line\" no-headers=\"true\"> \
-  <ETableColumn model_col= \"0\" _title=\"Objectclass\" 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*
-objectclasses_create_server_table (char *name, char *string1, char *string2,
-				   int num1, int num2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-
-	model = e_table_memory_store_new (objectclasses_table_columns);
-
-	table = e_table_scrolled_new (model, NULL, OBJECTCLASSES_TABLE_SPEC, NULL);
-
-	gtk_object_set_data (GTK_OBJECT (table), "model", model);
-
-	return table;
-}
-
-GtkWidget*
-objectclasses_create_evolution_table (char *name, char *string1, char *string2,
-				      int num1, int num2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-
-	model = e_table_memory_store_new (objectclasses_table_columns);
-
-	table = e_table_scrolled_new (model, NULL, OBJECTCLASSES_TABLE_SPEC, NULL);
-
-	gtk_object_set_data (GTK_OBJECT (table), "model", model);
-
-	return table;
-}
-
-static void
-objectclasses_add_foreach (int model_row, AddressbookSourceDialog *dialog)
-{
-	LDAPObjectClass *oc = e_table_memory_get_data (E_TABLE_MEMORY (dialog->objectclasses_server_model), model_row);	
-	e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog->objectclasses_server_model), model_row);
-	/* XXX remove from the server array */
-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog->objectclasses_evolution_model),
-				     -1, oc, oc->oc_names[0]);
-	/* XXX add to the evolution array */
-}
-
-static void
-objectclasses_add (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	ESelectionModel *esm = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->objectclasses_server_table)));
-
-	e_selection_model_foreach (esm, (EForeachFunc)objectclasses_add_foreach, dialog);
-	dialog->objectclasses_modify_func (item, dialog);
-}
-
-static void
-objectclasses_server_double_click (ETable *et, int row, int col, GdkEvent *event, AddressbookSourceDialog *dialog)
-{
-	objectclasses_add_foreach (row, dialog);
-	dialog->objectclasses_modify_func (GTK_WIDGET (et), dialog);
-}
-
-static void
-objectclasses_remove_foreach (int model_row, AddressbookSourceDialog *dialog)
-{
-	LDAPObjectClass *oc = e_table_memory_get_data (E_TABLE_MEMORY (dialog->objectclasses_evolution_model), model_row);
-	e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog->objectclasses_evolution_model), model_row);
-	/* XXX remove from the evolution array */
-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog->objectclasses_server_model),
-				     -1, oc, oc->oc_names[0]);
-	/* XXX add to the server array */
-}
-
-static void
-objectclasses_remove (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	ESelectionModel *esm = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->objectclasses_evolution_table)));
-
-	e_selection_model_foreach (esm, (EForeachFunc)objectclasses_add_foreach, dialog);
-
-	dialog->objectclasses_modify_func (item, dialog);
-}
-
-static void
-objectclasses_evolution_double_click (ETable *et, int row, int col, GdkEvent *event, AddressbookSourceDialog *dialog)
-{
-	objectclasses_remove_foreach (row, dialog);
-	dialog->objectclasses_modify_func (GTK_WIDGET (et), dialog);
-}
-
-static void
-objectclasses_restore_default (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	int i;
-	
-	dialog->objectclasses_modify_func (item, dialog);
-
-	/* clear out our evolution list */
-	for (i = 0; i < dialog->evolution_objectclasses->len; i ++) {
-		g_ptr_array_add (dialog->server_objectclasses, g_ptr_array_index (dialog->evolution_objectclasses, i));
-	}
-	g_ptr_array_set_size (dialog->evolution_objectclasses, 0);
-
-	e_table_memory_store_clear (E_TABLE_MEMORY_STORE (dialog->objectclasses_evolution_model));
-
-	for (i = 0; i < dialog->default_objectclasses->len; i++) {
-		LDAPObjectClass *oc = g_ptr_array_index (dialog->default_objectclasses, i);
-		g_ptr_array_add (dialog->evolution_objectclasses, oc);
-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog->objectclasses_evolution_model),
-					     i, oc, oc->oc_names[0]);
-	}
-}
-
-static void
-server_selection_model_changed (ESelectionModel *selection_model, AddressbookSourceDialog *dialog)
-{
-	gtk_widget_set_sensitive (dialog->objectclasses_add_button,
-				  e_selection_model_selected_count (selection_model) > 0);
-}
-
-static void
-evolution_selection_model_changed (ESelectionModel *selection_model, AddressbookSourceDialog *dialog)
-{
-	gtk_widget_set_sensitive (dialog->objectclasses_remove_button,
-				  e_selection_model_selected_count (selection_model) > 0);
-}
-
-static void
-setup_objectclasses_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)
-{
-	ETable *table;
-	GtkWidget *restore_default;
-	ESelectionModel *esm;
-
-	dialog->server_objectclasses = g_ptr_array_new ();
-	dialog->evolution_objectclasses = g_ptr_array_new ();
-	dialog->default_objectclasses = g_ptr_array_new ();
-
-	dialog->objectclasses_modify_func = modify_func;
-
-	dialog->objectclasses_server_table = glade_xml_get_widget (dialog->gui, "objectclasses-server-table");
-	dialog->objectclasses_server_model = gtk_object_get_data (GTK_OBJECT (dialog->objectclasses_server_table), "model");
-
-	dialog->objectclasses_evolution_table = glade_xml_get_widget (dialog->gui, "objectclasses-evolution-table");
-	dialog->objectclasses_evolution_model = gtk_object_get_data (GTK_OBJECT (dialog->objectclasses_evolution_table), "model");
-
-	table = e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->objectclasses_server_table));
-	gtk_signal_connect (GTK_OBJECT (table), "double_click",
-			    GTK_SIGNAL_FUNC (objectclasses_server_double_click), dialog);
-	esm = e_table_get_selection_model (table);
-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed",
-			    server_selection_model_changed, dialog);
-
-	table = e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->objectclasses_evolution_table));
-	gtk_signal_connect (GTK_OBJECT (table), "double_click",
-			    GTK_SIGNAL_FUNC (objectclasses_evolution_double_click), dialog);
-	esm = e_table_get_selection_model (table);
-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed",
-			    evolution_selection_model_changed, dialog);
-
-	dialog->objectclasses_add_button = glade_xml_get_widget (dialog->gui, "objectclasses-add-button");
-	gtk_signal_connect (GTK_OBJECT (dialog->objectclasses_add_button), "clicked",
-			    GTK_SIGNAL_FUNC(objectclasses_add), dialog);
-
-	dialog->objectclasses_remove_button = glade_xml_get_widget (dialog->gui, "objectclasses-remove-button");
-	gtk_signal_connect (GTK_OBJECT (dialog->objectclasses_remove_button), "clicked",
-			    GTK_SIGNAL_FUNC(objectclasses_remove), dialog);
-
-	restore_default = glade_xml_get_widget (dialog->gui, "objectclasses-default-button");
-	gtk_signal_connect (GTK_OBJECT (restore_default), "clicked",
-			    GTK_SIGNAL_FUNC(objectclasses_restore_default), dialog);
-}
-#endif
-
-
-static AddressbookSourceDialog *
-addressbook_add_server_druid (AddressbookDialog *dialog)
-{
-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *page;
-
-	sdialog->addressbook_dialog = dialog;
-
-	sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);
-
-	sdialog->window = glade_xml_get_widget (sdialog->gui, "account-druid-window");
-	sdialog->druid = glade_xml_get_widget (sdialog->gui, "account-druid");
-
-	/* info page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-info-page");
-	reparent_to_vbox (sdialog, "account-druid-general-vbox", "general-tab");
-	setup_general_tab (sdialog, GTK_SIGNAL_FUNC (druid_info_page_modify_cb));
-	gtk_signal_connect (GTK_OBJECT(page), "prepare",
-			    GTK_SIGNAL_FUNC(druid_info_page_prepare), sdialog);
-
-	/* connecting page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-connecting-page");
-	reparent_to_vbox (sdialog, "account-druid-connecting-vbox", "connecting-tab");
-	setup_connecting_tab (sdialog, druid_connecting_page_modify_cb);
-	gtk_signal_connect (GTK_OBJECT(page), "prepare",
-			    GTK_SIGNAL_FUNC(druid_connecting_page_prepare), sdialog);
-
-	/* searching page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-searching-page");
-	reparent_to_vbox (sdialog, "account-druid-searching-vbox", "searching-tab");
-	setup_searching_tab (sdialog, NULL);
-	gtk_signal_connect (GTK_OBJECT(page), "prepare",
-			    GTK_SIGNAL_FUNC(druid_searching_page_prepare), sdialog);
-
-	/* display name page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-display-name-page");
-	sdialog->display_name = glade_xml_get_widget (sdialog->gui, "druid-display-name-entry");
-	gtk_signal_connect (GTK_OBJECT (sdialog->display_name), "changed",
-			    druid_display_name_page_modify_cb, sdialog);
-	gtk_signal_connect (GTK_OBJECT(page), "prepare",
-			    GTK_SIGNAL_FUNC(display_name_page_prepare), sdialog);
-
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-finish-page");
-	gtk_signal_connect (GTK_OBJECT(page), "finish",
-			    GTK_SIGNAL_FUNC(addressbook_add_server_druid_finish), sdialog);
-	gtk_signal_connect (GTK_OBJECT(sdialog->druid), "cancel",
-			    GTK_SIGNAL_FUNC(addressbook_add_server_druid_cancel), sdialog);
-	gtk_signal_connect (GTK_OBJECT(sdialog->window), "destroy",
-			    GTK_SIGNAL_FUNC(addressbook_source_dialog_destroy), sdialog);
-
-	gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE);
-
-	gtk_widget_show (sdialog->window);
-
-	return sdialog;
-}
-
-static void
-editor_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-
-	valid = display_name_check (dialog);
-	if (valid)
-		valid = general_tab_check (dialog);
-#if 0
-	if (valid)
-		valid = connecting_tab_check (dialog);
-	if (valid)
-		valid = searching_tab_check (dialog);
-#endif
-
-	gtk_widget_set_sensitive (dialog->ok_button, valid);
-	gtk_widget_set_sensitive (dialog->apply_button, valid);
-}
-
-static void
-set_advanced_button_state (AddressbookSourceDialog *dialog)
-{
-	if (dialog->advanced) {
-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog->advanced_button_notebook), 0);
-#ifdef NEW_ADVANCED_UI
-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog->notebook), dialog->objectclasses_tab, dialog->objectclasses_label);
-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog->notebook), dialog->mappings_tab, dialog->mappings_label);
-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog->notebook), dialog->dn_customization_tab, dialog->dn_customization_label);
-#endif
-	}
-	else {
-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog->advanced_button_notebook), 1);
-		
-		/* hide the advanced tabs of the main notebook */
-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 5);
-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 4);
-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 3);
-	}
-}
-
-#ifdef NEW_ADVANCED_UI
-static void
-advanced_button_clicked (GtkWidget *button, AddressbookSourceDialog *dialog)
-{
-	dialog->advanced = !dialog->advanced;
-	set_advanced_button_state (dialog);
-}
-
-static gboolean
-do_schema_query (AddressbookSourceDialog *sdialog)
-{
-	LDAP *ldap;
-	int ldap_error;
-	char *schema_dn;
-	char *attrs[3];
-	char **values;
-	int i;
-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);
-	LDAPMessage *resp;
-	struct timeval timeout;
-
-	ldap = addressbook_ldap_init (sdialog->window, source);
-	if (!ldap)
-		goto fail;
-
-	if (LDAP_SUCCESS != addressbook_ldap_auth (sdialog->window, source, ldap))
-		goto fail;
-
-	attrs[0] = "subschemaSubentry";
-	attrs[1] = NULL;
-
-	ldap_error = addressbook_root_dse_query (sdialog->window, source, ldap, attrs, &resp);
-
-	if (ldap_error != LDAP_SUCCESS)
-		goto fail;
-
-	values = ldap_get_values (ldap, resp, "subschemaSubentry");
-	if (!values || values[0] == NULL) {
-		GtkWidget *dialog;
-		dialog = gnome_ok_dialog_parented (_("This server does not support LDAPv3 schema information"), GTK_WINDOW (sdialog->window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		goto fail;
-	}
-
-	schema_dn = g_strdup (values[0]);
-
-	ldap_value_free (values);
-	ldap_msgfree (resp);
-
-	attrs[0] = "objectClasses";
-	attrs[1] = NULL;
-
-	/* 3 second timeout */
-	timeout.tv_sec = 3;
-	timeout.tv_usec = 0;
-
-	ldap_error = ldap_search_ext_s (ldap, schema_dn, LDAP_SCOPE_BASE,
-					"(objectClass=subschema)", attrs, 0,
-					NULL, NULL, &timeout, LDAP_NO_LIMIT, &resp);
-	if (LDAP_SUCCESS != ldap_error) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Error retrieving schema information"), GTK_WINDOW (sdialog->window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		goto fail;
-	}
-
-	values = ldap_get_values (ldap, resp, "objectClasses");
-	if (!values) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Server did not respond with valid schema information"), GTK_WINDOW (sdialog->window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		goto fail;
-	}
-
-	for (i = 0; values[i]; i ++) { 
-		int j;
-		int code;
-		const char *err;
-		LDAPObjectClass *oc = ldap_str2objectclass (values[i], &code, &err, 0);
-
-		if (!oc)
-			continue;
-
-		/* we fill in the default list of classes here */
-		for (j = 0; oc->oc_names[j]; j ++) {
-			if (!g_strcasecmp (oc->oc_names[j], EVOLUTIONPERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], INETORGPERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], ORGANIZATIONALPERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], PERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], CALENTRY) ||
-			    !g_strcasecmp (oc->oc_names[j], TOP))
-				g_ptr_array_add (sdialog->default_objectclasses, oc);
-		}
-
-		g_ptr_array_add (sdialog->server_objectclasses, oc);
-	}
-
-	addressbook_source_free (source);
-	ldap_unbind_s (ldap);
-	return TRUE;
-
- fail:
-	addressbook_source_free (source);
-	if (ldap)
-		ldap_unbind_s (ldap);
-	return FALSE;
-}
-
-static void
-edit_dialog_switch_page (GtkNotebook *notebook,
-			 GtkNotebookPage *page, guint page_num,
-			 AddressbookSourceDialog *sdialog)
-{
-	if (page_num >= 3 && !sdialog->schema_query_successful) {
-		int i;
-
-		gtk_widget_set_sensitive (GTK_WIDGET (notebook), FALSE);
-
-		sdialog->schema_query_successful = do_schema_query (sdialog);
-
-		if (sdialog->schema_query_successful) {
-			/* fill in the objectclasses model */
-			for (i = 0; i < sdialog->server_objectclasses->len; i ++) {
-				LDAPObjectClass *oc = g_ptr_array_index (sdialog->server_objectclasses, i);
-				e_table_memory_store_insert (E_TABLE_MEMORY_STORE (sdialog->objectclasses_server_model),
-							     -1, oc, oc->oc_names[0]);
-			}
-			gtk_widget_set_sensitive (page->child, TRUE);
-		}
-		else {
-			gtk_widget_set_sensitive (page->child, FALSE);
-		}
-
-		gtk_widget_set_sensitive (GTK_WIDGET (notebook), TRUE);
-	}
-}
-#endif
-
-static gboolean
-edit_dialog_store_change (AddressbookSourceDialog *sdialog)
-{
-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);
-	AddressbookDialog *dialog = sdialog->addressbook_dialog;
-	AddressbookSource *old_source;
-
-	/* check the display name for uniqueness */
-	if (FALSE /* XXX */) {
-		return FALSE;
-	}
-
-	/* store the new source in the addressbook dialog */
-	old_source = e_table_memory_get_data (E_TABLE_MEMORY (dialog->sourcesModel), sdialog->source_model_row);
-	addressbook_source_free (old_source);
-	e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog->sourcesModel),
-				     sdialog->source_model_row);
-
-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog->sourcesModel),
-				     sdialog->source_model_row, source, source->name, source->host);
-
-	/* and let the config control know about the change */
-	evolution_config_control_changed (dialog->config_control);
-
-	return TRUE;
-}
-
-static void
-edit_dialog_apply_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
-{
-	if (!edit_dialog_store_change (sdialog))
-		return;
-
-	/* resensitize the buttons */
-	gtk_widget_set_sensitive (sdialog->ok_button, FALSE);
-	gtk_widget_set_sensitive (sdialog->apply_button, FALSE);
-}
-
-static void
-edit_dialog_close_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
-{
-	gtk_widget_destroy (sdialog->window);
-}
-
-static void
-edit_dialog_ok_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
-{
-	if (edit_dialog_store_change (sdialog))
-		edit_dialog_close_clicked (item, sdialog);
-}
-
-static AddressbookSourceDialog*
-addressbook_edit_server_dialog (AddressbookDialog *dialog, AddressbookSource *source, int model_row)
-{
-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *general_tab_help;
-	GtkWidget *fewer_options_button, *more_options_button;
-
-	sdialog->addressbook_dialog = dialog;
-	sdialog->source_model_row = model_row;
-
-	sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);
-
-	sdialog->window = glade_xml_get_widget (sdialog->gui, "account-editor-window");
-
-	/* general tab */
-	general_tab_help = glade_xml_get_widget (dialog->gui, "general-tab-help");
-	reparent_to_vbox (sdialog, "account-editor-general-vbox", "general-tab");
-	setup_general_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));
-	sdialog->display_name = glade_xml_get_widget (sdialog->gui, "account-editor-display-name-entry");
-	gtk_signal_connect (GTK_OBJECT (sdialog->display_name), "changed",
-			    editor_modify_cb, sdialog);
-	add_focus_handler (sdialog->display_name, general_tab_help, 4);
-
-	/* connecting tab */
-	reparent_to_vbox (sdialog, "account-editor-connecting-vbox", "connecting-tab");
-	setup_connecting_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));
-
-	/* searching tab */
-	reparent_to_vbox (sdialog, "account-editor-searching-vbox", "searching-tab");
-	setup_searching_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));
-
-#ifdef NEW_ADVANCED_UI
-	/* objectclasses tab */
-	reparent_to_vbox (sdialog, "account-editor-objectclasses-vbox", "objectclasses-tab");
-	setup_objectclasses_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));
-
-	/* mappings tab */
-	reparent_to_vbox (sdialog, "account-editor-mappings-vbox", "mappings-tab");
-	/* XXX setup_mappings_tab */
-
-	/* dn customization tab */
-	reparent_to_vbox (sdialog, "account-editor-dn-customization-vbox", "dn-customization-tab");
-	/* XXX setup_dn_customization_tab */
-#endif
-
-	sdialog->ok_button = glade_xml_get_widget (sdialog->gui, "account-editor-ok-button");
-	sdialog->apply_button = glade_xml_get_widget (sdialog->gui, "account-editor-apply-button");
-	sdialog->close_button = glade_xml_get_widget (sdialog->gui, "account-editor-close-button");
-
-	sdialog->advanced_button_notebook = glade_xml_get_widget (sdialog->gui, "account-editor-advanced-button-notebook");
-	fewer_options_button = glade_xml_get_widget (sdialog->gui, "account-editor-fewer-options-button");
-	more_options_button = glade_xml_get_widget (sdialog->gui, "account-editor-more-options-button");
-
-	sdialog->notebook = glade_xml_get_widget (sdialog->gui, "account-editor-notebook");
-#ifdef NEW_ADVANCED_UI
-	sdialog->objectclasses_label = glade_xml_get_widget (sdialog->gui, "account-editor-objectclasses-label");
-	gtk_object_ref (GTK_OBJECT (sdialog->objectclasses_label));
-	sdialog->objectclasses_tab = glade_xml_get_widget (sdialog->gui, "account-editor-objectclasses-vbox");
-	gtk_object_ref (GTK_OBJECT (sdialog->objectclasses_tab));
-	sdialog->mappings_label = glade_xml_get_widget (sdialog->gui, "account-editor-mappings-label");
-	gtk_object_ref (GTK_OBJECT (sdialog->mappings_label));
-	sdialog->mappings_tab = glade_xml_get_widget (sdialog->gui, "account-editor-mappings-vbox");
-	gtk_object_ref (GTK_OBJECT (sdialog->mappings_tab));
-	sdialog->dn_customization_label = glade_xml_get_widget (sdialog->gui, "account-editor-dn-customization-label");
-	gtk_object_ref (GTK_OBJECT (sdialog->dn_customization_label));
-	sdialog->dn_customization_tab = glade_xml_get_widget (sdialog->gui, "account-editor-dn-customization-vbox");
-	gtk_object_ref (GTK_OBJECT (sdialog->dn_customization_tab));
-#endif
-
-	addressbook_source_dialog_set_source (sdialog, source);
-
-	set_advanced_button_state (sdialog);
-
-#ifdef NEW_ADVANCED_UI
-	gtk_signal_connect (GTK_OBJECT (fewer_options_button),
-			    "clicked", advanced_button_clicked, sdialog);
-	gtk_signal_connect (GTK_OBJECT (more_options_button),
-			    "clicked", advanced_button_clicked, sdialog);
-
-#else
-	gtk_widget_hide (sdialog->advanced_button_notebook);
-#endif
-
-#ifdef NEW_ADVANCED_UI
-	/* set up a signal handler to query for schema info if the user switches to the advanced tabs */
-	gtk_signal_connect (GTK_OBJECT (sdialog->notebook), "switch_page",
-			    GTK_SIGNAL_FUNC (edit_dialog_switch_page), sdialog);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (sdialog->ok_button),
-			    "clicked", GTK_SIGNAL_FUNC(edit_dialog_ok_clicked), sdialog);
-	gtk_signal_connect (GTK_OBJECT (sdialog->apply_button),
-			    "clicked", GTK_SIGNAL_FUNC(edit_dialog_apply_clicked), sdialog);
-	gtk_signal_connect (GTK_OBJECT (sdialog->close_button),
-			    "clicked", GTK_SIGNAL_FUNC(edit_dialog_close_clicked), sdialog);
-	gtk_signal_connect (GTK_OBJECT(sdialog->window), "destroy",
-			    GTK_SIGNAL_FUNC(addressbook_source_dialog_destroy), sdialog);
-
-	gtk_widget_set_sensitive (sdialog->ok_button, FALSE);
-	gtk_widget_set_sensitive (sdialog->apply_button, FALSE);
-
-	gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE);
-
-	gtk_widget_show (sdialog->window);
-
-	return sdialog;
-}
-
-static void
-add_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	addressbook_add_server_druid (dialog);
-}
-
-static void
-edit_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	int i;
-	ESelectionModel *selection_model;
-	int row_count;
-	
-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->sourcesTable)));
-	row_count = e_selection_model_row_count (selection_model);
-
-	for (i = 0; i < row_count; i ++) {
-		if (e_selection_model_is_row_selected (selection_model, i)) {
-			AddressbookSource *source = e_table_memory_get_data (E_TABLE_MEMORY(dialog->sourcesModel), i);
-			AddressbookSourceDialog *sdialog;
-			sdialog = addressbook_edit_server_dialog (dialog, source, i);
-			break; /* single select so we're done now */
-		}
-	}
-
-#if 0
-	AddressbookSource *source;
-	AddressbookSourceDialog *sdialog;
-
-	source = gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row);
-
-	sdialog = addressbook_config_source_with_gui (dialog->gui, source, dialog->page);
-	if (sdialog->id == 0) {
-		/* Ok was clicked */
-		source = addressbook_source_copy(sdialog->source);
-
-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 0, source->name);
-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 1, source->host);
-		gtk_clist_set_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row, source);
-
-		evolution_config_control_changed (dialog->config_control);
-
-		update_sensitivity (dialog);
-	}
-#endif
-}
-
-static void
-delete_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	int i;
-	ESelectionModel *selection_model;
-	int row_count;
-	
-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->sourcesTable)));
-	row_count = e_selection_model_row_count (selection_model);
-
-	for (i = 0; i < row_count; i ++) {
-		if (e_selection_model_is_row_selected (selection_model, i)) {
-			AddressbookSource *source = e_table_memory_get_data (E_TABLE_MEMORY(dialog->sourcesModel), i);
-			e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog->sourcesModel), i);
-			addressbook_source_free (source);
-
-			break; /* single select so we're done now */
-		}
-	}
-
-	evolution_config_control_changed (dialog->config_control);
-}
-
-static void
-ldap_config_control_destroy_callback (EvolutionConfigControl *config_control,
-				      void *data)
-{
-	AddressbookDialog *dialog;
-
-	dialog = (AddressbookDialog *) data;
-
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-
-	/* XXX free more stuff here */
-
-	g_free (dialog);
-}
-
-static void
-ldap_config_control_apply_callback (EvolutionConfigControl *config_control,
-				    void *data)
-{
-	AddressbookDialog *dialog;
-	int i;
-	int count;
-
-	dialog = (AddressbookDialog *) data;
-
-	addressbook_storage_clear_sources();
-
-	count = e_table_model_row_count (E_TABLE_MODEL (dialog->sourcesModel));
-
-	for (i = 0; i < count; i ++) {
-		AddressbookSource *source = e_table_memory_get_data (E_TABLE_MEMORY (dialog->sourcesModel), i);
-		addressbook_storage_add_source (addressbook_source_copy (source));
-	}
-
-	addressbook_storage_write_sources();
-}
-
-static void
-sources_selection_changed (ESelectionModel *esm, AddressbookDialog *dialog)
-{
-	gboolean sensitive = e_selection_model_selected_count (esm) == 1;
-
-	gtk_widget_set_sensitive (dialog->editSource, sensitive);
-	gtk_widget_set_sensitive (dialog->deleteSource, sensitive);
-}
-
-static AddressbookDialog *
-ldap_dialog_new (GNOME_Evolution_Shell shell)
-{
-	AddressbookDialog *dialog;
-	GList *l;
-	ESelectionModel *esm;
-
-	dialog = g_new0 (AddressbookDialog, 1);
-
-	dialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);
-	dialog->shell = shell;
-
-	dialog->sourcesTable = glade_xml_get_widget (dialog->gui, "sourcesTable");
-	dialog->sourcesModel = gtk_object_get_data (GTK_OBJECT (dialog->sourcesTable), "model");
-	
-	dialog->addSource = glade_xml_get_widget (dialog->gui, "addSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->addSource), "clicked",
-			    GTK_SIGNAL_FUNC (add_source_clicked),
-			    dialog);
-
-	dialog->editSource = glade_xml_get_widget (dialog->gui, "editSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->editSource), "clicked",
-			    GTK_SIGNAL_FUNC (edit_source_clicked),
-			    dialog);
-
-	dialog->deleteSource = glade_xml_get_widget (dialog->gui, "deleteSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->deleteSource), "clicked",
-			    GTK_SIGNAL_FUNC (delete_source_clicked),
-			    dialog);
-
-	l = addressbook_storage_get_sources ();
-	for (; l != NULL; l = l->next) {
-		AddressbookSource *source;
-
-		source = addressbook_source_copy ((AddressbookSource*)l->data);
-
-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog->sourcesModel),
-					     -1, source, source->name, source->host);
-	}
-
-	esm = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog->sourcesTable)));
-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed",
-			    GTK_SIGNAL_FUNC (sources_selection_changed), dialog);
-
-	sources_selection_changed (esm, dialog);
-
-	dialog->page = glade_xml_get_widget (dialog->gui, "addressbook-sources");
-
-	return dialog;
-}
-
-static ETableMemoryStoreColumnInfo sources_table_columns[] = {
-	E_TABLE_MEMORY_STORE_STRING,
-	E_TABLE_MEMORY_STORE_STRING,
-	E_TABLE_MEMORY_STORE_TERMINATOR
-};
-
-#define SOURCES_TABLE_SPEC \
-"<ETableSpecification cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"0\" _title=\"Account Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"1\" _title=\"Server Name\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableState> \
-    <column source=\"0\"/> \
-    <column source=\"1\"/> \
-    <grouping></grouping> \
-  </ETableState> \
-</ETableSpecification>"
-
-GtkWidget*
-addressbook_dialog_create_sources_table (char *name, char *string1, char *string2, int num1, int num2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-	
-	model = e_table_memory_store_new (sources_table_columns);
-
-	table = e_table_scrolled_new (model, NULL, SOURCES_TABLE_SPEC, NULL);
-
-	gtk_object_set_data (GTK_OBJECT (table), "model", model);
-
-	return table;
-}
-#endif /* HAVE_LDAP */
-
-static EvolutionConfigControl *
-ldap_config_control_new (GNOME_Evolution_Shell shell)
-{
-	GtkWidget *control_widget;
-	EvolutionConfigControl *control;
-
-#ifdef HAVE_LDAP
-	AddressbookDialog *dialog;
-
-	dialog = ldap_dialog_new (shell);
-
-	control_widget = dialog->page;
-
-	gtk_widget_ref (control_widget);
-
-	gtk_container_remove (GTK_CONTAINER (control_widget->parent), control_widget);
-#else
-	control_widget = gtk_label_new (_("LDAP was not enabled in this build of Evolution"));
-	gtk_widget_set_sensitive (control_widget, FALSE);
-	gtk_widget_show (control_widget);
-#endif
-
-	control = evolution_config_control_new (control_widget);
-
-#ifdef HAVE_LDAP
-	dialog->config_control = control;
-	gtk_signal_connect (GTK_OBJECT (dialog->config_control), "apply",
-			    GTK_SIGNAL_FUNC (ldap_config_control_apply_callback), dialog);
-	gtk_signal_connect (GTK_OBJECT (dialog->config_control), "destroy",
-			    GTK_SIGNAL_FUNC (ldap_config_control_destroy_callback), dialog);
-
-	gtk_widget_unref (dialog->page);
-#endif
-
-	return control;
-}
-
-static void
-addressbook_folder_list_changed_callback (EFolderList *efl,
-					  EvolutionConfigControl *control)
-{
-	evolution_config_control_changed (control);
-}
-
-static void
-addressbook_config_control_destroy_callback (EvolutionConfigControl *config_control,
-					     void *data)
-{
-}
-
-
-static void
-addressbook_config_control_apply_callback (EvolutionConfigControl *config_control,
-					   EFolderList *list)
-{
-	Bonobo_ConfigDatabase config_db;
-	char *xml;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	config_db = addressbook_config_database(&ev);
-
-	xml = e_folder_list_get_xml (list);
-	bonobo_config_set_string (config_db, "/Addressbook/Completion/uris", xml, &ev);
-	g_free (xml);
-
-	CORBA_exception_free (&ev);
-}
-
-static EvolutionConfigControl *
-addressbook_config_control_new (GNOME_Evolution_Shell shell)
-{
-	GtkWidget *control_widget;
-	EvolutionConfigControl *control;
-	EvolutionShellClient *shell_client;
-	Bonobo_ConfigDatabase config_db;
-	char *xml;
-	CORBA_Environment ev;
-	static const char *possible_types[] = { "contacts", "ldap-contacts", NULL };
-
-	CORBA_exception_init (&ev);
-
-	config_db = addressbook_config_database(&ev);
-
-	xml = bonobo_config_get_string (config_db, "/Addressbook/Completion/uris", &ev);
-	shell_client = evolution_shell_client_new (shell);
-	control_widget = e_folder_list_new (shell_client,
-					    xml);
-	bonobo_object_client_unref (BONOBO_OBJECT_CLIENT (shell_client), NULL);
-	g_free (xml);
-
-	gtk_object_set (GTK_OBJECT (control_widget),
-			"title", _("Extra Completion folders"),
-			"possible_types", possible_types,
-			NULL);
-
-	gtk_widget_show (control_widget);
-
-	control = evolution_config_control_new (control_widget);
-
-	gtk_signal_connect (GTK_OBJECT (control_widget), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_folder_list_changed_callback), control);
-	gtk_signal_connect (GTK_OBJECT (control), "apply",
-			    GTK_SIGNAL_FUNC (addressbook_config_control_apply_callback), control_widget);
-	gtk_signal_connect (GTK_OBJECT (control), "destroy",
-			    GTK_SIGNAL_FUNC (addressbook_config_control_destroy_callback), control_widget);
-
-	CORBA_exception_free (&ev);
-
-	return control;
-}
-
-
-/* Implementation of the factory for the configuration control.  */
-
-static BonoboGenericFactory *factory = NULL;
-
-static BonoboObject *
-config_control_factory_fn (BonoboGenericFactory *factory,
-			   const char *component_id,
-			   void *data)
-{
-	GNOME_Evolution_Shell shell;
-	EvolutionConfigControl *control;
-
-	shell = (GNOME_Evolution_Shell) data;
-
-	if (!strcmp (component_id, LDAP_CONFIG_CONTROL_ID)) {
-		control = ldap_config_control_new (shell);
-	} else if (!strcmp (component_id, ADDRESSBOOK_CONFIG_CONTROL_ID)) {
-		control = addressbook_config_control_new (shell);
-	} else {
-		control = NULL;
-		g_assert_not_reached ();
-	}
-
-	return BONOBO_OBJECT (control);
-}
-
-gboolean
-addressbook_config_register_factory (GNOME_Evolution_Shell shell)
-{
-	g_return_val_if_fail (shell != CORBA_OBJECT_NIL, FALSE);
-
-	factory = bonobo_generic_factory_new_multi (CONFIG_CONTROL_FACTORY_ID,
-						    config_control_factory_fn,
-						    shell);
-
-	if (factory != NULL) {
-		return TRUE;
-	} else {
-		g_warning ("Cannot register factory %s", CONFIG_CONTROL_FACTORY_ID);
-		return FALSE;
-	}
-}
-
-void
-addressbook_config_create_new_source (const char *new_source, GtkWidget *parent)
-{
-#ifdef HAVE_LDAP
-#if 0
-	AddressbookSourceDialog *dialog;
-	GladeXML *gui;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);
-
-	dialog = addressbook_source_dialog (gui, NULL, parent);
-
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->name), new_source);
-
-	gnome_dialog_close_hides (GNOME_DIALOG(dialog->dialog), TRUE);
-
-	dialog->id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog->dialog));
-	
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-
-	if (dialog->id == 0) {
-		/* Ok was clicked */
-		addressbook_storage_add_source (addressbook_source_copy(dialog->source));
-		addressbook_storage_write_sources();
-	}
-#endif
-#endif /* HAVE_LDAP */
-}
-
-#ifdef STANDALONE
-int
-main(int argc, char **argv)
-{
-	AddressbookDialog *dialog;
-
-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",
-				    argc, argv, oaf_popt_options, 0, NULL);
-
-	glade_gnome_init ();
-
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-#if 0
-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-#endif
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	dialog = ldap_dialog_new (NULL);
-
-	gtk_widget_show (glade_xml_get_widget (dialog->gui, "addressbook-sources-window"));
-
-	gtk_main();
-
-	return 0;
-}
-#endif
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
deleted file mode 100644
index 668c55bbd3..0000000000
--- a/addressbook/gui/component/addressbook-config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- **/
-
-#ifndef __ADDRESSBOOK_CONFIG_H__
-#define __ADDRESSBOOK_CONFIG_H__
-
-#include "addressbook-storage.h"
-
-void  addressbook_config_create_new_source  (const char            *new_source,
-					     GtkWidget             *parent);
-
-gboolean  addressbook_config_register_factory  (GNOME_Evolution_Shell shell);
-
-#endif /* __ADDRESSBOOK_CONFIG_H__ */
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
deleted file mode 100644
index 6f675894e0..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * sample-control-factory.c
- *
- * Copyright 1999, Ximian, Inc.
- * 
- * Author:
- *   Nat Friedman (nat@nat.org)
- *
- */
-
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-main.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-#include <e-util/e-passwords.h>
-
-#include <camel/camel.h>
-
-#ifdef GTKHTML_HAVE_GCONF
-#include <gconf/gconf.h>
-#endif
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "e-address-widget.h"
-#include "e-address-popup.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"));
-
-#ifdef GTKHTML_HAVE_GCONF
-	gconf_init (argc, argv, NULL);
-#endif
-
-	glade_gnome_init ();
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	free (malloc (5));
-	
-	init_corba (&argc, argv);
-
-	init_bonobo (argc, argv);
-
-	if (!gnome_vfs_init ())
-		g_error (_("Could not initialize gnome-vfs"));
-
-	/* 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_address_widget_factory_init ();
-	e_address_popup_factory_init ();
-
-	e_cursors_init();
-
-	e_passwords_init("Addressbook");
-
-#if 0
-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-#endif
-
-	/*g_thread_init (NULL);*/
-	camel_type_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	g_print ("Evolution Addressbook up and running\n");
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
deleted file mode 100644
index d3430dd476..0000000000
--- a/addressbook/gui/component/addressbook-storage.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 addressbook-sources.xml file goes like this:
-
-   <?xml version="1.0"?>
-   <addressbooks>
-     <contactserver>
-           <name>LDAP Server</name>
-	   <host>ldap.server.com</host>
-	   <port>389</port>
-	   <rootdn></rootdn>
-	   <authmethod>simple</authmethod>
-	   <emailaddr>toshok@blubag.com</emailaddr>
-	   <limit>100</limit>
-	   <rememberpass/>
-     </contactserver>
-   </addressbooks>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "addressbook-storage.h"
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <bonobo/bonobo-object.h>
-
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "evolution-shell-component.h"
-
-#include "addressbook-config.h"
-
-#define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml"
-
-#ifdef HAVE_LDAP
-static gboolean load_source_data (const char *file_path);
-#endif
-
-static gboolean save_source_data (const char *file_path);
-static void deregister_storage (void);
-
-static GList *sources;
-static EvolutionStorage *storage;
-static char *storage_path;
-static GNOME_Evolution_Shell corba_shell;
-
-void
-addressbook_storage_setup (EvolutionShellComponent *shell_component,
-			   const char *evolution_homedir)
-{
-	EvolutionShellClient *shell_client;
-
-	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));
-
-	sources = NULL;
-
-	if (storage_path)
-		g_free (storage_path);
-	storage_path = g_concat_dir_and_file (evolution_homedir, ADDRESSBOOK_SOURCES_XML);
-#ifdef HAVE_LDAP
-	if (!load_source_data (storage_path))
-		deregister_storage ();
-#endif 
-}
-
-#ifdef HAVE_LDAP
-static void
-notify_listener (const Bonobo_Listener listener, 
-		 GNOME_Evolution_Storage_Result corba_result)
-{
-	CORBA_any any;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	any._type = TC_GNOME_Evolution_Storage_Result;
-	any._value = &corba_result;
-
-	Bonobo_Listener_event (listener, "result", &any, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-remove_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener,
-		    const CORBA_char *path, const CORBA_char *physical_uri,
-		    gpointer data)
-{
-	
-	addressbook_storage_remove_source (path + 1);
-	addressbook_storage_write_sources();
-
-	notify_listener (listener, GNOME_Evolution_Storage_OK);
-}
-
-static void
-create_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener,
-		    const CORBA_char *path, const CORBA_char *type,
-		    const CORBA_char *description, const CORBA_char *parent_physical_uri,
-		    gpointer data)
-{
-	if (strcmp (type, "ldap-contacts")) {
-		notify_listener (listener, GNOME_Evolution_Storage_UNSUPPORTED_TYPE);
-		return;
-	}
-
-	if (strcmp (parent_physical_uri, "")) {/* ldap servers can't have subfolders */
-		notify_listener (listener, GNOME_Evolution_Storage_INVALID_URI);
-		return;
-	}
-	addressbook_config_create_new_source (path + 1, NULL);
-
-	notify_listener (listener, GNOME_Evolution_Storage_OK);
-}
-#endif
-
-
-EvolutionStorage *
-addressbook_get_other_contact_storage (void) 
-{
-#ifdef HAVE_LDAP
-	EvolutionStorageResult result;
-
-	if (storage == NULL) {
-		storage = evolution_storage_new (U_("Other Contacts"), FALSE);
-		gtk_signal_connect (GTK_OBJECT (storage),
-				    "remove_folder",
-				    GTK_SIGNAL_FUNC(remove_ldap_folder), NULL);
-		gtk_signal_connect (GTK_OBJECT (storage),
-				    "create_folder",
-				    GTK_SIGNAL_FUNC(create_ldap_folder), NULL);
-		result = evolution_storage_register_on_shell (storage, corba_shell);
-		switch (result) {
-		case EVOLUTION_STORAGE_OK:
-			break;
-		case EVOLUTION_STORAGE_ERROR_GENERIC : 
-			g_warning("register_storage: generic error");
-			break;
-		case EVOLUTION_STORAGE_ERROR_CORBA : 
-			g_warning("register_storage: corba error");
-			break;
-		case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED :
-			g_warning("register_storage: already registered error");
-			break;
-		case EVOLUTION_STORAGE_ERROR_EXISTS :
-			g_warning("register_storage: already exists error");
-			break;
-		default:
-			g_warning("register_storage: other error");
-			break;
-		}
-	}
-#endif
-
-	return storage;
-}
-
-static void 
-deregister_storage (void)
-{
-	if (evolution_storage_deregister_on_shell (storage, corba_shell) != 
-	    EVOLUTION_STORAGE_OK) {
-		g_warning("couldn't deregister storage");
-	}
-
-	storage = NULL;
-}
-
-#ifdef HAVE_LDAP
-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 int
-get_integer_value (xmlNode *node,
-		   const char *name,
-		   int defval)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	int retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return defval;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the default */
-		return defval;
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = atoi (xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-#endif
-
-static char *
-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
-{
-	switch (auth_type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return "none";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:
-		return "ldap/simple-email";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
-		return "ldap/simple-binddn";
-	default:
-		g_assert(0);
-		return "none";
-	}
-}
-
-#ifdef HAVE_LDAP
-static AddressbookLDAPAuthType
-ldap_parse_auth (const char *auth)
-{
-	if (!auth)
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-
-	if (!strcmp (auth, "ldap/simple-email") || !strcmp (auth, "simple"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL;
-	else if (!strcmp (auth, "ldap/simple-binddn"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN;
-	else
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-}
-#endif
-
-static char *
-ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
-{
-	switch (scope_type) {
-	case ADDRESSBOOK_LDAP_SCOPE_BASE:
-		return "base";
-	case ADDRESSBOOK_LDAP_SCOPE_ONELEVEL:
-		return "one";
-	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:
-		return "sub";
-	default:
-		g_assert(0);
-		return "";
-	}
-}
-
-#ifdef HAVE_LDAP
-static AddressbookLDAPScopeType
-ldap_parse_scope (const char *scope)
-{
-	if (!scope)
-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE; /* XXX good default? */
-
-	if (!strcmp (scope, "base"))
-		return ADDRESSBOOK_LDAP_SCOPE_BASE;
-	else if (!strcmp (scope, "one"))
-		return ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-	else
-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE;
-}
-#endif
-
-static char *
-ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)
-{
-	switch (ssl_type) {
-	case ADDRESSBOOK_LDAP_SSL_NEVER:
-		return "never";
-	case ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE:
-		return "whenever_possible";
-	case ADDRESSBOOK_LDAP_SSL_ALWAYS:
-		return "always";
-	default:
-		g_assert(0);
-		return "";
-	}
-}
-
-#ifdef HAVE_LDAP
-static AddressbookLDAPSSLType
-ldap_parse_ssl (const char *ssl)
-{
-	if (!ssl)
-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; /* XXX good default? */
-
-	if (!strcmp (ssl, "always"))
-		return ADDRESSBOOK_LDAP_SSL_ALWAYS;
-	else if (!strcmp (ssl, "never"))
-		return ADDRESSBOOK_LDAP_SSL_NEVER;
-	else
-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-}
-#endif
-
-const char*
-addressbook_storage_auth_type_to_string (AddressbookLDAPAuthType auth_type)
-{
-	return ldap_unparse_auth (auth_type);
-}
-
-void
-addressbook_storage_init_source_uri (AddressbookSource *source)
-{
-	GString *str;
-
-	if (source->uri)
-		g_free (source->uri);
-
-	str = g_string_new ("ldap://");
-
-	g_string_sprintfa (str, "%s:%s/%s?"/*trigraph prevention*/"?%s",
-			   source->host, source->port, source->rootdn, ldap_unparse_scope (source->scope));
-
-	g_string_sprintfa (str, ";limit=%d", source->limit);
-
-	g_string_sprintfa (str, ";ssl=%s", ldap_unparse_ssl (source->ssl));
-
-#if 0
-	g_string_sprintfa (str, ";timeout=%d", source->timeout);
-#endif
-
-	source->uri = str->str;
-
-	g_string_free (str, FALSE);
-}
-
-#ifdef HAVE_LDAP
-static gboolean
-load_source_data (const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
-	addressbook_get_other_contact_storage();
-
- tryagain:
-	doc = xmlParseFile (file_path);
-	if (doc == NULL) {
-		/* Check to see if a addressbook-sources.xml.new file
-                   exists.  If it does, rename it and try loading 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 (rv < 0) {
-				g_error ("Failed to rename %s: %s\n",
-					 file_path,
-					 strerror(errno));
-				return FALSE;
-			} else
-				goto tryagain;
-		}
-
-		g_free (new_path);
-		return FALSE;
-	}
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "addressbooks") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *path;
-		AddressbookSource *source;
-
-		source = g_new0 (AddressbookSource, 1);
-
-		if (!strcmp (child->name, "contactserver")) {
-			source->port   = get_string_value (child, "port");
-			source->host   = get_string_value (child, "host");
-			source->rootdn = get_string_value (child, "rootdn");
-			source->scope  = ldap_parse_scope (get_string_value (child, "scope"));
-			source->auth   = ldap_parse_auth (get_string_value (child, "authmethod"));
-			source->ssl    = ldap_parse_ssl (get_string_value (child, "ssl"));
-			source->email_addr = get_string_value (child, "emailaddr");
-			source->binddn = get_string_value (child, "binddn");
-			source->limit  = get_integer_value (child, "limit", 100);
-		}
-		else {
-			g_warning ("unknown node '%s' in %s", child->name, file_path);
-			g_free (source);
-			continue;
-		}
-
-		addressbook_storage_init_source_uri (source);
-
-		source->name = get_string_value (child, "name");
-		source->description = get_string_value (child, "description");
-
-		path = g_strdup_printf ("/%s", source->name);
-		evolution_storage_new_folder (storage, path, source->name,
-					      "ldap-contacts", source->uri,
-					      source->description, 0);
-
-		sources = g_list_append (sources, source);
-
-		g_free (path);
-	}
-
-	if (g_list_length (sources) == 0)
-		deregister_storage();
-
-	xmlFreeDoc (doc);
-	return TRUE;
-}
-#endif
-
-static void
-ldap_source_foreach(AddressbookSource *source, xmlNode *root)
-{
-	xmlNode *source_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactserver");
-
-	xmlAddChild (root, source_root);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "name",
-		     (xmlChar *) source->name);
-	xmlNewChild (source_root, NULL, (xmlChar *) "description",
-		     (xmlChar *) source->description);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "port",
-		     (xmlChar *) source->port);
-	xmlNewChild (source_root, NULL, (xmlChar *) "host",
-		     (xmlChar *) source->host);
-	xmlNewChild (source_root, NULL, (xmlChar *) "rootdn",
-		     (xmlChar *) source->rootdn);
-	xmlNewChild (source_root, NULL, (xmlChar *) "scope",
-		     (xmlChar *) ldap_unparse_scope(source->scope));
-	xmlNewChild (source_root, NULL, (xmlChar *) "authmethod",
-		     (xmlChar *) ldap_unparse_auth(source->auth));
-	xmlNewChild (source_root, NULL, (xmlChar *) "ssl",
-		     (xmlChar *) ldap_unparse_ssl(source->ssl));
-
-	if (source->limit != 100) {
-		char *string;
-		string = g_strdup_printf ("%d", source->limit);
-		xmlNewChild (source_root, NULL, (xmlChar *) "limit",
-			     (xmlChar *) string);
-		g_free (string);
-	}
-
-	if (source->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
-		if (source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)
-			xmlNewChild (source_root, NULL, (xmlChar *) "binddn",
-				     (xmlChar *) source->binddn);
-		else
-			xmlNewChild (source_root, NULL, (xmlChar *) "emailaddr",
-				     (xmlChar *) source->email_addr);
-
-		if (source->remember_passwd)
-			xmlNewChild (source_root, NULL, (xmlChar *) "rememberpass",
-				     NULL);
-	}
-}
-
-static gboolean
-save_source_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 *) "addressbooks", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	g_list_foreach (sources, (GFunc)ldap_source_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 %s: xmlBufferCreate() == NULL", file_path);
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new %s: %s\n", file_path, strerror(errno));
-		unlink (new_path);
-		return FALSE;
-	}
-	else {
-		if (0 > rename (new_path, file_path)) {
-			g_error ("Failed to rename %s: %s\n", file_path, strerror(errno));
-			unlink (new_path);
-			return FALSE;
-		}
-		return TRUE;
-	}
-}
-
-void
-addressbook_storage_add_source (AddressbookSource *source)
-{
-	char *path;
-
-	sources = g_list_append (sources, source);
-
-	/* And then to the ui */
-	addressbook_get_other_contact_storage();
-	path = g_strdup_printf ("/%s", source->name);
-	evolution_storage_new_folder (storage, path, source->name, "ldap-contacts",
-				      source->uri, source->description, 0);
-
-	g_free (path);
-}
-
-void
-addressbook_storage_remove_source (const char *name)
-{
-	char *path;
-	AddressbookSource *source = NULL;
-	GList *l;
-
-	/* remove it from our hashtable */
-	for (l = sources; l; l = l->next) {
-		AddressbookSource *s = l->data;
-		if (!strcmp (s->name, name)) {
-			source = s;
-			break;
-		}
-	}
-
-	if (!source)
-		return;
-
-	sources = g_list_remove_link (sources, l);
-	g_list_free_1 (l);
-
-	addressbook_source_free (source);
-
-	/* and then from the ui */
-	path = g_strdup_printf ("/%s", name);
-	evolution_storage_removed_folder (storage, path);
-
-	if (g_list_length (sources) == 0) 
-		deregister_storage ();
-
-	g_free (path);
-}
-
-GList *
-addressbook_storage_get_sources ()
-{
-	return sources;
-}
-
-AddressbookSource *
-addressbook_storage_get_source_by_uri (const char *uri)
-{
-	GList *l;
-
-	for (l = sources; l ; l = l->next) {
-		AddressbookSource *source = l->data;
-		if (!strcmp (uri, source->uri))
-			return source;
-	}
-
-	return NULL;
-}
-
-void
-addressbook_source_free (AddressbookSource *source)
-{
-	g_free (source->name);
-	g_free (source->description);
-	g_free (source->uri);
-	g_free (source->host);
-	g_free (source->port);
-	g_free (source->rootdn);
-	g_free (source->email_addr);
-	g_free (source->binddn);
-
-	g_free (source);
-}
-
-static void
-addressbook_source_foreach (AddressbookSource *source, gpointer data)
-{
-	char *path = g_strdup_printf ("/%s", source->name);
-
-	evolution_storage_removed_folder (storage, path);
-
-	g_free (path);
-
-	addressbook_source_free (source);
-}
-
-void
-addressbook_storage_clear_sources (void)
-{
-	g_list_foreach (sources, (GFunc)addressbook_source_foreach, NULL);
-	g_list_free (sources);
-	deregister_storage ();
-	sources = NULL;
-}
-
-void
-addressbook_storage_write_sources (void)
-{
-	save_source_data (storage_path);
-}
-
-AddressbookSource *
-addressbook_source_copy (const AddressbookSource *source)
-{
-	AddressbookSource *copy;
-
-	copy = g_new0 (AddressbookSource, 1);
-	copy->name = g_strdup (source->name);
-	copy->description = g_strdup (source->description);
-	copy->uri = g_strdup (source->uri);
-
-	copy->host = g_strdup (source->host);
-	copy->port = g_strdup (source->port);
-	copy->rootdn = g_strdup (source->rootdn);
-	copy->scope = source->scope;
-	copy->auth = source->auth;
-	copy->ssl = source->ssl;
-	copy->email_addr = g_strdup (source->email_addr);
-	copy->binddn = g_strdup (source->binddn);
-	copy->remember_passwd = source->remember_passwd;
-	copy->limit = source->limit;
-
-	return copy;
-}
diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
deleted file mode 100644
index 541d8096f7..0000000000
--- a/addressbook/gui/component/addressbook-storage.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 __ADDRESSBOOK_STORAGE_H__
-#define __ADDRESSBOOK_STORAGE_H__
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-typedef enum {
-	ADDRESSBOOK_LDAP_AUTH_NONE,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN,
-} AddressbookLDAPAuthType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
-	ADDRESSBOOK_LDAP_SCOPE_BASE,
-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
-	ADDRESSBOOK_LDAP_SCOPE_LAST
-} AddressbookLDAPScopeType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SSL_ALWAYS,
-	ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE,
-	ADDRESSBOOK_LDAP_SSL_NEVER
-} AddressbookLDAPSSLType;
-
-typedef struct {
-	char *name;
-	char *description;
-	char *host;
-	char *port;
-	char *rootdn;
-	AddressbookLDAPScopeType scope;
-	AddressbookLDAPAuthType auth;
-	AddressbookLDAPSSLType ssl;
-	char *email_addr;                   /* used in AUTH_SIMPLE_EMAIL */
-	char *binddn;                       /* used in AUTH_SIMPLE_BINDDN */
-	gboolean remember_passwd;
-	int limit;
-
-	char *uri; /* filled in from the above */
-} AddressbookSource;
-
-void addressbook_storage_setup (EvolutionShellComponent *shell_component,
-				const char *evolution_homedir);
-
-EvolutionStorage  *addressbook_get_other_contact_storage (void);
-GList             *addressbook_storage_get_sources (void);
-AddressbookSource *addressbook_storage_get_source_by_uri (const char *uri);
-void               addressbook_storage_clear_sources (void);
-void               addressbook_storage_write_sources (void);
-AddressbookSource *addressbook_source_copy (const AddressbookSource *source);
-void               addressbook_source_free (AddressbookSource *source);
-void               addressbook_storage_init_source_uri (AddressbookSource *source);
-
-void               addressbook_storage_add_source (AddressbookSource *source);
-void               addressbook_storage_remove_source (const char *name);
-const char*        addressbook_storage_auth_type_to_string (AddressbookLDAPAuthType auth_type);
-
-#endif /* __ADDRESSBOOK_STORAGE_H__ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index 332ddf3b56..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,1138 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * addressbook.c: 
- *
- * Author:
- *   Chris Lahey (clahey@ximian.com)
- *
- * (C) 2000 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "e-util/e-categories-master-list-wombat.h"
-#include "e-util/e-sexp.h"
-#include "e-util/e-passwords.h"
-#include "select-names/e-select-names.h"
-#include "select-names/e-select-names-manager.h"
-
-#include "evolution-shell-component-utils.h"
-#include "evolution-activity-client.h"
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook-config.h"
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-#include "addressbook/printing/e-contact-print.h"
-
-#include <ebook/e-book.h>
-#include <ebook/e-book-util.h>
-#include <widgets/misc/e-search-bar.h>
-#include <widgets/misc/e-filter-bar.h>
-
-/* This is used for the addressbook status bar */
-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "evolution-contacts-mini.png"
-static GdkPixbuf *progress_icon[2] = { NULL, NULL };
-
-#define d(x)
-
-#define PROPERTY_FOLDER_URI          "folder_uri"
-
-#define PROPERTY_FOLDER_URI_IDX      1
-
-typedef struct {
-	gint refs;
-	EAddressbookView *view;
-	ESearchBar *search;
-	gint        ecml_changed_id;
-	GtkWidget *vbox;
-	EvolutionActivityClient *activity;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	char *uri;
-	char *passwd;
-	gboolean ignore_search_changes;
-} AddressbookView;
-
-static void addressbook_view_ref (AddressbookView *);
-static void addressbook_view_unref (AddressbookView *);
-
-static void
-new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view) {
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-
-		g_assert (E_IS_BOOK (book));
-
-		e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, e_addressbook_view_can_create(view->view));
-	}
-}
-
-static void
-new_contact_list_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view) {
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-
-		g_assert (E_IS_BOOK (book));
-
-		e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, e_addressbook_view_can_create(view->view));
-	}
-}
-
-static void
-save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_save_as(view->view);
-}
-
-static void
-view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_view(view->view);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view)
-		gtk_widget_show(e_addressbook_search_dialog_new(view->view));
-}
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_delete_selection(view->view);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_print(view->view);
-}
-
-static void
-print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_print_preview(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_stop(view->view);
-}
-
-static void
-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_cut(view->view);
-}
-
-static void
-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_copy(view->view);
-}
-
-static void
-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_paste(view->view);
-}
-
-static void
-select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_select_all (view->view);
-}
-
-static void
-send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_send (view->view);
-}
-
-static void
-send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_send_to (view->view);
-}
-
-static void
-copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_copy_to_folder (view->view);
-}
-
-static void
-move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_move_to_folder (view->view);
-}
-
-static void
-forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	e_passwords_forget_passwords();
-}
-
-static void
-update_command_state (EAddressbookView *eav, AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	if (view->view == NULL)
-		return;
-
-	addressbook_view_ref (view);
-
-	uic = bonobo_control_get_ui_component (view->control);
-
-	if (bonobo_ui_component_get_container (uic) != CORBA_OBJECT_NIL) {
-
-		/* New Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactNew",
-					      "sensitive",
-					      e_addressbook_view_can_create (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactNewList",
-					      "sensitive",
-					      e_addressbook_view_can_create (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSaveAsVCard",
-					      "sensitive",
-					      e_addressbook_view_can_save_as (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsView",
-					      "sensitive",
-					      e_addressbook_view_can_view (view->view) ? "1" : "0", NULL);
-
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrint",
-					      "sensitive",
-					      e_addressbook_view_can_print (view->view) ? "1" : "0", NULL);
-
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrintPreview",
-					      "sensitive",
-					      e_addressbook_view_can_print (view->view) ? "1" : "0", NULL);
-
-		/* Delete Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactDelete",
-					      "sensitive",
-					      e_addressbook_view_can_delete (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCut",
-					      "sensitive",
-					      e_addressbook_view_can_cut (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopy",
-					      "sensitive",
-					      e_addressbook_view_can_copy (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPaste",
-					      "sensitive",
-					      e_addressbook_view_can_paste (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSelectAll",
-					      "sensitive",
-					      e_addressbook_view_can_select_all (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendContactToOther",
-					      "sensitive",
-					      e_addressbook_view_can_send (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendMessageToContact",
-					      "sensitive",
-					      e_addressbook_view_can_send_to (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsMoveToFolder",
-					      "sensitive",
-					      e_addressbook_view_can_move_to_folder (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopyToFolder",
-					      "sensitive",
-					      e_addressbook_view_can_copy_to_folder (view->view) ? "1" : "0", NULL);
-
-		/* Stop */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactStop",
-					      "sensitive",
-					      e_addressbook_view_can_stop (view->view) ? "1" : "0", NULL);
-	}
-
-	addressbook_view_unref (view);
-}
-
-static void
-change_view_type (AddressbookView *view, EAddressbookViewType view_type)
-{
-	gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrintPreview", print_preview_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSaveAsVCard", save_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsView", view_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactNewList", new_contact_list_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsCut", cut_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopy", copy_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPaste", paste_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSelectAll", select_all_contacts_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendContactToOther", send_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendMessageToContact", send_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsMoveToFolder", move_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopyToFolder", copy_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsForgetPasswords", forget_passwords_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/New/NewFirstItem/ContactNew", "evolution-contacts-mini.png"),
-	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "save-as-16.png"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrint", "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "print-preview.xpm"),
-
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "evolution-trash-mini.png"),
-
-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/ToolSearch", "search-16.png"),
-
-	E_PIXMAP ("/Toolbar/ContactsPrint", "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/ContactDelete", "buttons/delete-message.png"),
-
-	E_PIXMAP_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);
-
-	e_search_bar_set_ui_component (view->search, uic);
-
-	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");
-
-	e_addressbook_view_setup_menus (view->view, uic);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	update_command_state (view->view, view);
-}
-
-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);
-		if (activate && view->view && view->view->model)
-			e_addressbook_model_force_folder_bar_message (view->view->model);
-
-	} else {
-		bonobo_ui_component_unset_container (uic);
-		e_addressbook_view_discard_menus (view->view);
-	}
-}
-
-static void
-addressbook_view_ref (AddressbookView *view)
-{
-	g_assert (view->refs > 0);
-	++view->refs;
-}
-
-static void
-addressbook_view_unref (AddressbookView *view)
-{
-	g_assert (view->refs > 0);
-	--view->refs;
-	if (view->refs == 0) {
-		g_free (view);
-	}
-}
-
-static ECategoriesMasterList *
-get_master_list (void)
-{
-	static ECategoriesMasterList *category_list = NULL;
-
-	if (category_list == NULL)
-		category_list = e_categories_master_list_wombat_new ();
-	return category_list;
-}
-
-static void
-addressbook_view_clear (AddressbookView *view)
-{
-	EBook *book;
-
-	if (view->uri && view->view) {
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-	
-	if (view->properties) {
-		bonobo_object_unref (BONOBO_OBJECT(view->properties));
-		view->properties = NULL;
-	}
-
-	if (view->view) {
-		gtk_widget_destroy (GTK_WIDGET (view->view));
-		view->view = NULL;
-	}
-		
-	g_free(view->passwd);
-	view->passwd = NULL;
-
-	g_free(view->uri);
-	view->uri = NULL;
-
-	if (view->refs == 0)
-		g_free(view);
-
-	if (view->ecml_changed_id != 0) {
-		gtk_signal_disconnect (GTK_OBJECT(get_master_list()),
-				       view->ecml_changed_id);
-		view->ecml_changed_id = 0;
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookView *view = closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-	} else {
-		AddressbookSource *source;
-		GtkWidget *warning_dialog, *label;
-
-        	warning_dialog = gnome_dialog_new (
-        		_("Unable to open addressbook"),
-			GNOME_STOCK_BUTTON_CLOSE,
-        		NULL);
-
-		source = addressbook_storage_get_source_by_uri (view->uri);
-
-		if (source) {
-#if HAVE_LDAP
-			label = gtk_label_new (
-					       _("We were unable to open this addressbook.  This either\n"
-						 "means you have entered an incorrect URI, or the LDAP server\n"
-						 "is down"));
-#else
-			label = gtk_label_new (
-					       _("This version of Evolution does not have LDAP support\n"
-						 "compiled in to it.  If you want to use LDAP in Evolution\n"
-						 "you must compile the program from the CVS sources after\n"
-						 "retrieving OpenLDAP from the link below.\n"));
-#endif
-		}
-		else {
-			label = gtk_label_new (
-					       _("We were unable to open this addressbook.  Please check that the\n"
-						 "path exists and that you have permission to access it."));
-		}
-
-		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);
-
-#ifndef HAVE_LDAP
-		if (source) {
-			GtkWidget *href;
-			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);
-		}
-#endif
-		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;
-	if (view->view && view->view->model && view->view->model->book_view)
-		e_book_view_stop (view->view->model->book_view);
-	addressbook_view_clear (view);
-	addressbook_view_unref (view);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  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);
-	}
-}
-
-typedef struct {
-	EBookCallback cb;
-	gpointer closure;
-} LoadUriData;
-
-static void
-load_uri_auth_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadUriData *data = closure;
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		/* pop up a nice dialog, or redo the authentication
-                   bit some number of times. */
-	}
-
-	data->cb (book, status, data->closure);
-
-	g_free (data);
-}
-
-
-static void
-load_uri_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookSource *source;
-	LoadUriData *load_uri_data = closure;
-
-	source = addressbook_storage_get_source_by_uri (e_book_get_uri (book));
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		/* check if the addressbook needs authentication */
-
-		if (source &&
-		    source->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
-			const char *password;
-			char *pass_dup = NULL;
-
-			password = e_passwords_get_password (e_book_get_uri (book));
-
-			if (!password) {
-				char *prompt;
-				gboolean remember;
-
-				if (source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)
-					prompt = g_strdup_printf (_("Enter password for %s (user %s)"),
-								  source->name, source->binddn);
-				else
-					prompt = g_strdup_printf (_("Enter password for %s (user %s)"),
-								  source->name, source->email_addr);
-				remember = source->remember_passwd;
-				pass_dup = e_passwords_ask_password (
-								     prompt, e_book_get_uri (book), prompt, TRUE,
-								     E_PASSWORDS_REMEMBER_FOREVER, &remember,
-								     NULL);
-				if (remember != source->remember_passwd) {
-					source->remember_passwd = remember;
-					addressbook_storage_write_sources ();
-				}
-				g_free (prompt);
-			}
-
-			if (password || pass_dup) {
-				char *user;
-
-				if (source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)
-					user = source->binddn;
-				else
-					user = source->email_addr;
-				if (!user)
-					user = "";
-				e_book_authenticate_user (book, user, password ? password : pass_dup,
-							  addressbook_storage_auth_type_to_string (source->auth),
-							  load_uri_auth_cb, closure);
-				g_free (pass_dup);
-				return;
-			}
-		}
-	}
-
-	load_uri_data->cb (book, status, load_uri_data->closure);
-	g_free (load_uri_data);
-}
-
-gboolean
-addressbook_load_uri (EBook *book, const char *uri,
-		      EBookCallback cb, gpointer closure)
-{
-	LoadUriData *load_uri_data = g_new (LoadUriData, 1);
-	gboolean rv;
-
-	load_uri_data->cb = cb;
-	load_uri_data->closure = closure;
-
-	rv = e_book_load_uri (book, uri, load_uri_cb, load_uri_data);
-
-	if (!rv)
-		g_free (load_uri_data);
-
-	return rv;
-}
-
-gboolean
-addressbook_load_default_book (EBook *book, EBookCallback cb, gpointer closure)
-{
-	LoadUriData *load_uri_data = g_new (LoadUriData, 1);
-	gboolean rv;
-
-	load_uri_data->cb = cb;
-	load_uri_data->closure = closure;
-
-	rv = e_book_load_default_book (book, load_uri_cb, load_uri_data);
-
-	if (!rv)
-		g_free (load_uri_data);
-
-	return rv;
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  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));
-		
-		uri_data = e_book_expand_uri (view->uri);
-
-		if (! addressbook_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;
-	}
-}
-
-enum {
-	ESB_FULL_NAME,
-	ESB_EMAIL,
-	ESB_CATEGORY,
-	ESB_ANY,
-	ESB_ADVANCED
-};
-
-static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Name begins with"), ESB_FULL_NAME, NULL },
-	{ N_("Email is"), ESB_EMAIL, NULL },
-	{ N_("Category is"), ESB_CATEGORY, NULL }, /* We attach subitems below */
-	{ N_("Any field contains"), ESB_ANY, NULL },
-	{ N_("Advanced..."), ESB_ADVANCED, NULL },
-	{ NULL, -1, NULL }
-};
-
-static void
-alphabet_state_changed (EAddressbookView *eav, gunichar letter, AddressbookView *view)
-{
-	view->ignore_search_changes = TRUE;
-	if (letter == 0) {
-		e_search_bar_set_item_id (view->search, ESB_ANY);
-		e_search_bar_set_text (view->search, "");
-	} else {
-		e_search_bar_set_item_id (view->search, ESB_ADVANCED);
-	}
-	view->ignore_search_changes = FALSE;
-}
-
-static void
-addressbook_search_activated (ESearchBar *esb, AddressbookView *view)
-{
-	ECategoriesMasterList *master_list;
-	char *search_word, *search_query;
-	const char *category_name;
-	int search_type, subid;
-
-	if (view->ignore_search_changes) {
-		return;
-	}
-
-	gtk_object_get(GTK_OBJECT(esb),
-		       "text", &search_word,
-		       "item_id", &search_type,
-		       NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(e_addressbook_search_dialog_new(view->view));
-	}
-	else {
-		if ((search_word && strlen (search_word)) || search_type == ESB_CATEGORY) {
-			GString *s = g_string_new ("");
-			e_sexp_encode_string (s, search_word);
-			switch (search_type) {
-			case ESB_ANY:
-				search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" %s)",
-								s->str);
-				break;
-			case ESB_FULL_NAME:
-				search_query = g_strdup_printf ("(beginswith \"full_name\" %s)",
-								s->str);
-				break;
-			case ESB_EMAIL:
-				search_query = g_strdup_printf ("(is \"email\" %s)",
-								s->str);
-				break;
-			case ESB_CATEGORY:
-				subid = e_search_bar_get_subitem_id (esb);
-
-				if (subid < 0 || subid == G_MAXINT) {
-					/* match everything */
-					search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				} else {
-					master_list = get_master_list ();
-					category_name = e_categories_master_list_nth (master_list, subid);
-					search_query = g_strdup_printf ("(contains \"category\" \"%s\")", category_name);
-				}
-				break;
-			default:
-				search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				break;
-			}
-			g_string_free (s, TRUE);
-		} else
-			search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-
-		if (search_query)
-			gtk_object_set (GTK_OBJECT(view->view),
-					"query", search_query,
-					NULL);
-
-		g_free (search_query);
-	}
-
-	g_free (search_word);
-}
-
-static void
-addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
-{
-	int search_type;
-
-	gtk_object_get(GTK_OBJECT(esb),
-		       "item_id", &search_type,
-		       NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(e_addressbook_search_dialog_new(view->view));
-	}
-}
-
-static GNOME_Evolution_ShellView
-retrieve_shell_view_interface_from_control (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	shell_view_interface = gtk_object_get_data (GTK_OBJECT (control),
-						    "shell_view_interface");
-
-	if (shell_view_interface)
-		return shell_view_interface;
-
-	control_frame = bonobo_control_get_control_frame (control);
-
-	if (control_frame == NULL)
-		return CORBA_OBJECT_NIL;
-
-	CORBA_exception_init (&ev);
-	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-							       "IDL:GNOME/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.");
-
-	return shell_view_interface;
-}
-
-static void
-set_status_message (EAddressbookView *eav, const char *message, AddressbookView *view)
-{
-
-	if (!message || !*message) {
-		if (view->activity) {
-			gtk_object_unref (GTK_OBJECT (view->activity));
-			view->activity = NULL;
-		}
-	}
-	else if (!view->activity) {
-		int display;
-		char *clientid = g_strdup_printf ("%p", view);
-
-		if (progress_icon[0] == NULL)
-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CONTACTS_PROGRESS_IMAGE);
-
-		view->activity = evolution_activity_client_new (addressbook_component_get_shell_client(), clientid,
-								progress_icon, message, TRUE, &display);
-
-		g_free (clientid);
-	}
-	else {
-		evolution_activity_client_update (view->activity, message, -1.0);
-	}
-
-}
-
-static void
-set_folder_bar_label (EAddressbookView *eav, const char *message, AddressbookView *view)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellView shell_view_interface;
-
-	CORBA_exception_init (&ev);
-
-	shell_view_interface = retrieve_shell_view_interface_from_control (view->control);
-	if (!shell_view_interface) {
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	d(g_message("Updating via ShellView"));
-
-	if (message == NULL || message[0] == 0) {
-		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
-							     "",
-							     &ev);
-	}
-	else {
-		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
-							     message,
-							     &ev);
-	}
-
-	if (BONOBO_EX (&ev))
-		g_warning ("Exception in label update: %s",
-			   bonobo_exception_get_text (&ev));
-
-	CORBA_exception_free (&ev);
-}
-
-/* Our global singleton config database */
-static Bonobo_ConfigDatabase config_db = NULL;
-
-Bonobo_ConfigDatabase
-addressbook_config_database (CORBA_Environment *ev)
-{
-	if (config_db == NULL)
-		config_db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", ev);
-
-	return config_db;
-}
-
-static int
-compare_subitems (const void *a, const void *b)
-{
-	const ESearchBarSubitem *subitem_a = a;
-	const ESearchBarSubitem *subitem_b = b;
-
-	return strcoll (subitem_a->text, subitem_b->text);
-}
-
-static void
-make_suboptions (AddressbookView *view)
-{
-	ESearchBarSubitem *subitems;
-	ECategoriesMasterList *master_list;
-	gint i, N;
-
-	master_list = get_master_list ();
-	N = e_categories_master_list_count (master_list);
-	subitems = g_new (ESearchBarSubitem, N+2);
-
-	subitems[0].id = G_MAXINT;
-	subitems[0].text = g_strdup (_("Any Category"));
-	subitems[0].translate = FALSE;
-
-	for (i=0; i<N; ++i) {
-		const char *category = e_categories_master_list_nth (master_list, i);
-
-		subitems[i+1].id = i;
-		subitems[i+1].text = e_utf8_to_locale_string (category);
-		subitems[i+1].translate = FALSE;
-	}
-	subitems[N+1].id = -1;
-	subitems[N+1].text = NULL;
-
-	qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems);
-
-	e_search_bar_set_suboption (view->search, ESB_CATEGORY, subitems);
-}
-
-static void
-ecml_changed (ECategoriesMasterList *ecml, AddressbookView *view)
-{
-	make_suboptions (view);
-}
-
-static void
-connect_master_list_changed (AddressbookView *view)
-{
-	view->ecml_changed_id =
-		gtk_signal_connect (GTK_OBJECT (get_master_list()), "changed",
-				    GTK_SIGNAL_FUNC (ecml_changed), view);
-}
-
-BonoboControl *
-addressbook_factory_new_control (void)
-{
-	AddressbookView *view;
-	GtkWidget *frame;
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-
-	view = g_new0 (AddressbookView, 1);
-	view->refs = 1;
-	view->ignore_search_changes = FALSE;
-
-	view->vbox = gtk_vbox_new (FALSE, 0);
-
-	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_SEARCH_BAR (e_search_bar_new (NULL, addressbook_search_option_items));
-	make_suboptions (view);
-	connect_master_list_changed (view);
-
-	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), "search_activated",
-			    GTK_SIGNAL_FUNC (addressbook_search_activated), view);
-
-	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
-	gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view->view));
-	gtk_box_pack_start (GTK_BOX (view->vbox), frame,
-			    TRUE, TRUE, 0);
-
-	/* create the initial view */
-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-	gtk_widget_show (frame);
-	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);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "status_message",
-			    GTK_SIGNAL_FUNC(set_status_message),
-			    view);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "folder_bar_message",
-			    GTK_SIGNAL_FUNC(set_folder_bar_label),
-			    view);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "command_state_change",
-			    GTK_SIGNAL_FUNC(update_command_state),
-			    view);
-	
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "alphabet_state_change",
-			    GTK_SIGNAL_FUNC(alphabet_state_changed),
-			    view);
-	
-	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 (
-		"OAFIID:GNOME_Evolution_Addressbook_ControlFactory",
-		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 6fb82b710d..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <ebook/e-book.h>
-
-Bonobo_ConfigDatabase addressbook_config_database (CORBA_Environment *ev);
-
-/* use this instead of e_book_load_uri everywhere where you want the
-   authentication to be handled for you. */
-gboolean       addressbook_load_uri             (EBook *book, const char *uri, EBookCallback cb, gpointer closure);
-gboolean       addressbook_load_default_book    (EBook *book, EBookCallback open_response, gpointer closure);
-
-BonoboControl *addressbook_factory_new_control  (void);
-void           addressbook_factory_init         (void);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c
deleted file mode 100644
index 7c04cc0130..0000000000
--- a/addressbook/gui/component/e-address-popup.c
+++ /dev/null
@@ -1,1274 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-popup.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 file is too big and this widget is too complicated.  Forgive me.
- */
-
-#include <config.h>
-#include "addressbook.h"
-#include "e-address-popup.h"
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include <addressbook/gui/widgets/e-minicard-widget.h>
-#include <addressbook/gui/widgets/e-addressbook-util.h>
-
-/*
- * Some general scaffolding for our widgets.  Think of this as a really, really
- * lame implementation of a wizard (...which is still somewhat more general that
- * we really need it to be).
- */
-
-typedef struct _MiniWizard MiniWizard;
-struct _MiniWizard {
-	GtkWidget *body;
-
-	GtkWidget *vbox;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-
-	void (*ok_cb) (MiniWizard *, gpointer);
-	void (*cleanup_cb) (gpointer);
-	gpointer closure;
-
-	void (*destroy_cb) (MiniWizard *, gpointer);
-	gpointer destroy_closure;
-};
-
-static void
-mini_wizard_container_add (MiniWizard *wiz, GtkWidget *w)
-{
-	GList *iter = gtk_container_children (GTK_CONTAINER (wiz->vbox));
-	while (iter != NULL) {
-		GtkWidget *oldw = (GtkWidget *) iter->data;
-		iter = g_list_next (iter);
-		gtk_container_remove (GTK_CONTAINER (wiz->vbox), oldw);
-		gtk_widget_destroy (oldw);
-	}
-	gtk_container_add (GTK_CONTAINER (wiz->vbox), w);
-}
-
-static void
-mini_wizard_destroy (MiniWizard *wiz)
-{
-	if (wiz->cleanup_cb)
-		wiz->cleanup_cb (wiz->closure);
-	wiz->cleanup_cb = NULL;
-
-	if (wiz->destroy_cb)
-		wiz->destroy_cb (wiz, wiz->destroy_closure);
-}
-
-static void
-mini_wizard_ok_cb (GtkWidget *b, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-
-	gpointer old_closure = wiz->closure;
-	void (*old_cleanup) (gpointer) = wiz->cleanup_cb;
-
-	wiz->cleanup_cb = NULL;
-
-	if (wiz->ok_cb)
-		wiz->ok_cb (wiz, wiz->closure);
-
-	if (old_cleanup)
-		old_cleanup (old_closure);
-
-}
-
-static void
-mini_wizard_cancel_cb (GtkWidget *b, gpointer closure)
-{
-	mini_wizard_destroy ((MiniWizard *) closure);
-}
-
-static void
-mini_wizard_destroy_cb (GtkWidget *w, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	if (wiz->cleanup_cb)
-		wiz->cleanup_cb (wiz->closure);
-	g_free (wiz);
-}
-
-static MiniWizard *
-mini_wizard_new (void)
-{
-	MiniWizard *wiz = g_new (MiniWizard, 1);
-	GtkWidget *hbox;
-
-	wiz->body          = gtk_vbox_new (FALSE, 2);
-	wiz->vbox          = gtk_vbox_new (FALSE, 2);
-	wiz->ok_button     = gnome_stock_button (GNOME_STOCK_BUTTON_OK);
-	wiz->cancel_button = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL);
-
-	wiz->ok_cb      = NULL;
-	wiz->cleanup_cb = NULL;
-	wiz->closure    = NULL;
-
-	wiz->destroy_cb      = NULL;
-	wiz->destroy_closure = NULL;
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), wiz->ok_button, TRUE, FALSE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), wiz->cancel_button, TRUE, FALSE, 2);
-
-	gtk_box_pack_start (GTK_BOX (wiz->body), wiz->vbox, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (wiz->body), gtk_hseparator_new (), FALSE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (wiz->body), hbox, FALSE, TRUE, 2);
-
-	gtk_widget_show_all (wiz->body);
-
-	gtk_signal_connect (GTK_OBJECT (wiz->ok_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (mini_wizard_ok_cb),
-			    wiz);
-	gtk_signal_connect (GTK_OBJECT (wiz->cancel_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (mini_wizard_cancel_cb),
-			    wiz);
-	gtk_signal_connect (GTK_OBJECT (wiz->body),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (mini_wizard_destroy_cb),
-			    wiz);
-
-	return wiz;
-	
-}
-
-
-
-/*
- * This is the code for the UI thingie that lets you manipulate the e-mail
- * addresses (and *only* the e-mail addresses) associated with an existing
- * card.
- */
-
-#define EMPTY_ENTRY N_("(none)")
-
-typedef struct _EMailMenu EMailMenu;
-struct _EMailMenu {
-	GtkWidget *option_menu;
-	GList *options;
-	gchar *current_selection;
-};
-
-static void
-email_menu_free (EMailMenu *menu)
-{
-	if (menu == NULL)
-		return;
-
-	g_list_foreach (menu->options, (GFunc) g_free, NULL);
-	g_list_free (menu->options);
-	g_free (menu);
-}
-
-static EMailMenu *
-email_menu_new (void)
-{
-	EMailMenu *menu = g_new (EMailMenu, 1);
-
-	menu->option_menu = gtk_option_menu_new ();
-	menu->options = NULL;
-	menu->current_selection = NULL;
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (menu->option_menu), gtk_menu_new ());
-
-	return menu;
-}
-
-static void
-menu_activate_cb (GtkWidget *w, gpointer closure)
-{
-	EMailMenu *menu = (EMailMenu *) closure;
-	gchar *addr = (gchar *) gtk_object_get_data (GTK_OBJECT (w), "addr");
-
-	menu->current_selection = addr;
-}
-
-static void
-email_menu_add_option (EMailMenu *menu, const gchar *addr)
-{
-	GtkWidget *menu_item;
-	gchar *addr_cpy;
-
-	g_return_if_fail (menu != NULL);
-	if (addr == NULL)
-		return;
-
-	addr_cpy = g_strdup (addr);
-	menu->options = g_list_append (menu->options, addr_cpy);
-
-	menu_item = gtk_menu_item_new_with_label (addr);
-	gtk_object_set_data (GTK_OBJECT (menu_item), "addr", addr_cpy);
-	gtk_widget_show_all (menu_item);
-	gtk_menu_append (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (menu->option_menu))), menu_item);
-
-	gtk_signal_connect (GTK_OBJECT (menu_item),
-			    "activate",
-			    menu_activate_cb,
-			    menu);
-}
-
-static void
-email_menu_add_options_from_card (EMailMenu *menu, ECard *card, const gchar *extra_addr)
-{
-	ECardSimple *simple;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	simple = e_card_simple_new (card);
-
-	/* If any of these three e-mail fields are NULL, email_menu_add_option will just
-	   return without doing anything. */
-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL));
-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2));
-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3));
-	email_menu_add_option (menu, extra_addr);
-	email_menu_add_option (menu, EMPTY_ENTRY);
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-email_menu_set_option (EMailMenu *menu, const gchar *addr)
-{
-	guint count = 0;
-	GList *iter;
-
-	g_return_if_fail (menu != NULL);
-
-	if (addr == NULL) {
-		email_menu_set_option (menu, EMPTY_ENTRY);
-		return;
-	}
-
-	iter = menu->options;
-	while (iter && strcmp (addr, (gchar *) iter->data)) {
-		++count;
-		iter = g_list_next (iter);
-	}
-
-	if (iter) {
-		gtk_option_menu_set_history (GTK_OPTION_MENU (menu->option_menu), count);
-		menu->current_selection = (gchar *) iter->data;
-	} 
-}
-
-#ifdef UNDEFINED_FUNCTIONS_SHOULD_PLEASE_BE_INCLUDED
-static void
-email_menu_unset_option (EMailMenu *menu, const gchar *addr)
-{
-	GList *iter;
-
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (addr != NULL);
-
-	if (menu->current_selection == NULL || strcmp (addr, menu->current_selection))
-		return;
-
-	iter = menu->options;
-	while (iter && strcmp (addr, (gchar *) iter->data)) {
-		iter = g_list_next (iter);
-	}
-	if (iter) {
-		iter = g_list_next (iter);
-		if (iter) {
-			email_menu_set_option (menu, (gchar *) iter->data);
-		} else {
-			email_menu_set_option (menu, EMPTY_ENTRY);
-		}
-	}
-}
-#endif
-
-
-
-typedef struct _EMailTable EMailTable;
-struct _EMailTable {
-	GtkWidget *table;
-	ECard *card;
-	EMailMenu *primary;
-	EMailMenu *email2;
-	EMailMenu *email3;
-};
-
-static void
-email_table_cleanup_cb (gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	if (et == NULL)
-		return;
-
-	gtk_object_unref (GTK_OBJECT (et->card));
-	email_menu_free (et->primary);
-	email_menu_free (et->email2);
-	email_menu_free (et->email3);
-
-	g_free (et);
-}
-
-static void
-email_table_from_card (EMailTable *et)
-{
-	ECardSimple *simple;
-	
-	g_return_if_fail (et != NULL);
-
-	simple = e_card_simple_new (et->card);
-	email_menu_set_option (et->primary, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL));
-	email_menu_set_option (et->email2,  e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2));
-	email_menu_set_option (et->email3,  e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3));
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-email_table_to_card (EMailTable *et)
-{
-	ECardSimple *simple;
-	gchar *curr;
-
-	g_return_if_fail (et != NULL);
-
-	simple = e_card_simple_new (et->card);
-
-	curr = et->primary->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL, curr);
-
-	curr = et->email2->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2, curr);
-
-	curr = et->email3->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3, curr);
-
-	e_card_simple_sync_card (simple);
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-email_table_save_card_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ECard *card = E_CARD (closure);
-
-	if (book) {
-		e_book_commit_card (book, card, NULL, NULL);
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-	gtk_object_unref (GTK_OBJECT (card));
-}
-
-/*
- * We have to do this in an idle function because of what might be a
- * re-entrancy problems with EBook.
- */
-static gint
-add_card_idle_cb (gpointer closure)
-{
-	EBook *book;
-
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, email_table_save_card_cb, closure)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		email_table_save_card_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, closure);
-	}
-
-	return 0;
-}
-
-static void
-email_table_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	email_table_to_card (et);
-
-	gtk_object_ref (GTK_OBJECT (et->card));
-	gtk_idle_add (add_card_idle_cb, et->card);
-
-	mini_wizard_destroy (wiz);
-}
-
-static void
-email_table_init (MiniWizard *wiz, ECard *card, const gchar *extra_address)
-{
-	EMailTable *et;
-
-	gchar *name_str;
-	gint xpad, ypad;
-	GtkAttachOptions label_x_opts, label_y_opts;
-	GtkAttachOptions menu_x_opts, menu_y_opts;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	et = g_new (EMailTable, 1);
-
-	et->card = card;
-	gtk_object_ref (GTK_OBJECT (et->card));
-
-	et->table = gtk_table_new (4, 2, FALSE);
-
-	et->primary = email_menu_new ();
-	et->email2  = email_menu_new ();
-	et->email3  = email_menu_new ();
-
-	email_menu_add_options_from_card (et->primary, et->card, extra_address);
-	email_menu_add_options_from_card (et->email2,  et->card, extra_address);
-	email_menu_add_options_from_card (et->email3,  et->card, extra_address);
-
-	email_table_from_card (et);
-
-	label_x_opts = GTK_FILL;
-	label_y_opts = GTK_FILL;
-	menu_x_opts = GTK_EXPAND | GTK_FILL;
-	menu_y_opts = GTK_EXPAND | GTK_FILL;
-	xpad = 3;
-	ypad = 3;
-
-	name_str = e_card_name_to_string (et->card->name);
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (name_str),
-			  0, 2, 0, 1, 
-			  label_x_opts, label_y_opts, xpad, ypad);
-	g_free (name_str);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Primary Email")),
-			  0, 1, 1, 2, 
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->primary->option_menu,
-			  1, 2, 1, 2, 
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Email 2")),
-			  0, 1, 2, 3,
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->email2->option_menu,
-			  1, 2, 2, 3,
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Email 3")),
-			  0, 1, 3, 4,
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->email3->option_menu,
-			  1, 2, 3, 4,
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_widget_show_all (et->primary->option_menu);
-	gtk_widget_show_all (et->email2->option_menu);
-	gtk_widget_show_all (et->email3->option_menu);
-
-	gtk_widget_show_all (et->table);
-	mini_wizard_container_add (wiz, et->table);
-	wiz->ok_cb      = email_table_ok_cb;
-	wiz->cleanup_cb = email_table_cleanup_cb;
-	wiz->closure    = et;
-}
-
-/*
- * This code is for the little UI thing that lets you pick from a set of cards
- * and decide which one you want to add the e-mail address to.
- */
-
-typedef struct _CardPicker CardPicker;
-struct _CardPicker {
-	GtkWidget *body;
-	GtkWidget *clist;
-	GList *cards;
-	gchar *new_name;
-	gchar *new_email;
-
-	gint current_row;
-};
-
-static void
-card_picker_row_select_cb (GtkCList *clist, gint row, gint col, GdkEventButton *ev, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	CardPicker *pick = (CardPicker *) wiz->closure;
-	pick->current_row = row;
-	gtk_widget_set_sensitive (wiz->ok_button, TRUE);
-}
-
-static void
-card_picker_row_unselect_cb (GtkCList *clist, gint row, gint col, GdkEventButton *ev, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	CardPicker *pick = (CardPicker *) wiz->closure;
-	pick->current_row = -1;
-	gtk_widget_set_sensitive (wiz->ok_button, FALSE);
-}
-
-static void
-card_picker_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	CardPicker *pick = (CardPicker *) closure;
-	g_return_if_fail (pick->current_row >= 0);
-
-	if (pick->current_row == 0) {
-		e_contact_quick_add (pick->new_name, pick->new_email, NULL, NULL);
-		mini_wizard_destroy (wiz);
-	} else {
-		ECard *card = (ECard *) g_list_nth_data (pick->cards, pick->current_row-1);
-		email_table_init (wiz, card, pick->new_email);
-	}
-}
-
-static void
-card_picker_cleanup_cb (gpointer closure)
-{
-	CardPicker *pick = (CardPicker *) closure;
-
-	g_list_foreach (pick->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (pick->cards);
-
-	g_free (pick->new_name);
-	g_free (pick->new_email);
-}
-
-static void
-card_picker_init (MiniWizard *wiz, const GList *cards, const gchar *new_name, const gchar *new_email)
-{
-	CardPicker *pick;
-	gchar *str;
-	GtkWidget *w, *swin;
-
-	pick = g_new (CardPicker, 1);
-
-	pick->body  = gtk_vbox_new (FALSE, 2);
-
-	pick->clist = gtk_clist_new (1);
-	gtk_clist_set_column_title (GTK_CLIST (pick->clist), 0, _("Select an Action"));
-	gtk_clist_column_titles_show (GTK_CLIST (pick->clist));
-	gtk_clist_set_selection_mode (GTK_CLIST (pick->clist), GTK_SELECTION_SINGLE);
-
-	gtk_clist_freeze (GTK_CLIST (pick->clist));
-
-	str = g_strdup_printf (_("Create a new contact \"%s\""), new_name);
-	gtk_clist_append (GTK_CLIST (pick->clist), &str);
-	g_free (str);
-
-	pick->cards = NULL;
-	while (cards) {
-		ECard *card = (ECard *) cards->data;
-		gchar *name_str = e_card_name_to_string (card->name);
-
-		pick->cards = g_list_append (pick->cards, card);
-		gtk_object_ref (GTK_OBJECT (card));
-
-		str = g_strdup_printf (_("Add address to existing contact \"%s\""), name_str);
-		gtk_clist_append (GTK_CLIST (pick->clist), &str);
-		g_free (name_str);
-		g_free (str);
-
-		cards = g_list_next (cards);
-	}
-
-	gtk_clist_thaw (GTK_CLIST (pick->clist));
-
-	pick->new_name  = g_strdup (new_name);
-	pick->new_email = g_strdup (new_email);
-
-	pick->current_row = -1;
-	gtk_widget_set_sensitive (wiz->ok_button, FALSE);
-
-	/* Connect some signals & callbacks */
-
-	wiz->ok_cb      = card_picker_ok_cb;
-	wiz->cleanup_cb = card_picker_cleanup_cb;
-
-	gtk_signal_connect (GTK_OBJECT (pick->clist),
-			    "select-row",
-			    GTK_SIGNAL_FUNC (card_picker_row_select_cb),
-			    wiz);
-	gtk_signal_connect (GTK_OBJECT (pick->clist),
-			    "unselect-row",
-			    GTK_SIGNAL_FUNC (card_picker_row_unselect_cb),
-			    wiz);
-
-	/* Build our widget */
-
-	w = gtk_label_new (new_email);
-	gtk_box_pack_start (GTK_BOX (pick->body), w, FALSE, TRUE, 3);
-
-	swin = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swin), pick->clist);
-	
-	gtk_box_pack_start (GTK_BOX (pick->body), swin, TRUE, TRUE, 2);
-	gtk_widget_show_all (pick->body);
-
-
-	/* Put it in our mini-wizard */
-
-	wiz->closure = pick;
-	mini_wizard_container_add (wiz, pick->body);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/*
- * The code for the actual EAddressPopup widget begins here.
- */
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-
-static GtkObjectClass *parent_class;
-
-static void e_address_popup_destroy (GtkObject *);
-static void e_address_popup_query   (EAddressPopup *);
-
-
-static void
-e_address_popup_class_init (EAddressPopupClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));
-
-	object_class->destroy = e_address_popup_destroy;
-}
-
-static void
-e_address_popup_init (EAddressPopup *pop)
-{
-	pop->transitory = TRUE;
-}
-
-static void
-e_address_popup_cleanup (EAddressPopup *pop)
-{
-	if (pop->card) {
-		gtk_object_unref (GTK_OBJECT (pop->card));
-		pop->card = NULL;
-	}
-
-	if (pop->scheduled_refresh) {
-		gtk_timeout_remove (pop->scheduled_refresh);
-		pop->scheduled_refresh = 0;
-	}
-
-	if (pop->query_tag) {
-		e_book_simple_query_cancel (pop->book, pop->query_tag);
-		pop->query_tag = 0;
-	}
-
-	if (pop->book) {
-		gtk_object_unref (GTK_OBJECT (pop->book));
-		pop->book = NULL;
-	}
-
-	g_free (pop->name);
-	pop->name = NULL;
-
-	g_free (pop->email);
-	pop->email = NULL;
-}
-
-static void
-e_address_popup_destroy (GtkObject *obj)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (obj);
-
-	e_address_popup_cleanup (pop);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		GTK_OBJECT_CLASS (parent_class)->destroy (obj);
-}
-
-GtkType
-e_address_popup_get_type (void)
-{
-	static GtkType pop_type = 0;
-
-	if (!pop_type) {
-		GtkTypeInfo pop_info = {
-			"EAddressPopup",
-			sizeof (EAddressPopup),
-			sizeof (EAddressPopupClass),
-			(GtkClassInitFunc) e_address_popup_class_init,
-			(GtkObjectInitFunc) e_address_popup_init,
-			NULL, NULL,
-			(GtkClassInitFunc) NULL
-		};
-
-		pop_type = gtk_type_unique (gtk_event_box_get_type (), &pop_info);
-	}
-
-	return pop_type;
-}
-
-static void
-e_address_popup_refresh_names (EAddressPopup *pop)
-{
-	if (pop->name_widget) {
-		if (pop->name && *pop->name) {
-			gchar *s = e_utf8_to_gtk_string (pop->name_widget, pop->name);
-			gtk_label_set_text (GTK_LABEL (pop->name_widget), s);
-			g_free (s);
-			gtk_widget_show (pop->name_widget);
-		} else {
-			gtk_widget_hide (pop->name_widget);
-		}
-	}
-
-	if (pop->email_widget) {
-		if (pop->email && *pop->email) {
-			gchar *s = e_utf8_to_gtk_string (pop->email_widget, pop->email);
-			gtk_label_set_text (GTK_LABEL (pop->email_widget), s);
-			g_free (s);
-			gtk_widget_show (pop->email_widget);
-		} else {
-			gtk_widget_hide (pop->email_widget);
-		}
-	}
-
-	e_address_popup_query (pop);
-}
-
-static gint
-refresh_timeout_cb (gpointer ptr)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (ptr);
-	e_address_popup_refresh_names (pop);
-	pop->scheduled_refresh = 0;
-	return 0;
-}
-
-static void
-e_address_popup_schedule_refresh (EAddressPopup *pop)
-{
-	if (pop->scheduled_refresh == 0)
-		pop->scheduled_refresh = gtk_timeout_add (20, refresh_timeout_cb, pop);
-}
-
-/* If we are handed something of the form "Foo <bar@bar.com>",
-   do the right thing. */
-static gboolean
-e_address_popup_set_free_form (EAddressPopup *pop, const gchar *txt)
-{
-	gchar *lt, *gt = NULL;
-
-	g_return_val_if_fail (pop && E_IS_ADDRESS_POPUP (pop), FALSE);
-
-	if (txt == NULL)
-		return FALSE;
-
-	lt = strchr (txt, '<');
-	if (lt)
-		gt = strchr (txt, '>');
-
-	if (lt && gt && lt+1 < gt) {
-		gchar *name  = g_strndup (txt,  lt-txt);
-		gchar *email = g_strndup (lt+1, gt-lt-1);
-		e_address_popup_set_name (pop, name);
-		e_address_popup_set_email (pop, email);
-
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-void
-e_address_popup_set_name (EAddressPopup *pop, const gchar *name)
-{
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	/* We only allow the name to be set once. */
-	if (pop->name)
-		return;
-
-	if (!e_address_popup_set_free_form (pop, name)) {
-		pop->name = g_strdup (name);
-		if (pop->name)
-			g_strstrip (pop->name);
-	}
-
-	e_address_popup_schedule_refresh (pop);
-}
-
-void
-e_address_popup_set_email (EAddressPopup *pop, const gchar *email)
-{
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	/* We only allow the e-mail to be set once. */
-	if (pop->email)
-		return;
-
-	if (!e_address_popup_set_free_form (pop, email)) {
-		pop->email = g_strdup (email);
-		if (pop->email)
-			g_strstrip (pop->email);
-	}
-
-	e_address_popup_schedule_refresh (pop);
-}
-
-void
-e_address_popup_construct (EAddressPopup *pop)
-{
-	GtkWidget *vbox, *name_holder;
-	GdkColor color = { 0x0, 0xffff, 0xffff, 0xffff };
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	pop->main_vbox = gtk_vbox_new (FALSE, 0);
-
-	/* Build Generic View */
-
-	name_holder = gtk_event_box_new ();
-	vbox = gtk_vbox_new (FALSE, 2);
-	pop->name_widget = gtk_label_new ("");
-	pop->email_widget = gtk_label_new ("");
-
-	gtk_box_pack_start (GTK_BOX (vbox), pop->name_widget, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (vbox), pop->email_widget, TRUE, TRUE, 2);
-	gtk_container_add (GTK_CONTAINER (name_holder), GTK_WIDGET (vbox));
-
-	if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (name_holder)), &color, FALSE, TRUE)) {
-		GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (name_holder)));
-		style->bg[0] = color;
-		gtk_widget_set_style (GTK_WIDGET (name_holder), style);
-		gtk_style_unref (style);
-	}
-
-	pop->generic_view = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (pop->generic_view), name_holder);
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->generic_view, TRUE, TRUE, 0);
-	gtk_widget_show_all (pop->generic_view);
-
-	pop->query_msg = gtk_label_new (_("Querying Addressbook..."));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->query_msg, TRUE, TRUE, 0);
-	gtk_widget_show (pop->query_msg);
-
-	/* Build Minicard View */
-	pop->minicard_view = e_minicard_widget_new ();
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->minicard_view, TRUE, TRUE, 0);
-
-
-	/* Final assembly */
-
-	gtk_container_add (GTK_CONTAINER (pop), pop->main_vbox);
-	gtk_widget_show (pop->main_vbox);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
-	gtk_container_set_border_width (GTK_CONTAINER (pop), 2);
-}
-
-GtkWidget *
-e_address_popup_new (void)
-{
-	EAddressPopup *pop = gtk_type_new (E_ADDRESS_POPUP_TYPE);
-	e_address_popup_construct (pop);
-	return GTK_WIDGET (pop);
-}
-
-static void
-emit_event (EAddressPopup *pop, const char *event)
-{
-	if (pop->es) {
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_BOOLEAN);
-		BONOBO_ARG_SET_BOOLEAN (arg, TRUE);
-		bonobo_event_source_notify_listeners_full (pop->es,
-							   "GNOME/Evolution/Addressbook/AddressPopup",
-							   "Event",
-							   event,
-							   arg, NULL);
-		bonobo_arg_release (arg);
-	}	
-}
-
-static void
-contact_editor_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);
-	EContactEditor *ce = e_addressbook_show_contact_editor (book, pop->card, FALSE, TRUE);
-	e_address_popup_cleanup (pop);
-	emit_event (pop, "Destroy");
-	e_contact_editor_raise (ce);
-}
-
-static void
-edit_contact_info_cb (EAddressPopup *pop)
-{
-	EBook *book;
-	emit_event (pop, "Hide");
-
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, contact_editor_cb, pop)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		contact_editor_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, pop);
-	}
-}
-
-static void
-e_address_popup_cardify (EAddressPopup *pop, ECard *card)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-	g_return_if_fail (card && E_IS_CARD (card));
-	g_return_if_fail (pop->card == NULL);
-
-	pop->card = card;
-	gtk_object_ref (GTK_OBJECT (pop->card));
-
-	e_minicard_widget_set_card (E_MINICARD_WIDGET (pop->minicard_view), card);
-	gtk_widget_show (pop->minicard_view);
-	gtk_widget_hide (pop->generic_view);
-
-	b = gtk_button_new_with_label (_("Edit Contact Info"));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), b, TRUE, TRUE, 0);
-	gtk_signal_connect_object (GTK_OBJECT (b),
-				   "clicked",
-				   GTK_SIGNAL_FUNC (edit_contact_info_cb),
-				   GTK_OBJECT (pop));
-	gtk_widget_show (b);
-}
-
-static void
-add_contacts_cb (EAddressPopup *pop)
-{
-	if (pop->email && *pop->email) {
-		if (pop->name && *pop->name)
-			e_contact_quick_add (pop->name, pop->email, NULL, NULL);
-		else
-			e_contact_quick_add_free_form (pop->email, NULL, NULL);
-
-	}
-	e_address_popup_cleanup (pop);
-	emit_event (pop, "Destroy");
-}
-
-static void
-e_address_popup_no_matches (EAddressPopup *pop)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	b = gtk_button_new_with_label (_("Add to Contacts"));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), b, TRUE, TRUE, 0);
-	gtk_signal_connect_object (GTK_OBJECT (b),
-				   "clicked",
-				   GTK_SIGNAL_FUNC (add_contacts_cb),
-				   GTK_OBJECT (pop));
-	gtk_widget_show (b);
-}
-
-static void
-wizard_destroy_cb (MiniWizard *wiz, gpointer closure)
-{
-	gtk_widget_destroy (GTK_WIDGET (closure));
-}
-
-static void
-popup_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data)
-{
-	gint x, y, w, h, xmax, ymax;
-
-	xmax = gdk_screen_width ();
-	ymax = gdk_screen_height ();
-
-	if (gtk_object_get_data (GTK_OBJECT (widget), "size_allocate") == NULL) {
-		gdk_window_get_pointer (NULL, &x, &y, NULL);
-		w = alloc->width;
-		h = alloc->height;
-		x = CLAMP (x - w/2, 0, xmax - w);
-		y = CLAMP (y - h/2, 0, ymax - h);
-		gtk_widget_set_uposition (widget, x, y);
-		gtk_object_set_data (GTK_OBJECT (widget), "size_allocate", widget);
-	}
-}
-
-static void
-e_address_popup_ambiguous_email_add (EAddressPopup *pop, const GList *cards)
-{
-	MiniWizard *wiz = mini_wizard_new ();
-	GtkWidget *win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	
-	wiz->destroy_cb      = wizard_destroy_cb;
-	wiz->destroy_closure = win;
-
-	gtk_window_set_title (GTK_WINDOW (win),  _("Merge E-Mail Address"));
-	gtk_signal_connect (GTK_OBJECT (win),
-			    "size_allocate",
-			    GTK_SIGNAL_FUNC (popup_size_allocate_cb),
-			    NULL);
-
-	/* FIXME: This hard-wired size is evil. */
-	gtk_widget_set_usize (win, 275, 170);
-		
-	card_picker_init (wiz, cards, pop->name, pop->email);
-
-	e_address_popup_cleanup (pop);
-	emit_event (pop, "Destroy");
-
-	gtk_container_add (GTK_CONTAINER (win), wiz->body);
-	gtk_widget_show_all (win);
-}
-
-static void
-e_address_popup_multiple_matches (EAddressPopup *pop, const GList *cards)
-{
-	pop->multiple_matches = TRUE;
-
-	e_address_popup_ambiguous_email_add (pop, cards);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-/*
- *  Addressbook Query Fun
- */
-
-static void
-name_only_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EAddressPopup *pop;
-
-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS)
-		return;
-
-	pop = E_ADDRESS_POPUP (closure);
-
-	pop->query_tag = 0;
-
-	if (cards == NULL) {
-		e_address_popup_no_matches (pop);
-	} else {
-		e_address_popup_ambiguous_email_add (pop, cards);
-	}
-}
-
-static void
-query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EAddressPopup *pop;
-
-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS)
-		return;
-
-	pop = E_ADDRESS_POPUP (closure);
-
-	pop->query_tag = 0;
-	gtk_widget_hide (pop->query_msg);
-
-	if (cards == NULL) {
-		
-		/* Do a name-only query if:
-		   (1) The name is non-empty.
-		   (2) The e-mail is also non-empty (so that the query we just did wasn't actually a name-only query.
-		*/
-		if (pop->name && *pop->name && pop->email && *pop->email) {
-			pop->query_tag = e_book_name_and_email_query (book, pop->name, NULL, name_only_query_cb, pop);
-		} else {
-			e_address_popup_no_matches (pop);
-		}
-		
-	} else {
-		if (g_list_length ((GList *) cards) == 1)
-			e_address_popup_cardify (pop, E_CARD (cards->data));
-		else
-			e_address_popup_multiple_matches (pop, cards);
-	}
-}
-
-static void
-start_query (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);
-	
-	if (pop->query_tag)
-		e_book_simple_query_cancel (book, pop->query_tag);
-
-	if (pop->book != book) {
-		gtk_object_ref (GTK_OBJECT (book));
-		if (pop->book)
-			gtk_object_unref (GTK_OBJECT (pop->book));
-		pop->book = book;
-	}
-		
-	pop->query_tag = e_book_name_and_email_query (book, pop->name, pop->email, query_cb, pop);
-
-	gtk_object_unref (GTK_OBJECT (pop));
-}
-
-static void
-e_address_popup_query (EAddressPopup *pop)
-{
-	EBook *book;
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	book = e_book_new ();
-	gtk_object_ref (GTK_OBJECT (pop));
-
-	if (!addressbook_load_default_book (book, start_query, pop)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		start_query (NULL, E_BOOK_STATUS_OTHER_ERROR, pop);
-	}
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-enum {
-	PROPERTY_NAME,
-	PROPERTY_EMAIL,
-	PROPERTY_TRANSITORY
-};
-
-static void
-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		e_address_popup_set_name (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case PROPERTY_EMAIL:
-		e_address_popup_set_email (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		BONOBO_ARG_SET_STRING (arg, pop->name);
-		break;
-
-	case PROPERTY_EMAIL:
-		BONOBO_ARG_SET_STRING (arg, pop->email);
-		break;
-
-	case PROPERTY_TRANSITORY:
-		BONOBO_ARG_SET_BOOLEAN (arg, pop->transitory);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static BonoboControl *
-e_address_popup_factory_new_control (void)
-{
-        BonoboControl *control;
-        BonoboPropertyBag *bag;
-	EAddressPopup *addy;
-	GtkWidget *w;
-
-	w = e_address_popup_new ();
-	addy = E_ADDRESS_POPUP (w);
-
-	control = bonobo_control_new (w);
-	gtk_widget_show (w);
-
-        bag = bonobo_property_bag_new (get_prop, set_prop, w);
-        bonobo_property_bag_add (bag, "name", PROPERTY_NAME,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-        bonobo_property_bag_add (bag, "email", PROPERTY_EMAIL,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-	bonobo_property_bag_add (bag, "transitory", PROPERTY_TRANSITORY,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE);
-
-        bonobo_control_set_properties (control, bag);
-        bonobo_object_unref (BONOBO_OBJECT (bag));
-
-	addy->es = bonobo_event_source_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				     BONOBO_OBJECT (addy->es));
-
-        return control;
-}
-
-static BonoboObject *
-e_address_popup_factory (BonoboGenericFactory *factory, gpointer user_data)
-{
-	return BONOBO_OBJECT (e_address_popup_factory_new_control ());
-}
-
-void
-e_address_popup_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory",
-					      e_address_popup_factory, NULL);
-	
-	if (factory == NULL)
-		g_error ("I could not register an AddressPopup factory.");
-}
diff --git a/addressbook/gui/component/e-address-popup.h b/addressbook/gui/component/e-address-popup.h
deleted file mode 100644
index b648b79d4f..0000000000
--- a/addressbook/gui/component/e-address-popup.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-popup.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_ADDRESS_POPUP_H__
-#define __E_ADDRESS_POPUP_H__
-
-#include <gtk/gtk.h>
-#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <bonobo/bonobo-event-source.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_ADDRESS_POPUP_TYPE        (e_address_popup_get_type ())
-#define E_ADDRESS_POPUP(o)          (GTK_CHECK_CAST ((o), E_ADDRESS_POPUP_TYPE, EAddressPopup))
-#define E_ADDRESS_POPUP_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_POPUP_TYPE, EAddressPopupClass))
-#define E_IS_ADDRESS_POPUP(o)       (GTK_CHECK_TYPE ((o), E_ADDRESS_POPUP_TYPE))
-#define E_IS_ADDRESS_POPUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_POPUP_TYPE))
-
-typedef struct _EAddressPopup EAddressPopup;
-typedef struct _EAddressPopupClass EAddressPopupClass;
-
-struct _EAddressPopup {
-	GtkEventBox parent;
-
-	gchar *name;
-	gchar *email;
-
-	GtkWidget *name_widget;
-	GtkWidget *email_widget;
-	GtkWidget *query_msg;
-	
-	GtkWidget *main_vbox;
-	GtkWidget *generic_view;
-	GtkWidget *minicard_view;
-
-	gboolean transitory;
-
-	guint scheduled_refresh;
-	EBook *book;
-	guint query_tag;
-	gboolean multiple_matches;
-	ECard *card;
-
-	BonoboEventSource *es;
-};
-
-struct _EAddressPopupClass {
-	GtkEventBoxClass parent_class;
-};
-
-GtkType e_address_popup_get_type (void);
-
-void e_address_popup_set_name  (EAddressPopup *, const gchar *name);
-void e_address_popup_set_email (EAddressPopup *, const gchar *email);
-
-void e_address_popup_construct (EAddressPopup *);
-GtkWidget *e_address_popup_new (void);
-
-void e_address_popup_factory_init (void);
-
-END_GNOME_DECLS
-
-#endif /* __E_ADDRESS_POPUP_H__ */
-
diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c
deleted file mode 100644
index d044ddf7b9..0000000000
--- a/addressbook/gui/component/e-address-widget.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-widget.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include "e-address-widget.h"
-
-static void e_address_widget_class_init (EAddressWidgetClass *klass);
-static void e_address_widget_init       (EAddressWidget *obj);
-static void e_address_widget_destroy    (GtkObject *obj);
-
-static gint e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev);
-static void e_address_widget_popup (EAddressWidget *, GdkEventButton *ev);
-static void e_address_widget_schedule_query (EAddressWidget *);
-
-static GtkObjectClass *parent_class;
-
-static EBook *common_book = NULL; /* sort of lame */
-
-static gboolean doing_queries = FALSE;
-
-static void
-e_address_widget_class_init (EAddressWidgetClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));
-
-	object_class->destroy = e_address_widget_destroy;
-
-	widget_class->button_press_event = e_address_widget_button_press_handler;
-}
-
-static void
-e_address_widget_init (EAddressWidget *addr)
-{
-
-}
-
-static void
-e_address_widget_destroy (GtkObject *obj)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (obj);
-
-	g_free (addr->name);
-	g_free (addr->email);
-
-	if (addr->query_tag)
-		e_book_simple_query_cancel (common_book, addr->query_tag);
-
-	if (addr->query_idle_tag)
-		gtk_idle_remove (addr->query_idle_tag);
-}
-
-static gint
-e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (w);
-	if (ev->button == 3 && ev->state == 0) {
-		e_address_widget_popup (addr, ev);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-GtkType
-e_address_widget_get_type (void)
-{
-	static GtkType aw_type = 0;
-
-	if (!aw_type) {
-		GtkTypeInfo aw_info = {
-			"EAddressWidget",
-			sizeof (EAddressWidget),
-			sizeof (EAddressWidgetClass),
-			(GtkClassInitFunc) e_address_widget_class_init,
-			(GtkObjectInitFunc) e_address_widget_init,
-			NULL, NULL, /* reserved... but for what sinister purpose? */
-			(GtkClassInitFunc) NULL
-		};
-
-		aw_type = gtk_type_unique (gtk_event_box_get_type (), &aw_info);
-	}
-
-	return aw_type;
-}
-
-static void
-gtk_widget_visible (GtkWidget *w, gboolean x)
-{
-	if (x)
-		gtk_widget_show (w);
-	else
-		gtk_widget_hide (w);
-}
-
-static void
-e_address_widget_refresh (EAddressWidget *addr)
-{
-	gchar *str;
-	gboolean have_name, have_email;
-
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	have_name = addr->name && *addr->name;
-	have_email = addr->email && *addr->email && (addr->card == NULL || !addr->known_email);
-
-	gtk_label_set_text (GTK_LABEL (addr->name_widget), have_name ? addr->name : "");
-	gtk_widget_visible (addr->name_widget, have_name);
-	if (addr->card) {
-		gint i, N = strlen (addr->name);
-		gchar *pattern = g_malloc (N+1);
-		for (i=0; i<N; ++i)
-			pattern[i] = '_';
-		pattern[i] = '\0';
-		gtk_label_set_pattern (GTK_LABEL (addr->name_widget), pattern);
-		g_free (pattern);
-	} else {
-		gtk_label_set_pattern (GTK_LABEL (addr->name_widget), "");
-	}
-
-	if (have_email) {
-		str = g_strdup_printf (have_name ? "<%s>" : "%s", addr->email);
-		gtk_label_set_text (GTK_LABEL (addr->email_widget), str);
-		g_free (str);
-	} else {
-		gtk_label_set_text (GTK_LABEL (addr->email_widget), "");
-	}
-	gtk_widget_visible (addr->email_widget, have_email);
-
-	gtk_widget_visible (addr->spacer, have_name && have_email);
-
-	/* Launch a query to find the appropriate card, if necessary. */
-	if (addr->card == NULL) 
-		e_address_widget_schedule_query (addr);
-}
-
-void
-e_address_widget_set_name (EAddressWidget *addr, const gchar *name)
-{
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	g_free (addr->name);
-	addr->name = g_strdup (name);
-
-	e_address_widget_refresh (addr);
-}
-
-void
-e_address_widget_set_email (EAddressWidget *addr, const gchar *email)
-{
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	g_free (addr->email);
-	addr->email = g_strdup (email);
-
-	e_address_widget_refresh (addr);
-}
-
-
-void
-e_address_widget_set_text (EAddressWidget *addr, const gchar *text)
-{
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-	
-	e_address_widget_set_email (addr, text); /* CRAP */
-}
-
-void
-e_address_widget_construct (EAddressWidget *addr)
-{
-	GtkWidget *box;
-
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	box = gtk_hbox_new (FALSE, 2);
-	
-	addr->name_widget = gtk_label_new ("");
-	addr->spacer = gtk_label_new (" ");
-	addr->email_widget = gtk_label_new ("");
-	
-	gtk_box_pack_start (GTK_BOX (box), addr->name_widget, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), addr->spacer, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), addr->email_widget, FALSE, FALSE, 0);
-
-	gtk_container_add (GTK_CONTAINER (addr), box);
-
-	gtk_widget_show (box);
-	gtk_widget_show (addr->name_widget);
-	gtk_widget_show (addr->email_widget);
-}
-
-GtkWidget *
-e_address_widget_new (void)
-{
-	EAddressWidget *addr = gtk_type_new (e_address_widget_get_type ());
-	e_address_widget_construct (addr);
-	return GTK_WIDGET (addr);
-}
-
-/*
- *
- * Cardification
- *
- */
-
-static void
-e_address_widget_cardify (EAddressWidget *addr, ECard *card, gboolean known_email)
-{
-	if (addr->card != card || addr->known_email != known_email) {
-
-		if (addr->card != card) {
-			if (addr->card)
-				gtk_object_unref (GTK_OBJECT (addr->card));
-			addr->card = card;
-			gtk_object_ref (GTK_OBJECT (addr->card));
-		}
-
-		addr->known_email = known_email;
-
-		if (!(addr->name && *addr->name)) {
-			gchar *s = e_card_name_to_string (card->name);
-			e_address_widget_set_name (addr, s);
-			g_free (s);
-		}
-
-		e_address_widget_refresh (addr);
-	}
-}
-
-static void
-query_results_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer user_data)
-{
-	EAddressWidget *addr = user_data;
-
-	if (g_list_length ((GList *) cards) == 1) {
-		ECard *card = E_CARD (cards->data);
-		e_address_widget_cardify (addr, card, TRUE);
-	}
-
-	addr->query_tag = 0;
-}
-
-static void
-e_address_widget_do_query (EAddressWidget *addr)
-{
-	e_book_name_and_email_query (common_book, addr->name, addr->email, query_results_cb, addr);
-}
-
-static void
-book_ready_cb (EBook *book, EBookStatus status, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	if (common_book == NULL) {
-		common_book = book;
-		gtk_object_ref (GTK_OBJECT (common_book));
-	} else
-		gtk_object_unref (GTK_OBJECT (book));
-
-	e_address_widget_do_query (addr);
-}
-
-static gint
-query_idle_fn (gpointer ptr)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (ptr);
-
-	if (common_book) {
-		e_address_widget_do_query (addr);
-	} else {
-		e_book_load_local_address_book (e_book_new (), book_ready_cb, addr);
-	}
-
-	addr->query_idle_tag = 0;
-	return FALSE;
-}
-
-static void
-e_address_widget_schedule_query (EAddressWidget *addr)
-{
-	if (addr->query_idle_tag || !doing_queries)
-		return;
-	addr->query_idle_tag = gtk_idle_add (query_idle_fn, addr);
-}
-
-/*
- *
- * Popup Menu
- *
- */
-
-#define ARBITRARY_UIINFO_LIMIT 64
-
-static gint
-popup_add_name_and_address (EAddressWidget *addr, GnomeUIInfo *uiinfo, gint i)
-{
-	gboolean flag = FALSE;
-
-	if (addr->name && *addr->name) {
-		uiinfo[i].type = GNOME_APP_UI_ITEM;
-		uiinfo[i].label = addr->name;
-		++i;
-		flag = TRUE;
-	}
-
-	if (addr->email && *addr->email) {
-		uiinfo[i].type = GNOME_APP_UI_ITEM;
-		uiinfo[i].label = addr->email;
-		++i;
-		flag = TRUE;
-	}
-
-	if (flag) {
-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-		++i;
-	}
-	
-	return i;
-}
-
-static void
-flip_queries_flag_cb (GtkWidget *w, gpointer user_data)
-{
-	doing_queries = !doing_queries;
-}
-
-static gint
-popup_add_query_change (EAddressWidget *addr, GnomeUIInfo *uiinfo, gint i)
-{
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = doing_queries ? _("Disable Queries") : _("Enable Queries (Dangerous!)");
-	uiinfo[i].moreinfo = flip_queries_flag_cb;
-	++i;
-
-	return i;
-}
-
-
-static GtkWidget *
-popup_menu_card (EAddressWidget *addr)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GtkWidget *pop;
-	gint i=0;
-	ECard *card = E_CARD (addr->card);
-
-	g_return_val_if_fail (card != NULL, NULL);
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	i = popup_add_name_and_address (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = _("Edit Contact Info");
-	++i;
-
-	i = popup_add_query_change (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-	pop = gnome_popup_menu_new (uiinfo);
-	return pop;
-}
-
-static void
-post_quick_add_cb (ECard *card, gpointer user_data)
-{
-	e_address_widget_cardify (E_ADDRESS_WIDGET (user_data), card, TRUE);
-}
-
-static void
-add_contacts_cb (GtkWidget *w, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	e_contact_quick_add (addr->name, addr->email, post_quick_add_cb, addr);
-}
-
-static GtkWidget *
-popup_menu_nocard (EAddressWidget *addr)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GtkWidget *pop;
-	gint i=0;
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	i = popup_add_name_and_address (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = _("Add to Contacts");
-	uiinfo[i].moreinfo = add_contacts_cb;
-	++i;
-
-	i = popup_add_query_change (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-	pop = gnome_popup_menu_new (uiinfo);
-	return pop;
-}
-
-static void
-e_address_widget_popup (EAddressWidget *addr, GdkEventButton *ev)
-{
-	GtkWidget *pop;
-
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	pop = addr->card ? popup_menu_card (addr) : popup_menu_nocard (addr);
-
-	if (pop)
-		gnome_popup_menu_do_popup (pop, NULL, NULL, ev, addr);
-}
-
-/*
- *
- * Bonobo Control Magic
- *
- */
-
-enum {
-	ADDRESS_PROPERTY_NAME,
-	ADDRESS_PROPERTY_EMAIL,
-	ADDRESS_PROPERTY_TEXT,
-	ADDRESS_PROPERTY_BACKGROUND_RGB
-};
-
-
-static void
-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ADDRESS_PROPERTY_NAME:
-		BONOBO_ARG_SET_STRING (arg, addr->name ? addr->name :"");
-		break;
-
-	case ADDRESS_PROPERTY_EMAIL:
-		BONOBO_ARG_SET_STRING (arg, addr->email ? addr->email : "");
-		break;
-
-	case ADDRESS_PROPERTY_TEXT:
-		BONOBO_ARG_SET_STRING (arg, "?");
-		break;
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ADDRESS_PROPERTY_NAME:
-		e_address_widget_set_name (addr, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case ADDRESS_PROPERTY_EMAIL:
-		e_address_widget_set_email (addr, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case ADDRESS_PROPERTY_TEXT:
-		e_address_widget_set_text (addr, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-		
-	case ADDRESS_PROPERTY_BACKGROUND_RGB:
-		{
-			gint bg = BONOBO_ARG_GET_INT (arg);
-			GdkColor color;
-
-			color.red   = (bg & 0xff0000) >> 8;
-			color.green = (bg & 0x00ff00);
-			color.blue  = (bg & 0x0000ff) << 8;
-
-			if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (addr)), &color, FALSE, TRUE)) {
-				GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (addr)));
-				style->bg[0] = color;
-				gtk_widget_set_style (GTK_WIDGET (addr), style);
-			}
-		}
-		
-		break;
-	}
-}
-
-static BonoboControl *
-e_address_widget_factory_new_control (void)
-{
-	BonoboControl *control;
-	BonoboPropertyBag *bag;
-	GtkWidget *w;
-
-	w = e_address_widget_new ();
-	gtk_widget_show (w);
-
-	control = bonobo_control_new (w);
-
-	bag = bonobo_property_bag_new (get_prop, set_prop, w);
-	bonobo_property_bag_add (bag, "name", ADDRESS_PROPERTY_NAME,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_property_bag_add (bag, "email", ADDRESS_PROPERTY_EMAIL,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_property_bag_add (bag, "text", ADDRESS_PROPERTY_TEXT,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_property_bag_add (bag, "background_rgb", ADDRESS_PROPERTY_BACKGROUND_RGB,
-				 BONOBO_ARG_INT, NULL, NULL,
-				 BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, bag);
-	bonobo_object_unref (BONOBO_OBJECT (bag));
-
-	return control;
-}
-
-static BonoboObject *
-e_address_widget_factory (BonoboGenericFactory *factory, gpointer user_data)
-{
-	return BONOBO_OBJECT (e_address_widget_factory_new_control ());
-}
-
-void
-e_address_widget_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory",
-					      e_address_widget_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register an AddressWidget factory.");
-}
-
diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h
deleted file mode 100644
index 535e51028c..0000000000
--- a/addressbook/gui/component/e-address-widget.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-widget.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_ADDRESS_WIDGET_H__
-#define __E_ADDRESS_WIDGET_H__
-
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_ADDRESS_WIDGET_TYPE        (e_address_widget_get_type ())
-#define E_ADDRESS_WIDGET(o)          (GTK_CHECK_CAST ((o), E_ADDRESS_WIDGET_TYPE, EAddressWidget))
-#define E_ADDRESS_WIDGET_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_WIDGET_TYPE, EAddressWidgetClass))
-#define E_IS_ADDRESS_WIDGET(o)       (GTK_CHECK_TYPE ((o), E_ADDRESS_WIDGET_TYPE))
-#define E_IS_ADDRESS_WIDGET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_WIDGET_TYPE))
-
-typedef struct _EAddressWidget EAddressWidget;
-typedef struct _EAddressWidgetClass EAddressWidgetClass;
-
-struct _EAddressWidget {
-	GtkEventBox parent;
-	
-	gchar *name;
-	gchar *email;
-	
-	GtkWidget *name_widget;
-	GtkWidget *email_widget;
-	GtkWidget *spacer;
-
-	guint query_idle_tag;
-	guint query_tag;
-
-	ECard *card;
-	gboolean known_email;
-};
-
-struct _EAddressWidgetClass {
-	GtkEventBoxClass parent_class;
-};
-
-GtkType e_address_widget_get_type (void);
-
-void e_address_widget_set_name  (EAddressWidget *, const gchar *name);
-void e_address_widget_set_email (EAddressWidget *, const gchar *email);
-void e_address_widget_set_text  (EAddressWidget *, const gchar *text);
-
-void e_address_widget_construct (EAddressWidget *);
-GtkWidget *e_address_widget_new (void);
-
-
-void e_address_widget_factory_init (void);
-
-
-
-END_GNOME_DECLS
-
-#endif /* __E_ADDRESS_WIDGET_H__ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
deleted file mode 100644
index 5d9b053934..0000000000
--- a/addressbook/gui/component/e-cardlist-model.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 1999 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "e-cardlist-model.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_table_model_pre_change(etc);
-	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;
-		const 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;
-				break;
-			}
-		}
-		if (!found) {
-			e_table_model_pre_change(E_TABLE_MODEL(model));
-			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) ) {
-			e_table_model_pre_change(E_TABLE_MODEL(model));
-			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/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
deleted file mode 100644
index 868cdb40f0..0000000000
--- a/addressbook/gui/component/ldap-config.glade
+++ /dev/null
@@ -1,5819 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>addressbook-config-mockup</name>
-  <program_name>addressbook-config-mockup</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>../../../art</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>Add/Edit Attribute Mappings--Simple Version</name>
-  <visible>False</visible>
-  <title>Add (or Edit) Attribute Mappings</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</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>dialog-vbox4</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_area4</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>button37</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>button39</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>vbox30</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox66</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap35</name>
-	  <filename>ldap.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label283</name>
-	  <label>Please select and Evolution attribute and an
-LDAP attribute to associate with it.</label>
-	  <justify>GTK_JUSTIFY_LEFT</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>GtkHSeparator</class>
-	<name>hseparator8</name>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table18</name>
-	<border_width>3</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>3</row_spacing>
-	<column_spacing>3</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label284</name>
-	  <label>_Evolution attribute:</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>combo-entry2</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>label285</name>
-	  <label>_LDAP attribute:</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>combo-entry3</default_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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>combo4</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>
-	    <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>combo-entry2</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>combo5</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>
-	    <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>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>combo-entry3</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>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>Add/Edit Attribute Mappings-- Multiple Selection Version</name>
-  <visible>False</visible>
-  <title>Add (or Edit) Attribute Mappings</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>393</default_width>
-  <default_height>324</default_height>
-  <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>vbox31</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>hbuttonbox9</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>button40</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>button41</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>vbox32</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox67</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap36</name>
-	  <filename>ldap.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label286</name>
-	  <label>Please select and Evolution attribute and an
-LDAP attribute to associate with it.</label>
-	  <justify>GTK_JUSTIFY_LEFT</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>GtkHSeparator</class>
-	<name>hseparator9</name>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table19</name>
-	<border_width>3</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>3</row_spacing>
-	<column_spacing>3</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label287</name>
-	  <label>_Evolution attribute:</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>entry32</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>GtkCombo</class>
-	  <name>combo6</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>
-	    <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>entry32</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>GtkLabel</class>
-	  <name>label288</name>
-	  <label>_LDAP attributes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>7.45058e-09</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>GtkScrolledWindow</class>
-	  <name>scrolledwindow6</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>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>GtkCList</class>
-	    <name>clist4</name>
-	    <can_focus>True</can_focus>
-	    <columns>2</columns>
-	    <column_widths>163,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>label289</name>
-	      <label>Attribute</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>label290</name>
-	      <label>Select</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>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>account-editor-window</name>
-  <visible>False</visible>
-  <title>account-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>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox37</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>account-editor-notebook</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>account-editor-general-vbox</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox100</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label431</name>
-	    <label>_Display 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>GtkAlignment</class>
-	    <name>alignment45</name>
-	    <xalign>1</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0.9</xscale>
-	    <yscale>1</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>account-editor-display-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>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator12</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label331</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>GtkVBox</class>
-	<name>account-editor-connecting-vbox</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label334</name>
-	<label>Connecting</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>account-editor-searching-vbox</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label344</name>
-	<label>Searching</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>account-editor-objectclasses-vbox</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>account-editor-objectclasses-label</name>
-	<label>Objectclasses</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>account-editor-mappings-vbox</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>account-editor-mappings-label</name>
-	<label>Mappings</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>account-editor-dn-customization-vbox</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>account-editor-dn-customization-label</name>
-	<label>DN Customization</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>
-      <class>GtkHSeparator</class>
-      <name>hseparator10</name>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox120</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkNotebook</class>
-	<name>account-editor-advanced-button-notebook</name>
-	<show_tabs>False</show_tabs>
-	<show_border>False</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>GtkHButtonBox</class>
-	  <name>hbuttonbox21</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</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>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>account-editor-fewer-options-button</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>&lt;&lt; Fewer Options</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label554</name>
-	  <label>label554</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>GtkHButtonBox</class>
-	  <name>hbuttonbox28</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</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>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>account-editor-more-options-button</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_More Options &gt;&gt;</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label555</name>
-	  <label>label555</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>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox20</name>
-	<layout_style>GTK_BUTTONBOX_END</layout_style>
-	<spacing>0</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>account-editor-ok-button</name>
-	  <sensitive>False</sensitive>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>account-editor-apply-button</name>
-	  <sensitive>False</sensitive>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>account-editor-close-button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>account-druid-window</name>
-  <visible>False</visible>
-  <title>account-druid</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>GnomeDruid</class>
-    <name>account-druid</name>
-
-    <widget>
-      <class>GnomeDruidPageStart</class>
-      <name>druidpagestart1</name>
-      <title>LDAP Configuration Assistant</title>
-      <text>This assistant will help you to access online directory services
-using LDAP (Lightweight Directory Access Protocol) servers. 
-
-Adding a new LDAP server requires some specialized information
-about the server. Please contact your system administrator if you 
-need help finding this information.</text>
-      <title_color>255,255,255</title_color>
-      <text_color>0,0,0</text_color>
-      <background_color>0,0,0</background_color>
-      <logo_background_color>0,0,0</logo_background_color>
-      <textbox_color>255,255,255</textbox_color>
-      <logo_image>ldap.png</logo_image>
-      <watermark_image>xstdruidbg-3.png</watermark_image>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>add-server-druid-info-page</name>
-      <title>Step 1: Server Information</title>
-      <title_color>255,255,255</title_color>
-      <background_color>0,0,0</background_color>
-      <logo_background_color>0,0,0</logo_background_color>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox1</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>account-druid-general-vbox</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label158</name>
-	    <label>The first step in configuring an LDAP server is to provide its name, and your log in
-information. Please ask your system administrator if you are unsure of this information.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>3</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHSeparator</class>
-	    <name>hseparator2</name>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>add-server-druid-connecting-page</name>
-      <title>Step 2: Connecting to Server</title>
-      <title_color>255,255,255</title_color>
-      <background_color>0,0,0</background_color>
-      <logo_background_color>0,0,0</logo_background_color>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox2</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>account-druid-connecting-vbox</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label174</name>
-	    <label>Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer)
-and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect
-your connection. Ask your system administrator if your LDAP server uses these protocols.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>3</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHSeparator</class>
-	    <name>hseparator3</name>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>add-server-druid-searching-page</name>
-      <title>Step 3: Searching the Directory</title>
-      <title_color>255,255,255</title_color>
-      <background_color>0,0,0</background_color>
-      <logo_background_color>0,0,0</logo_background_color>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>vbox23</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>account-druid-searching-vbox</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label254</name>
-	    <label>The options on this page control how many entries should be included in your
-searches, and how long a search should take. Ask your system administrator if you
-need to change these options.</label>
-	    <justify>GTK_JUSTIFY_LEFT</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>GtkHSeparator</class>
-	    <name>hseparator7</name>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>add-server-druid-display-name-page</name>
-      <title>Step 4: Display Name</title>
-      <title_color>255,255,255</title_color>
-      <background_color>0,0,0</background_color>
-      <logo_background_color>0,0,0</logo_background_color>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox5</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox21</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label198</name>
-	    <label>Specifying a display name is the last required step in configuring an LDAP server.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>3</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHSeparator</class>
-	    <name>hseparator5</name>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table15</name>
-	    <border_width>3</border_width>
-	    <rows>1</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>3</row_spacing>
-	    <column_spacing>3</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>druid-display-name-entry</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>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>GtkLabel</class>
-	      <name>label199</name>
-	      <label>_Display name:</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>druid-display-name-entry</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>
-
-	  <widget>
-	    <class>GtkNotebook</class>
-	    <name>notebook15</name>
-	    <show_tabs>False</show_tabs>
-	    <show_border>False</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>False</expand>
-	      <fill>False</fill>
-	      <pack>GTK_PACK_END</pack>
-	    </child>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox41</name>
-	      <border_width>3</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>2</spacing>
-
-	      <widget>
-		<class>GnomePixmap</class>
-		<name>pixmap21</name>
-		<filename>gnome-hint.png</filename>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label207</name>
-		<label>This is the name for this server that will appear in your Evolution folder list.
-It is for display purposes only. </label>
-		<justify>GTK_JUSTIFY_LEFT</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>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>Notebook:tab</child_name>
-	      <name>label208</name>
-	      <label>label163</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>hbox42</name>
-	      <border_width>3</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>3</spacing>
-
-	      <widget>
-		<class>GnomePixmap</class>
-		<name>pixmap22</name>
-		<filename>gnome-hint.png</filename>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label215</name>
-		<label>Selecting this option will let you change Evolution's default settings for LDAP
-searches, and for creating and editting contacts. </label>
-		<justify>GTK_JUSTIFY_LEFT</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>GtkLabel</class>
-	      <child_name>Notebook:tab</child_name>
-	      <name>label210</name>
-	      <label>label164</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>GnomeDruidPageFinish</class>
-      <name>add-server-druid-finish-page</name>
-      <title>Finished</title>
-      <text>Congratulations, you are finished setting up this LDAP server. You
-are now ready to access this directory.
-
-Please click the &quot;Finish&quot; button to save the settings you have entered here.</text>
-      <background_color>0,0,0</background_color>
-      <logo_background_color>0,0,0</logo_background_color>
-      <textbox_color>255,255,255</textbox_color>
-      <text_color>0,0,0</text_color>
-      <title_color>255,255,255</title_color>
-      <watermark_image>xstdruidbg-3.png</watermark_image>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>edit_server_window_simple</name>
-  <visible>False</visible>
-  <title>edit_server_window_simple</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>GtkVBox</class>
-    <name>vbox67</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook25</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>vbox68</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox121</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label484</name>
-	    <label>_Display 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>GtkAlignment</class>
-	    <name>alignment52</name>
-	    <xalign>1</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0.9</xscale>
-	    <yscale>1</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>entry54</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>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator13</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table32</name>
-	  <border_width>3</border_width>
-	  <rows>3</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label485</name>
-	    <label>_Server name:</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>entry55</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>label486</name>
-	    <label>_Log in method:</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>label487</name>
-	    <label>Distinguished _name:</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>entry56</default_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>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry55</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>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>alignment53</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>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>optionmenu18</name>
-	      <can_focus>True</can_focus>
-	      <items>Anonymously
-Using email address
-Using distinguished name (DN)
-</items>
-	      <initial_choice>2</initial_choice>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry56</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>
-
-	<widget>
-	  <class>GtkNotebook</class>
-	  <name>notebook26</name>
-	  <show_tabs>False</show_tabs>
-	  <show_border>False</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>False</expand>
-	    <fill>False</fill>
-	    <pack>GTK_PACK_END</pack>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox122</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap66</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label488</name>
-	      <label>This is the full name of your ldap server. For example, &quot;ldap.mycompany.com&quot;.</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label489</name>
-	    <label>label163</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>hbox123</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap67</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label490</name>
-	      <label>label168</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label491</name>
-	    <label>label164</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>hbox124</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap68</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label492</name>
-	      <label>label169</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label493</name>
-	    <label>label165</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>Placeholder</class>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label494</name>
-	    <label>label214</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>hbox125</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap69</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label495</name>
-	      <label>This is the name for this server that will appear in your Evolution folder list.
-It is for display purposes only. </label>
-	      <justify>GTK_JUSTIFY_LEFT</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>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label496</name>
-	    <label>label452</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label497</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>GtkVBox</class>
-	<name>vbox69</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table33</name>
-	  <border_width>3</border_width>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label498</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>
-	    <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>GtkAlignment</class>
-	    <name>alignment54</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>GtkVBox</class>
-	      <name>vbox70</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton9</name>
-		<can_focus>True</can_focus>
-		<label>_Always</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton10</name>
-		<can_focus>True</can_focus>
-		<label>_If necessary </label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton11</name>
-		<can_focus>True</can_focus>
-		<label>_Don't use SSL/TLS</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment55</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>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>
-	      <class>GtkPixmap</class>
-	      <name>pixmap70</name>
-	      <filename>gnome-hint.png</filename>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <build_insensitive>True</build_insensitive>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment56</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>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>GtkCombo</class>
-	      <name>combo8</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>380
-666
-1234
-</items>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<child_name>GtkCombo:entry</child_name>
-		<name>entry57</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>380</text>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label499</name>
-	    <label>U_se SSL/TLS:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>7.45058e-09</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>
-
-	<widget>
-	  <class>GtkNotebook</class>
-	  <name>notebook27</name>
-	  <show_tabs>False</show_tabs>
-	  <show_border>False</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>False</expand>
-	    <fill>False</fill>
-	    <pack>GTK_PACK_END</pack>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox126</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap71</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label500</name>
-	      <label>This is the port on the LDAP server that Evolution will try to connect to. A 
-list of standard ports has been provided. Ask your system administrator
-what port you should specify.</label>
-	      <justify>GTK_JUSTIFY_LEFT</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label501</name>
-	    <label>label163</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>hbox127</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap72</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label502</name>
-	      <label>Selecting this option means that Evolution will only connect to your LDAP server if
-your LDAP server supports SSL or TLS.</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label503</name>
-	    <label>label398</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>hbox128</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap73</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label504</name>
-	      <label>Selecting this option means that Evolution will only try to use SSL/TLS if you are in a 
-insecure environment. For example, if you and your LDAP server are behind a firewall
-at work, then Evolution doesn't need to use SSL/TLS because your connection is already
-secure.</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label505</name>
-	    <label>label396</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>hbox129</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap74</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label506</name>
-	      <label>Selecting this option means that your server does not support either SSL or TLS.  This 
-means that your connection will be insecure, and that you will be vulnerable to security
-exploits. </label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label507</name>
-	    <label>label397</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label508</name>
-	<label>Connecting</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>vbox71</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table34</name>
-	  <border_width>3</border_width>
-	  <rows>4</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label509</name>
-	    <label>_Search base:</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>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label510</name>
-	    <label>S_earch scope: </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>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>GtkAlignment</class>
-	    <name>alignment57</name>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>7.45058e-09</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>optionmenu19</name>
-	      <can_focus>True</can_focus>
-	      <items>Sub
-One
-</items>
-	      <initial_choice>0</initial_choice>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox130</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</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>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>entry58</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>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>button90</name>
-	      <can_focus>True</can_focus>
-	      <label>  S_how Supported Bases </label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label511</name>
-	    <label>_Timeout (minutes):</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>1</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>GtkAlignment</class>
-	    <name>alignment58</name>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>1</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>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox131</name>
-	      <border_width>3</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>3</spacing>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label512</name>
-		<label>1:00</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>GtkHScale</class>
-		<name>hscale5</name>
-		<can_focus>True</can_focus>
-		<draw_value>False</draw_value>
-		<value_pos>GTK_POS_LEFT</value_pos>
-		<digits>0</digits>
-		<policy>GTK_UPDATE_DELAYED</policy>
-		<value>3</value>
-		<lower>1</lower>
-		<upper>5</upper>
-		<step>0.5</step>
-		<page>1</page>
-		<page_size>0</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label513</name>
-		<label>5:00</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xpad>3</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label514</name>
-		<label>Selected:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>1</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>label515</name>
-		<label>2:30</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>
-	    <class>GtkLabel</class>
-	    <name>label516</name>
-	    <label>_Download limit:</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>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>GtkAlignment</class>
-	    <name>alignment59</name>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0</xscale>
-	    <yscale>1</yscale>
-	    <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>GtkHBox</class>
-	      <name>hbox132</name>
-	      <border_width>3</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>3</spacing>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>spinbutton5</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>100</value>
-		<lower>0</lower>
-		<upper>10000</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>label517</name>
-		<label>cards</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>GtkNotebook</class>
-	  <name>notebook28</name>
-	  <show_tabs>False</show_tabs>
-	  <show_border>False</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>False</expand>
-	    <fill>False</fill>
-	    <pack>GTK_PACK_END</pack>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox133</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap75</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label518</name>
-	      <label>The search base is the distinguished name (DN)  of the entry where your searches will 
-begin. If you leave this blank, the search will begin at the root of the directory tree.</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label519</name>
-	    <label>label163</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>hbox134</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap76</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label520</name>
-	      <label>The search scope defines how deep you would like the search to extend down the 
-directory tree. A search scope of &quot;sub&quot; will include all entries below your search base.
-A search scope of &quot;one&quot; will only include the entries one level beneath your base.
-</label>
-	      <justify>GTK_JUSTIFY_LEFT</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label521</name>
-	    <label>label164</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>hbox135</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap77</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label522</name>
-	      <label>This option controls how long a search will be run.</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label523</name>
-	    <label>label165</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>hbox136</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>2</spacing>
-
-	    <widget>
-	      <class>GnomePixmap</class>
-	      <name>pixmap78</name>
-	      <filename>gnome-hint.png</filename>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label524</name>
-	      <label>This is the maximum number of entries to download. Setting this number to be 
-too large will slow down your addressbook.</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</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>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label525</name>
-	    <label>label166</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label526</name>
-	<label>Searching</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>
-      <class>GtkHSeparator</class>
-      <name>hseparator14</name>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox142</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox25</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
-	<spacing>0</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>button100</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>_More Options &gt;&gt;</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox26</name>
-	<layout_style>GTK_BUTTONBOX_END</layout_style>
-	<spacing>0</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>button101</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button102</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button103</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>addressbook-sources-window</name>
-  <visible>False</visible>
-  <title>Addressbook Sources</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>355</default_width>
-  <default_height>285</default_height>
-  <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>addressbook-sources-vbox</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>hbuttonbox27</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>button104</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>button105</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>button106</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>addressbook-sources</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>Custom</class>
-	<name>sourcesTable</name>
-	<creation_function>addressbook_dialog_create_sources_table</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Thu, 11 Apr 2002 00:31:02 GMT</last_modification_time>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox73</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label529</name>
-	  <label>
-</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>GtkVButtonBox</class>
-	  <name>vbuttonbox18</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</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>addSource</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>editSource</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Edit</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>deleteSource</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>De_lete</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>general-tab-window</name>
-  <visible>False</visible>
-  <title>general-tab</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>GtkVBox</class>
-    <name>general-tab</name>
-    <border_width>6</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>3</spacing>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table36</name>
-      <border_width>3</border_width>
-      <rows>3</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>3</row_spacing>
-      <column_spacing>3</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label534</name>
-	<label>_Server name:</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>server-name-entry</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>label535</name>
-	<label>_Log in method:</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>server-name-entry</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>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>alignment63</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>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>auth-optionmenu</name>
-	  <can_focus>True</can_focus>
-	  <items>Anonymously
-Using email address
-Using distinguished name (DN)
-</items>
-	  <initial_choice>0</initial_choice>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkNotebook</class>
-	<name>auth-label-notebook</name>
-	<sensitive>False</sensitive>
-	<show_tabs>False</show_tabs>
-	<show_border>False</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>
-	  <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>label553</name>
-	  <label>Email Address:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label546</name>
-	  <label>label546</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>
-	  <name>label536</name>
-	  <label>Distinguished _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>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label547</name>
-	  <label>label547</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>
-	<class>GtkNotebook</class>
-	<name>auth-entry-notebook</name>
-	<sensitive>False</sensitive>
-	<show_tabs>False</show_tabs>
-	<show_border>False</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>
-	  <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>GtkEntry</class>
-	  <name>email-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>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label549</name>
-	  <label>label549</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>GtkEntry</class>
-	  <name>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>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label550</name>
-	  <label>label550</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>GtkNotebook</class>
-      <name>general-tab-help</name>
-      <show_tabs>False</show_tabs>
-      <show_border>False</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>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox145</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap79</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label537</name>
-	  <label>This is the full name of your ldap server. For example, &quot;ldap.mycompany.com&quot;.</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label538</name>
-	<label>label163</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>hbox146</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap80</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label539</name>
-	  <label>Evolution will use this email address to authenticate you with the server</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label540</name>
-	<label>label164</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>hbox147</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap81</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label541</name>
-	  <label>Evolution will use this DN to authenticate you with the server</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label542</name>
-	<label>label165</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>
-	<name>label552</name>
-	<label>This is the method evolution will use to authenticate you.  Note that setting this to &quot;Email Address&quot; requires anonymous access to your ldap server.</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>True</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label551</name>
-	<label>label551</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>hbox148</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap82</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label544</name>
-	  <label>This is the name for this server that will appear in your Evolution folder list.
-It is for display purposes only. </label>
-	  <justify>GTK_JUSTIFY_LEFT</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>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label545</name>
-	<label>label452</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>GtkWindow</class>
-  <name>connecting-tab-window</name>
-  <visible>False</visible>
-  <title>connecting-tab</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>GtkVBox</class>
-    <name>connecting-tab</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table14</name>
-      <border_width>3</border_width>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>3</row_spacing>
-      <column_spacing>3</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label175</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>
-	<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>GtkAlignment</class>
-	<name>alignment23</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>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>
-	  <class>GtkPixmap</class>
-	  <name>pixmap11</name>
-	  <filename>gnome-hint.png</filename>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <build_insensitive>True</build_insensitive>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment21</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>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>GtkCombo</class>
-	  <name>port-combo</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>389
-636
-3268
-</items>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>entry27</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>389</text>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label176</name>
-	<label>U_se SSL/TLS:</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>GtkAlignment</class>
-	<name>alignment60</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>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>ssl-optionmenu</name>
-	  <can_focus>True</can_focus>
-	  <items>Always
-Whenever Possible
-Never
-</items>
-	  <initial_choice>1</initial_choice>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>connecting-tab-help</name>
-      <show_tabs>False</show_tabs>
-      <show_border>False</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>GtkHBox</class>
-	<name>hbox30</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap7</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label178</name>
-	  <label>This is the port on the LDAP server that Evolution will try to connect to. A 
-list of standard ports has been provided. Ask your system administrator
-what port you should specify.</label>
-	  <justify>GTK_JUSTIFY_LEFT</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label179</name>
-	<label>label163</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>hbox31</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap8</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label395</name>
-	  <label>Selecting this option means that Evolution will only connect to your LDAP server if
-your LDAP server supports SSL or TLS.</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label398</name>
-	<label>label398</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>hbox91</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap43</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label399</name>
-	  <label>Selecting this option means that Evolution will only try to use SSL/TLS if you are in a 
-insecure environment. For example, if you and your LDAP server are behind a firewall
-at work, then Evolution doesn't need to use SSL/TLS because your connection is already
-secure.</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label396</name>
-	<label>label396</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>hbox92</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap44</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label400</name>
-	  <label>Selecting this option means that your server does not support either SSL or TLS.  This 
-means that your connection will be insecure, and that you will be vulnerable to security
-exploits. </label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label397</name>
-	<label>label397</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>GtkWindow</class>
-  <name>searching-tab-window</name>
-  <visible>False</visible>
-  <title>searching-tab</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>GtkVBox</class>
-    <name>searching-tab</name>
-    <border_width>6</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>3</spacing>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table30</name>
-      <border_width>3</border_width>
-      <rows>4</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>3</row_spacing>
-      <column_spacing>3</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label455</name>
-	<label>_Search base:</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>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label456</name>
-	<label>S_earch scope: </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>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>GtkAlignment</class>
-	<name>alignment49</name>
-	<xalign>7.45058e-09</xalign>
-	<yalign>7.45058e-09</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>scope-optionmenu</name>
-	  <can_focus>True</can_focus>
-	  <items>One
-Sub
-</items>
-	  <initial_choice>0</initial_choice>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox109</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</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>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>rootdn-entry</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>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>rootdn-button</name>
-	  <can_focus>True</can_focus>
-	  <label>  S_how Supported Bases </label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label457</name>
-	<label>_Timeout (minutes):</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>1</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>GtkAlignment</class>
-	<name>alignment50</name>
-	<xalign>7.45058e-09</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</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>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox110</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label458</name>
-	    <label>1:00</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>GtkHScale</class>
-	    <name>timeout-scale</name>
-	    <can_focus>True</can_focus>
-	    <draw_value>False</draw_value>
-	    <value_pos>GTK_POS_LEFT</value_pos>
-	    <digits>0</digits>
-	    <policy>GTK_UPDATE_DELAYED</policy>
-	    <value>3</value>
-	    <lower>1</lower>
-	    <upper>5</upper>
-	    <step>0.5</step>
-	    <page>1</page>
-	    <page_size>0</page_size>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label459</name>
-	    <label>5:00</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>3</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label460</name>
-	    <label>Selected:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>1</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>label461</name>
-	    <label>2:30</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>
-	<class>GtkLabel</class>
-	<name>label462</name>
-	<label>_Download limit:</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>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>GtkAlignment</class>
-	<name>alignment51</name>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xscale>0</xscale>
-	<yscale>1</yscale>
-	<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>GtkHBox</class>
-	  <name>hbox111</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>download-limit-spinbutton</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>100</value>
-	    <lower>0</lower>
-	    <upper>10000</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>label463</name>
-	    <label>cards</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>GtkNotebook</class>
-      <name>searching-tab-help</name>
-      <show_tabs>False</show_tabs>
-      <show_border>False</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>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox112</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap60</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label464</name>
-	  <label>The search base is the distinguished name (DN)  of the entry where your searches will 
-begin. If you leave this blank, the search will begin at the root of the directory tree.</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label465</name>
-	<label>label163</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>hbox113</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap61</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label466</name>
-	  <label>The search scope defines how deep you would like the search to extend down the 
-directory tree. A search scope of &quot;sub&quot; will include all entries below your search base.
-A search scope of &quot;one&quot; will only include the entries one level beneath your base.
-</label>
-	  <justify>GTK_JUSTIFY_LEFT</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label467</name>
-	<label>label164</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>hbox114</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap62</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label468</name>
-	  <label>This option controls how long a search will be run.</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label469</name>
-	<label>label165</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>hbox115</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap63</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label470</name>
-	  <label>This is the maximum number of entries to download. Setting this number to be 
-too large will slow down your addressbook.</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label471</name>
-	<label>label166</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>GtkWindow</class>
-  <name>objectclasses-tab-window</name>
-  <visible>False</visible>
-  <title>objectclasses-tab</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>GtkVBox</class>
-    <name>objectclasses-tab</name>
-    <border_width>3</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>3</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox93</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>3</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox51</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label405</name>
-	  <label>Objectclasses Used on Server:</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>objectclasses-server-table</name>
-	  <creation_function>objectclasses_create_server_table</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Tue, 16 Apr 2002 17:09:21 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox52</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label407</name>
-	  <label>
-</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>GtkVButtonBox</class>
-	  <name>vbuttonbox15</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>1</spacing>
-	  <child_min_width>47</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>objectclasses-add-button</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add -&gt;</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>objectclasses-remove-button</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>&lt;- _Remove</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox53</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label408</name>
-	  <label>Objectclasses Used in Evolution:</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>objectclasses-evolution-table</name>
-	  <creation_function>objectclasses_create_evolution_table</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Tue, 16 Apr 2002 17:09:43 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <name>hbuttonbox16</name>
-      <border_width>6</border_width>
-      <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-      <spacing>0</spacing>
-      <child_min_width>87</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>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>objectclasses-default-button</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>R_estore Defaults</label>
-	<relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>mappings-tab-window</name>
-  <visible>False</visible>
-  <title>mappings-tab</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>GtkVBox</class>
-    <name>mappings-tab</name>
-    <border_width>3</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>3</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox94</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>3</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox55</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow21</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>clist18</name>
-	    <can_focus>True</can_focus>
-	    <columns>2</columns>
-	    <column_widths>146,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>label411</name>
-	      <label>Evolution Attribute</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>label412</name>
-	      <label>Associated LDAP Attribute</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>vbox56</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label413</name>
-	  <label>
-</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>GtkVButtonBox</class>
-	  <name>vbuttonbox16</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>7</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>button71</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add Mapping</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button72</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Edit Mapping</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button73</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Delete Mapping</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <name>hbuttonbox17</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>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button74</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Re_store Defaults</label>
-	<relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>dn-customization-tab-window</name>
-  <visible>False</visible>
-  <title>dn-customization-tab</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>GtkVBox</class>
-    <name>dn-customization-tab</name>
-    <border_width>3</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>3</spacing>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook24</name>
-      <show_tabs>False</show_tabs>
-      <show_border>False</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>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox116</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap64</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label473</name>
-	  <label>To add an attribute to the DN, select it from the list and click the &quot;Add Attribute&quot; button.
-Any values that you add to the DN will become required values for any new contacts
-that you add to the directory on the LDAP server. </label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label474</name>
-	<label>label163</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>hbox117</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GnomePixmap</class>
-	  <name>pixmap65</name>
-	  <filename>gnome-hint.png</filename>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label475</name>
-	  <label>Selecting this option will let you change Evolution's default settings for LDAP
-searches, and for creating and editting contacts. </label>
-	  <justify>GTK_JUSTIFY_LEFT</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>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label476</name>
-	<label>label164</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>
-      <class>GtkTable</class>
-      <name>table31</name>
-      <border_width>3</border_width>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>3</row_spacing>
-      <column_spacing>3</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox64</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<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>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label477</name>
-	  <label></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>GtkVButtonBox</class>
-	  <name>vbuttonbox17</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>10</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>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button78</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add to DN</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow22</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>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>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist19</name>
-	  <can_focus>True</can_focus>
-	  <columns>2</columns>
-	  <column_widths>152,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>label478</name>
-	    <label>LDAP Attribute</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>label479</name>
-	    <label>Corresponding Evolution Attribute</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>GtkHBox</class>
-	<name>hbox118</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</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>label480</name>
-	  <label>_Distinguished Name (DN):</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>entry53</default_focus_target>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry53</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>GtkHButtonBox</class>
-	<name>hbuttonbox18</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>7</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
-	<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>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button79</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>_Restore Defaults</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>supported-bases-dialog</name>
-  <visible>False</visible>
-  <title>Supported Search Bases</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>300</default_width>
-  <default_height>200</default_height>
-  <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>dialog-vbox5</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_area5</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>button107</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>button109</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>Custom</class>
-      <name>supported-bases-table</name>
-      <creation_function>supported_bases_create_table</creation_function>
-      <int1>0</int1>
-      <int2>0</int2>
-      <last_modification_time>Fri, 12 Apr 2002 20:06:45 GMT</last_modification_time>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index cd669499fa..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,12 +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
-GNOME_Evolution_Addressbook_SelectNames.oaf
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 f25279bb38..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the SelectNames dialog.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-
-	interface SimpleCard : Bonobo::Unknown {
-		struct Arbitrary {
-			string key;
-			string type;
-			string value;
-		};
-
-		enum Field {
-			FileAs,
-			FullName,
-			Email,
-			PhonePrimary,
-			PhoneAssistant,
-			PhoneBusiness,
-			PhoneCallback,
-			PhoneCompany,
-			PhoneHome,
-			Org,
-			AddressBusiness,
-			AddressHome,
-			PhoneMobile,
-			PhoneCar,
-			PhoneBusinessFax,
-			PhoneHomeFax,
-			PhoneBusiness2,
-			PhoneHome2,
-			PhoneIsdn,
-			PhoneOther,
-			PhoneOtherFax,
-			PhonePager,
-			PhoneRadio,
-			PhoneTelex,
-			PhoneTtytdd,
-			AddressOther,
-			Email2,
-			Email3,
-			Url,
-			OrgUnit,
-			Office,
-			Title,
-			Role,
-			Manager,
-			Assistant,
-			Nickname,
-			Spouse,
-			Note,
-			Caluri,
-			Fburl,
-			Anniversary,
-			BirthDate,
-			Mailer,
-			NameOrOrg,
-			Categories,
-			FamilyName,
-			GivenName,
-			AdditionalName,
-			NameSuffix,
-			WantsHtml,
-			IsList,
-			Last
-		};
-
-		Arbitrary getArbitrary (in string key);
-		void setArbitrary (in string key, in string type, in string value);
-
-		string get (in Field field);
-		void set (in Field field, in string value);
-	};
-
-	typedef sequence<SimpleCard> SimpleCardList;
-
-	interface SelectNames : Bonobo::Unknown {
-		struct Section {
-			string id;
-			string title;
-		};
-
-		typedef sequence<Section> SectionList;
-
-		exception DuplicateID {};
-		exception SectionNotFound {};
-
-		void addSection (in string id, in string title)
-			raises (DuplicateID);
-		void addSectionWithLimit (in string id, in string title, in short limit)
-			raises (DuplicateID);
-
-		Bonobo::Control getEntryBySection (in string section_id)
-			raises (SectionNotFound);
-
-		void activateDialog (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 7f26e2aaed..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:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory: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:GNOME_Evolution_Addressbook_SelectNames"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/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 347af45f74..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,85 +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 $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		$(srcdir)/Evolution-Addressbook-SelectNames.idl
-
-oafdir = $(datadir)/oaf
-
-oaf_in_files = GNOME_Evolution_Addressbook_SelectNames.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	-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		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-lib_LTLIBRARIES = libeselectnames.la
-
-libeselectnames_la_SOURCES = 			\
-	$(IDL_GENERATED)			\
-	e-select-names-bonobo.c			\
-	e-select-names-bonobo.h			\
-	e-select-names-completion.c		\
-	e-select-names-completion.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-popup.c			\
-	e-select-names-popup.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			\
-	e-simple-card-bonobo.c			\
-	e-simple-card-bonobo.h
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = select-names.glade
-
-
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_in_files)		\
-	$(oaf_DATA)		\
-	$(IDLS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(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 a8d0975771..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-select-names-bonobo.h"
-#include "e-simple-card-bonobo.h"
-
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-event-source.h>
-
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-entry.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#include "e-select-names-manager.h"
-#include "e-select-names-model.h"
-#include "e-select-names-text-model.h"
-#include "e-select-names-completion.h"
-
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESelectNamesBonoboPrivate {
-	ESelectNamesManager *manager;
-	BonoboEventSource *event_source;
-};
-
-enum _EntryPropertyID {
-	ENTRY_PROPERTY_ID_TEXT,
-	ENTRY_PROPERTY_ID_DESTINATIONS,
-	ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST,
-	ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,
-	ENTRY_PROPERTY_ID_ENTRY_CHANGED
-};
-typedef enum _EntryPropertyID EntryPropertyID;
-
-
-/* PropertyBag implementation for the entry widgets.  */
-
-static void
-entry_get_property_fn (BonoboPropertyBag *bag,
-		       BonoboArg *arg,
-		       unsigned int arg_id,
-		       CORBA_Environment *ev,
-		       void *user_data)
-{
-	GtkWidget *w;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		{
-			ETextModel *text_model;
-			text_model = E_TEXT_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_text_model"));
-			g_assert (text_model != NULL);
-			
-			BONOBO_ARG_SET_STRING (arg, e_text_model_get_text (text_model));
-		break;
-		}
-
-	case ENTRY_PROPERTY_ID_DESTINATIONS:
-		{
-			ESelectNamesModel *model;
-			char *text;
-
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			text = e_select_names_model_export_destinationv (model);
-			BONOBO_ARG_SET_STRING (arg, text);
-			g_free (text);
-		}
-		break;
-
-	case ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST:
-		{
-			ESelectNamesModel *model;
-			int count;
-			int i;
-			GNOME_Evolution_Addressbook_SimpleCardList *card_list;
-
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			count = e_select_names_model_count (model);
-
-			card_list = GNOME_Evolution_Addressbook_SimpleCardList__alloc ();
-			card_list->_buffer = CORBA_sequence_GNOME_Evolution_Addressbook_SimpleCard_allocbuf (count);
-			card_list->_maximum = count;
-			card_list->_length = count;
-
-			for (i = 0; i < count; i++) {
-				const EDestination *destination = e_select_names_model_get_destination (model, i);
-				const ECard *card = e_destination_get_card (destination);
-				ECardSimple *simple = e_card_simple_new ((ECard *) card);
-				ESimpleCardBonobo *simple_card = e_simple_card_bonobo_new (simple);
-				gtk_object_unref (GTK_OBJECT (simple));
-
-				card_list->_buffer[i] = bonobo_object_corba_objref (BONOBO_OBJECT (simple_card));
-			}
-
-			CORBA_free (arg->_value);
-			BONOBO_ARG_SET_GENERAL (arg, card_list, TC_GNOME_Evolution_Addressbook_SimpleCardList, GNOME_Evolution_Addressbook_SimpleCardList *, NULL);
-		}
-		break;
-
-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:
-		{
-			ESelectNamesCompletion *comp;
-			comp = E_SELECT_NAMES_COMPLETION (gtk_object_get_data (GTK_OBJECT (w), "completion_handler"));
-			g_assert (comp != NULL);
-
-			BONOBO_ARG_SET_BOOLEAN (arg, e_select_names_completion_get_match_contact_lists (comp));
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		/* This is a read-only property. */
-		g_assert_not_reached ();
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       CORBA_Environment *ev,
-		       gpointer user_data)
-{
-	GtkWidget *w;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ENTRY_PROPERTY_ID_TEXT:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-			
-			e_entry_set_text (E_ENTRY (w), BONOBO_ARG_GET_STRING (arg));
-			e_select_names_model_cardify_all (model, NULL, 0);
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_DESTINATIONS:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			e_select_names_model_import_destinationv (model, BONOBO_ARG_GET_STRING (arg));
-			e_select_names_model_cardify_all (model, NULL, 0);
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:
-		{
-			ESelectNamesCompletion *comp;
-			comp = E_SELECT_NAMES_COMPLETION (gtk_object_get_data (GTK_OBJECT (w), "completion_handler"));
-			g_assert (comp != NULL);
-
-			e_select_names_completion_set_match_contact_lists (comp, BONOBO_ARG_GET_BOOLEAN (arg));
-			break;
-		}
-		
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		gtk_object_set_data (GTK_OBJECT (w), "entry_property_id_changed", GUINT_TO_POINTER (1));
-		break;
-
-	default:
-		break;
-	}
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
-
-static POA_GNOME_Evolution_Addressbook_SelectNames *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SelectNames_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_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 void
-impl_SelectNames_add_section_with_limit (PortableServer_Servant servant,
-					 const CORBA_char *id,
-					 const CORBA_char *title,
-					 CORBA_short limit,
-					 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_with_limit (priv->manager, id, title, limit);
-}
-
-static void
-entry_changed (GtkWidget *widget, BonoboControl *control)
-{
-	gboolean changed = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (widget), "entry_property_id_changed"));
-
-	if (!changed)
-		bonobo_control_set_property (control, "entry_changed", TRUE, NULL);
-}
-
-static void
-manager_changed_cb (ESelectNamesManager *manager, const gchar *section_id, gint changed_working_copy, gpointer closure)
-{
-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);
-	BonoboArg *arg;
-
-	arg = bonobo_arg_new (BONOBO_ARG_STRING);
-	BONOBO_ARG_SET_STRING (arg, section_id);
-
-	bonobo_event_source_notify_listeners_full (select_names->priv->event_source,
-						   "GNOME/Evolution",
-						   "changed",
-						   changed_working_copy ? "working_copy" : "model",
-						   arg, NULL);
-
-	bonobo_arg_release (arg);
-}
-
-static void
-manager_ok_cb (ESelectNamesManager *manager, gpointer closure)
-{
-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);
-	BonoboArg *arg;
-
-	arg = bonobo_arg_new (BONOBO_ARG_NULL);
-
-	bonobo_event_source_notify_listeners_full (select_names->priv->event_source,
-						   "GNOME/Evolution",
-						   "ok",
-						   "dialog",
-						   arg,
-						   NULL);
-
-	bonobo_arg_release (arg);
-}
-
-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_GNOME_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_property_bag_add (property_bag, "destinations", ENTRY_PROPERTY_ID_DESTINATIONS,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "simple_card_list", ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST,
-				 TC_GNOME_Evolution_Addressbook_SimpleCardList, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE);
-	bonobo_property_bag_add (property_bag, "allow_contact_lists", ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "entry_changed", ENTRY_PROPERTY_ID_ENTRY_CHANGED,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, property_bag);
-
-	gtk_signal_connect (GTK_OBJECT (entry_widget), "changed", GTK_SIGNAL_FUNC (entry_changed), control);
-
-	return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (control)), ev);
-}
-
-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;
-
-	if (priv->manager->names) {
-		gtk_widget_destroy (GTK_WIDGET (priv->manager->names));
-		priv->manager->names = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (priv->manager));
-
-	g_free (priv);
-}
-
-
-static void
-corba_class_init ()
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames__vepv *vepv;
-	POA_GNOME_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_GNOME_Evolution_Addressbook_SelectNames__epv, 1);
-	epv->addSection          = impl_SelectNames_add_section;
-	epv->addSectionWithLimit = impl_SelectNames_add_section_with_limit;
-	epv->getEntryBySection   = impl_SelectNames_get_entry_for_section;
-	epv->activateDialog      = impl_SelectNames_activate_dialog;
-
-	vepv = &SelectNames_vepv;
-	vepv->Bonobo_Unknown_epv                    = bonobo_object_get_epv ();
-	vepv->GNOME_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 ();
-	priv->event_source = NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->manager),
-			    "changed",
-			    GTK_SIGNAL_FUNC (manager_changed_cb),
-			    select_names);
-
-	gtk_signal_connect (GTK_OBJECT (priv->manager),
-			    "ok",
-			    GTK_SIGNAL_FUNC (manager_ok_cb),
-			    select_names);
-
-	select_names->priv = priv;
-}
-
-
-void
-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
-				 GNOME_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);
-
-	g_assert (select_names->priv->event_source == NULL);
-	select_names->priv->event_source = bonobo_event_source_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (select_names), BONOBO_OBJECT (select_names->priv->event_source));
-}
-
-ESelectNamesBonobo *
-e_select_names_bonobo_new (void)
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
-	GNOME_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 f254dd6e94..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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__
-
-#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 ((klass), 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,
-						      GNOME_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-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
deleted file mode 100644
index cbfc1d56c6..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ /dev/null
@@ -1,1292 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 "e-select-names-completion.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-
-#include <gal/unicode/gunicode.h>
-
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-destination.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include <addressbook/backend/ebook/e-card-compare.h>
-
-typedef struct {
-	EBook *book;
-	guint book_view_tag;
-	EBookView *book_view;
-	ESelectNamesCompletion *comp;
-	guint card_added_tag;
-	guint seq_complete_tag;
-	gboolean sequence_complete_received;
-} ESelectNamesCompletionBookData;
-
-struct _ESelectNamesCompletionPrivate {
-
-	ESelectNamesTextModel *text_model;
-
-	GList *book_data;
-	gint books_not_ready;
-	gint pending_completion_seq;
-
-	gchar *waiting_query;
-	gint waiting_pos, waiting_limit;
-	gchar *query_text;
-
-	gchar *cached_query_text;
-	GList *cached_cards;
-	gboolean cache_complete;
-
-	gboolean match_contact_lists;
-	gboolean primary_only;
-
-	gboolean can_fail_due_to_too_many_hits; /* like LDAP, for example... */
-};
-
-static void e_select_names_completion_class_init (ESelectNamesCompletionClass *);
-static void e_select_names_completion_init (ESelectNamesCompletion *);
-static void e_select_names_completion_destroy (GtkObject *object);
-
-static void e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data);
-static void e_select_names_completion_card_added_cb    (EBookView *, const GList *cards, gpointer user_data);
-static void e_select_names_completion_seq_complete_cb  (EBookView *, gpointer user_data);
-
-static void e_select_names_completion_do_query (ESelectNamesCompletion *, const gchar *query_text, gint pos, gint limit);
-
-static void e_select_names_completion_handle_request  (ECompletion *, const gchar *txt, gint pos, gint limit);
-static void e_select_names_completion_end    (ECompletion *);
-
-static GtkObjectClass *parent_class;
-
-static FILE *out;
-
-/*
- *
- * Query builders
- *
- */
-
-typedef gchar *(*BookQuerySExp) (ESelectNamesCompletion *);
-typedef ECompletionMatch *(*BookQueryMatchTester) (ESelectNamesCompletion *, EDestination *);
-
-static void
-our_match_destroy (ECompletionMatch *match)
-{
-	gtk_object_unref (GTK_OBJECT (match->user_data));
-}
-
-static ECompletionMatch *
-make_match (EDestination *dest, const gchar *menu_form, double score)
-{
-	ECompletionMatch *match;
-	ECard *card = e_destination_get_card (dest);
-
-	match = e_completion_match_new (e_destination_get_name (dest), menu_form, score);
-
-	e_completion_match_set_text (match, e_destination_get_name (dest), menu_form);
-
-	/* Reject any match that has null text fields. */
-	if (! (e_completion_match_get_match_text (match) && e_completion_match_get_menu_text (match))) {
-		gtk_object_unref (GTK_OBJECT (match));
-		return NULL;
-	}
-
-	/* Since we sort low to high, we negate so that larger use scores will come first */
-	match->sort_major = card ? -floor (e_card_get_use_score (card)) : 0;
-
-	match->sort_minor = e_destination_get_email_num (dest);
-
-	match->user_data = dest;
-	gtk_object_ref (GTK_OBJECT (dest));
-
-	match->destroy = our_match_destroy;
-
-	return match;
-}
-
-/*
- * Nickname query
- */
-
-static gchar *
-sexp_nickname (ESelectNamesCompletion *comp)
-{
-	gchar *query = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", comp->priv->query_text);
-
-	return query;
-}
-
-static ECompletionMatch *
-match_nickname (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *match = NULL;
-	gint len;
-	ECard *card = e_destination_get_card (dest);
-	double score;
-
-	if (card->nickname == NULL)
-		return NULL;
-
-	len = g_utf8_strlen (comp->priv->query_text, -1);
-	if (card->nickname && !g_utf8_strncasecmp (comp->priv->query_text, card->nickname, len)) {
-		const gchar *name;
-		gchar *str;
-
-		score = len * 2; /* nickname gives 2 points per matching character */
-
-		if (len == g_utf8_strlen (card->nickname, -1)) /* boost score on an exact match */
-		    score *= 10;
-
-		name = e_destination_get_name (dest);
-		if (name && *name)
-			str = g_strdup_printf ("'%s' %s <%s>", card->nickname, name, e_destination_get_email (dest));
-		else
-			str = g_strdup_printf ("'%s' <%s>", card->nickname, e_destination_get_email (dest));
-
-		match = make_match (dest, str, score);
-		g_free (str);
-	}
-
-	return match;
-}
-
-/*
- * E-Mail Query
- */
-
-static gchar *
-sexp_email (ESelectNamesCompletion *comp)
-{
-	return g_strdup_printf ("(beginswith \"email\" \"%s\")", comp->priv->query_text);
-}
-
-static ECompletionMatch *
-match_email (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *match;
-	gint len = strlen (comp->priv->query_text);
-	const gchar *name = e_destination_get_name (dest);
-	const gchar *email = e_destination_get_email (dest);
-	double score;
-	
-	if (email
-	    && !g_utf8_strncasecmp (comp->priv->query_text, email, len)
-	    && !e_destination_is_evolution_list (dest)) {
-		
-		gchar *str;
-		
-		score = len * 2; /* 2 points for each matching character */
-
-		if (name && *name)
-			str = g_strdup_printf ("<%s> %s", email, name);
-		else
-			str = g_strdup (email);
-
-		match = make_match (dest, str, score);
-
-		g_free (str);
-
-		return match;
-	}
-
-	return NULL;
-}
-
-/*
- * Name Query
- */
-
-static gchar *
-name_style_query (ESelectNamesCompletion *comp, const gchar *field)
-{
-	if (comp && comp->priv->query_text && *comp->priv->query_text) {
-		gchar *cpy = g_strdup (comp->priv->query_text), *c;
-		gchar **strv;
-		gchar *query;
-		gint i, count=0;
-
-		for (c = cpy; *c; ++c) {
-			if (*c == ',')
-				*c = ' ';
-		}
-
-		strv = g_strsplit (cpy, " ", 0);
-		for (i=0; strv[i]; ++i) {
-			gchar *old;
-			++count;
-			g_strstrip (strv[i]);
-			old = strv[i];
-			strv[i] = g_strdup_printf ("(contains \"%s\" \"%s\")", field, old);
-			g_free (old);
-		}
-
-		if (count == 1) {
-			query = strv[0];
-			strv[0] = NULL;
-		} else {
-			gchar *joined = g_strjoinv (" ", strv);
-			query = g_strdup_printf ("(and %s)", joined);
-			g_free (joined);
-		}
-
-		g_free (cpy);
-		g_strfreev (strv);
-
-		return query;
-	}
-
-	return NULL;
-}
-
-static gchar *
-sexp_name (ESelectNamesCompletion *comp)
-{
-	return name_style_query (comp, "full_name");
-}
-
-static ECompletionMatch *
-match_name (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *final_match = NULL;
-	gchar *menu_text = NULL;
-	ECard *card;
-	const gchar *email;
-	gint match_len = 0;
-	ECardMatchType match;
-	ECardMatchPart first_match;
-	double score = 0;
-	gboolean have_given, have_additional, have_family;
-
-	card = e_destination_get_card (dest);
-	
-	if (card->name == NULL)
-		return NULL;
-
-	email = e_destination_get_email (dest);
-
-	match = e_card_compare_name_to_string_full (card, comp->priv->query_text, TRUE /* yes, allow partial matches */,
-						    NULL, &first_match, &match_len);
-
-	if (match <= E_CARD_MATCH_NONE)
-		return NULL;
-
-	score = match_len * 3; /* three points per match character */
-
-#if 0
-	if (card->nickname) {
-		/* We massively boost the score if the nickname exists and is the same as one of the "real" names.  This keeps the
-		   nickname from matching ahead of the real name for this card. */
-		len = strlen (card->nickname);
-		if ((card->name->given && !g_utf8_strncasecmp (card->name->given, card->nickname, MIN (strlen (card->name->given), len)))
-		    || (card->name->family && !g_utf8_strncasecmp (card->name->family, card->nickname, MIN (strlen (card->name->family), len)))
-		    || (card->name->additional && !g_utf8_strncasecmp (card->name->additional, card->nickname, MIN (strlen (card->name->additional), len))))
-			score *= 100;
-	}
-#endif
-
-	have_given       = card->name->given && *card->name->given;
-	have_additional  = card->name->additional && *card->name->additional;
-	have_family      = card->name->family && *card->name->family;
-
-	if (e_card_evolution_list (card)) {
-
-		menu_text = e_card_name_to_string (card->name);
-
-	} else if (first_match == E_CARD_MATCH_PART_GIVEN_NAME) {
-
-		if (have_family)
-			menu_text = g_strdup_printf ("%s %s <%s>", card->name->given, card->name->family, email);
-		else
-			menu_text = g_strdup_printf ("%s <%s>", card->name->given, email);
-
-	} else if (first_match == E_CARD_MATCH_PART_ADDITIONAL_NAME) {
-
-		if (have_given) {
-
-			menu_text = g_strdup_printf ("%s%s%s, %s <%s>",
-						     card->name->additional,
-						     have_family ? " " : "",
-						     have_family ? card->name->family : "",
-						     card->name->given,
-						     email);
-		} else {
-
-			menu_text = g_strdup_printf ("%s%s%s <%s>",
-						     card->name->additional,
-						     have_family ? " " : "",
-						     have_family ? card->name->family : "",
-						     email);
-		}
-
-	} else if (first_match == E_CARD_MATCH_PART_FAMILY_NAME) { 
-
-		if (have_given)
-			menu_text = g_strdup_printf ("%s, %s%s%s <%s>",
-						     card->name->family,
-						     card->name->given,
-						     have_additional ? " " : "",
-						     have_additional ? card->name->additional : "",
-						     email);
-		else
-			menu_text = g_strdup_printf ("%s <%s>", card->name->family, email);
-
-	} else { /* something funny happened */
-
-		menu_text = g_strdup_printf ("<%s> ???", email);
-
-	}
-
-	if (menu_text) {
-		g_strstrip (menu_text);
-		final_match = make_match (dest, menu_text, score);
-		g_free (menu_text);
-	}
-	
-	return final_match;
-}
-
-/*
- * File As Query
- */
-
-static gchar *
-sexp_file_as (ESelectNamesCompletion *comp)
-{
-	return name_style_query (comp, "file_as");
-}
-
-static ECompletionMatch *
-match_file_as (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	const gchar *name;
-	const gchar *email;
-	gchar *cpy, **strv, *menu_text;
-	gint i, len;
-	double score = 0.00001;
-	ECompletionMatch *match;
-
-	name = e_destination_get_name (dest);
-	email = e_destination_get_email (dest);
-
-	if (!(name && *name))
-		return NULL;
-
-	cpy = g_strdup (comp->priv->query_text);
-	strv = g_strsplit (cpy, " ", 0);
-
-	for (i=0; strv[i] && score > 0; ++i) {
-		len = g_utf8_strlen (strv[i], -1);
-		if (!g_utf8_strncasecmp (name, strv[i], len))
-			score += len; /* one point per character of the match */
-		else
-			score = 0;
-	}
-	
-	g_free (cpy);
-	g_strfreev (strv);
-
-	if (score <= 0)
-		return NULL;
-	
-	menu_text = g_strdup_printf ("%s <%s>", name, email);
-	g_strstrip (menu_text);
-	match = make_match (dest, menu_text, score);
-	g_free (menu_text);
-
-	return match;
-}
-
-/*
- * Initials Query
- */
-
-static gchar *
-sexp_initials (ESelectNamesCompletion *comp)
-{
-	return NULL;
-}
-
-static ECompletionMatch *
-match_initials (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	return NULL;
-}
-
-
-typedef struct _BookQuery BookQuery;
-struct _BookQuery {
-	gboolean primary;
-	BookQuerySExp builder;
-	BookQueryMatchTester tester;
-};
-
-static BookQuery book_queries[] = {
-	{ TRUE,  sexp_nickname, match_nickname},
-	{ TRUE,  sexp_email,    match_email },
-	{ TRUE,  sexp_name,     match_name },
-	{ TRUE,  sexp_file_as,  match_file_as },
-	{ FALSE, sexp_initials, match_initials }
-};
-static gint book_query_count = sizeof (book_queries) / sizeof (BookQuery);
-
-/*
- * Build up a big compound sexp corresponding to all of our queries.
- */
-static gchar *
-book_query_sexp (ESelectNamesCompletion *comp)
-{
-	gint i, j, count = 0;
-	gchar **queryv, *query;
-
-	g_return_val_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-
-	if (! (comp->priv->query_text && *comp->priv->query_text))
-		return NULL;
-
-	if (comp->priv->primary_only) {
-		for (i=0; i<book_query_count; ++i)
-			if (book_queries[i].primary)
-				++count;
-	} else {
-		count = book_query_count;
-	}
-
-	queryv = g_new0 (gchar *, count+1);
-	for (i=0, j=0; i<count; ++i) {
-		queryv[j] = book_queries[i].builder (comp);
-		if (queryv[j])
-			++j;
-	}
-
-	if (j == 0) {
-		query = NULL;
-	} else if (j == 1) {
-		query = queryv[0];
-		queryv[0] = NULL;
-	} else {
-		gchar *tmp = g_strjoinv (" ", queryv);
-		query = g_strdup_printf ("(or %s)", tmp);
-		g_free (tmp);
-	}
-
-	for (i=0; i<count; ++i)
-		g_free (queryv[i]);
-	g_free (queryv);
-
-	return query;
-}
-
-/*
- * Sweep across all of our query rules and find the best score/match
- * string that applies to a given destination.
- */
-static ECompletionMatch *
-book_query_score (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *best_match = NULL;
-	gint i;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-	g_return_val_if_fail (E_IS_DESTINATION (dest), NULL);
-
-	if (! (comp->priv->query_text && *comp->priv->query_text))
-		return NULL;
-	
-	for (i=0; i<book_query_count; ++i) {
-
-		ECompletionMatch *this_match = NULL;
-
-		if (book_queries[i].primary || !comp->priv->primary_only) {
-			if (book_queries[i].tester && e_destination_get_card (dest)) {
-				this_match = book_queries[i].tester (comp, dest);
-			}
-
-			if (this_match) {
-				if (best_match == NULL || this_match->score > best_match->score) {
-					e_completion_match_unref (best_match);
-					best_match = this_match;
-				} else {
-					e_completion_match_unref (this_match);
-				}
-			}
-		}
-	}
-
-	return best_match;
-}
-
-static void
-book_query_process_card_list (ESelectNamesCompletion *comp, const GList *cards)
-{
-	while (cards) {
-		ECard *card = E_CARD (cards->data);
-
-		if (e_card_evolution_list (card)) {
-
-			if (comp->priv->match_contact_lists) {
-
-				EDestination *dest = e_destination_new ();
-				ECompletionMatch *match;
-				e_destination_set_card (dest, card, 0);
-				match = book_query_score (comp, dest);
-				if (match && match->score > 0) {
-					e_completion_found_match (E_COMPLETION (comp), match);
-				} else {
-					e_completion_match_unref (match);
-				}
-				gtk_object_unref (GTK_OBJECT (dest));
-
-			}
-
-		} else if (card->email) {
-			gint i;
-			for (i=0; i<e_list_length (card->email); ++i) {
-				EDestination *dest = e_destination_new ();
-				const gchar *email;
-				ECompletionMatch *match;
-				
-				e_destination_set_card (dest, card, i);
-				email = e_destination_get_email (dest);
-
-				if (email && *email) {
-				
-					match = book_query_score (comp, dest);
-					if (match && match->score > 0) {
-						e_completion_found_match (E_COMPLETION (comp), match);
-					} else {
-						e_completion_match_unref (match);
-					}
-				}
-
-				gtk_object_unref (GTK_OBJECT (dest));
-			}
-		}
-		
-		cards = g_list_next (cards);
-	}
-}
-
-#if 0
-static gchar *
-initials_query_match_cb (QueryInfo *qi, ECard *card, double *score)
-{
-	gint len;
-	gchar f='\0', m='\0', l='\0'; /* initials */
-	gchar cf, cm, cl;
-
-	len = strlen (qi->comp->priv->query_text);
-	
-	if (len == 2) {
-		
-		f = qi->comp->priv->query_text[0];
-		m = '\0';
-		l = qi->comp->priv->query_text[1];
-
-	} else if (len == 3) {
-
-		f = qi->comp->priv->query_text[0];
-		m = qi->comp->priv->query_text[1];
-		l = qi->comp->priv->query_text[2];
-
-	} else {
-		return NULL;
-	}
-
-	cf = card->name->given ? *card->name->given : '\0';
-	cm = card->name->additional ? *card->name->additional : '\0';
-	cl = card->name->family ? *card->name->family : '\0';
-
-	if (f && isupper ((gint) f))
-		f = tolower ((gint) f);
-	if (m && isupper ((gint) m))
-		m = tolower ((gint) m);
-	if (l && isupper ((gint) l))
-		l = tolower ((gint) l);
-
-	if (cf && isupper ((gint) cf))
-		cf = tolower ((gint) cf);
-	if (cm && isupper ((gint) cm))
-		cm = tolower ((gint) cm);
-	if (cl && isupper ((gint) cl))
-		cl = tolower ((gint) cl);
-
-	if ((f == '\0' || (f == cf)) && (m == '\0' || (m == cm)) && (l == '\0' || (l == cl))) {
-		if (score)
-			*score = 3;
-		if (m)
-			return g_strdup_printf ("%s %s %s", card->name->given, card->name->additional, card->name->family);
-		else
-			return g_strdup_printf ("%s %s", card->name->given, card->name->family);
-	}
-
-	return NULL;
-}
-
-static gboolean
-start_initials_query (ESelectNamesCompletion *comp)
-{
-	gint len;
-	gchar *query;
-
-	if (comp && comp->priv->query_text && *(comp->priv->query_text)) {
-		
-		len = strlen (comp->priv->query_text);
-		if (len < 2 || len > 3)
-			return FALSE;
-
-		query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%c\")", *(comp->priv->query_text));
-		query_info_start (comp, comp->priv->query_text, query, initials_query_match_cb);
-		g_free (query);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-#endif
-
-
-/*
- *
- * ESelectNamesCompletion code
- *
- */
-
-
-GtkType
-e_select_names_completion_get_type (void)
-{
-	static GtkType select_names_complete_type = 0;
-  
-	if (!select_names_complete_type) {
-		GtkTypeInfo select_names_complete_info = {
-			"ESelectNamesCompletion",
-			sizeof (ESelectNamesCompletion),
-			sizeof (ESelectNamesCompletionClass),
-			(GtkClassInitFunc) e_select_names_completion_class_init,
-			(GtkObjectInitFunc) e_select_names_completion_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		select_names_complete_type = gtk_type_unique (e_completion_get_type (), &select_names_complete_info);
-	}
-
-	return select_names_complete_type;
-}
-
-static void
-e_select_names_completion_class_init (ESelectNamesCompletionClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-	ECompletionClass *completion_class = E_COMPLETION_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (e_completion_get_type ()));
-
-	object_class->destroy = e_select_names_completion_destroy;
-
-	completion_class->request_completion = e_select_names_completion_handle_request;
-	completion_class->end_completion = e_select_names_completion_end;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_COMPLETION")) {
-		out = fopen ("/tmp/evo-debug-select-names-completion", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-e_select_names_completion_init (ESelectNamesCompletion *comp)
-{
-	comp->priv = g_new0 (struct _ESelectNamesCompletionPrivate, 1);
-	comp->priv->match_contact_lists = TRUE;
-}
-
-static void
-e_select_names_completion_destroy (GtkObject *object)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (object);
-	GList *l;
-
-	if (comp->priv->text_model)
-		gtk_object_unref (GTK_OBJECT (comp->priv->text_model));
-
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-
-		if (book_data->card_added_tag) {
-			gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->card_added_tag);
-			book_data->card_added_tag = 0;
-		}
-
-		if (book_data->seq_complete_tag) {
-			gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->seq_complete_tag);
-			book_data->seq_complete_tag = 0;
-		}
-
-		gtk_object_unref (GTK_OBJECT (book_data->book));
-
-		if (book_data->book_view)
-			gtk_object_unref (GTK_OBJECT (book_data->book_view));
-
-		g_free (book_data);
-	}
-	g_list_free (comp->priv->book_data);
-
-	g_free (comp->priv->waiting_query);
-	g_free (comp->priv->query_text);
-
-	g_free (comp->priv->cached_query_text);
-	g_list_foreach (comp->priv->cached_cards, (GFunc)gtk_object_unref, NULL);
-	g_list_free (comp->priv->cached_cards);
-
-	g_free (comp->priv);
-
-	if (parent_class->destroy)
-		parent_class->destroy (object);
-}
-
-
-/*
- *
- *  EBook/EBookView Callbacks & Query Stuff
- *
- */
-
-static gchar *
-clean_query_text (const gchar *s)
-{
-	gchar *q = g_new (gchar, strlen(s)+1), *t;
-
-	t = q;
-	while (*s) {
-		if (*s != ',' && *s != '"') {
-			*t = *s;
-			++t;
-		}
-		++s;
-	}
-	*t = '\0';
-
-	g_strstrip (q);
-
-	return q;
-}
-
-static void
-e_select_names_completion_clear_cache (ESelectNamesCompletion *comp)
-{
-	g_free (comp->priv->cached_query_text);
-	comp->priv->cached_query_text = NULL;
-
-	g_list_foreach (comp->priv->cached_cards, (GFunc)gtk_object_unref, NULL);
-	g_list_free (comp->priv->cached_cards);
-	comp->priv->cached_cards = NULL;
-}
-
-static void
-e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data)
-{
-	ESelectNamesCompletion *comp;
-	ESelectNamesCompletionBookData *book_data;
-
-	if (status != E_BOOK_STATUS_SUCCESS)
-		return;
-
-	book_data = (ESelectNamesCompletionBookData*)user_data;
-	comp = book_data->comp;
-
-	book_data->book_view_tag = 0;
-
-	if (book_data->card_added_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->card_added_tag);
-		book_data->card_added_tag = 0;
-	}
-	if (book_data->seq_complete_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->seq_complete_tag);
-		book_data->seq_complete_tag = 0;
-	}
-
-	gtk_object_ref (GTK_OBJECT (view));
-	if (book_data->book_view)
-		gtk_object_unref (GTK_OBJECT (book_data->book_view));
-	book_data->book_view = view;
-
-	book_data->card_added_tag = 
-		gtk_signal_connect (GTK_OBJECT (view),
-				    "card_added",
-				    GTK_SIGNAL_FUNC (e_select_names_completion_card_added_cb),
-				    book_data);
-
-	book_data->seq_complete_tag =
-		gtk_signal_connect (GTK_OBJECT (view),
-				    "sequence_complete",
-				    GTK_SIGNAL_FUNC (e_select_names_completion_seq_complete_cb),
-				    book_data);
-	book_data->sequence_complete_received = FALSE;
-	comp->priv->pending_completion_seq++;
-}
-
-static void
-e_select_names_completion_card_added_cb (EBookView *book_view, const GList *cards, gpointer user_data)
-{
-	ESelectNamesCompletionBookData *book_data = user_data;
-	ESelectNamesCompletion *comp = book_data->comp;
-
-	if (e_completion_searching (E_COMPLETION (comp))) {
-		book_query_process_card_list (comp, cards);
-
-		/* Save the list of matching cards. */
-		while (cards) {
-			comp->priv->cached_cards = g_list_prepend (comp->priv->cached_cards, cards->data);
-			gtk_object_ref (GTK_OBJECT (cards->data));
-			cards = g_list_next (cards);
-		}
-	}
-}
-
-static void
-e_select_names_completion_seq_complete_cb (EBookView *book_view, gpointer user_data)
-{
-	ESelectNamesCompletionBookData *book_data = user_data;
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION(book_data->comp);
-
-	/*
-	 * We aren't searching, but the addressbook has changed -- clear our card cache so that
-	 * future completion requests will take the changes into account.
-	 */
-	if (! e_completion_searching (E_COMPLETION (comp))) {
-		e_select_names_completion_clear_cache (comp);
-		return;
-	}
-
-	if (!book_data->sequence_complete_received) {
-		book_data->sequence_complete_received = TRUE;
-		comp->priv->pending_completion_seq --;
-		if (comp->priv->pending_completion_seq > 0)
-			return;
-	}
-
-	if (comp->priv->cached_query_text
-	    && !comp->priv->cache_complete
-	    && !strcmp (comp->priv->cached_query_text, comp->priv->query_text))
-		comp->priv->cache_complete = TRUE;
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	if (out)
-		fprintf (out, "ending search\n");
-
-	e_completion_end_search (E_COMPLETION (comp)); /* That's all folks! */
-
-	/* Need to launch a new completion if another one is pending. */
-	if (comp->priv->waiting_query) {
-		gchar *s = comp->priv->waiting_query;
-		comp->priv->waiting_query = NULL;
-		e_completion_begin_search (E_COMPLETION (comp), s, comp->priv->waiting_pos, comp->priv->waiting_limit);
-		g_free (s);
-	}
-}
-
-static void
-e_select_names_completion_stop_query (ESelectNamesCompletion *comp)
-{
-	GList *l;
-
-	g_return_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "stopping query\n");
-
-	if (comp->priv->waiting_query) {
-		if (out)
-			fprintf (out, "stopped waiting query\n");
-		g_free (comp->priv->waiting_query);
-		comp->priv->waiting_query = NULL;
-	}
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-		if (book_data->book_view_tag) {
-			if (out)
-				fprintf (out, "cancelled book view creation\n");
-			e_book_cancel (book_data->book, book_data->book_view_tag);
-			book_data->book_view_tag = 0;
-		}
-		if (book_data->book_view) {
-			if (out)
-				fprintf (out, "disconnecting book view signals\n");
-
-			if (book_data->card_added_tag) {
-				gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->card_added_tag);
-				book_data->card_added_tag = 0;
-			}
-			if (book_data->seq_complete_tag) {
-				gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->seq_complete_tag);
-				book_data->seq_complete_tag = 0;
-			}
-	
-			if (out)
-				fprintf (out, "unrefed book view\n");
-			gtk_object_unref (GTK_OBJECT (book_data->book_view));
-			book_data->book_view = NULL;
-		}
-	}
-
-	/* Clear the cache, which may contain partial results. */
-	e_select_names_completion_clear_cache (comp);
-
-}
-
-static void
-e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar *query_text)
-{
-	g_return_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (query_text);
-
-	e_select_names_completion_stop_query (comp);  /* Stop any prior queries. */
-
-	if (comp->priv->books_not_ready == 0) {
-		gchar *sexp;
-	
-		g_free (comp->priv->query_text);
-		comp->priv->query_text = g_strdup (query_text);
-
-		g_free (comp->priv->cached_query_text);
-		comp->priv->cached_query_text = g_strdup (query_text);
-		comp->priv->cache_complete = FALSE;
-
-		sexp = book_query_sexp (comp);
-		if (sexp && *sexp) {
-			GList *l;
-
-			if (out)
-				fprintf (out, "\n\n**** starting query: \"%s\"\n", comp->priv->query_text);
-
-			for (l = comp->priv->book_data; l; l = l->next) {
-				ESelectNamesCompletionBookData *book_data = l->data;
-				book_data->book_view_tag = e_book_get_book_view (book_data->book, sexp, 
-										 e_select_names_completion_got_book_view_cb, book_data);
-				if (! book_data->book_view_tag)
-					g_warning ("Exception calling e_book_get_book_view");
-			}
-
-		} else {
-			g_free (comp->priv->query_text);
-			comp->priv->query_text = NULL;
-		}
-		g_free (sexp);
-
-	} else {
-
-		comp->priv->waiting_query = g_strdup (query_text);
-
-	}
-}
-
-static void
-e_select_names_completion_do_query (ESelectNamesCompletion *comp, const gchar *query_text, gint pos, gint limit)
-{
-	gchar *clean;
-	gboolean query_is_still_running, can_reuse_cached_cards;
-	GList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	clean = clean_query_text (query_text);
-	if (! (clean && *clean)) {
-		g_free (clean);
-		e_completion_end_search (E_COMPLETION (comp));
-		return;
-	}
-
-	query_is_still_running = FALSE;
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-		query_is_still_running = book_data->book_view_tag;
-		if (query_is_still_running)
-			break;
-	}
-
-	if (out) {
-		fprintf (out, "do_query: %s => %s\n", query_text, clean);
-		if (query_is_still_running)
-			fprintf (out, "a query is still running!\n");
-	}
-	if (comp->priv->cached_query_text && out)
-		fprintf (out, "cached: %s\n", comp->priv->cached_query_text);
-
-	can_reuse_cached_cards = (comp->priv->cached_query_text
-				  && comp->priv->cache_complete
-				  && (!comp->priv->can_fail_due_to_too_many_hits || comp->priv->cached_cards != NULL)
-				  && (strlen (comp->priv->cached_query_text) <= strlen (clean))
-				  && !g_utf8_strncasecmp (comp->priv->cached_query_text, clean, strlen (comp->priv->cached_query_text)));
-
-
-	if (can_reuse_cached_cards) {
-
-		if (out)
-			fprintf (out, "can reuse cached card!\n");
-
-		if (query_is_still_running) {
-			g_free (comp->priv->waiting_query);
-			comp->priv->waiting_query = clean;
-			comp->priv->waiting_pos = pos;
-			comp->priv->waiting_limit = limit;
-			if (out)
-				fprintf (out, "waiting for running query to complete: %s\n", comp->priv->waiting_query);
-			return;
-		}
-
-		g_free (comp->priv->query_text);
-		comp->priv->query_text = clean;
-		if (out)
-			fprintf (out, "using existing query info: %s (vs %s)\n", comp->priv->query_text, comp->priv->cached_query_text);
-		book_query_process_card_list (comp, comp->priv->cached_cards);
-		e_completion_end_search (E_COMPLETION (comp));
-		return;
-	}
-	
-	e_select_names_completion_start_query (comp, clean);
-	g_free (clean);
-}
-
-
-/*
- *
- *  Completion Search Override - a Framework for Christian-Resurrection-Holiday Edible-Chicken-Ova
- *
- */
-
-typedef struct _SearchOverride SearchOverride;
-struct _SearchOverride {
-	const gchar *trigger;
-	const gchar *text[4];
-};
-static SearchOverride override[] = { 
-	{ "why?", { "\"I must create a system, or be enslaved by another man's.\"",
-		    "            -- Wiliam Blake, \"Jerusalem\"",
-		    NULL } },
-	{ "easter-egg?", { "What were you expecting, a flight simulator?", NULL } },
-	{ NULL, { NULL } } };
-
-static gboolean
-search_override_check (SearchOverride *over, const gchar *text)
-{
-	/* The g_utf8_validate is needed because as of 2001-06-11,
-	 * EText doesn't translate from locale->UTF8 when you paste
-	 * into it.
-	 */
-	if (over == NULL || text == NULL || !g_utf8_validate (text, -1, NULL))
-		return FALSE;
-
-	return !g_utf8_strcasecmp (over->trigger, text);
-}
-
-
-/*
- *
- *  Completion Callbacks
- *
- */
-
-static void
-e_select_names_completion_handle_request (ECompletion *comp, const gchar *text, gint pos, gint limit)
-{
-	ESelectNamesCompletion *selcomp = E_SELECT_NAMES_COMPLETION (comp);
-	const gchar *str;
-	gint index, j;
-	
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (text != NULL);
-	
-	if (out) {
-		fprintf (out, "\n\n**** requesting completion\n");
-		fprintf (out, "text=\"%s\" pos=%d limit=%d\n", text, pos, limit);
-	}
-
-	e_select_names_model_text_pos (selcomp->priv->text_model->source,
-				       selcomp->priv->text_model->seplen,
-				       pos, &index, NULL, NULL);
-	str = index >= 0 ? e_select_names_model_get_string (selcomp->priv->text_model->source, index) : NULL;
-
-	if (out)
-		fprintf (out, "index=%d str=\"%s\"\n", index, str);
-
-	if (str == NULL || *str == '\0') {
-		if (out)
-			fprintf (out, "aborting empty query\n");
-		e_completion_end_search (comp);
-		return;
-	}
-
-	for (j=0; override[j].trigger; ++j) {
-		if (search_override_check (&(override[j]), str)) {
-			gint k;
-
-			for (k=0; override[j].text[k]; ++k) {
-				ECompletionMatch *match = g_new (ECompletionMatch, 1);
-				e_completion_match_construct (match);
-				e_completion_match_set_text (match, text, override[j].text[k]);
-				match->score = 1 / (double) (k + 1);
-				e_completion_found_match (comp, match);
-			}
-
-			e_completion_end_search (comp);
-			return;
-		}
-	}
-
-	e_select_names_completion_do_query (selcomp, str, pos, limit);
-}
-
-static void
-e_select_names_completion_end (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "completion ended\n");
-}
-
-static void
-check_capabilities (ESelectNamesCompletion *comp, EBook *book)
-{
-	gchar *cap = e_book_get_static_capabilities (book);
-	comp->priv->can_fail_due_to_too_many_hits = !strcmp (cap, "net");
-	if (comp->priv->can_fail_due_to_too_many_hits) {
-		g_message ("using LDAP source for completion!");
-	}
-	g_free (cap);
-}
-
-static void
-e_select_names_completion_book_ready (EBook *book, EBookStatus status, ESelectNamesCompletion *comp)
-{
-	comp->priv->books_not_ready--;
-
-	g_return_if_fail (E_IS_BOOK (book));
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	check_capabilities (comp, book);
-
-	/* If waiting_query is non-NULL, someone tried to start a query before the book was ready.
-	   Now that it is, get started. */
-	if (comp->priv->books_not_ready == 0 && comp->priv->waiting_query) {
-		e_select_names_completion_start_query (comp, comp->priv->waiting_query);
-		g_free (comp->priv->waiting_query);
-		comp->priv->waiting_query = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp)); /* post-async unref */
-}
-
-
-/*
- *
- *  Our Pseudo-Constructor
- *
- */
-
-ECompletion *
-e_select_names_completion_new (EBook *book, ESelectNamesTextModel *text_model)
-{
-	ESelectNamesCompletion *comp;
-
-	g_return_val_if_fail (book == NULL || E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (text_model), NULL);
-
-	comp = (ESelectNamesCompletion *) gtk_type_new (e_select_names_completion_get_type ());
-
-	if (book == NULL) {
-		ESelectNamesCompletionBookData *book_data = g_new0 (ESelectNamesCompletionBookData, 1);
-
-		book_data->book = e_book_new ();
-		book_data->comp = comp;
-		gtk_object_ref (GTK_OBJECT (book_data->book));
-		gtk_object_sink (GTK_OBJECT (book_data->book));
-
-		comp->priv->book_data = g_list_append (comp->priv->book_data, book_data);
-		comp->priv->books_not_ready++;
-
-		gtk_object_ref (GTK_OBJECT (comp)); /* ref ourself before our async call */
-		e_book_load_local_address_book (book_data->book, (EBookCallback) e_select_names_completion_book_ready, comp);
-
-	} else {
-		e_select_names_completion_add_book (comp, book);
-	}
-		
-	comp->priv->text_model = text_model;
-	gtk_object_ref (GTK_OBJECT (text_model));
-
-	return E_COMPLETION (comp);
-}
-
-void
-e_select_names_completion_add_book (ESelectNamesCompletion *comp, EBook *book)
-{
-	ESelectNamesCompletionBookData *book_data;
-
-	g_return_if_fail (book != NULL);
-
-	book_data = g_new0 (ESelectNamesCompletionBookData, 1);
-	book_data->book = book;
-	book_data->comp = comp;
-	check_capabilities (comp, book);
-	gtk_object_ref (GTK_OBJECT (book_data->book));
-	comp->priv->book_data = g_list_append (comp->priv->book_data, book_data);
-}
-
-gboolean
-e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *comp)
-{
-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), FALSE);
-	return comp->priv->match_contact_lists;
-}
-
-
-void
-e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *comp, gboolean x)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	comp->priv->match_contact_lists = x;
-}
-
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h
deleted file mode 100644
index 86522fa5ce..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_SELECT_NAMES_COMPLETION_H
-#define E_SELECT_NAMES_COMPLETION_H
-
-#include <gal/e-text/e-completion.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-select-names-text-model.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_SELECT_NAMES_COMPLETION_TYPE        (e_select_names_completion_get_type ())
-#define E_SELECT_NAMES_COMPLETION(o)          (GTK_CHECK_CAST ((o), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletion))
-#define E_SELECT_NAMES_COMPLETION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletionClass))
-#define E_IS_SELECT_NAMES_COMPLETION(o)       (GTK_CHECK_TYPE ((o), E_SELECT_NAMES_COMPLETION_TYPE))
-#define E_IS_SELECT_NAMES_COMPLETION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECT_NAMES_COMPLETION_TYPE))
-
-typedef struct _ESelectNamesCompletion ESelectNamesCompletion;
-typedef struct _ESelectNamesCompletionClass ESelectNamesCompletionClass;
-struct _ESelectNamesCompletionPrivate;
-
-struct _ESelectNamesCompletion {
-	ECompletion parent;
-
-	struct _ESelectNamesCompletionPrivate *priv;
-};
-
-struct _ESelectNamesCompletionClass {
-	ECompletionClass parent_class;
-
-};
-
-GtkType      e_select_names_completion_get_type (void);
-
-ECompletion *e_select_names_completion_new                     (EBook *, ESelectNamesTextModel *);
-void         e_select_names_completion_add_book                (ESelectNamesCompletion *, EBook *);
-gboolean     e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *);
-void         e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *, gboolean);
-
-END_GNOME_DECLS
-
-#endif /* E_SELECT_NAMES_COMPLETION_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 d6560d6366..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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/bonobo-generic-factory.h>
-
-#include "e-select-names-bonobo.h"
-#include "e-select-names-factory.h"
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-
-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 0fe85c8361..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 53978ac502..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbridge  <trow@ximian.com.
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gal/e-text/e-entry.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 "e-select-names-completion.h"
-#include "e-select-names-popup.h"
-#include <addressbook/backend/ebook/e-destination.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-
-enum {
-	CHANGED,
-	OK,
-	CANCEL,
-	LAST_SIGNAL
-};
-
-static guint e_select_names_manager_signals[LAST_SIGNAL] = { 0 };
-
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-	ESelectNamesModel *original_model;
-	ESelectNamesManager *manager;
-	guint changed_tag;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-	ESelectNamesManager *manager;
-	ESelectNamesModel *model;
-	guint cleaning_tag;
-} 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);
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* ESelectNamesManagerSection routines */
-
-static void
-section_model_changed_cb (ESelectNamesModel *model, gpointer closure)
-{
-	ESelectNamesManagerSection *section = closure;
-	gtk_signal_emit (GTK_OBJECT (section->manager),
-			 e_select_names_manager_signals[CHANGED],
-			 section->id,
-			 FALSE);
-}
-
-static ESelectNamesManagerSection *
-e_select_names_manager_section_new (ESelectNamesManager *manager,
-				    const gchar *id,
-				    const gchar *title,
-				    ESelectNamesModel *model)
-{
-	ESelectNamesManagerSection *section;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	section = g_new0 (ESelectNamesManagerSection, 1);
-
-	section->id = g_strdup (id);
-	section->title = g_strdup (title);
-
-	section->manager = manager;
-
-	section->model = model;
-	gtk_object_ref (GTK_OBJECT (section->model));
-	section->changed_tag =
-		gtk_signal_connect (GTK_OBJECT (section->model),
-				    "changed",
-				    GTK_SIGNAL_FUNC (section_model_changed_cb),
-				    section);
-
-	return section;
-}
-
-static void
-e_select_names_manager_section_free (ESelectNamesManagerSection *section)
-{
-	if (section == NULL)
-		return;
-
-	g_free (section->id);
-	g_free (section->title);
-
-	if (section->model) {
-		gtk_signal_disconnect (GTK_OBJECT (section->model), section->changed_tag);
-		gtk_object_unref (GTK_OBJECT (section->model));
-	}
-
-	if (section->original_model) {
-		gtk_object_unref (GTK_OBJECT (section->original_model));
-	}
-
-	g_free (section);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* ESelectNamesManagerEntry routines */
-
-static ESelectNamesManagerEntry *
-get_entry_info (EEntry *entry)
-{
-	g_return_val_if_fail (E_IS_ENTRY (entry), NULL);
-	return (ESelectNamesManagerEntry *) gtk_object_get_data (GTK_OBJECT (entry), "entry_info");
-}
-
-static void
-popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, gpointer user_data)
-{
-	ESelectNamesTextModel *text_model;
-
-	gtk_object_get (GTK_OBJECT (eentry),
-			"model", &text_model,
-			NULL);
-	g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));
-
-	e_select_names_popup (text_model, ev, pos);
-}
-
-static gboolean
-clean_cb (gpointer ptr)
-{
-	ESelectNamesManagerEntry *entry = ptr;
-
-	e_select_names_model_clean (entry->model, TRUE);
-	entry->cleaning_tag = 0;
-	return FALSE;
-}
-
-static gint
-focus_in_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	if (entry->cleaning_tag) {
-		gtk_timeout_remove (entry->cleaning_tag);
-		entry->cleaning_tag = 0;
-	}
-
-	e_select_names_model_cancel_cardify_all (entry->model);
-
-	return FALSE;
-}
-
-static gint
-focus_out_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-	gboolean visible = e_entry_completion_popup_is_visible (entry->entry);
-
-	if (! visible) {
-		e_select_names_model_cardify_all (entry->model, entry->manager->completion_book, 100);
-		if (entry->cleaning_tag == 0)
-			entry->cleaning_tag = gtk_timeout_add (100, clean_cb, entry);
-	}
-
-	return FALSE;
-}
-
-static void
-completion_popup_cb (EEntry *w, gint visible, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	if (!visible && !GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry->entry->canvas)))
-		e_select_names_model_cardify_all (entry->model, entry->manager->completion_book, 0);
-}
-
-static void
-completion_handler (EEntry *entry, ECompletionMatch *match)
-{
-	ESelectNamesManagerEntry *mgr_entry;
-	ESelectNamesTextModel *text_model;
-	EDestination *dest;
-	gint i, pos, start_pos, len;
-
-	if (match == NULL || match->user_data == NULL)
-		return;
-
-	mgr_entry = get_entry_info (entry);
-	dest = E_DESTINATION (match->user_data);
-
-	/* Sometimes I really long for garbage collection.  Reference
-           counting makes you feel 31337, but sometimes it is just a
-           bitch. */
-	gtk_object_ref (GTK_OBJECT (dest));
-
-	gtk_object_get (GTK_OBJECT (entry),
-			"model", &text_model,
-			NULL);
-	g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));
-
-	pos = e_entry_get_position (entry);
-	e_select_names_model_text_pos (mgr_entry->model, text_model->seplen, pos, &i, NULL, NULL);
-	e_select_names_model_replace (mgr_entry->model, i, dest);
-	e_select_names_model_name_pos (mgr_entry->model, text_model->seplen, i, &start_pos, &len);
-	e_entry_set_position (entry, start_pos+len);
-}
-
-static ESelectNamesManagerEntry *
-e_select_names_manager_entry_new (ESelectNamesManager *manager, ESelectNamesModel *model, const gchar *id)
-{
-	ESelectNamesManagerEntry *entry;
-	ETextModel *text_model;
-	ECompletion *comp;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	entry = g_new0 (ESelectNamesManagerEntry, 1);
-
-	entry->id = g_strdup (id);
-
-	entry->entry = E_ENTRY (e_entry_new ());
-	text_model = e_select_names_text_model_new (model);
-	gtk_object_set(GTK_OBJECT(entry->entry),
-		       "model",          text_model, /* The entry takes ownership of the text model */
-		       "editable",       TRUE,
-		       "use_ellipsis",   TRUE,
-		       "allow_newlines", FALSE,
-		       NULL);
-
-	gtk_object_ref (GTK_OBJECT (entry->entry));
-
-	comp = e_select_names_completion_new (NULL, E_SELECT_NAMES_TEXT_MODEL (text_model));
-	if (manager->completion_book)
-		e_select_names_completion_add_book (E_SELECT_NAMES_COMPLETION (comp),
-						    manager->completion_book);
-
-	e_entry_enable_completion_full (entry->entry, comp, 50, completion_handler);
-
-	entry->manager = manager;
-
-	entry->model = model;
-	gtk_object_ref (GTK_OBJECT (model));
-	
-	gtk_signal_connect (GTK_OBJECT (entry->entry),
-			    "popup",
-			    GTK_SIGNAL_FUNC (popup_cb),
-			    entry);
-			
-	gtk_signal_connect (GTK_OBJECT (entry->entry->canvas),
-			    "focus_in_event",
-			    GTK_SIGNAL_FUNC (focus_in_cb),
-			    entry);
-	
-	gtk_signal_connect (GTK_OBJECT (entry->entry->canvas),
-			    "focus_out_event",
-			    GTK_SIGNAL_FUNC (focus_out_cb),
-			    entry);
-
-	gtk_signal_connect (GTK_OBJECT (entry->entry),
-			    "completion_popup",
-			    GTK_SIGNAL_FUNC (completion_popup_cb),
-			    entry);
-
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "entry_info", entry);
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "select_names_model", model);
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "select_names_text_model", text_model);
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "completion_handler", comp);
-
-	return entry;
-}
-
-static void
-e_select_names_manager_entry_free (ESelectNamesManagerEntry *entry)
-{
-	if (entry == NULL)
-		return;
-
-	g_free (entry->id);
-	gtk_object_unref (GTK_OBJECT (entry->model));
-	gtk_object_unref (GTK_OBJECT (entry->entry));
-
-	if (entry->cleaning_tag)
-		gtk_timeout_remove (entry->cleaning_tag);
-
-	g_free (entry);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-e_select_names_manager_save_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-	
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-
-		if (section->original_model == NULL && section->model != NULL)
-			section->original_model = e_select_names_model_duplicate (section->model);
-
-	}
-}
-
-static void
-e_select_names_manager_revert_to_saved_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (section->model && section->original_model) {
-			e_select_names_model_overwrite_copy (section->model, section->original_model);
-			gtk_object_unref (GTK_OBJECT (section->original_model));
-			section->original_model = NULL;
-		}
-	}
-}
-
-static void
-e_select_names_manager_discard_saved_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (section->original_model) {
-			gtk_object_unref (GTK_OBJECT (section->original_model));
-			section->original_model = NULL;
-		}
-	}
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-
-static void
-open_book_cb (EBook *book, EBookStatus status, ESelectNamesManager *manager)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		gtk_object_unref (GTK_OBJECT (book));
-		manager->completion_book = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (manager)); /* unref ourself (matches ref before the load_uri call below) */
-}
-
-/**
- * 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()));
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	char *val;
-
-	CORBA_exception_init (&ev);
-
-	db = addressbook_config_database (&ev);
-
-	val = bonobo_config_get_string (db, "/Addressbook/Completion/uri", &ev);
-
-	CORBA_exception_free (&ev);
-
-	if (val) {
-		manager->completion_book = e_book_new ();
-		gtk_object_ref (GTK_OBJECT (manager)); /* ref ourself before our async call */
-		addressbook_load_uri (manager->completion_book, val, (EBookCallback)open_book_cb, manager);
-		g_free (val);
-	}
-	else
-		manager->completion_book = NULL;
-
-	return manager;
-}
-
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-
-void
-e_select_names_manager_add_section (ESelectNamesManager *manager,
-				    const char *id,
-				    const char *title)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-	g_return_if_fail (title != NULL);
-	
-	e_select_names_manager_add_section_with_limit (manager, id, title, -1);
-}
-
-void
-e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,
-					       const char *id,
-					       const char *title,
-					       gint limit)
-{
-	ESelectNamesManagerSection *section;
-	ESelectNamesModel *model;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-	g_return_if_fail (title != NULL);
-	
-	model = e_select_names_model_new ();
-	e_select_names_model_set_limit (model, limit);
-	
-	section = e_select_names_manager_section_new (manager, id, title, model);
-
-	manager->sections = g_list_append (manager->sections, section);
-
-	gtk_object_unref (GTK_OBJECT (model));
-}
-
-ESelectNamesModel *
-e_select_names_manager_get_source (ESelectNamesManager *manager,
-				   const char *id)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (!strcmp (section->id, id))
-			return section->model;
-	}
-	return NULL;
-}
-
-GtkWidget *
-e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *id)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-
-			entry = e_select_names_manager_entry_new (manager, section->model, section->id);
-			manager->entries = g_list_append (manager->entries, entry);
-
-			return GTK_WIDGET(entry->entry);
-		}
-	}
-
-	return NULL;
-}
-
-static void
-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-
-	switch(button) {
-	case 0:
-		e_select_names_manager_discard_saved_models (manager);
-		gtk_signal_emit (GTK_OBJECT (manager), e_select_names_manager_signals[OK]);
-		break;
-
-	case 1:
-		e_select_names_manager_revert_to_saved_models (manager);
-		gtk_signal_emit (GTK_OBJECT (manager), e_select_names_manager_signals[CANCEL]);
-		break;
-	}
-}
-
-void
-e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
-					const char *id)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-
-	if (manager->names) {
-		
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		e_select_names_set_default (manager->names, id);
-		gdk_window_show (GTK_WIDGET (manager->names)->window);
-		gdk_window_raise (GTK_WIDGET (manager->names)->window);
-
-	} else {
-
-		GList *iter;
-
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-			ESelectNamesManagerSection *section = iter->data;
-			e_select_names_add_section (manager->names, section->id, section->title, section->model);
-		}
-
-		e_select_names_set_default (manager->names, id);
-
-		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));
-	}
-
-	e_select_names_manager_save_models (manager);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	manager->sections = NULL;
-	manager->entries  = NULL;
-}
-
-static void
-e_select_names_manager_destroy (GtkObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	if (manager->names) {
-		gtk_widget_destroy (GTK_WIDGET (manager->names));
-		manager->names = NULL;
-	}
-
-	g_list_foreach (manager->sections, (GFunc) e_select_names_manager_section_free, NULL);
-	g_list_free (manager->sections);
-	manager->sections = NULL;
-
-	g_list_foreach (manager->entries, (GFunc) e_select_names_manager_entry_free, NULL);
-	g_list_free (manager->entries);
-	manager->entries = NULL;
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	object_class->destroy = e_select_names_manager_destroy;
-
-	e_select_names_manager_signals[CHANGED] = 
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, changed),
-				gtk_marshal_NONE__POINTER_INT,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT);
-
-	e_select_names_manager_signals[OK] =
-		gtk_signal_new ("ok",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, ok),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_select_names_manager_signals[CANCEL] =
-		gtk_signal_new ("cancel",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, cancel),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_select_names_manager_signals, LAST_SIGNAL);
-}
-
-/**
- * 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;
-}
-
-
-
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 9fdad2c304..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MANAGER_H__
-#define __E_SELECT_NAMES_MANAGER_H__
-
-#include <stdio.h>
-#include <time.h>
-#include <gtk/gtkobject.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;
-	
-	GList *sections;
-	GList *entries;
-
-	ESelectNames *names;
-
-	EBook *completion_book;
-};
-
-struct _ESelectNamesManagerClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesManager *, const gchar *section_id, gint changed_working_copy);
-	void (*ok)      (ESelectNamesManager *);
-	void (*cancel)  (ESelectNamesManager *);
-};
-
-ESelectNamesManager *e_select_names_manager_new                    (void);
-void                 e_select_names_manager_add_section            (ESelectNamesManager *manager,
-							            const char *id,
-							            const char *title);
-void                 e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,
-								    const char *id,
-								    const char *title,
-								    gint limit);
-ESelectNamesModel   *e_select_names_manager_get_source             (ESelectNamesManager *manager,
-								    const char *id);
-GtkWidget           *e_select_names_manager_create_entry           (ESelectNamesManager *manager,
-							            const char *id);
-void                 e_select_names_manager_activate_dialog        (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 fadb8c21a0..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,889 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbidge   <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtksignal.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-select-names-model.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define MAX_LENGTH 2047
-
-
-enum {
-	E_SELECT_NAMES_MODEL_CHANGED,
-	E_SELECT_NAMES_MODEL_RESIZED,
-	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,
-};
-
-enum {
-	NAME_DATA_BLANK,
-	NAME_DATA_CARD,
-	NAME_DATA_STRING
-};
-
-enum {
-	NAME_FORMAT_GIVEN_FIRST,
-	NAME_FORMAT_FAMILY_FIRST
-};
-
-struct _ESelectNamesModelPrivate {
-	gchar *id;
-	gchar *title;
-
-	GList *data;  /* of EDestination */
-
-	gint limit;
-
-	gint freeze_count;
-	gboolean pending_changed;
-};
-
-
-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);
-
-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;
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_INT) (GtkObject *object, gint arg1, gint arg2, gint arg3, gpointer user_data);
-static void
-local_gtk_marshal_NONE__INT_INT_INT (GtkObject    *object, 
-				     GtkSignalFunc func, 
-				     gpointer      func_data, 
-				     GtkArg       *args)
-{
-	GtkSignal_NONE__INT_INT_INT rfunc;
-	rfunc = (GtkSignal_NONE__INT_INT_INT) func;
-	(* rfunc) (object,
-		   GTK_VALUE_INT(args[0]),
-		   GTK_VALUE_INT(args[1]),
-		   GTK_VALUE_INT(args[2]),
-		   func_data);
-}
-
-
-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);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED] =
-		gtk_signal_new ("resized",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, resized),
-				local_gtk_marshal_NONE__INT_INT_INT,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	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;
-}
-
-/**
- * e_select_names_model_init:
- */
-static void
-e_select_names_model_init (ESelectNamesModel *model)
-{
-	model->priv = g_new0 (struct _ESelectNamesModelPrivate, 1);
-
-	model->priv->limit = -1;
-}
-
-static void
-e_select_names_model_destroy (GtkObject *object)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL (object);
-	
-	g_free (model->priv->title);
-	g_free (model->priv->id);
-
-	g_list_foreach (model->priv->data, (GFunc) gtk_object_unref, NULL);
-	g_list_free (model->priv->data);
-
-	g_free (model->priv);
-
-}
-
-
-/* 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
-e_select_names_model_changed (ESelectNamesModel *model)
-{
-	if (model->priv->freeze_count > 0) {
-		model->priv->pending_changed = TRUE;
-	} else {
-		gtk_signal_emit (GTK_OBJECT(model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);
-		model->priv->pending_changed = FALSE;
-	}
-}
-
-static void
-destination_changed_proxy (EDestination *dest, gpointer closure)
-{
-	e_select_names_model_changed (E_SELECT_NAMES_MODEL (closure));
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-ESelectNamesModel *
-e_select_names_model_new (void)
-{
-	ESelectNamesModel *model;
-	model = E_SELECT_NAMES_MODEL (gtk_type_new (e_select_names_model_get_type ()));
-	return model;
-}
-
-ESelectNamesModel *
-e_select_names_model_duplicate (ESelectNamesModel *old)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	GList *iter;
-
-	model->priv->id = g_strdup (old->priv->id);
-	model->priv->title = g_strdup (old->priv->title);
-	
-	for (iter = old->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dup = e_destination_copy (E_DESTINATION (iter->data));
-		e_select_names_model_append (model, dup);
-	}
-
-	model->priv->limit = old->priv->limit;
-
-	return model;
-}
-
-gchar *
-e_select_names_model_get_textification (ESelectNamesModel *model, const char *separator)
-{
-	gchar *text;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (separator && *separator, NULL);
-
-	if (model->priv->data == NULL) {
-		
-		text = g_strdup ("");
-
-	} else {
-		gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-		gint i = 0;
-		GList *iter = model->priv->data;
-		
-		while (iter) {
-			EDestination *dest = E_DESTINATION (iter->data);
-			strv[i] = (gchar *) e_destination_get_textrep (dest);
-			++i;
-			iter = g_list_next (iter);
-		}
-		
-		text = g_strjoinv (separator, strv);
-		
-		if (strlen(text) > MAX_LENGTH) {
-			text[MAX_LENGTH] = '\0';
-			text = g_realloc (text, MAX_LENGTH + 1);
-		}
-		
-		g_free (strv);
-		
-	}
-
-	return text;
-}
-
-gchar *
-e_select_names_model_get_address_text (ESelectNamesModel *model, const char *separator)
-{
-	gchar *addr_text;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (separator && *separator, NULL);
-
-	if (model->priv->data == NULL) {
-
-		addr_text = g_strdup ("");
-		
-	} else {
-		gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-		gint i = 0;
-		GList *iter = model->priv->data;
-
-		while (iter) {
-			EDestination *dest = E_DESTINATION (iter->data);
-			strv[i] = (gchar *) e_destination_get_address (dest);
-			if (strv[i])
-				++i;
-			iter = g_list_next (iter);
-		}
-		
-		addr_text = g_strjoinv (separator, strv);
-		
-		g_free (strv);
-		
-	}
-
-	return addr_text;
-}
-
-gint
-e_select_names_model_count (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return g_list_length (model->priv->data);
-}
-
-gint
-e_select_names_model_get_limit (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return model->priv->limit;
-}
-
-void
-e_select_names_model_set_limit (ESelectNamesModel *model, gint limit)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	model->priv->limit = MAX (limit, -1);
-}
-
-gboolean
-e_select_names_model_at_limit (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, TRUE);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), TRUE);
-
-	return model->priv->limit >= 0 && g_list_length (model->priv->data) >= model->priv->limit;
-}
-
-const EDestination *
-e_select_names_model_get_destination (ESelectNamesModel *model, gint index)
-{
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	return E_DESTINATION (g_list_nth_data (model->priv->data, index));
-}
-
-gchar *
-e_select_names_model_export_destinationv (ESelectNamesModel *model)
-{
-	EDestination **destv;
-	gchar *str;
-	gint i, len = 0;
-	GList *j;
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	len = g_list_length (model->priv->data);
-	destv = g_new0 (EDestination *, len+1);
-	
-	for (i=0, j = model->priv->data; j != NULL; j = g_list_next (j)) {
-		EDestination *dest = E_DESTINATION (j->data);
-
-		if (dest)
-			destv[i++] = dest;
-	}
-
-	str = e_destination_exportv (destv);
-	g_free (destv);
-
-	return str;
-}
-
-static
-void send_changed (EDestination *dest, ECard *card, gpointer closure)
-{
-	ESelectNamesModel *model = closure;
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_import_destinationv (ESelectNamesModel *model,
-					  gchar *destinationv)
-{
-	EDestination **destv;
-	gint i;
-
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-
-	destv = e_destination_importv (destinationv);
-
-	e_select_names_model_delete_all (model);
-
-	if (destv == NULL)
-		return;
-
-	for (i = 0; destv[i]; i++) {
-		e_destination_use_card (destv[i], send_changed, model);
-		e_select_names_model_append (model, destv[i]);
-	}
-	g_free (destv);
-}
-
-ECard *
-e_select_names_model_get_card (ESelectNamesModel *model, gint index)
-{
-	const EDestination *dest;
-
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	dest = e_select_names_model_get_destination (model, index);
-	return dest ? e_destination_get_card (dest) : NULL;
-
-}
-
-const gchar *
-e_select_names_model_get_string (ESelectNamesModel *model, gint index)
-{
-	const EDestination *dest;
-
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	dest = e_select_names_model_get_destination (model, index);
-	
-	return dest ? e_destination_get_textrep (dest) : "";
-}
-
-static void
-connect_destination (ESelectNamesModel *model, EDestination *dest)
-{
-	gtk_signal_connect (GTK_OBJECT (dest),
-			    "changed",
-			    destination_changed_proxy,
-			    model);
-}
-
-static void
-disconnect_destination (ESelectNamesModel *model, EDestination *dest)
-{
-	gtk_signal_disconnect_by_func (GTK_OBJECT (dest), destination_changed_proxy, model);
-}
-
-gboolean
-e_select_names_model_contains (ESelectNamesModel *model, const EDestination *dest)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		if (iter->data != NULL && e_destination_equal (dest, E_DESTINATION (iter->data)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-void
-e_select_names_model_insert (ESelectNamesModel *model, gint index, EDestination *dest)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index <= g_list_length (model->priv->data));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	if (e_select_names_model_at_limit (model)) {
-		/* FIXME: This is bad. */
-		gtk_object_unref (GTK_OBJECT (dest));
-		return;
-	}
-
-	connect_destination (model, dest);
-
-	model->priv->data = g_list_insert (model->priv->data, dest, index);
-	
-	gtk_object_ref (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_append (ESelectNamesModel *model, EDestination *dest)
-{
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	if (e_select_names_model_at_limit (model)) {
-		/* FIXME: This is bad. */
-		gtk_object_unref (GTK_OBJECT (dest));
-		return;
-	}
-
-	connect_destination (model, dest);
-
-	model->priv->data = g_list_append (model->priv->data, dest);
-
-	gtk_object_ref  (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_replace (ESelectNamesModel *model, gint index, EDestination *dest)
-{
-	GList *node;
-	const gchar *new_str, *old_str;
-	gint old_strlen=0, new_strlen=0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (model->priv->data == NULL || (0 <= index && index < g_list_length (model->priv->data)));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	new_str = e_destination_get_textrep (dest);
-	new_strlen = new_str ? strlen (new_str) : 0;
-
-	if (model->priv->data == NULL) {
-
-		connect_destination (model, dest);
-
-		model->priv->data = g_list_append (model->priv->data, dest);
-		gtk_object_ref (GTK_OBJECT (dest));
-		gtk_object_sink (GTK_OBJECT (dest));
-
-	} else {
-		
-		node = g_list_nth (model->priv->data, index);
-
-		if (node->data != dest) {
-
-			disconnect_destination (model, E_DESTINATION (node->data));
-			connect_destination (model, dest);
-
-			old_str = e_destination_get_textrep (E_DESTINATION (node->data));
-			old_strlen = old_str ? strlen (old_str) : 0;
-
-			gtk_object_unref (GTK_OBJECT (node->data));
-
-			node->data = dest;
-			gtk_object_ref (GTK_OBJECT (dest));
-			gtk_object_sink (GTK_OBJECT (dest));
-		}
-	}
-
-	e_select_names_model_changed (model);
-
-	gtk_signal_emit (GTK_OBJECT (model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED],
-			 index, old_strlen, new_strlen);
-}
-
-void
-e_select_names_model_delete (ESelectNamesModel *model, gint index)
-{
-	GList *node;
-	EDestination *dest;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-	
-	node = g_list_nth (model->priv->data, index);
-	dest = E_DESTINATION (node->data);
-
-	disconnect_destination (model, dest);
-	gtk_object_unref (GTK_OBJECT (dest));
-
-	model->priv->data = g_list_remove_link (model->priv->data, node);
-	g_list_free_1 (node);
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_clean (ESelectNamesModel *model, gboolean clean_last_entry)
-{
-	GList *iter, *next;
-	gboolean changed = FALSE;
-
-	g_return_if_fail (model != NULL && E_IS_SELECT_NAMES_MODEL (model));
-
-	iter = model->priv->data;
-
-	while (iter) {
-		EDestination *dest;
-
-		next = g_list_next (iter);
-
-		if (next == NULL && !clean_last_entry)
-			break;
-		
-		dest = iter->data ? E_DESTINATION (iter->data) : NULL;
-
-		if (dest == NULL || e_destination_is_empty (dest)) {
-			if (dest) {
-				disconnect_destination (model, dest);
-				gtk_object_unref (GTK_OBJECT (dest));
-			}
-			model->priv->data = g_list_remove_link (model->priv->data, iter);
-			g_list_free_1 (iter);
-			changed = TRUE;
-		}
-		
-		iter = next;
-	}
-
-	if (changed)
-		e_select_names_model_changed (model);
-}
-
-static void
-delete_all_iter (gpointer data, gpointer closure)
-{
-	disconnect_destination (E_SELECT_NAMES_MODEL (closure), E_DESTINATION (data));
-	gtk_object_unref (GTK_OBJECT (data));
-}
-
-void
-e_select_names_model_delete_all (ESelectNamesModel *model)
-{
-	g_return_if_fail (model != NULL && E_IS_SELECT_NAMES_MODEL (model));
-
-	g_list_foreach (model->priv->data, delete_all_iter, model);
-	g_list_free (model->priv->data);
-	model->priv->data = NULL;
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src)
-{
-	gint i, len;
-
-	g_return_if_fail (dest && E_IS_SELECT_NAMES_MODEL (dest));
-	g_return_if_fail (src && E_IS_SELECT_NAMES_MODEL (src));
-
-	if (src == dest)
-		return;
-
-	e_select_names_model_delete_all (dest);
-	len = e_select_names_model_count (src);
-	for (i = 0; i < len; ++i) {
-		const EDestination *d = e_select_names_model_get_destination (src, i);
-		if (d)
-			e_select_names_model_append (dest, e_destination_copy (d));
-	}
-}
-
-void
-e_select_names_model_merge (ESelectNamesModel *dest, ESelectNamesModel *src)
-{
-	gint i, len;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (dest));
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (src));
-
-	if (src == dest)
-		return;
-
-	len = e_select_names_model_count (src);
-	for (i = 0; i < len; ++i) {
-		const EDestination *d = e_select_names_model_get_destination (src, i);
-		if (d && !e_select_names_model_contains (dest, d))
-			e_select_names_model_append (dest, e_destination_copy (d));
-	}
-}
-
-void
-e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index, gint *pos, gint *length)
-{
-	gint rp = 0, i, len = 0;
-	GList *iter;
-	const gchar *str;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (seplen > 0);
-
-	i = 0;
-	iter = model->priv->data;
-	while (iter && i <= index) {
-		rp += len + (i > 0 ? seplen : 0);
-		str = e_destination_get_textrep (E_DESTINATION (iter->data));
-		len = str ? strlen (str) : 0;
-		++i;
-		iter = g_list_next (iter);
-	}
-	
-	if (i <= index) {
-		rp = -1;
-		len = 0;
-	}
-	
-	if (pos)
-		*pos = rp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, gint *index, gint *start_pos, gint *length)
-{
-	GList *iter;
-	const gchar *str;
-	gint len = 0, i = 0, sp = 0, adj = 0;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (seplen > 0);
-
-	iter = model->priv->data;
-
-	while (iter != NULL) {
-		str = e_destination_get_textrep (E_DESTINATION (iter->data));
-		len = str ? strlen (str) : 0;
-
-		if (sp <= pos && pos <= sp + len + adj) {
-			break;
-		}
-
-		sp += len + adj + 1;
-		adj = seplen-1;
-		++i;
-
-		iter = g_list_next (iter);
-	}
-
-	if (i != 0)
-		sp += seplen-1; /* skip past "magic space" */
-
-	if (iter == NULL) {
-#if 0
-		g_print ("text_pos ended NULL\n");
-#endif
-		i = -1;
-		sp = -1;
-		len = 0;
-	} else {
-#if 0
-		g_print ("text_pos got index %d\n", i);
-#endif
-	}
-
-	if (index)
-		*index = i;
-	if (start_pos)
-		*start_pos = sp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_cardify (ESelectNamesModel *model, EBook *book, gint index, gint delay)
-{
-	EDestination *dest;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-
-	dest = E_DESTINATION (g_list_nth_data (model->priv->data, index));
-
-	if (!e_destination_is_empty (dest)) {
-
-		if (delay > 0)
-			e_destination_cardify_delayed (dest, book, delay);
-		else
-			e_destination_cardify (dest, book);
-	}
-}
-
-gboolean
-e_select_names_model_uncardify (ESelectNamesModel *model, gint index)
-{
-	EDestination *dest;
-	gboolean rv = FALSE;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);
-	g_return_val_if_fail (0 <= index && index < g_list_length (model->priv->data), FALSE);
-
-	dest = E_DESTINATION (g_list_nth_data (model->priv->data, index));
-
-	if (!e_destination_is_empty (dest)) {
-		EDestination *cpy_dest = e_destination_copy (dest);
-
-		rv = e_destination_uncardify (cpy_dest);
-
-		if (rv) {
-			e_select_names_model_replace (model, index, cpy_dest);
-		}
-		
-	}
-
-	return rv;
-}
-
-void
-e_select_names_model_cancel_cardify (ESelectNamesModel *model, gint index)
-{
-	EDestination *dest;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-
-	dest = E_DESTINATION (g_list_nth_data (model->priv->data, index));
-	
-	e_destination_cancel_cardify (dest);
-}
-
-void
-e_select_names_model_cardify_all (ESelectNamesModel *model, EBook *book, gint delay)
-{
-	GList *iter;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dest = E_DESTINATION (iter->data);
-		if (!e_destination_is_empty (dest)) {
-
-			if (delay > 0)
-				e_destination_cardify_delayed (dest, book, delay);
-			else
-				e_destination_cardify (dest, book);
-		}
-	}
-}
-
-void
-e_select_names_model_cancel_cardify_all (ESelectNamesModel *model)
-{
-	GList *iter;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dest = E_DESTINATION (iter->data);
-		e_destination_cancel_cardify (dest);
-	}
-}
-
-void
-e_select_names_model_freeze (ESelectNamesModel *model)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	
-	++model->priv->freeze_count;
-}
-
-void
-e_select_names_model_thaw (ESelectNamesModel *model)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (model->priv->freeze_count > 0);
-
-	--model->priv->freeze_count;
-	if (model->priv->pending_changed)
-		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 9179eb676d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MODEL_H__
-#define __E_SELECT_NAMES_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-destination.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 struct _ESelectNamesModel ESelectNamesModel;
-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;
-struct _ESelectNamesModelPrivate;
-
-struct _ESelectNamesModel {
-	GtkObject object;
-	
-	struct _ESelectNamesModelPrivate *priv;
-};
-
-struct _ESelectNamesModelClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesModel *model);
-	void (*resized) (ESelectNamesModel *model, gint index, gint old_len, gint new_len);
-};
-
-GtkType e_select_names_model_get_type  (void);
-
-ESelectNamesModel *e_select_names_model_new       (void);
-ESelectNamesModel *e_select_names_model_duplicate (ESelectNamesModel *old);
-
-gchar             *e_select_names_model_get_textification (ESelectNamesModel *model, const char *separator);
-gchar             *e_select_names_model_get_address_text  (ESelectNamesModel *model, const char *separator);
-
-gint                e_select_names_model_count               (ESelectNamesModel *model);
-gint                e_select_names_model_get_limit           (ESelectNamesModel *model);
-void                e_select_names_model_set_limit           (ESelectNamesModel *model, gint limit);
-gboolean            e_select_names_model_at_limit            (ESelectNamesModel *model);
-
-const EDestination *e_select_names_model_get_destination     (ESelectNamesModel *model, gint index);
-gchar              *e_select_names_model_export_destinationv (ESelectNamesModel *model);
-void                e_select_names_model_import_destinationv (ESelectNamesModel *model,
-							      gchar *destinationv);
-ECard              *e_select_names_model_get_card            (ESelectNamesModel *model, gint index);
-const gchar        *e_select_names_model_get_string          (ESelectNamesModel *model, gint index);
-
-gboolean      e_select_names_model_contains       (ESelectNamesModel *model, const EDestination *dest);
-
-void          e_select_names_model_insert         (ESelectNamesModel *model, gint index, EDestination *dest);
-void          e_select_names_model_append         (ESelectNamesModel *model, EDestination *dest);
-void          e_select_names_model_replace        (ESelectNamesModel *model, gint index, EDestination *dest);
-void          e_select_names_model_delete         (ESelectNamesModel *model, gint index);
-void          e_select_names_model_delete_all     (ESelectNamesModel *model);
-void          e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src);
-void          e_select_names_model_merge          (ESelectNamesModel *dest, ESelectNamesModel *src);
-
-void          e_select_names_model_clean      (ESelectNamesModel *model, gboolean clean_last_entry);
-
-void          e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index, gint *pos, gint *length);
-void          e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, gint *index, gint *start_pos, gint *length);
-
-void          e_select_names_model_cardify            (ESelectNamesModel *model, EBook *book, gint index, gint delay);
-gboolean      e_select_names_model_uncardify          (ESelectNamesModel *model, gint index);
-void          e_select_names_model_cancel_cardify     (ESelectNamesModel *model, gint index);
-void          e_select_names_model_cardify_all        (ESelectNamesModel *model, EBook *book, gint delay);
-void          e_select_names_model_cancel_cardify_all (ESelectNamesModel *model);
-
-/* This is a mildly annoying freeze/thaw pair, in that it only applies to the 'changed'
-   signal and not to 'resized'.  This could cause unexpected results in some cases. */
-void          e_select_names_model_freeze (ESelectNamesModel *model);
-void          e_select_names_model_thaw   (ESelectNamesModel *model);
-
-
-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
deleted file mode 100644
index 442a00b6c1..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ /dev/null
@@ -1,564 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-popup.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-popup-menu.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include "e-addressbook-util.h"
-#include "e-select-names-popup.h"
-
-typedef struct _PopupInfo PopupInfo;
-struct _PopupInfo {
-	ESelectNamesTextModel *text_model;
-	const EDestination *dest;
-	gint pos;
-	gint index;
-};
-
-static PopupInfo *
-popup_info_new (ESelectNamesTextModel *text_model, const EDestination *dest, gint pos, gint index)
-{
-	PopupInfo *info = g_new0 (PopupInfo, 1);
-	info->text_model = text_model;
-	info->dest = dest;
-	info->pos = pos;
-	info->index = index;
-
-	if (text_model)
-		gtk_object_ref (GTK_OBJECT (text_model));
-
-	if (dest)
-		gtk_object_ref (GTK_OBJECT (dest));
-
-	return info;
-}
-
-static void
-popup_info_free (PopupInfo *info)
-{
-	if (info) {
-		
-		if (info->text_model)
-			gtk_object_unref (GTK_OBJECT (info->text_model));
-
-		if (info->dest)
-			gtk_object_unref (GTK_OBJECT (info->dest));
-
-		g_free (info);
-	}
-}
-
-static void
-popup_info_cleanup (GtkWidget *w, gpointer info)
-{
-	popup_info_free ((PopupInfo *) info);
-}
-
-/* You are in a maze of twisty little callbacks, all alike... */
-
-static void
-make_contact_editor_cb (EBook *book, gpointer user_data)
-{
-	if (book) {
-		EDestination *dest = E_DESTINATION (user_data);
-		ECard *card;
-
-		card = (ECard *) e_destination_get_card (dest);
-		if (e_card_evolution_list (card)) {
-			EContactListEditor *ce;
-			ce = e_addressbook_show_contact_list_editor (book, card, FALSE, TRUE);
-			e_contact_list_editor_raise (ce);
-		}
-		else {
-			EContactEditor *ce;
-			ce = e_addressbook_show_contact_editor (book, card, FALSE, TRUE);
-			e_contact_editor_raise (ce);
-		}
-		gtk_object_unref (GTK_OBJECT (dest));
-	}
-}
-
-static void
-edit_contact_info_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	if (info == NULL)
-		return;
-
-	gtk_object_ref (GTK_OBJECT (info->dest));
-	e_book_use_local_address_book (make_contact_editor_cb, (gpointer) info->dest);
-}
-
-static void
-change_email_num_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	gint n;
-	EDestination *dest;
-	
-	if (info == NULL) 
-		return;
-
-	if (! GTK_CHECK_MENU_ITEM (w)->active)
-		return;
-
-	n = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "number"));
-
-	if (n != e_destination_get_email_num (info->dest)) {
-		dest = e_destination_new ();
-		e_destination_set_card (dest, e_destination_get_card (info->dest), n);
-		e_select_names_model_replace (info->text_model->source, info->index, dest);
-
-	}
-}
-
-static void
-remove_recipient_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete (info->text_model->source, info->index);
-}
-
-static void
-add_remove_recipient (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	uiinfo->type = GNOME_APP_UI_ITEM;
-	uiinfo->label = _("Remove");
-	uiinfo->moreinfo = remove_recipient_cb;
-}
-
-static void
-remove_all_recipients_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete_all (info->text_model->source);
-}
-
-static void
-add_remove_all_recipients (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	uiinfo->type = GNOME_APP_UI_ITEM;
-	uiinfo->label = _("Remove All");
-	uiinfo->moreinfo = remove_all_recipients_cb;
-}
-
-static void
-toggle_html_mail_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM (w);
-	const EDestination *dest;
-
-	if (info == NULL)
-		return;
-
-	dest = info->dest;
-
-	item = GTK_CHECK_MENU_ITEM (item);
-	e_destination_set_html_mail_pref ((EDestination *) dest, item->active);
-}
-
-static void
-add_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	uiinfo->type = GNOME_APP_UI_TOGGLEITEM;
-	uiinfo->label = _("Send HTML Mail?");
-	uiinfo->moreinfo = toggle_html_mail_cb;
-}
-
-static void
-init_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (uiinfo->widget),
-					e_destination_get_html_mail_pref (info->dest));
-	gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (uiinfo->widget), TRUE);
-
-}
-
-static void
-set_uiinfo_label (GnomeUIInfo *uiinfo, const gchar *str)
-{
-	GtkWidget *label;
-	gchar *label_txt;
-	GList *item_children;
-	
-	label_txt = e_utf8_to_locale_string (str);
-	item_children = gtk_container_children (GTK_CONTAINER (uiinfo->widget));
-	label = item_children->data;
-	g_list_free (item_children);
-	gtk_label_set_text (GTK_LABEL (label), label_txt);
-	g_free (label_txt);
-}
-
-#define ARBITRARY_UIINFO_LIMIT 64
-static GtkWidget *
-popup_menu_card (PopupInfo *info)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GnomeUIInfo radioinfo[ARBITRARY_UIINFO_LIMIT];
-	gboolean using_radio = FALSE;
-	ECard *card;
-	gint i=0;
-	GtkWidget *pop;
-	EIterator *iterator;
-	gint html_toggle;
-	gint mail_label = -1;
-	const gchar *mail_label_str = NULL;
-
-	/*
-	 * Build up our GnomeUIInfo array.
-	 */
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-	memset (radioinfo, 0, sizeof (radioinfo));
-
-	card = e_destination_get_card (info->dest);
-
-	/* Use an empty label for now, we'll fill it later.
-	   If we set uiinfo label to contact name here, gnome_popup_menu_new
-	   could screw it up trying make a "translation". */
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = "";
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	if (card->email) {
-		
-		if (e_list_length (card->email) > 1) {
-			gint j = 0;
-
-			using_radio = TRUE;
-
-			iterator = e_list_get_iterator (card->email);
-			for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-				gchar *label = (gchar *)e_iterator_get (iterator);
-				if (label && *label) {
-					radioinfo[j].label = "";
-					radioinfo[j].type = GNOME_APP_UI_ITEM;
-					radioinfo[j].moreinfo = change_email_num_cb;
-					++j;
-				}
-			}
-			gtk_object_unref (GTK_OBJECT (iterator));
-			
-			radioinfo[j].type = GNOME_APP_UI_ENDOFINFO;
-			
-			uiinfo[i].type = GNOME_APP_UI_RADIOITEMS;
-			uiinfo[i].moreinfo = radioinfo;
-			++i;
-			
-		} else {
-			uiinfo[i].type = GNOME_APP_UI_ITEM;
-			uiinfo[i].label = "";
-			mail_label_str = e_destination_get_email (info->dest);
-			mail_label = i;
-			++i;
-		}
-
-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-		++i;
-	}
-
-	add_html_mail (&(uiinfo[i]), info);
-	html_toggle = i;
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = N_("Edit Contact Info");
-	uiinfo[i].moreinfo = edit_contact_info_cb;
-	++i;
-
-	add_remove_recipient (&(uiinfo[i]), info);
-	++i;
-	
-	add_remove_all_recipients (&(uiinfo[i]), info);
-	++i;
-		
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-
-	/*
-	 * Now do something with it...
-	 */
-
-	pop = gnome_popup_menu_new (uiinfo);
-
-	init_html_mail (&(uiinfo[html_toggle]), info);
-
-	/* Properly handle the names & e-mail addresses so that they don't get leaked and so that
-	   underscores are interpreted as key accelerators.  This sucks. */
-
-	set_uiinfo_label (&(uiinfo[0]), e_destination_get_name (info->dest));
-	
-	if (mail_label >= 0) {
-		set_uiinfo_label (&(uiinfo[mail_label]), e_destination_get_email (info->dest));
-	}
-
-	if (using_radio) {
-		gint n = e_destination_get_email_num (info->dest);
-		gint j = 0;
-		iterator = e_list_get_iterator (card->email);
-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-			gchar *label = (gchar *)e_iterator_get (iterator);
-			if (label && *label) {
-				set_uiinfo_label (&(radioinfo[j]), label);
-				
-				gtk_object_set_data (GTK_OBJECT (radioinfo[j].widget), "number", GINT_TO_POINTER (j));
-
-				if (j == n) 
-					gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (radioinfo[n].widget), TRUE);
-				
-				++j;
-			}
-		}
-		gtk_object_unref (GTK_OBJECT (iterator));
-	}
-
-	return pop;
-}
-
-static GtkWidget *
-popup_menu_list (PopupInfo *info)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GtkWidget *pop;
-	const gchar *str;
-	gchar *gs;
-	gint i = 0, subcount = 0, max_subcount = 10;
-	ECard *card;
-	EIterator *iterator;
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = "";
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	card = e_destination_get_card (info->dest);
-
-	if (card->email) {
-		
-		iterator = e_list_get_iterator (card->email);
-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator) && subcount < max_subcount; e_iterator_next (iterator)) {
-			gchar *label = (gchar *) e_iterator_get (iterator);
-			if (label && *label) {
-				uiinfo[i].type = GNOME_APP_UI_ITEM;
-				uiinfo[i].label = "";
-				++i;
-				++subcount;
-			}
-		}
-		if (e_iterator_is_valid (iterator)) {
-			uiinfo[i].type = GNOME_APP_UI_ITEM;
-			uiinfo[i].label = "";
-			++i;
-		}
-		
-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-		++i;
-
-		gtk_object_unref (GTK_OBJECT (iterator));
-	}
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = N_("Edit Contact List");
-	uiinfo[i].moreinfo = edit_contact_info_cb;
-	++i;
-
-	add_remove_recipient (&(uiinfo[i]), info);
-	++i;
-	
-	add_remove_all_recipients (&(uiinfo[i]), info);
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-
-	pop = gnome_popup_menu_new (uiinfo);
-
-	/* Now set labels properly. */
-	
-	str = e_destination_get_name (info->dest);
-	if (!(str && *str))
-		str = _("Unnamed Contact List");
-	set_uiinfo_label (&(uiinfo[0]), str);
-
-	if (card->email) {
-		
-		iterator = e_list_get_iterator (card->email);
-		i = 2;
-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator) && subcount < max_subcount; e_iterator_next (iterator)) {
-			gchar *label = (gchar *) e_iterator_get (iterator);
-			if (label && *label) {
-				EDestination *subdest = e_destination_import (label);
-				set_uiinfo_label (&(uiinfo[i]), e_destination_get_address (subdest));
-				++i;
-				gtk_object_unref (GTK_OBJECT (subdest));
-			}
-		}
-		if (e_iterator_is_valid (iterator)) {
-			gs = g_strdup_printf (N_("(%d not shown)"), e_list_length (card->email) - max_subcount);
-			set_uiinfo_label (&(uiinfo[i]), gs);
-			g_free (gs);
-		}
-
-		gtk_object_unref (GTK_OBJECT (iterator));
-	}
-
-
-	return pop;
-}
-
-static void
-quick_add_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_contact_quick_add_free_form (e_destination_get_address (info->dest), NULL, NULL);
-}
-
-static GtkWidget *
-popup_menu_nocard (PopupInfo *info)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	gint i=0;
-	GtkWidget *pop;
-	const gchar *str;
-	gint html_toggle;
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	/* Use an empty label for now, we'll fill it later.
-	   If we set uiinfo label to contact name here, gnome_popup_menu_new
-	   could screw it up trying make a "translation". */
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = "";
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	add_html_mail (&(uiinfo[i]), info);
-	html_toggle = i;
-	++i;
-	
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = _("Add to Contacts");
-	uiinfo[i].moreinfo = quick_add_cb;
-	++i;
-
-	add_remove_recipient (&(uiinfo[i]), info);
-	++i;
-
-	add_remove_all_recipients (&(uiinfo[i]), info);
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-
-	pop = gnome_popup_menu_new (uiinfo);
-
-	init_html_mail (&(uiinfo[html_toggle]), info);
-
-	/* Now set label of the first item to contact name */
-	str = e_destination_get_name (info->dest);
-	if (! (str && *str))
-		str = e_destination_get_email (info->dest);
-	if (! (str && *str))
-		str = _("Unnamed Contact");
-	
-	set_uiinfo_label (&(uiinfo[0]), str);
-	
-	return pop;
-}
-
-void
-e_select_names_popup (ESelectNamesTextModel *text_model, GdkEventButton *ev, gint pos)
-{
-	ESelectNamesModel *model;
-	GtkWidget *popup;
-	PopupInfo *info;
-	const EDestination *dest;
-	ECard *card;
-	gint index;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));
-	g_return_if_fail (ev);
-	g_return_if_fail (0 <= pos);
-
-	model = text_model->source;
-
-	e_select_names_model_text_pos (model, text_model->seplen, pos, &index, NULL, NULL);
-	if (index < 0 || index >= e_select_names_model_count (model))
-		return;
-
-	dest = e_select_names_model_get_destination (model, index);
-	if (e_destination_is_empty (dest))
-		return;
-
-	card = e_destination_get_card (dest);
-
-	info = popup_info_new (text_model, dest, pos, index);
-	
-	if (e_destination_contains_card (dest)) {
-		if (e_destination_is_evolution_list (dest))
-			popup = popup_menu_list (info);
-		else
-			popup = popup_menu_card (info);
-	} else {
-		popup = popup_menu_nocard (info);
-	}
-
-	if (popup) {
-		/* Clean up our info item after we've made our selection. */
-		gtk_signal_connect (GTK_OBJECT (popup),
-				    "selection-done",
-				    GTK_SIGNAL_FUNC (popup_info_cleanup),
-				    info);
-
-		gnome_popup_menu_do_popup (popup, NULL, NULL, ev, info);
-
-	} else {
-
-		popup_info_free (info);
-
-	}
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.h b/addressbook/gui/component/select-names/e-select-names-popup.h
deleted file mode 100644
index 09cd29da18..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-popup.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_SELECT_NAMES_POPUP_H__
-#define __E_SELECT_NAMES_POPUP_H__
-
-#include "e-select-names-text-model.h"
-
-void e_select_names_popup (ESelectNamesTextModel *text_model, GdkEventButton *ev, gint pos);
-
-#endif /* __E_SELECT_NAMES_POPUP_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 a4faf69503..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtksignal.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) {
-		int count = e_select_names_model_count (model->source);
-		gint i;
-
-		model->count = count;
-		model->data = g_new(ESelectNamesTableModelData, count);
-
-		for (i = 0; i < count; ++i) {
-			const EDestination *dest = e_select_names_model_get_destination (model->source, i);
-			ECard *card = dest ? e_destination_get_card (dest) : NULL;
-
-			if (card) {
-				ECardSimple *simple = e_card_simple_new(card);
-				model->data[i].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);
-				if (model->data[i].name == 0)
-					model->data[i].name = g_strdup("");
-				model->data[i].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-				if (model->data[i].email == 0)
-					model->data[i].email = g_strdup("");
-				gtk_object_unref(GTK_OBJECT(simple));
-			} else {
-				const gchar *name = e_destination_get_name (dest);
-				const gchar *email = e_destination_get_email (dest);
-
-				model->data[i].name =  g_strdup (name && *name ? name : email);
-				model->data[i].email = g_strdup (email);
-			}
-		}
-	} 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)
-{
-	e_table_model_pre_change(E_TABLE_MODEL(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 f917ff17d8..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@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__
-#define __E_SELECT_NAMES_TABLE_MODEL_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include "e-select-names-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 0a69137fa5..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,779 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gal/e-text/e-text-model-repos.h>
-
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include "e-select-names-text-model.h"
-#include "e-addressbook-util.h"
-
-static FILE *out = NULL; /* stream for debugging spew */
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);
-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);
-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_source (ESelectNamesTextModel *model, ESelectNamesModel *source);
-
-static const gchar *e_select_names_text_model_get_text      (ETextModel *model);
-static void         e_select_names_text_model_set_text      (ETextModel *model, const gchar *text);
-static void         e_select_names_text_model_insert        (ETextModel *model, gint position, const gchar *text);
-static void         e_select_names_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length);
-static void         e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);
-
-static gint         e_select_names_text_model_obj_count   (ETextModel *model);
-static const gchar *e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len);
-static void         e_select_names_text_model_activate_obj (ETextModel *model, gint n);
-
-
-static 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;
-}
-
-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->get_text      = e_select_names_text_model_get_text;
-	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;
-
-	text_model_class->obj_count     = e_select_names_text_model_obj_count;
-	text_model_class->get_nth_obj   = e_select_names_text_model_get_nth_obj;
-	text_model_class->object_activated = e_select_names_text_model_activate_obj;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_TEXT_MODEL")) {
-		out = fopen ("/tmp/evo-debug-select-names-text-model", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-dump_model (ESelectNamesTextModel *text_model)
-{
-	ESelectNamesModel *model = text_model->source;
-	gint i;
-
-	if (out == NULL)
-		return;
-	
-	fprintf (out, "\n*** Model State: count=%d\n", e_select_names_model_count (model));
-
-	for (i=0; i<e_select_names_model_count (model); ++i)
-		fprintf (out, "[%d] \"%s\" %s\n", i,
-			 e_select_names_model_get_string (model, i),
-			 e_select_names_model_get_card (model, i) ? "<card>" : "");
-	fprintf (out, "\n");
-}
-
-static void
-e_select_names_text_model_init (ESelectNamesTextModel *model)
-{
-	const gchar *default_sep;
-
-	model->last_magic_comma_pos = -1;
-
-	if (getenv ("EVOLUTION_DISABLE_MAGIC_COMMA"))
-		default_sep = ",";
-	else
-		default_sep = ", ";
-
-	e_select_names_text_model_set_separator (model, default_sep);
-}
-
-static void
-e_select_names_text_model_destroy (GtkObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	g_free (model->text);
-	g_free (model->sep);
-	
-	e_select_names_text_model_set_source (model, NULL);
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-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_set_source(model, E_SELECT_NAMES_MODEL (GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-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;
-	}
-}
-
-static void
-resize_cb (ESelectNamesModel *source, gint index, gint old_len, gint new_len, ETextModel *model)
-{
-	EReposDeleteShift repos_del;
-	EReposInsertShift repos_ins;
-	gint pos;
-	gint seplen = E_SELECT_NAMES_TEXT_MODEL (model)->seplen;
-
-	e_select_names_model_name_pos (source, seplen, index, &pos, NULL);
-
-	if (new_len < old_len) {
-
-		repos_del.model = model;
-		repos_del.pos = pos;
-		repos_del.len = old_len - new_len;
-		e_text_model_reposition (model, e_repos_delete_shift, &repos_del);
-
-	} else if (old_len < new_len) {
-
-		repos_ins.model = model;
-		repos_ins.pos = pos;
-		repos_ins.len = new_len - old_len;
-		e_text_model_reposition (model, e_repos_insert_shift, &repos_ins);
-
-	}
-}
-
-static void
-changed_cb (ETextModel *model)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	
-	g_free (text_model->text);
-	text_model->text = NULL;
-
-	e_text_model_changed (model);
-}
-
-
-static void
-e_select_names_text_model_set_source (ESelectNamesTextModel *model,
-				      ESelectNamesModel     *source)
-{
-	if (source == model->source)
-		return;
-	
-	if (model->source) {
-		gtk_signal_disconnect (GTK_OBJECT (model->source), model->source_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (model->source), model->source_resize_id);
-		gtk_object_unref (GTK_OBJECT (model->source));
-	}
-
-	model->source = source;
-
-	if (model->source) {
-		gtk_object_ref (GTK_OBJECT (model->source));
-		model->source_changed_id = gtk_signal_connect_object (GTK_OBJECT(model->source),
-								      "changed",
-								      GTK_SIGNAL_FUNC (changed_cb),
-								      GTK_OBJECT (model));
-		model->source_resize_id = gtk_signal_connect (GTK_OBJECT(model->source),
-							      "resized",
-							      GTK_SIGNAL_FUNC (resize_cb),
-							      model);
-	}
-}
-
-ETextModel *
-e_select_names_text_model_new (ESelectNamesModel *source)
-{
-	ETextModel *model = E_TEXT_MODEL (gtk_type_new (e_select_names_text_model_get_type()));
-	e_select_names_text_model_set_source (E_SELECT_NAMES_TEXT_MODEL (model), source);
-	return model;
-}
-
-void
-e_select_names_text_model_set_separator (ESelectNamesTextModel *model, const char *sep)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (model));
-	g_return_if_fail (sep && *sep);
-
-	g_free (model->sep);
-	model->sep = g_strdup (sep);
-	model->seplen = strlen (sep);
-}
-
-static const gchar *
-e_select_names_text_model_get_text (ETextModel *model)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	if (snm == NULL)
-		return "";
-	else if (snm->text == NULL)
-		snm->text = e_select_names_model_get_textification (snm->source, snm->sep);
-
-	return snm->text;
-}
-
-static void
-e_select_names_text_model_set_text (ETextModel *model, const gchar *text)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	e_select_names_model_delete_all (snm->source);
-	e_select_names_text_model_insert (model, 0, text);
-}
-
-static void
-e_select_names_text_model_insert (ETextModel *model, gint position, const gchar *text)
-{
-	e_select_names_text_model_insert_length (model, position, text, strlen (text));
-}
-
-static void
-e_select_names_text_model_insert_length (ETextModel *model, gint pos, const gchar *text, gint length)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	ESelectNamesModel *source = text_model->source;
-
-	gint i;
-
-	if (out) {
-		gchar *tmp = g_strndup (text, length);
-		fprintf (out, ">> insert  \"%s\" (len=%d) at %d\n", tmp, length, pos);
-		g_free (tmp);
-	}
-
-	pos = CLAMP (pos, 0, strlen (e_select_names_model_get_textification (source, text_model->sep)));
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	gtk_signal_handler_block (GTK_OBJECT (source), text_model->source_resize_id);
-
-	/* We handle this one character at a time. */
-
-	for (i = 0; i < length && text[i]; ++i) {
-		gint index, start_pos, text_len;
-		gboolean inside_quote = FALSE;
-
-		text_model->last_magic_comma_pos = -1;
-
-		if (out) 
-			fprintf (out, "processing [%c]\n", text[i]);
-
-		e_select_names_model_text_pos (source, text_model->seplen, pos, &index, &start_pos, &text_len);
-
-		if (out) 
-			fprintf (out, "index=%d start_pos=%d text_len=%d\n", index, start_pos, text_len);
-
-		if (text[i] == *text_model->sep && index >= 0) { /* Is this a quoted or an unquoted separator we are dealing with? */
-			const EDestination *dest = e_select_names_model_get_destination (source, index);
-			if (dest) {
-				const gchar *str = e_destination_get_textrep (dest);
-				gint j;
-				if (out)
-					fprintf (out, "str=%s pos=%d\n", str, pos);
-				for (j=0; j<pos-start_pos && str[j]; ++j)
-					if (str[j] == '"') {
-						inside_quote = !inside_quote;
-						if (out)
-							fprintf (out, "flip to %d at %d\n", start_pos+j, inside_quote);
-					}
-			}
-			if (out)
-				fprintf (out, inside_quote ? "inside quote\n" : "not inside quote\n");
-		}
-
-
-		if (text[i] == *text_model->sep && !inside_quote) {
-
-			/* This is the case of hitting , first thing in an empty entry */
-			if (index == -1) {
-				EReposAbsolute repos;
-				
-				e_select_names_model_insert (source, 0, e_destination_new ());
-				e_select_names_model_insert (source, 0, e_destination_new ());
-
-				repos.model = model;
-				repos.pos = -1; /* At end */
-				e_text_model_reposition (model, e_repos_absolute, &repos);
-				
-
-			} else if (pos <= start_pos || pos == start_pos + text_len) {
-				EReposInsertShift repos;
-				gint ins_point = index;
-
-				if (text_len != 0 && pos == start_pos + text_len)
-					++ins_point;
-				
-				/* Block adjacent blank cards. */
-				if (! ((ins_point < e_select_names_model_count (source) &&
-					(e_select_names_model_get_string (source, ins_point) == NULL)) 
-				       || (ins_point > 0 && (e_select_names_model_get_string (source, ins_point-1) == NULL)))) {
-
-					e_select_names_model_insert (source, ins_point, e_destination_new ());
-
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = text_model->seplen;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-					pos += text_model->seplen;
-				} 
-
-			} else {
-				EReposInsertShift repos;
-				gint offset = MAX (pos - start_pos, 0);
-				const gchar *str = e_select_names_model_get_string (source, index);
-				gchar *str1 = g_strndup (str, offset);
-				gchar *str2 = g_strdup (str+offset);
-				EDestination *d1 = e_destination_new (), *d2 = e_destination_new ();
-
-				e_destination_set_raw (d1, str1);
-				e_destination_set_raw (d2, str2);
-
-				e_select_names_model_replace (source, index, d1);
-				e_select_names_model_insert (source, index+1, d2);
-
-				g_free (str1);
-				g_free (str2);
-
-				repos.model = model;
-				repos.pos = pos;
-				repos.len = text_model->seplen;
-				e_text_model_reposition (model, e_repos_insert_shift, &repos);
-				pos += text_model->seplen;
-			}
-
-			if (text_model->seplen > 1)
-				text_model->last_magic_comma_pos = pos;
-
-		} else {
-			EReposInsertShift repos;
-			gint offset = MAX (pos - start_pos, 0);
-			const gchar *str;
-			gchar *new_str = NULL;
-			gint this_length = 1;
-			gboolean whitespace = isspace ((gint) text[i]);
-
-			str = index >= 0 ? e_select_names_model_get_string (source, index) : NULL;
-			if (str && *str) {
-				if (pos <= start_pos) {
-					if (whitespace) {
-						/* swallow leading whitespace */
-						this_length = 0;
-					} else {
-						/* Adjust for our "magic white space" */
-						/* FIXME: This code does the wrong thing if seplen > 2 */
-						new_str = g_strdup_printf("%c%s%s", text[i], pos < start_pos ? " " : "", str);
-						if (pos < start_pos)
-							++this_length;
-					}
-				} else {
-					new_str = g_strdup_printf ("%.*s%c%s", offset, str, text[i], str + offset);
-				}
-			} else {
-				if (whitespace) {
-					/* swallow leading whitespace */
-					this_length = 0;
-				} else {
-					new_str = g_strdup_printf ("%c", text[i]);
-				}
-			}
-
-			if (new_str) {
-
-				EDestination *dest;
-				dest = index >= 0 ? e_destination_copy (e_select_names_model_get_destination (source, index)) : e_destination_new ();
-				e_destination_set_raw (dest, new_str);
-				e_select_names_model_replace (source, index, dest);
-				
-				/* e_select_names_model_replace (source, index, dest); */
-
-				if (this_length > 0) {
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = this_length;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-
-					pos += this_length;
-				}
-
-				g_free (new_str);
-			}
-		}
-	}
-
-	dump_model (text_model);
-
-	gtk_signal_handler_unblock (GTK_OBJECT (source), text_model->source_resize_id);
-}
-
-
-static void
-e_select_names_text_model_delete (ETextModel *model, gint pos, gint length)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	ESelectNamesModel *source = text_model->source;
-	gint index, start_pos, text_len, offset;
-		
-	if (out) {
-		const gchar *str = e_select_names_model_get_textification (source, text_model->sep);
-		gint i, len;
-
-		fprintf (out, ">> delete %d at pos %d\n", length, pos);
-
-		len = strlen (str);
-		for (i=0; i<pos && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "[");
-		for (i=pos; i<pos+length && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "]");
-		for (i=pos+length; i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "\n");
-	}
-
-	if (length < 0)
-		return;
-
-	if (text_model->last_magic_comma_pos == pos+1 && length == 1) {
-		pos -= text_model->seplen-1;
-		if (pos >= 0)
-			length = text_model->seplen;
-		text_model->last_magic_comma_pos = -1;
-	}
-
-	e_select_names_model_text_pos (source, text_model->seplen, pos, &index, &start_pos, &text_len);
-
-	if (out) 
-		fprintf (out, "index=%d, start_pos=%d, text_len=%d\n", index, start_pos, text_len);
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	gtk_signal_handler_block (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-
-	/* First, we handle a few tricky cases. */
-
-	if (pos < start_pos) {
-		EReposAbsolute repos;
-
-		repos.model = model;
-		repos.pos = pos;
-		e_text_model_reposition (model, e_repos_absolute, &repos);
-
-		length -= start_pos - pos;
-
-		if (length > 0)
-			e_select_names_text_model_delete (model, start_pos, length);
-		goto finished;
-	}
-
-	if (pos == start_pos + text_len) {
-		/* We are positioned right at the end of an entry, possibly right in front of a comma. */
-
-		if (index+1 < e_select_names_model_count (source)) {
-			EReposDeleteShift repos;
-			EDestination *new_dest;
-			const gchar *str1 = e_select_names_model_get_string (source, index);
-			const gchar *str2 = e_select_names_model_get_string (source, index+1);
-			gchar *new_str;
-
-			while (str1 && *str1 && isspace ((gint) *str1))
-				++str1;
-			while (str2 && *str2 && isspace ((gint) *str2))
-				++str2;
-			
-			if (str1 && str2)
-				new_str = g_strdup_printf ("%s%s%s", str1, text_model->sep+1, str2);
-			else if (str1)
-				new_str = g_strdup (str1);
-			else if (str2)
-				new_str = g_strdup (str2);
-			else
-				new_str = g_strdup ("");
-
-			if (out)
-				fprintf (out, "joining \"%s\" and \"%s\" to \"%s\"\n", str1, str2, new_str);
-
-			e_select_names_model_delete (source, index+1);
-
-			new_dest = e_destination_new ();
-			e_destination_set_raw (new_dest, new_str);
-			e_select_names_model_replace (source, index, new_dest);
-			g_free (new_str);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_model->seplen;
-
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			if (length > 1)
-				e_select_names_text_model_delete (model, pos, length-1);
-		} else {
-			/* If we are at the end of the last entry (which we must be if we end up in this block),
-			   we can just do nothing.  So this else-block is here just to give us a place to
-			   put this comment. */
-		}
-
-		goto finished;
-	}
-	
-	if (pos + length > start_pos + text_len) {
-		/* Uh oh... our changes straddle two objects. */
-
-		if (pos == start_pos) { /* Delete the whole thing */
-			EReposDeleteShift repos;
-		
-			e_select_names_model_delete (source, index);
-
-			if (out) 
-				fprintf (out, "deleted all of %d\n", index);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_len + text_model->seplen;
-		
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			length -= text_len + text_model->seplen;
-			if (length > 0)
-				e_select_names_text_model_delete (model, pos, length);
-
-		} else {
-			/* Delete right up to the end, and then call e_select_names_text_model_delete again
-			   to finish the job. */
-			gint len1, len2;
-			
-			len1 = text_len - (pos - start_pos);
-			len2 = length - len1;
-
-			if (out) 
-				fprintf (out, "two-stage delete: %d, %d\n", len1, len2);
-
-
-			e_select_names_text_model_delete (model, pos, len1);
-			e_select_names_text_model_delete (model, pos, len2);
-		}
-
-		goto finished;
-	}
-
-	/* Our changes are confined to just one entry. */
-	if (length > 0) {
-		const gchar *str;
-		gchar *new_str;
-		
-		offset = pos - start_pos;
-		
-		str = e_select_names_model_get_string (source, index);
-		new_str = str ? g_strdup_printf ("%.*s%s", offset, str, str + offset + length) : NULL;
-		
-		if (new_str) {
-			EReposDeleteShift repos;
-			EDestination *dest;
-
-			dest = index >= 0 ? e_destination_copy (e_select_names_model_get_destination (source, index)) : e_destination_new ();
-			e_destination_set_raw (dest, new_str);
-			e_select_names_model_replace (source, index, dest);
-			
-			if (out)
-				fprintf (out, "new_str: \"%s\"\n", new_str);
-
-			g_free (new_str);
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = length;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-			
-		} else {
-			EReposDeleteShift repos;
-			
-			e_select_names_model_delete (source, index);
-			
-			if (out)
-				fprintf (out, "deleted %d\n", index);
-
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_model->seplen;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-		}
-	}
-
- finished:
-	E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos = -1;
-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-	dump_model (E_SELECT_NAMES_TEXT_MODEL (model));
-}
-
-static gint
-e_select_names_text_model_obj_count (ETextModel *model)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint i, count;
-
-	count = i = e_select_names_model_count (source);
-	while (i > 0) {
-		const EDestination *dest;
-		--i;
-		dest = e_select_names_model_get_destination (source, i);
-		if (e_destination_get_card (dest) == NULL)
-			--count;
-	}
-
-	return count;
-}
-
-static gint
-nth_obj_index (ESelectNamesModel *source, gint n)
-{
-	gint i, N;
-
-	i = 0;
-	N = e_select_names_model_count (source);
-	
-	do {
-		const EDestination *dest = e_select_names_model_get_destination (source, i);
-		if (e_destination_get_card (dest))
-			--n;
-		++i;
-	} while (n >= 0 && i < N);
-
-	if (i <= N)
-		--i;
-	else
-		i = -1;
-
-	return i;
-}
-
-static const gchar *
-e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	ESelectNamesModel *source = text_model->source;
-	gint i, pos;
-
-	i = nth_obj_index (source, n);
-	if (i < 0)
-		return NULL;
-	
-	e_select_names_model_name_pos (source, text_model->seplen, i, &pos,  len);
-	if (pos < 0)
-		return NULL;
-	
-	if (text_model->text == NULL)
-		text_model->text = e_select_names_model_get_textification (source, text_model->sep);
-	return text_model->text + pos;
-}
-
-static void
-e_select_names_text_model_activate_obj (ETextModel *model, gint n)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	EContactEditor *contact_editor;
-	ECard *card;
-	gint i;
-
-	i = nth_obj_index (source, n);
-	g_return_if_fail (i >= 0);
-
-	card = e_select_names_model_get_card (source, i);
-	g_return_if_fail (card != NULL);
-	
-	/* present read-only contact editor when someone double clicks from here */
-	contact_editor = e_addressbook_show_contact_editor (e_card_get_book (card), card, FALSE, FALSE);
-	e_contact_editor_raise (contact_editor);
-}
-
-
-
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 29ab727368..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__
-#define __E_SELECT_NAMES_TEXT_MODEL_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <gtk/gtkobject.h>
-#include <gal/e-text/e-text-model.h>
-#include "e-select-names-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;
-	gint source_changed_id;
-	gint source_resize_id;
-
-	gchar *text;
-
-	gchar *sep;
-	gint seplen;
-	
-	gint last_magic_comma_pos;
-};
-
-struct _ESelectNamesTextModelClass {
-	ETextModelClass parent_class;
-};
-
-ETextModel *e_select_names_text_model_new           (ESelectNamesModel *source);
-void        e_select_names_text_model_set_separator (ESelectNamesTextModel *model, const char *sep);
-
-/* 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 3f5c32d38e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,1182 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-without.h>
-#include <gal/widgets/e-font.h>
-#include <gal/widgets/e-popup-menu.h>
-
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-#include <addressbook/gui/widgets/e-addressbook-table-adapter.h>
-#include <addressbook/gui/component/e-cardlist-model.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/gui/component/addressbook-component.h>
-#include <addressbook/gui/component/addressbook-storage.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <shell/evolution-shell-client.h>
-
-#include "e-select-names.h"
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include "e-select-names-text-model.h"
-#include <gal/widgets/e-categories-master-list-option-menu.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-text/e-entry.h>
-#include <e-util/e-categories-master-list-wombat.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 void update_query (GtkWidget *widget, ESelectNames *e_select_names);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-};
-
-typedef struct {
-	char                  *title;
-	ESelectNamesModel     *source;
-	ESelectNamesTextModel *text_model;
-	ESelectNames          *names;
-	GtkWidget             *label;
-	GtkWidget             *button;
-} ESelectNamesChild;
-
-struct _ESelectNamesFolder {
-	char *description;
-	char *display_name;
-	char *uri;
-	char *physicalUri;
-	char *path;
-	int   count;
-};
-
-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= \"%d\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\" search=\"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\" search=\"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, ESelectNames *esn)
-{
-	gtk_object_set(GTK_OBJECT(esn->model),
-		       "book", book,
-		       NULL);
-	update_query (NULL, esn);
-	gtk_object_unref(GTK_OBJECT(book));
-	gtk_object_unref(GTK_OBJECT(esn));
-	gtk_object_unref(GTK_OBJECT(esn->model));
-}
-
-static void
-set_book_with_model_data(EBook *book, EBookStatus status, EAddressbookModel *model)
-{
-	gtk_object_set(GTK_OBJECT(model),
-		       "book", book,
-		       "query", "(contains \"email\" \"\")",
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(book));
-	gtk_object_unref(GTK_OBJECT(model));
-}
-
-static void
-addressbook_model_set_uri(ESelectNames *e_select_names, EAddressbookModel *model, const char *uri, ESelectNamesFolder *e_folder)
-{
-	EBook *book;
-
-	/* If uri == the current uri, then we don't have to do anything */
-	book = e_addressbook_model_get_ebook (model);
-	if (book) {
-		const gchar *current_uri = e_book_get_uri (book);
-		if (uri && current_uri && !strcmp (uri, current_uri))
-			return;
-	}
-
-	book = e_book_new();
-	if (e_select_names) {
-		gtk_object_ref(GTK_OBJECT(e_select_names));
-		gtk_object_ref(GTK_OBJECT(model));
-		addressbook_load_uri(book, uri, (EBookCallback) set_book, e_select_names);
-		e_select_names->current_folder = e_folder;
-	} else {
-		gtk_object_ref(GTK_OBJECT(model));
-		addressbook_load_uri(book, uri, (EBookCallback) set_book_with_model_data, model);
-	}
-}
-
-static void *
-card_key (ECard *card)
-{
-	EBook *book;
-	const gchar *book_uri;
-	
-	if (card == NULL)
-		return NULL;
-
-	g_assert (E_IS_CARD (card));
-
-	book = e_card_get_book (card);
-	book_uri = book ? e_book_get_uri (book) : "NoBook";
-	return g_strdup_printf ("%s|%s", book_uri ? book_uri : "NoURI", e_card_get_id (card));
-}
-
-static void
-sync_one_model (gpointer k, gpointer val, gpointer closure)
-{
-	ETableWithout *etw = E_TABLE_WITHOUT (closure);
-	ESelectNamesChild *child = val;
-	ESelectNamesModel *model = child->source;
-	gint i, count;
-	ECard *card;
-	void *key;
-	
-	count = e_select_names_model_count (model);
-	for (i = 0; i < count; ++i) {
-		card = e_select_names_model_get_card (model, i);
-		if (card) {
-			key = card_key (card);
-			e_table_without_hide (etw, key);
-			g_free (key);
-		}
-	}
-}
-
-static void
-sync_table_and_models (ESelectNamesModel *triggering_model, ESelectNames *esl)
-{
-	e_table_without_show_all (E_TABLE_WITHOUT (esl->without));
-	g_hash_table_foreach (esl->children, sync_one_model, esl->without);
-}
-
-static void
-real_add_address_cb (int model_row, gpointer closure)
-{
-	ESelectNamesChild *child = closure;
-	ESelectNames *names = child->names;
-	ECard *card;
-	EDestination *dest = e_destination_new ();
-	gint mapped_row;
-
-	mapped_row = e_table_subset_view_to_model_row (E_TABLE_SUBSET (names->without), model_row);
-
-	card = e_addressbook_model_get_card (E_ADDRESSBOOK_MODEL(names->model), mapped_row);
-	
-	if (card != NULL) {
-		e_destination_set_card (dest, card, 0);
-
-		e_select_names_model_append (child->source, dest);
-		e_select_names_model_clean (child->source, FALSE);
-
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-real_add_address(ESelectNames *names, ESelectNamesChild *child)
-{
-	e_select_names_model_freeze (child->source);
-	e_table_selected_row_foreach(e_table_scrolled_get_table(names->table),
-				     real_add_address_cb, child);
-	e_select_names_model_thaw (child->source);
-}
-
-static void
-add_address(ETable *table, int row, int col, GdkEvent *event, ESelectNames *names)
-{
-	ESelectNamesChild *child;
-
-	child = g_hash_table_lookup(names->children, names->def);
-	if (child) {
-		real_add_address(names, child);
-	}
-}
-
-static void
-sensitize_button (gpointer key, gpointer data, gpointer user_data)
-{
-	gboolean *sensitive = user_data;
-	ESelectNamesChild *child = data;
-
-	gtk_widget_set_sensitive (child->button, *sensitive);
-}
-
-static void
-selection_change (ETable *table, ESelectNames *names)
-{
-	gboolean sensitive;
-
-	sensitive = e_table_selected_count (table) > 0;
-
-	g_hash_table_foreach (names->children, sensitize_button, &sensitive);
-}
-
-static void *
-esn_get_key_fn (ETableModel *source, int row, void *closure)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL (closure);
-	ECard *card = e_addressbook_model_get_card (model, row);
-	void *key = card_key (card);
-	gtk_object_unref (GTK_OBJECT (card));
-	return key;
-}
-
-static void *
-esn_dup_key_fn (const void *key, void *closure)
-{
-	void *dup = (void *) g_strdup ((const gchar *) key);
-	return dup;
-}
-
-static void
-esn_free_gotten_key_fn (void *key, void *closure)
-{
-	g_free (key);
-}
-
-static void
-esn_free_duped_key_fn (void *key, void *closure)
-{
-	g_free (key);
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *adapter;
-	ETableModel *without;
-	EAddressbookModel *model;
-	GtkWidget *table;
-	char *filename;
-	char *uri;
-	char *spec;
-
-	model = e_addressbook_model_new ();
-	adapter = E_TABLE_MODEL (e_addressbook_table_adapter_new (model));
-
-	filename = gnome_util_prepend_user_home("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf("file://%s", filename);
-
-	addressbook_model_set_uri(NULL, model, uri, NULL);
-
-	g_free(uri);
-	g_free(filename);
-
-	gtk_object_set(GTK_OBJECT(model),
-		       "editable", FALSE,
-		       NULL);
-
-	without = e_table_without_new (adapter,
-				       g_str_hash,
-				       g_str_equal,
-				       esn_get_key_fn,
-				       esn_dup_key_fn,
-				       esn_free_gotten_key_fn,
-				       esn_free_duped_key_fn,
-				       model);
-
-	spec = g_strdup_printf(SPEC, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);
-	table = e_table_scrolled_new (without, NULL, spec, NULL);
-	g_free(spec);
-
-	gtk_object_set_data(GTK_OBJECT(table), "adapter", adapter);
-	gtk_object_set_data(GTK_OBJECT(table), "without", without);
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-
-	return table;
-}
-
-static void
-e_select_names_folder_free(ESelectNamesFolder *e_folder)
-{
-	g_free(e_folder->description );
-	g_free(e_folder->display_name);
-	g_free(e_folder->uri);
-	g_free(e_folder->physicalUri);
-	g_free(e_folder->path);
-	g_free(e_folder);
-}
-
-static void
-e_select_names_option_activated(GtkWidget *widget, ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder = gtk_object_get_data (GTK_OBJECT (widget), "EsnChoiceFolder");
-
-	addressbook_model_set_uri(e_select_names, e_select_names->model, e_folder->uri, e_folder);
-}
-
-typedef struct {
-	ESelectNames *names;
-	GtkWidget *menu;
-	int count;
-} NamesAndMenu;
-
-static void
-add_menu_item		(gpointer	key,
-			 gpointer	value,
-			 gpointer	user_data)
-{
-	GtkWidget *menu;
-	GtkWidget *item;
-	ESelectNamesFolder *e_folder;
-	NamesAndMenu *nnm;
-	ESelectNames *e_select_names;
-	gchar *label;
-
-	nnm = user_data;
-	e_folder = value;
-	menu = nnm->menu;
-	e_select_names = nnm->names;
-
-	label = e_utf8_to_locale_string (_(e_folder->display_name));
-	item = gtk_menu_item_new_with_label (label);
-	g_free (label);
-
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_object_set_data (GTK_OBJECT (item), "EsnChoiceFolder", e_folder);
-
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (e_select_names_option_activated),
-			    e_select_names);
-
-	e_folder->count = nnm->count++;
-}
-
-static void
-update_option_menu(ESelectNames *e_select_names)
-{
-	GtkWidget *menu;
-	GtkWidget *option;
-
-	option = glade_xml_get_widget (e_select_names->gui,
-				       "optionmenu-folder");
-	if (option) {
-		NamesAndMenu nnm;
-		menu = gtk_menu_new ();
-
-		nnm.names = e_select_names;
-		nnm.menu = menu;
-		nnm.count = 0;
-
-		g_hash_table_foreach	(e_select_names->folders,
-					 add_menu_item,
-					 &nnm);
-
-		gtk_widget_show_all (menu);
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (option), 
-					  menu);
-		gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
-		gtk_widget_set_sensitive (option, TRUE);
-	}
-}
-
-static void
-new_folder      (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 const GNOME_Evolution_Folder *folder,
-		 ESelectNames *e_select_names)
-{
-	if (!strcmp(folder->type, "contacts")
-	    || !strcmp(folder->type, "ldap-contacts")) {
-		ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1);
-		e_folder->description  = g_strdup(folder->description );
-		if (!strcmp (folder->type, "ldap-contacts"))
-			e_folder->display_name = g_strdup_printf ("%s [LDAP]", folder->displayName);
-		else
-			e_folder->display_name = g_strdup(folder->displayName);
-
-		if (!strncmp (folder->physicalUri, "file:", 5))
-			e_folder->uri = g_strdup_printf ("%s/addressbook.db", folder->physicalUri);
-		else
-			e_folder->uri = g_strdup(folder->physicalUri);
-		e_folder->physicalUri = g_strdup(folder->physicalUri);
-		e_folder->path = g_strdup (path);
-		e_folder->count = -1;
-		g_hash_table_insert(e_select_names->folders,
-				    e_folder->path, e_folder);
-		g_hash_table_insert(e_select_names->folders_by_uri,
-				    e_folder->physicalUri, e_folder);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-removed_folder  (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder;
-
-	if ((e_folder = g_hash_table_lookup(e_select_names->folders, path))) {
-		g_hash_table_remove(e_select_names->folders_by_uri,
-				    e_folder->physicalUri);
-		g_hash_table_remove(e_select_names->folders, path);
-		e_select_names_folder_free(e_folder);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-update_query (GtkWidget *widget, ESelectNames *e_select_names)
-{
-	char *category = "";
-	char *search = "";
-	char *query;
-	char *q_array[4];
-	int i;
-	if (e_select_names->categories) {
-		category = e_categories_master_list_option_menu_get_category (E_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories));
-	}
-	if (e_select_names->search_entry) {
-		search = gtk_entry_get_text (GTK_ENTRY (e_select_names->search_entry));
-	}
-	i = 0;
-	q_array[i++] = "(contains \"email\" \"\")";
-	if (category && *category)
-		q_array[i++] = g_strdup_printf ("(is \"category\" \"%s\")", category);
-	if (search && *search)
-		q_array[i++] = g_strdup_printf ("(or (beginswith \"email\" \"%s\") "
-						"    (beginswith \"full_name\" \"%s\") "
-						"    (beginswith \"nickname\" \"%s\"))",
-						search, search, search);
-	q_array[i++] = NULL;
-	if (i > 2) {
-		char *temp = g_strjoinv (" ", q_array);
-		query = g_strdup_printf ("(and %s)", temp);
-		g_free (temp);
-	} else {
-		query = g_strdup (q_array[0]);
-	}
-	gtk_object_set (GTK_OBJECT (e_select_names->model),
-			"query", query,
-			NULL);
-	for (i = 1; q_array[i]; i++) {
-		g_free (q_array[i]);
-	}
-	g_free (query);
-}
-
-static void
-categories_changed (GtkWidget *widget, gint value, ESelectNames *e_select_names)
-{
-	update_query (widget, e_select_names);
-}
-
-static void
-select_entry_changed (GtkWidget *widget, ESelectNames *e_select_names)
-{
-	if (e_select_names->select_entry) {
-		char *select_string = gtk_entry_get_text (GTK_ENTRY (e_select_names->select_entry));
-		char *select_strcoll_string = g_utf8_collate_key (select_string, -1);
-		int count;
-		ETable *table;
-		int i;
-
-		table = e_table_scrolled_get_table (e_select_names->table);
-
-		count = e_table_model_row_count (e_select_names->without);
-
-		for (i = 0; i < count; i++) {
-			int model_row = e_table_view_to_model_row (table, i);
-			char *row_strcoll_string =
-				g_utf8_collate_key (e_table_model_value_at (e_select_names->without,
-									    E_CARD_SIMPLE_FIELD_NAME_OR_ORG,
-									    model_row),
-						    -1);
-			if (strcmp (select_strcoll_string, row_strcoll_string) <= 0) {
-				g_free (row_strcoll_string);
-				break;
-			}
-			g_free (row_strcoll_string);
-		}
-		g_free (select_strcoll_string);
-		if (i == count)
-			i --;
-
-		if (count > 0) {
-			i = e_table_view_to_model_row (table, i);
-			e_table_set_cursor_row (table, i);
-		}
-	}
-}
-
-extern EvolutionShellClient *global_shell_client;
-
-static void
-folder_browse (GtkWidget *widget, ESelectNames *e_select_names)
-{
-	const char *allowed_types[] = { "contacts", NULL };
-	GNOME_Evolution_Folder *folder;
-	const char *current_uri = "";
-	ESelectNamesFolder *e_folder;
-
-	if (e_select_names->current_folder && e_select_names->current_folder->physicalUri) {
-		current_uri = e_select_names->current_folder->physicalUri;
-	}
-
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-						   _("Find contact in"), current_uri,
-						   allowed_types,
-						   &folder);
-	if (!folder)
-		return;
-
-	if ((e_folder = g_hash_table_lookup(e_select_names->folders_by_uri, folder->physicalUri))) {
-		GtkWidget *option;
-
-		option = glade_xml_get_widget (e_select_names->gui,
-					       "optionmenu-folder");
-		if (e_folder->count != -1 && option) {
-			gtk_option_menu_set_history (GTK_OPTION_MENU (option), e_folder->count);
-		}
-
-		addressbook_model_set_uri(e_select_names, e_select_names->model, e_folder->uri, e_folder);
-	}
-}
-
-
-static void
-hookup_listener (ESelectNames *e_select_names,
-		 GNOME_Evolution_Storage storage,
-		 EvolutionStorageListener *listener,
-		 CORBA_Environment *ev)
-{
-	GNOME_Evolution_StorageListener corba_listener;
-
-	g_return_if_fail (storage != CORBA_OBJECT_NIL);
-
-	corba_listener = evolution_storage_listener_corba_objref(listener);
-
-	gtk_signal_connect(GTK_OBJECT(listener), "new_folder",
-			   GTK_SIGNAL_FUNC(new_folder), e_select_names);
-	gtk_signal_connect(GTK_OBJECT(listener), "removed_folder",
-			   GTK_SIGNAL_FUNC(removed_folder), e_select_names);
-
-	GNOME_Evolution_Storage_addListener(storage, corba_listener, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_select_names_init: Exception adding listener to "
-			   "remote GNOME_Evolution_Storage interface.\n");
-		return;
-	}
-}
-
-static void
-add_additional_select_names_uris (ESelectNames *e_select_names, CORBA_Environment *ev)
-{
-	Bonobo_ConfigDatabase config_db;
-	guint32 num_additional_uris;
-	int i;
-	gboolean flag;
-
-	config_db = addressbook_config_database (ev);
-
-	num_additional_uris = bonobo_config_get_ulong_with_default (config_db, "/Addressbook/additional_select_names_folders/num", 0, &flag);
-	for (i = 0; i < num_additional_uris; i ++) {
-		ESelectNamesFolder *e_folder;
-		char *config_path;
-		char *path;
-		char *name;
-		char *uri;
-
-		config_path = g_strdup_printf ("/Addressbook/additional_select_names_folders/folder_%d_path", i);
-		path = bonobo_config_get_string (config_db, config_path, ev);
-		g_free (config_path);
-
-		config_path = g_strdup_printf ("/Addressbook/additional_select_names_folders/folder_%d_name", i);
-		name = bonobo_config_get_string (config_db, config_path, ev);
-		g_free (config_path);
-
-		config_path = g_strdup_printf ("/Addressbook/additional_select_names_folders/folder_%d_uri", i);
-		uri = bonobo_config_get_string (config_db, config_path, ev);
-		g_free (config_path);
-
-		if (!path || !name || !uri) {
-			g_free (path);
-			g_free (name);
-			g_free (uri);
-			continue;
-		}
-
-		e_folder = g_new(ESelectNamesFolder, 1);
-		e_folder->description  = g_strdup("");
-		e_folder->display_name = g_strdup(name);
-		if (!strncmp (uri, "file:", 5))
-			e_folder->uri = g_strdup_printf ("%s/addressbook.db", uri);
-		else
-			e_folder->uri = g_strdup(uri);
-		g_hash_table_insert(e_select_names->folders,
-				    g_strdup(path), e_folder);
-	}
-
-	if (num_additional_uris)
-		update_option_menu(e_select_names);
-}
-
-static void
-e_select_names_hookup_shell_listeners (ESelectNames *e_select_names)
-{
-	EvolutionStorage *other_contact_storage;
-	GNOME_Evolution_Storage storage;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init(&ev);
-
-	storage = (GNOME_Evolution_Storage) (evolution_shell_client_get_local_storage(addressbook_component_get_shell_client()));
-	e_select_names->local_listener = evolution_storage_listener_new();
-
-	/* This should really never happen, but a bug report (ximian #5193) came in w/ a backtrace suggesting that it did in
-	   fact happen to someone, so the best we can do is try to avoid crashing in this case. */
-	if (storage == CORBA_OBJECT_NIL) {
-		GtkWidget *oh_shit;
-
-#if 0
-		oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n"
-						"This may have been caused by the evolution-addressbook component crashing.\n"
-						"To help us better understand and ultimately resolve this problem,\n"
-						"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-						"detailed description of the circumstances under which this error\n"
-						"occurred.  Thank you."));
-#endif
-
-		oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n"
-						"Under normal circumstances, this should never happen.\n"
-						"You may need to exit and restart Evolution in order to\n"
-						"correct this problem."));
-		gtk_widget_show (oh_shit);
-		return;
-	}
-	else {
-		hookup_listener (e_select_names, storage, e_select_names->local_listener, &ev);
-		bonobo_object_release_unref(storage, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_select_names_init: Exception unref'ing "
-				   "remote GNOME_Evolution_Storage interface.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-	}
-
-	other_contact_storage = addressbook_get_other_contact_storage ();
-	if (other_contact_storage) {
-		storage = bonobo_object_corba_objref (BONOBO_OBJECT (other_contact_storage));
-		e_select_names->other_contacts_listener = evolution_storage_listener_new();
-
-		hookup_listener (e_select_names, storage, e_select_names->other_contacts_listener, &ev);
-	}
-
-	/* XXX kludge to fill in folders for the exchange plugin.  we
-	   latch onto a set of bonobo-conf settings that are
-	   maintained by the plugin and do the right magic to get the
-	   folders displayed in the option menu */
-	add_additional_select_names_uris (e_select_names, &ev);
-	
-	CORBA_exception_free(&ev);
-}
-
-GtkWidget *e_select_names_create_categories (gchar *name,
-					     gchar *string1, gchar *string2,
-					     gint int1, gint int2);
-
-GtkWidget *
-e_select_names_create_categories (gchar *name,
-				  gchar *string1, gchar *string2,
-				  gint int1, gint int2)
-{
-	ECategoriesMasterList *ecml;
-	GtkWidget *option_menu;
-
-	ecml = e_categories_master_list_wombat_new ();
-	option_menu = e_categories_master_list_option_menu_new (ecml);
-	gtk_object_unref (GTK_OBJECT (ecml));
-
-	return option_menu;
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget, *button;
-
-	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;
-	e_select_names->def = NULL;
-
-	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);
-	gnome_dialog_set_default(GNOME_DIALOG(e_select_names), 0);
-
-	gtk_window_set_title(GTK_WINDOW(e_select_names), _("Select Contacts from Addressbook")); 
-	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->adapter = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "adapter");
-	e_select_names->without = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "without");
-
-	e_select_names->categories = glade_xml_get_widget (gui, "custom-categories");
-	if (e_select_names->categories && !E_IS_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories))
-		e_select_names->categories = NULL;
-	if (e_select_names->categories)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->categories), "changed",
-				   GTK_SIGNAL_FUNC(categories_changed), e_select_names);
-
-	e_select_names->search_entry = glade_xml_get_widget (gui, "entry-find");
-	if (e_select_names->search_entry && !GTK_IS_ENTRY (e_select_names->search_entry))
-		e_select_names->search_entry = NULL;
-	if (e_select_names->search_entry)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->search_entry), "activate",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-
-	e_select_names->select_entry = glade_xml_get_widget (gui, "entry-select");
-	if (e_select_names->select_entry && !GTK_IS_ENTRY (e_select_names->select_entry))
-		e_select_names->select_entry = NULL;
-	if (e_select_names->select_entry)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->select_entry), "changed",
-				   GTK_SIGNAL_FUNC(select_entry_changed), e_select_names);
-
-	button  = glade_xml_get_widget (gui, "button-find");
-	if (button && GTK_IS_BUTTON (button))
-		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-
-	button  = glade_xml_get_widget (gui, "button-browse");
-	if (button && GTK_IS_BUTTON (button))
-		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				   GTK_SIGNAL_FUNC(folder_browse), e_select_names);
-
-	e_select_names->folders = g_hash_table_new(g_str_hash, g_str_equal);
-	e_select_names->folders_by_uri = g_hash_table_new(g_str_hash, g_str_equal);
-
-	e_select_names_hookup_shell_listeners (e_select_names);
-
-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table (e_select_names->table)), "double_click",
-			    GTK_SIGNAL_FUNC (add_address), e_select_names);
-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table (e_select_names->table)), "selection_change",
-			    GTK_SIGNAL_FUNC (selection_change), e_select_names);
-	selection_change (e_table_scrolled_get_table (e_select_names->table), e_select_names);
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	gtk_signal_disconnect_by_func (GTK_OBJECT (child->source), GTK_SIGNAL_FUNC (sync_table_and_models), e_select_names);
-	g_free(child->title);
-	gtk_object_unref(GTK_OBJECT(child->text_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);
-
-	if (e_select_names->local_listener) {
-		gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->local_listener), e_select_names);
-		gtk_object_unref(GTK_OBJECT(e_select_names->local_listener));
-	}
-
-	if (e_select_names->other_contacts_listener) {
-		gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->other_contacts_listener), e_select_names);
-		gtk_object_unref(GTK_OBJECT(e_select_names->other_contacts_listener));
-	}
-
-	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);
-	g_hash_table_destroy(e_select_names->folders);
-	g_hash_table_destroy(e_select_names->folders_by_uri);
-
-	g_free(e_select_names->def);
-}
-
-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)
-{
-	real_add_address(child->names, child);
-}
-
-#if 0
-static void
-remove_address(ETable *table, int row, int col, GdkEvent *event, ESelectNamesChild *child)
-{
-	e_select_names_model_delete (child->source, row);
-}
-#endif
-
-struct _RightClickData {
-	ESelectNamesChild *child;
-	int index;
-};
-typedef struct _RightClickData RightClickData;
-
-#if 0
-static GSList *selected_rows = NULL;
-
-static void
-etable_selection_foreach_cb (int row, void *data)
-{
-	/* Build a list of rows in reverse order, then remove them,
-           necessary because otherwise it'll start trying to delete
-           rows out of index in ETableModel */
-	selected_rows = g_slist_prepend (selected_rows, GINT_TO_POINTER (row));
-}
-
-static void
-selected_rows_foreach_cb (void *row, void *data)
-{
-	ESelectNamesChild *child = data;
-
-	remove_address (NULL, GPOINTER_TO_INT (row), 0, NULL, child);
-}
-#endif
-
-static void
-remove_cb (GtkWidget *widget, void *data)
-{
-	RightClickData *rcdata = (RightClickData *)data;
-
-	e_select_names_model_delete (rcdata->child->source, rcdata->index);
-
-	/* Free everything we've created */
-	g_free (rcdata);
-}
-
-static void
-section_right_click_cb (EText *text, GdkEventButton *ev, gint pos, ESelectNamesChild *child)
-{
-	EPopupMenu right_click_menu[] = {
-		E_POPUP_ITEM (N_("Remove"), GTK_SIGNAL_FUNC (remove_cb), 0),
-		E_POPUP_TERMINATOR
-	};
-	gint index;
-
-	e_select_names_model_text_pos (child->source, child->text_model->seplen, pos, &index, NULL, NULL);
-
-	if (index != -1) {
-		RightClickData *rcdata = g_new0 (RightClickData, 1);
-		rcdata->index = index;
-		rcdata->child = child;
-
-		e_popup_menu_run (right_click_menu, (GdkEvent *)ev, 0, 0, rcdata);
-	}
-}
-
-void
-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)
-{
-	ESelectNamesChild *child;
-	GtkWidget *button;
-	GtkWidget *alignment;
-	GtkWidget *label;
-	GtkTable *table;
-	char *label_text;
-	ETable *etable;
-
-	GtkWidget *sw;
-	GtkWidget *recipient_table;
-
-	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 = e_utf8_from_locale_string(_(name));
-
-	child->text_model = (ESelectNamesTextModel *) e_select_names_text_model_new (source);
-	e_select_names_text_model_set_separator (child->text_model, "\n");
-
-	child->source = source;
-	gtk_object_ref(GTK_OBJECT(child->source));
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-
-	button = gtk_button_new ();
-
-	label = e_entry_new ();
-	gtk_object_set(GTK_OBJECT(label),
-		       "draw_background", FALSE,
-		       "draw_borders", FALSE,
-		       "draw_button", TRUE,
-		       "editable", FALSE,
-		       "text", "",
-		       "use_ellipsis", FALSE,
-		       "justification", GTK_JUSTIFY_CENTER,
-		       NULL);
-
-	label_text = g_strconcat (child->title, " ->", NULL);
-	gtk_object_set (GTK_OBJECT (label),
-			"text", label_text,
-			"emulate_label_resize", TRUE,
-			NULL);
-	g_free (label_text);
-	gtk_container_add (GTK_CONTAINER (button), label);
-	child->label = label;
-	child->button = button;
-
-	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);
-
-	etable = e_table_scrolled_get_table (e_select_names->table);
-	gtk_widget_set_sensitive (button, e_table_selected_count (etable) > 0);
-
-	
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	recipient_table = e_entry_new ();
-	gtk_object_set (GTK_OBJECT (recipient_table),
-			"model", child->text_model,
-			"allow_newlines", TRUE,
-			NULL);
-
-	gtk_signal_connect (GTK_OBJECT (recipient_table),
-			    "popup",
-			    GTK_SIGNAL_FUNC (section_right_click_cb),
-			    child);
-
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), recipient_table);
-	
-#if 0
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "right_click",
-			   GTK_SIGNAL_FUNC(section_right_click_cb), child);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "double_click",
-			   GTK_SIGNAL_FUNC(remove_address), child);
-#endif
-
-
-	gtk_signal_connect (GTK_OBJECT (child->source),
-			    "changed",
-			    GTK_SIGNAL_FUNC (sync_table_and_models),
-			    e_select_names);
-	
-	gtk_widget_show_all (sw);
-	
-	gtk_table_attach(table, sw,
-			 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);
-
-	sync_table_and_models (child->source, e_select_names);
-}
-
-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_select_names_model_count (child->source);
-	
-	list = e_list_new(card_copy, card_free, NULL);
-	for (i = 0; i < rows; i++) {
-		ECard *card = e_select_names_model_get_card (child->source, 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;
-}
-
-void
-e_select_names_set_default (ESelectNames *e_select_names,
-			    const char *id)
-{
-	ESelectNamesChild *child;
-
-	if (e_select_names->def) {
-		child = g_hash_table_lookup(e_select_names->children, e_select_names->def);
-		if (child)
-			gtk_object_set (GTK_OBJECT (E_ENTRY (child->label)->item),
-					"bold", FALSE,
-					NULL);
-	}
-
-	g_free(e_select_names->def);
-	e_select_names->def = g_strdup(id);
-
-	if (e_select_names->def) {
-		child = g_hash_table_lookup(e_select_names->children, e_select_names->def);
-		if (child)
-			gtk_object_set (GTK_OBJECT (E_ENTRY (child->label)->item),
-					"bold", TRUE,
-					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 443784ee9e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <glib.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-scrolled.h>
-
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-
-#include "e-select-names-model.h"
-#include "e-util/e-list.h"
-#include "shell/evolution-storage-listener.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;
-typedef struct _ESelectNamesFolder ESelectNamesFolder;
-
-struct _ESelectNames
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	
-	GHashTable *children; /* Of type char * to ESelectNamesChild */
-	int child_count;
-	ETableScrolled *table;
-	ETableModel *adapter;
-	ETableModel *without;
-	EAddressbookModel *model;
-	GtkWidget *categories;
-	GtkWidget *search_entry;
-	GtkWidget *select_entry;
-	GtkWidget *status_message;
-	EvolutionStorageListener *local_listener;
-	EvolutionStorageListener *other_contacts_listener;
-	GHashTable *folders;
-	GHashTable *folders_by_uri;
-	char *def;
-	ESelectNamesFolder *current_folder;
-};
-
-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);
-void e_select_names_set_default (ESelectNames *e_select_names,
-				 const 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/e-simple-card-bonobo.c b/addressbook/gui/component/select-names/e-simple-card-bonobo.c
deleted file mode 100644
index 9834eddd83..0000000000
--- a/addressbook/gui/component/select-names/e-simple-card-bonobo.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-simple-card-bonobo.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-simple-card-bonobo.h"
-
-#include <gal/util/e-util.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESimpleCardBonoboPrivate {
-	ECardSimple *card_simple;
-};
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Addressbook_SimpleCard__vepv SimpleCard_vepv;
-
-static POA_GNOME_Evolution_Addressbook_SimpleCard *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Addressbook_SimpleCard *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_SimpleCard *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SimpleCard_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_SimpleCard__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 GNOME_Evolution_Addressbook_SimpleCard_Arbitrary *
-impl_SimpleCard_get_arbitrary (PortableServer_Servant servant,
-			       const CORBA_char *key,
-			       CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESimpleCardBonobo *simple_card;
-	ESimpleCardBonoboPrivate *priv;
-	GNOME_Evolution_Addressbook_SimpleCard_Arbitrary *ret_val = GNOME_Evolution_Addressbook_SimpleCard_Arbitrary__alloc ();
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);
-	priv = simple_card->priv;
-
-	if (priv->card_simple) {
-		const ECardArbitrary *arbitrary = e_card_simple_get_arbitrary (priv->card_simple, key);
-		ret_val->key = CORBA_string_dup (arbitrary->key);
-		ret_val->value = CORBA_string_dup (arbitrary->value);
-		ret_val->type = CORBA_string_dup (arbitrary->type);
-	} else {
-		ret_val->key = CORBA_string_dup ("");
-		ret_val->value = CORBA_string_dup ("");
-		ret_val->type = CORBA_string_dup ("");
-	}
-
-	return ret_val;
-}
-
-static void
-impl_SimpleCard_set_arbitrary (PortableServer_Servant servant,
-			       const CORBA_char *key,
-			       const CORBA_char *type,
-			       const CORBA_char *value,
-			       CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESimpleCardBonobo *simple_card;
-	ESimpleCardBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);
-	priv = simple_card->priv;
-
-	if (priv->card_simple) {
-		e_card_simple_set_arbitrary (priv->card_simple, key, type, value);
-	}
-}
-
-static CORBA_char *
-impl_SimpleCard_get (PortableServer_Servant servant,
-		     GNOME_Evolution_Addressbook_SimpleCard_Field field,
-		     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESimpleCardBonobo *simple_card;
-	ESimpleCardBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);
-	priv = simple_card->priv;
-
-	if (priv->card_simple) {
-		char *value = e_card_simple_get (priv->card_simple,
-						 field);
-		char *ret_val = CORBA_string_dup (value);
-		g_free (value);
-		return ret_val;
-	} else {
-		return CORBA_string_dup ("");
-	}
-}
-
-static void
-impl_SimpleCard_set (PortableServer_Servant servant,
-		     GNOME_Evolution_Addressbook_SimpleCard_Field field,
-		     const CORBA_char *value,
-		     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESimpleCardBonobo *simple_card;
-	ESimpleCardBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);
-	priv = simple_card->priv;
-
-	if (priv->card_simple) {
-		e_card_simple_set (priv->card_simple,
-				   field,
-				   value);
-	}
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ESimpleCardBonobo *simple_card;
-	ESimpleCardBonoboPrivate *priv;
-
-	simple_card = E_SIMPLE_CARD_BONOBO (object);
-	priv = simple_card->priv;
-
-	if (priv->card_simple) {
-		gtk_object_unref (GTK_OBJECT (priv->card_simple));
-	}
-
-	g_free (priv);
-
-	simple_card->priv = NULL;
-}
-
-
-static void
-corba_class_init ()
-{
-	POA_GNOME_Evolution_Addressbook_SimpleCard__vepv *vepv;
-	POA_GNOME_Evolution_Addressbook_SimpleCard__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_GNOME_Evolution_Addressbook_SimpleCard__epv, 1);
-	epv->getArbitrary        = impl_SimpleCard_get_arbitrary;
-	epv->setArbitrary        = impl_SimpleCard_set_arbitrary;
-	epv->get                 = impl_SimpleCard_get;
-	epv->set                 = impl_SimpleCard_set;
-
-	vepv                     = &SimpleCard_vepv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Addressbook_SimpleCard_epv = epv;
-}
-
-static void
-class_init (ESimpleCardBonoboClass *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 (ESimpleCardBonobo *simple_card)
-{
-	ESimpleCardBonoboPrivate *priv;
-
-	priv = g_new (ESimpleCardBonoboPrivate, 1);
-
-	priv->card_simple = NULL;
-
-	simple_card->priv = priv;
-}
-
-
-void
-e_simple_card_bonobo_construct (ESimpleCardBonobo *simple_card,
-				GNOME_Evolution_Addressbook_SimpleCard corba_object,
-				ECardSimple *card_simple)
-{
-	g_return_if_fail (simple_card != NULL);
-	g_return_if_fail (E_IS_SIMPLE_CARD_BONOBO (simple_card));
-
-	bonobo_object_construct (BONOBO_OBJECT (simple_card), corba_object);
-
-	simple_card->priv->card_simple = card_simple;
-	gtk_object_ref (GTK_OBJECT (card_simple));
-}
-
-ESimpleCardBonobo *
-e_simple_card_bonobo_new (ECardSimple *card_simple)
-{
-	POA_GNOME_Evolution_Addressbook_SimpleCard *servant;
-	GNOME_Evolution_Addressbook_SimpleCard corba_object;
-	ESimpleCardBonobo *simple_card;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	simple_card = gtk_type_new (e_simple_card_bonobo_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (simple_card), servant);
-	e_simple_card_bonobo_construct (simple_card, corba_object, card_simple);
-
-	return simple_card;
-}
-
-
-E_MAKE_TYPE (e_simple_card_bonobo, "ESimpleCardBonobo", ESimpleCardBonobo, class_init, init, PARENT_TYPE)
diff --git a/addressbook/gui/component/select-names/e-simple-card-bonobo.h b/addressbook/gui/component/select-names/e-simple-card-bonobo.h
deleted file mode 100644
index 763c54085b..0000000000
--- a/addressbook/gui/component/select-names/e-simple-card-bonobo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-simple-card-bonobo.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- */
-
-#ifndef __E_SIMPLE_CARD_BONOBO_H__
-#define __E_SIMPLE_CARD_BONOBO_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-#include <addressbook/backend/ebook/e-card-simple.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SIMPLE_CARD_BONOBO			(e_simple_card_bonobo_get_type ())
-#define E_SIMPLE_CARD_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SIMPLE_CARD_BONOBO, ESimpleCardBonobo))
-#define E_SIMPLE_CARD_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SIMPLE_CARD_BONOBO, ESimpleCardBonoboClass))
-#define E_IS_SIMPLE_CARD_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SIMPLE_CARD_BONOBO))
-#define E_IS_SIMPLE_CARD_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SIMPLE_CARD_BONOBO))
-
-
-typedef struct _ESimpleCardBonobo        ESimpleCardBonobo;
-typedef struct _ESimpleCardBonoboPrivate ESimpleCardBonoboPrivate;
-typedef struct _ESimpleCardBonoboClass   ESimpleCardBonoboClass;
-
-struct _ESimpleCardBonobo {
-	BonoboObject parent;
-
-	ESimpleCardBonoboPrivate *priv;
-};
-
-struct _ESimpleCardBonoboClass {
-	BonoboObjectClass parent_class;
-};
-
-
-GtkType            e_simple_card_bonobo_get_type   (void);
-void               e_simple_card_bonobo_construct  (ESimpleCardBonobo                      *simple_card,
-						    GNOME_Evolution_Addressbook_SimpleCard  corba_object,
-						    ECardSimple                            *card_simple);
-ESimpleCardBonobo *e_simple_card_bonobo_new        (ECardSimple                            *card_simple);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_SIMPLE_CARD_BONOBO_H__ */
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 59c8d31364..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,477 +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>../../../../art/</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>
-</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>
-  <default_width>417</default_width>
-  <default_height>332</default_height>
-  <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>
-    <border_width>3</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>3</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>button4</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>button5</name>
-	<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>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>3</row_spacing>
-      <column_spacing>3</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHSeparator</class>
-	<name>hseparator1</name>
-	<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>False</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame1</name>
-	<label>Show Contacts</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<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>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table5</name>
-	  <border_width>3</border_width>
-	  <rows>2</rows>
-	  <columns>3</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label30</name>
-	    <label>_Folder:</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>optionmenu-folder</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>label31</name>
-	    <label>_Category:</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>GtkOptionMenu</class>
-	    <name>optionmenu-folder</name>
-	    <can_focus>True</can_focus>
-	    <items></items>
-	    <initial_choice>0</initial_choice>
-	    <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>
-	    <class>Custom</class>
-	    <name>custom-categories</name>
-	    <creation_function>e_select_names_create_categories</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Tue, 19 Feb 2002 23:06:24 GMT</last_modification_time>
-	    <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>True</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-browse</name>
-	    <can_focus>True</can_focus>
-	    <label>_Browse...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <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>
-      </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>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table4</name>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label32</name>
-	    <label>Type a name into the entry, or
-select one from the list below:</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>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment4</name>
-	    <xalign>7.45058e-09</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>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox6</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>3</spacing>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<name>entry-select</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>
-		<class>GtkAlignment</class>
-		<name>alignment3</name>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xscale>1</xscale>
-		<yscale>1</yscale>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<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>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table-recipients</name>
-	    <rows>5</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>3</row_spacing>
-	    <column_spacing>3</column_spacing>
-	    <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>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label20</name>
-	      <label>Selected Contacts:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>True</wrap>
-	      <xalign>0.5</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>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>status-message</name>
-	<label></label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>3</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>
-  </widget>
-</widget>
-
-</GTK-Interface>
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 c6dd88415d..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/addressbook/gui/merging	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-I$(top_builddir)/shell			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecontacteditor.a
-
-libecontacteditor_a_SOURCES = 			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.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			\
-	e-contact-quick-add.c			\
-	e-contact-quick-add.h
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	file-exists.glade		\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)
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/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index c8c880fa0c..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2537 +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>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <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>
-    <homogeneous>False</homogeneous>
-    <spacing>4</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>button28</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>button29</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>button30</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>table2</name>
-      <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>
-	<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>
-	<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>
-	  <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>button32</name>
-	  <border_width>2</border_width>
-	  <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>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<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>
-	  <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>
-	    <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>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <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>
-    <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>button43</name>
-	<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>
-	<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>frame-add-phone</name>
-      <border_width>4</border_width>
-      <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>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</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>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <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>
-    <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>
-      <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>
-	<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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <can_focus>True</can_focus>
-	  <label>Full _Name...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <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>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <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>
-	  <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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <can_default>True</can_default>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	    <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>
-	  <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>alignment-htmlmail</name>
-	  <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>
-	    <can_focus>True</can_focus>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <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>
-	    <label>Business</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-phone1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <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>
-	    <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>
-	  <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>
-	    <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>
-	  <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>
-	    <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>
-	  <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>
-	    <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>
-	  <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>
-	    <label>Business</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>
-	  <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>
-	    <label>This is the _mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <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>
-	  <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>
-	  <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>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <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>
-	    <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>
-	  <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>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <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>label-jobtitle</name>
-	    <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts-plain.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>
-	  <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>
-	  <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>label-company</name>
-	  <label>Organi_zation:</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>
-	  <can_focus>True</can_focus>
-	  <label>Add_ress...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <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>
-	  <class>GtkAlignment</class>
-	  <name>alignment17</name>
-	  <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>GtkTable</class>
-	    <name>table-contacts</name>
-	    <rows>1</rows>
-	    <columns>1</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>0</column_spacing>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>accellabel-fileas</name>
-	  <label>File A_s:</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-file-as</focus_target>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>accellabel-web</name>
-	  <label>_Web page address:</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-web</focus_target>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</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>table-contact-editor-details</name>
-	<border_width>7</border_width>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-department</name>
-	  <label>D_epartment:</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>label-office</name>
-	  <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>label-profession</name>
-	  <label>P_rofession:</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>label-nickname</name>
-	  <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>label-spouse</name>
-	  <label>S_pouse:</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>label-birthday</name>
-	  <label>Birthda_y:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>dateedit-birthday</focus_target>
-	  <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>label-assistant</name>
-	  <label>A_ssistant'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>label-manager</name>
-	  <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>label-anniversary</name>
-	  <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>
-	  <focus_target>dateedit-anniversary</focus_target>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>GtkEntry</class>
-	  <name>entry-assistant</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>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>
-	  <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>
-	  <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>label-comments</name>
-	  <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>
-	  <focus_target>text-comments</focus_target>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <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>
-	  <class>Custom</class>
-	  <name>dateedit-birthday</name>
-	  <can_focus>True</can_focus>
-	  <creation_function>e_contact_editor_create_date</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Tue, 05 Jun 2001 02:36:27 GMT</last_modification_time>
-	  <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>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>dateedit-anniversary</name>
-	  <can_focus>True</can_focus>
-	  <creation_function>e_contact_editor_create_date</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Tue, 05 Jun 2001 02:36:32 GMT</last_modification_time>
-	  <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>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</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>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox1</name>
-	  <border_width>7</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>custom12</name>
-	    <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:13 GMT</last_modification_time>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label24</name>
-	    <label>If this person publishes free/busy or other calendar information on the Internet, enter the address
-of that information here.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment18</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0.75</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table-contact-editor-collaboration</name>
-	    <border_width>7</border_width>
-	    <rows>2</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label-caluri</name>
-	      <label>_Public Calendar URL:</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-caluri</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>label-fburl</name>
-	      <label>F_ree/Busy URL:</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-fburl</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-caluri</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>GtkEntry</class>
-	      <name>entry-fburl</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>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label21</name>
-	<label>Collaboration</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>
-    <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 dfd89fc75d..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,564 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <e-contact-editor-address.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gtk/gtkcombo.h>
-#include <string.h>
-#include <stdlib.h>
-#include <locale.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,
-	ARG_IS_READ_ONLY
-};
-
-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);
-	gtk_object_add_arg_type ("EContactEditorAddress::editable", GTK_TYPE_BOOL, 
-				 GTK_ARG_READWRITE, ARG_IS_READ_ONLY);
- 
-	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 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-checkaddress");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-city");
-		list = add_to_tab_order(list, gui, "entry-region");
-		list = add_to_tab_order(list, gui, "entry-code");
-		list = add_to_tab_order(list, gui, "combo-country");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static char * countries [] = {
-	N_("United States"),
-	N_("Afghanistan"),
-	N_("Albania"),
-	N_("Algeria"),
-	N_("American Samoa"),
-	N_("Andorra"),
-	N_("Angola"),
-	N_("Anguilla"),
-	N_("Antarctica"),
-	N_("Antigua And Barbuda"),
-	N_("Argentina"),
-	N_("Armenia"),
-	N_("Aruba"),
-	N_("Australia"),
-	N_("Austria"),
-	N_("Azerbaijan"),
-	N_("Bahamas"),
-	N_("Bahrain"),
-	N_("Bangladesh"),
-	N_("Barbados"),
-	N_("Belarus"),
-	N_("Belgium"),
-	N_("Belize"),
-	N_("Benin"),
-	N_("Bermuda"),
-	N_("Bhutan"),
-	N_("Bolivia"),
-	N_("Bosnia And Herzegowina"),
-	N_("Botswana"),
-	N_("Bouvet Island"),
-	N_("Brazil"),
-	N_("British Indian Ocean Territory"),
-	N_("Brunei Darussalam"),
-	N_("Bulgaria"),
-	N_("Burkina Faso"),
-	N_("Burundi"),
-	N_("Cambodia"),
-	N_("Cameroon"),
-	N_("Canada"),
-	N_("Cape Verde"),
-	N_("Cayman Islands"),
-	N_("Central African Republic"),
-	N_("Chad"),
-	N_("Chile"),
-	N_("China"),
-	N_("Christmas Island"),
-	N_("Cocos (Keeling) Islands"),
-	N_("Colombia"),
-	N_("Comoros"),
-	N_("Congo"),
-	N_("Congo"),
-	N_("Cook Islands"),
-	N_("Costa Rica"),
-	N_("Cote d'Ivoire"),
-	N_("Croatia"),
-	N_("Cuba"),
-	N_("Cyprus"),
-	N_("Czech Republic"),
-	N_("Denmark"),
-	N_("Djibouti"),
-	N_("Dominica"),
-	N_("Dominican Republic"),
-	N_("East Timor"),
-	N_("Ecuador"),
-	N_("Egypt"),
-	N_("El Salvador"),
-	N_("Equatorial Guinea"),
-	N_("Eritrea"),
-	N_("Estonia"),
-	N_("Ethiopia"),
-	N_("Falkland Islands"),
-	N_("Faroe Islands"),
-	N_("Fiji"),
-	N_("Finland"),
-	N_("France"),
-	N_("French Guiana"),
-	N_("French Polynesia"),
-	N_("French Southern Territories"),
-	N_("Gabon"),
-	N_("Gambia"),
-	N_("Georgia"),
-	N_("Germany"),
-	N_("Ghana"),
-	N_("Gibraltar"),
-	N_("Greece"),
-	N_("Greenland"),
-	N_("Grenada"),
-	N_("Guadeloupe"),
-	N_("Guam"),
-	N_("Guatemala"),
-	N_("Guinea"),
-	N_("Guinea-bissau"),
-	N_("Guyana"),
-	N_("Haiti"),
-	N_("Heard And McDonald Islands"),
-	N_("Holy See"),
-	N_("Honduras"),
-	N_("Hong Kong"),
-	N_("Hungary"),
-	N_("Iceland"),
-	N_("India"),
-	N_("Indonesia"),
-	N_("Ireland"),
-	N_("Israel"),
-	N_("Italy"),
-	N_("Jamaica"),
-	N_("Japan"),
-	N_("Jordan"),
-	N_("Kazakhstan"),
-	N_("Kenya"),
-	N_("Kiribati"),
-	N_("Korea, Republic Of"),
-	N_("Kuwait"),
-	N_("Kyrgyzstan"),
-	N_("Laos"),
-	N_("Latvia"),
-	N_("Lebanon"),
-	N_("Lesotho"),
-	N_("Liberia"),
-	N_("Liechtenstein"),
-	N_("Lithuania"),
-	N_("Luxembourg"),
-	N_("Macau"),
-	N_("Macedonia"),
-	N_("Madagascar"),
-	N_("Malawi"),
-	N_("Malaysia"),
-	N_("Maldives"),
-	N_("Mali"),
-	N_("Malta"),
-	N_("Marshall Islands"),
-	N_("Martinique"),
-	N_("Mauritania"),
-	N_("Mauritius"),
-	N_("Mayotte"),
-	N_("Mexico"),
-	N_("Micronesia"),
-	N_("Moldova, Republic Of"),
-	N_("Monaco"),
-	N_("Mongolia"),
-	N_("Montserrat"),
-	N_("Morocco"),
-	N_("Mozambique"),
-	N_("Myanmar"),
-	N_("Namibia"),
-	N_("Nauru"),
-	N_("Nepal"),
-	N_("Netherlands"),
-	N_("Netherlands Antilles"),
-	N_("New Caledonia"),
-	N_("New Zealand"),
-	N_("Nicaragua"),
-	N_("Niger"),
-	N_("Nigeria"),
-	N_("Niue"),
-	N_("Norfolk Island"),
-	N_("Northern Mariana Islands"),
-	N_("Norway"),
-	N_("Oman"),
-	N_("Pakistan"),
-	N_("Palau"),
-	N_("Palestinian Territory"),
-	N_("Panama"),
-	N_("Papua New Guinea"),
-	N_("Paraguay"),
-	N_("Peru"),
-	N_("Philippines"),
-	N_("Pitcairn"),
-	N_("Poland"),
-	N_("Portugal"),
-	N_("Puerto Rico"),
-	N_("Qatar"),
-	N_("Reunion"),
-	N_("Romania"),
-	N_("Russian Federation"),
-	N_("Rwanda"),
-	N_("Saint Kitts And Nevis"),
-	N_("Saint Lucia"),
-	N_("Saint Vincent And The Grena-dines"),
-	N_("Samoa"),
-	N_("San Marino"),
-	N_("Sao Tome And Principe"),
-	N_("Saudi Arabia"),
-	N_("Senegal"),
-	N_("Seychelles"),
-	N_("Sierra Leone"),
-	N_("Singapore"),
-	N_("Slovakia"),
-	N_("Slovenia"),
-	N_("Solomon Islands"),
-	N_("Somalia"),
-	N_("South Africa"),
-	N_("South Georgia And The South Sandwich Islands"),
-	N_("Spain"),
-	N_("Sri Lanka"),
-	N_("St. Helena"),
-	N_("St. Pierre And Miquelon"),
-	N_("Sudan"),
-	N_("Suriname"),
-	N_("Svalbard And Jan Mayen Islands"),
-	N_("Swaziland"),
-	N_("Sweden"),
-	N_("Switzerland"),
-	N_("Taiwan"),
-	N_("Tajikistan"),
-	N_("Tanzania, United Republic Of"),
-	N_("Thailand"),
-	N_("Togo"),
-	N_("Tokelau"),
-	N_("Tonga"),
-	N_("Trinidad And Tobago"),
-	N_("Tunisia"),
-	N_("Turkey"),
-	N_("Turkmenistan"),
-	N_("Turks And Caicos Islands"),
-	N_("Tuvalu"),
-	N_("Uganda"),
-	N_("Ukraine"),
-	N_("United Arab Emirates"),
-	N_("United Kingdom"),
-	N_("United States Minor Outlying Islands"),
-	N_("Uruguay"),
-	N_("Uzbekistan"),
-	N_("Vanuatu"),
-	N_("Venezuela"),
-	N_("Viet Nam"),
-	N_("Virgin Islands, British"),
-	N_("Virgin Islands, U.S."),
-	N_("Wallis And Futuna Islands"),
-	N_("Western Sahara"),
-	N_("Yemen"),
-	N_("Yugoslavia"),
-	N_("Zambia"),
-	N_("Zimbabwe"),
-	NULL
-};
-
-static int
-compare_func (const void *voida, const void *voidb)
-{
-	char * const *stringa = voida, * const *stringb = voidb;
-
-	return strcoll (*stringa, *stringb);
-}
-
-static void
-fill_in_countries (GladeXML *gui)
-{
-	GtkCombo *combo;
-	combo = (GtkCombo *) glade_xml_get_widget(gui, "combo-country");
-	if (combo && GTK_IS_COMBO (combo)) {
-		static gboolean sorted = FALSE;
-		static GList *country_list;
-		if (!sorted) {
-			int i;
-			char *locale;
-
-			for (i = 0; countries[i]; i++) {
-				countries[i] = _(countries[i]);
-			}
-
-			locale = setlocale (LC_COLLATE, NULL);
-			qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);
-			country_list = NULL;
-			for (i = 0; countries[i]; i++) {
-				country_list = g_list_prepend (country_list, countries[i]);
-			}
-			country_list = g_list_reverse (country_list);
-			sorted = TRUE;
-		}
-		gtk_combo_set_popdown_strings (combo, country_list);
-	}
-}
-
-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;
-
-	setup_tab_order (gui);
-	fill_in_countries (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_unref(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:
-		e_card_delivery_address_unref(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;
-	case ARG_IS_READ_ONLY: {
-		int i;
-		char *entry_names[] = {
-			"entry-street",
-			"entry-city",
-			"entry-ext",
-			"entry-po",
-			"entry-region",
-			"combo-country",
-			"entry-code",
-			NULL
-		};
-		e_contact_editor_address->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		for (i = 0; entry_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_address->gui, entry_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (w),
-							e_contact_editor_address->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry),
-							e_contact_editor_address->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_address->editable);
-			}
-		}
-		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_ref(e_contact_editor_address->address);
-		break;
-	case ARG_IS_READ_ONLY:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor_address->editable ? TRUE : FALSE;
-		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 ff29c5b7ec..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-dialog.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;
-
-	guint editable : 1;
-
-	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-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index b91a040d46..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,83 +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>
-</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-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 5ae8b36a9b..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include "e-contact-editor-fullname.h"
-#include <gtk/gtkcombo.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,
-	ARG_IS_READ_ONLY
-};
-
-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);
-
-	gtk_object_add_arg_type ("EContactEditorFullname::editable", GTK_TYPE_BOOL, 
-				 GTK_ARG_READWRITE, ARG_IS_READ_ONLY);
- 
-	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_unref(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:
-		e_card_name_unref(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;
-	case ARG_IS_READ_ONLY: {
-		int i;
-		char *entry_names[] = {
-			"combo-title",
-			"combo-suffix",
-			"entry-first",
-			"entry-middle",
-			"entry-last",
-			NULL
-		};
-		e_contact_editor_fullname->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		for (i = 0; entry_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, entry_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (w),
-							e_contact_editor_fullname->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry),
-							e_contact_editor_fullname->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_fullname->editable);
-			}
-		}
-		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_ref(e_contact_editor_fullname->name);
-		break;
-	case ARG_IS_READ_ONLY:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor_fullname->editable ? TRUE : FALSE;
-		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 0d09b13700..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-dialog.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;
-
-	/* Whether the dialog will accept modifications */
-	guint editable : 1;
-};
-
-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.c b/addressbook/gui/contact-editor/e-contact-editor.c
deleted file mode 100644
index fd0f14ddb5..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,2748 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-contact-editor.h"
-
-#include <time.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtktext.h>
-#include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <gal/widgets/e-categories.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-text/e-entry.h>
-
-#include <e-util/e-categories-master-list-wombat.h>
-
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-#include "e-util/e-gui-utils.h"
-#include "widgets/misc/e-dateedit.h"
-#include "shell/evolution-shell-component-utils.h"
-
-#include "e-card-merging.h"
-
-#include "e-contact-editor-address.h"
-#include "e-contact-editor-fullname.h"
-#include "e-contact-save-as.h"
-
-/* Signal IDs */
-enum {
-	CARD_ADDED,
-	CARD_MODIFIED,
-	CARD_DELETED,
-	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 find_address_mailing (EContactEditor *editor);
-static void enable_writable_fields(EContactEditor *editor);
-static void set_editable(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 void command_state_changed (EContactEditor *ce);
-static void widget_changed (GtkWidget *widget, EContactEditor *editor);
-static void close_dialog (EContactEditor *ce);
-static void enable_widget (GtkWidget *widget, gboolean enabled);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_CARD,
-	ARG_IS_NEW_CARD,
-	ARG_EDITABLE,
-	ARG_CHANGED,
-	ARG_WRITABLE_FIELDS
-};
-
-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;
-}
-
-typedef void (*GtkSignal_NONE__INT_OBJECT) (GtkObject * object,
-					    gint arg1,
-					    GtkObject *arg2,
-					    gpointer user_data);
-
-static void
-e_marshal_NONE__INT_OBJECT (GtkObject * object,
-			    GtkSignalFunc func,
-			    gpointer func_data, GtkArg * args)
-{
-	GtkSignal_NONE__INT_OBJECT rfunc;
-	rfunc = (GtkSignal_NONE__INT_OBJECT) func;
-	(*rfunc) (object,
-		  GTK_VALUE_INT (args[0]),
-		  GTK_VALUE_OBJECT (args[1]),
-		  func_data);
-}
-
-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::book", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_BOOK);
-  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);
-  gtk_object_add_arg_type ("EContactEditor::writable_fields", GTK_TYPE_POINTER,
-			   GTK_ARG_READWRITE, ARG_WRITABLE_FIELDS);
-  gtk_object_add_arg_type ("EContactEditor::editable", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_EDITABLE);
-  gtk_object_add_arg_type ("EContactEditor::changed", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_CHANGED);
-
-  contact_editor_signals[CARD_ADDED] =
-	  gtk_signal_new ("card_added",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_added),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_editor_signals[CARD_MODIFIED] =
-	  gtk_signal_new ("card_modified",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_modified),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_editor_signals[CARD_DELETED] =
-	  gtk_signal_new ("card_deleted",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_deleted),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, 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);
-
-	widget_changed (widget, editor);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	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;
-	phone = e_card_phone_new();
-	phone->number = e_utf8_gtk_entry_get_text(entry);
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-	e_card_phone_unref(phone);
-	set_fields(editor);
-
-	widget_changed (widget, 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);
-
-	widget_changed (widget, editor);
-}
-
-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();
-
-	if (editor->address_mailing == editor->address_choice || editor->address_mailing == -1) {
-		GtkWidget *check;
-		
-		address->flags |= E_CARD_ADDR_DEFAULT;
-		
-		check = glade_xml_get_widget(editor->gui, "checkbutton-mailingaddress");
-		if (check && GTK_IS_CHECK_BUTTON (check)) {
-			gtk_signal_handler_block_by_data (GTK_OBJECT (check), editor);
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (check), editor);
-		}
-	}
-	
-	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_unref(address);
-
-	widget_changed (widget, editor);
-}
-
-
-static void
-address_mailing_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	ECardAddrLabel *address;
-	GtkWidget *text;
-	gboolean mailing_address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	mailing_address = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-	
-	/* Mark the current address as the mailing address */
- 	text = glade_xml_get_widget(editor->gui, "text-address");
-	if (text && GTK_IS_TEXT(text)) {
-
-		address = e_card_address_label_new();
-		
-		if (mailing_address)
-			address->flags |= E_CARD_ADDR_DEFAULT;
-		else
-			address->flags &= ~E_CARD_ADDR_DEFAULT;
-		address->data = e_utf8_gtk_editable_get_chars(GTK_EDITABLE (text), 0, -1);
-	
-		e_card_simple_set_address(editor->simple, editor->address_choice, address);
-		e_card_address_label_unref(address);
-	}
-
-	/* Unset the previous mailing address flag */
-	if (mailing_address && editor->address_mailing != -1) {
-		const ECardAddrLabel *curr;
-
-		curr = e_card_simple_get_address(editor->simple, 
-						 editor->address_mailing);
-		address = e_card_address_label_copy (curr);
-		address->flags &= ~E_CARD_ADDR_DEFAULT;
-		e_card_simple_set_address(editor->simple, 
-					  editor->address_mailing,
-					  address);
-	}
-
-	/* Remember the new mailing address */
-	if (mailing_address)
-		editor->address_mailing = editor->address_choice;
-	else
-		editor->address_mailing = -1;
-
-	widget_changed (widget, editor);
-}
-
-
-/* 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;
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return -1;
-
-	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 (!(file_as && GTK_IS_ENTRY(file_as)))
-		return;
-
-	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)
-{
-	int style = 0;
-	char *string;
-
-	style = file_as_get_style(editor);
-	
-	e_card_name_unref(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	file_as_set_style(editor, style);
-
-	widget_changed (widget, editor);
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-
-	style = file_as_get_style(editor);
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	file_as_set_style(editor, style);
-
-	widget_changed (widget, editor);
-}
-
-static void
-field_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-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
-widget_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	if (!editor->editable) {
-		g_warning ("non-editable contact editor has an editable field in it.");
-		return;
-	}
-
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_entry_changed_signal_field(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",
-				   field_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);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-web");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-categories");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-jobtitle");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-manager");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-assistant");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-office");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-department");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-profession");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-nickname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-spouse");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-comments");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-	if (widget && E_IS_DATE_EDIT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-	if (widget && E_IS_DATE_EDIT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-web");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_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_object_set (GTK_OBJECT (dialog),
-			"editable", editor->editable,
-			NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-		int style = 0;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-
-		style = file_as_get_style(editor);
-
-		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);
-		}
-
-		e_card_name_unref(editor->name);
-		editor->name = e_card_name_ref(name);
-
-		file_as_set_style(editor, style);
-	}
-	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_object_set (GTK_OBJECT (dialog),
-			"editable", editor->editable,
-			NULL);
-	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);
-
-		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_unref(address);
-		}
-
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		e_card_delivery_address_unref(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories = NULL;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	ECategoriesMasterList *ecml;
-	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_categories_new(categories));
-
-	if (dialog == NULL) {
-		GtkWidget *uh_oh = gnome_error_dialog (_("Category editor not available."));
-		gtk_widget_show (uh_oh);
-		return;
-	}
-
-	ecml = e_categories_master_list_wombat_new ();
-	gtk_object_set(GTK_OBJECT(dialog),
-		       "header", _("This contact belongs to these categories:"),
-		       "ecml", ecml,
-		       NULL);
-	gtk_object_unref (GTK_OBJECT (ecml));
-	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));
-}
-
-static void
-ensure_select_names_contact (EContactEditor *editor)
-{
-	if (editor->select_names_contacts == NULL) {
-		editor->select_names_contacts = e_select_names_manager_new ();
-		e_select_names_manager_add_section (editor->select_names_contacts,
-						    "contacts",
-						    "Related Contacts");
-	}
-
-	set_entry_changed_signal_field(editor, "entry-caluri");
-	set_entry_changed_signal_field(editor, "entry-fburl");
-}
-
-static void
-contacts_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	ensure_select_names_contact (editor);
-	e_select_names_manager_activate_dialog (editor->select_names_contacts,
-						"contacts");
-}
-
-static void
-add_lists (EContactEditor *editor)
-{
-	GtkWidget *table = glade_xml_get_widget (editor->gui, "table-contacts");
-	if (table && GTK_IS_TABLE (table)) {
-		GtkWidget *entry;
-
-		ensure_select_names_contact (editor);
-		entry = e_select_names_manager_create_entry (editor->select_names_contacts,
-							     "contacts");
-		gtk_signal_connect(GTK_OBJECT(entry), "changed",
-				   widget_changed, editor);
-		gtk_table_attach_defaults (GTK_TABLE (table), entry, 0, 1, 0, 1);
-		gtk_widget_show (entry);
-	}
-}
-
-
-typedef struct {
-	EContactEditor *ce;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-card_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	e_card_set_id (ce->card, id);
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_ADDED],
-			 status, ce->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		ce->is_new_card = FALSE;
-
-		if (should_close) {
-			close_dialog (ce);
-		}
-		else {
-			ce->changed = FALSE;
-			command_state_changed (ce);
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (ce));
-	g_free (ecs);
-}
-
-static void
-card_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_MODIFIED],
-			 status, ce->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		if (should_close) {
-			close_dialog (ce);
-		}
-		else {
-			ce->changed = FALSE;
-			command_state_changed (ce);
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (ce));
-	g_free (ecs);
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce, gboolean should_close)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->ce = ce;
-		gtk_object_ref (GTK_OBJECT (ecs->ce));
-
-		ecs->should_close = should_close;
-
-		gtk_widget_set_sensitive (ce->app, FALSE);
-		ce->in_async_call = TRUE;
-
-		if (ce->is_new_card)
-			e_card_merging_book_add_card (ce->book, ce->card, GTK_SIGNAL_FUNC(card_added_cb), ecs);
-		else
-			e_card_merging_book_commit_card (ce->book, ce->card, GTK_SIGNAL_FUNC(card_modified_cb), ecs);
-	}
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	if (ce->app != NULL) {
-		gtk_widget_destroy (ce->app);
-		ce->app = NULL;
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-	}
-}
-
-static gboolean
-prompt_to_save_changes (EContactEditor *editor)
-{
-	if (!editor->changed)
-		return TRUE;
-
-	switch (e_addressbook_prompt_save_dialog (GTK_WINDOW(editor->app))) {
-	case 0: /* Save */
-		save_card (editor, FALSE);
-		return TRUE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-	}
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce, FALSE);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	if (!prompt_to_save_changes (ce))
-		return;
-
-	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 Contact as VCard"), card);
-}
-
-static void
-file_send_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_card_send(card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_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_card_send(card, E_CARD_DISPOSITION_AS_TO);
-}
-
-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
-card_deleted_cb (EBook *book, EBookStatus status, EContactEditor *ce)
-{
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_DELETED],
-			 status, ce->card);
-
-	/* always close the dialog after we successfully delete a card */
-	if (status == E_BOOK_STATUS_SUCCESS)
-		close_dialog (ce);
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-	ECard *card = ce->card;
-	ECardSimple *simple = ce->simple;
-
-	gtk_object_ref(GTK_OBJECT(card));
-	gtk_object_ref(GTK_OBJECT(simple));
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (simple);
-		
-		if (!ce->is_new_card && ce->book) {
-			gtk_widget_set_sensitive (ce->app, FALSE);
-			ce->in_async_call = TRUE;
-
-			e_book_remove_card (ce->book, card, GTK_SIGNAL_FUNC(card_deleted_cb), ce);
-		}
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-/* 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));
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-/* 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));
-}
-#endif
-
-/* 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, TRUE);
-}
-
-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 ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-#endif
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-EPixmap pixmaps[] = {
-	E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"),
-	E_PIXMAP ("/commands/ContactEditorSaveClose", "save-16.png"),
-	E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"),
-	E_PIXMAP ("/commands/ContactEditorDelete", "evolution-trash-mini.png"),
-	E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	E_PIXMAP ("/commands/ContactEditorPrintEnvelope", "print.xpm"),
-#endif
-	E_PIXMAP ("/Toolbar/ContactEditorSaveClose", "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/ContactEditorDelete", "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/ContactEditorPrint", "buttons/print.png"),
-
-	E_PIXMAP_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");
-
-	e_pixmaps_update (ce->uic, pixmaps);
-}
-
-/* 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);
-
-	/* if we're saving, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (!prompt_to_save_changes (ce))
-		return TRUE;
-
-	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 = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "alignment-htmlmail");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "button-fulladdr");
-		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->address_mailing = -1;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-	e_contact_editor->changed = FALSE;
-	e_contact_editor->in_async_call = FALSE;
-	e_contact_editor->editable = TRUE;
-
-	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);
-	add_lists (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, "checkbutton-mailingaddress");
-	if (widget && GTK_IS_TOGGLE_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "toggled",
-				   address_mailing_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);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-contacts");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   contacts_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);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "entry-fullname");
-	if (widget)
-		gtk_widget_grab_focus (widget);
-
-	/* 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->writable_fields) {
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->writable_fields));
-	}
-	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->book)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->book));
-
-	e_card_name_unref(e_contact_editor->name);
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-static void
-command_state_changed (EContactEditor *ce)
-{
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorSaveClose",
-				      "sensitive",
-				      ce->changed ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorSave",
-				      "sensitive",
-				      ce->changed ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorDelete",
-				      "sensitive",
-				      (ce->editable && !ce->is_new_card) ? "1" : "0", NULL);
-}
-
-static void
-supported_fields_cb (EBook *book, EBookStatus status,
-		     EList *fields, EContactEditor *ce)
-{
-	gtk_object_set (GTK_OBJECT (ce),
-			"writable_fields", fields,
-			NULL);
-
-	e_contact_editor_show (ce);
-
-	command_state_changed (ce);
-}
-
-EContactEditor *
-e_contact_editor_new (EBook *book,
-		      ECard *card,
-		      gboolean is_new_card,
-		      gboolean editable)
-{
-	EContactEditor *ce;
-
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (E_IS_CARD (card), NULL);
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"book", book,
-			"card", card,
-			"is_new_card", is_new_card,
-			"editable", editable,
-			NULL);
-
-	if (book)
-		e_book_get_supported_fields (book, (EBookFieldsCallback)supported_fields_cb, ce);
-
-	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_BOOK:
-		if (editor->book)
-			gtk_object_unref(GTK_OBJECT(editor->book));
-		editor->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref (GTK_OBJECT (editor->book));
-		/* XXX more here about editable/etc. */
-		break;
-	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);
-		editor->changed = FALSE;
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-
-	case ARG_EDITABLE: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-
-	case ARG_CHANGED: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->changed != new_value);
-
-		editor->changed = new_value;
-
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-	case ARG_WRITABLE_FIELDS:
-		if (editor->writable_fields)
-			gtk_object_unref(GTK_OBJECT(editor->writable_fields));
-		editor->writable_fields = GTK_VALUE_POINTER (*arg);
-		if (editor->writable_fields)
-			gtk_object_ref (GTK_OBJECT (editor->writable_fields));
-		else
-			editor->writable_fields = e_list_new(NULL, NULL, NULL);
-		enable_writable_fields (editor);
-		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_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->book);
-		break;
-
-	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;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->editable ? TRUE : FALSE;
-		break;
-
-	case ARG_CHANGED:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->changed ? TRUE : FALSE;
-		break;
-
-	case ARG_WRITABLE_FIELDS:
-		if (e_contact_editor->writable_fields)
-			GTK_VALUE_POINTER (*arg) = e_list_duplicate (e_contact_editor->writable_fields);
-		else
-			GTK_VALUE_POINTER (*arg) = NULL;
-		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;
-}
-
-static void
-e_contact_editor_build_phone_ui (EContactEditor *editor)
-{
-	int i;
-
-	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);
-	}
-}
-
-static void
-e_contact_editor_build_email_ui (EContactEditor *editor)
-{
-	int i;
-
-	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);
-	}
-}
-
-static void
-e_contact_editor_build_address_ui (EContactEditor *editor)
-{
-	int i;
-
-	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);
-	}
-}
-#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);
-
-	e_contact_editor_build_phone_ui (editor);
-	
-	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);
-		enable_widget (glade_xml_get_widget (editor->gui, label), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, entry), editor->editable);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-
-	e_contact_editor_build_email_ui (editor);
-
-	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);
-
-		/* make sure the buttons/entry is/are sensitive */
-		enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-		enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->editable);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-
-	e_contact_editor_build_address_ui (editor);
-
-	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);
-
-		/* make sure the buttons/entry is/are sensitive */
-		enable_widget (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->editable);
-	}
-}
-
-static void
-find_address_mailing (EContactEditor *editor)
-{
-	const ECardAddrLabel *address;
-	int i;
-	
-	editor->address_mailing = -1;
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		address = e_card_simple_get_address(editor->simple, i);
-		if (address && (address->flags & E_CARD_ADDR_DEFAULT)) {
-			if (editor->address_mailing == -1) {
-				editor->address_mailing = i;
-			} else {
-				ECardAddrLabel *new;
-				
-				new = e_card_address_label_copy (address);
-				new->flags &= ~E_CARD_ADDR_DEFAULT;
-				e_card_simple_set_address(editor->simple, i, new);
-				e_card_address_label_unref (new);
-			}
-		}
-	}
-}
-
-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;
-	GtkWidget *label_widget;
-	int i;
-
-	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));
-
-
-
-	e_contact_editor_build_address_ui (editor);
-
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-
-		if (address && address->data && *address->data)
-			break;
-	}
-	if (i == E_CARD_SIMPLE_ADDRESS_ID_LAST)
-		i = 0;
-
-	label_widget = glade_xml_get_widget(editor->gui, "label-address");
-	if (label_widget && GTK_IS_LABEL(label_widget)) {
-		gtk_object_set(GTK_OBJECT(label_widget),
-			       "label", _(g_list_nth_data(editor->address_list, i)),
-			       NULL);
-	}
-
-	set_address_field(editor, i);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *text, *check;
-	
-	text = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (text && GTK_IS_TEXT(text)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(text);
-
-		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);
-		}
-
-		check = glade_xml_get_widget(editor->gui, "checkbutton-mailingaddress");
-		if (check && GTK_IS_CHECK_BUTTON (check)) {
-			if (address && address->data)
-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), 
-							      address->flags & E_CARD_ADDR_DEFAULT);
-			else
-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
-		}
-		
-		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",
-		"entry-caluri",
-		"entry-fburl",
-		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));
-		}
-	}
-}
-
-static 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" },
-	{ "entry-caluri", "caluri" },
-	{ "entry-fburl", "fburl" },
-};
-
-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
-disable_widget_foreach (char *key, GtkWidget *widget, gpointer closure)
-{
-	enable_widget (widget, FALSE);
-}
-
-static struct {
-	char *widget_name;
-	ECardSimpleField field_id;
-	gboolean desensitize_for_read_only;
-} widget_field_mappings[] = {
-	{ "entry-web", E_CARD_SIMPLE_FIELD_URL, TRUE },
-	{ "accellabel-web", E_CARD_SIMPLE_FIELD_URL },
-
-	{ "entry-jobtitle", E_CARD_SIMPLE_FIELD_TITLE, TRUE },
-	{ "label-jobtitle", E_CARD_SIMPLE_FIELD_TITLE },
-
-	{ "entry-company", E_CARD_SIMPLE_FIELD_ORG, TRUE },
-	{ "label-company", E_CARD_SIMPLE_FIELD_ORG },
-
-	{ "combo-file-as", E_CARD_SIMPLE_FIELD_FILE_AS, TRUE },
-	{ "entry-file-as", E_CARD_SIMPLE_FIELD_FILE_AS, TRUE },
-	{ "accellabel-fileas", E_CARD_SIMPLE_FIELD_FILE_AS },
-
-	{ "label-department", E_CARD_SIMPLE_FIELD_ORG_UNIT },
-	{ "entry-department", E_CARD_SIMPLE_FIELD_ORG_UNIT, TRUE },
-
-	{ "label-office", E_CARD_SIMPLE_FIELD_OFFICE },
-	{ "entry-office", E_CARD_SIMPLE_FIELD_OFFICE, TRUE },
-
-	{ "label-profession", E_CARD_SIMPLE_FIELD_ROLE },
-	{ "entry-profession", E_CARD_SIMPLE_FIELD_ROLE, TRUE },
-
-	{ "label-manager", E_CARD_SIMPLE_FIELD_MANAGER },
-	{ "entry-manager", E_CARD_SIMPLE_FIELD_MANAGER, TRUE },
-
-	{ "label-assistant", E_CARD_SIMPLE_FIELD_ASSISTANT },
-	{ "entry-assistant", E_CARD_SIMPLE_FIELD_ASSISTANT, TRUE },
-
-	{ "label-nickname", E_CARD_SIMPLE_FIELD_NICKNAME },
-	{ "entry-nickname", E_CARD_SIMPLE_FIELD_NICKNAME, TRUE },
-
-	{ "label-spouse", E_CARD_SIMPLE_FIELD_SPOUSE },
-	{ "entry-spouse", E_CARD_SIMPLE_FIELD_SPOUSE, TRUE },
-
-	{ "label-birthday", E_CARD_SIMPLE_FIELD_BIRTH_DATE },
-	{ "dateedit-birthday", E_CARD_SIMPLE_FIELD_BIRTH_DATE, TRUE },
-
-	{ "label-anniversary", E_CARD_SIMPLE_FIELD_ANNIVERSARY },
-	{ "dateedit-anniversary", E_CARD_SIMPLE_FIELD_ANNIVERSARY, TRUE },
-
-	{ "label-comments", E_CARD_SIMPLE_FIELD_NOTE },
-	{ "text-comments", E_CARD_SIMPLE_FIELD_NOTE, TRUE },
-
-	{ "entry-fullname", E_CARD_SIMPLE_FIELD_FULL_NAME, TRUE },
-
-	{ "button-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },
-	{ "entry-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },
-
-	{ "label-caluri", E_CARD_SIMPLE_FIELD_CALURI },
-	{ "entry-caluri", E_CARD_SIMPLE_FIELD_CALURI, TRUE },
-
-	{ "label-fburl", E_CARD_SIMPLE_FIELD_FBURL },
-	{ "entry-fburl", E_CARD_SIMPLE_FIELD_FBURL, TRUE }
-};
-static int num_widget_field_mappings = sizeof(widget_field_mappings) / sizeof (widget_field_mappings[0]);
-
-static void
-enable_writable_fields(EContactEditor *editor)
-{
-	EList *fields = editor->writable_fields;
-	EIterator *iter;
-	GHashTable *dropdown_hash, *supported_hash;
-	int i;
-	ECardSimple *simple;
-	ECard *card;
-	char *widget_name;
-
-	if (!fields)
-		return;
-
-	card = e_card_new ("");
-	simple = e_card_simple_new (card);
-
-	dropdown_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	supported_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* build our hashtable of the drop down menu items */
-	e_contact_editor_build_phone_ui (editor);
-	for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_phone_to_field (i)),
-				     editor->phone_info[i].widget);
-	e_contact_editor_build_email_ui (editor);
-	for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_email_to_field (i)),
-				     editor->email_info[i].widget);
-	e_contact_editor_build_address_ui (editor);
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_address_to_field (i)),
-				     editor->address_info[i].widget);
-
-	/* then disable them all */
-	g_hash_table_foreach (dropdown_hash, (GHFunc)disable_widget_foreach, NULL);
-
-	/* disable the label widgets for the dropdowns (4 phone, 1
-           email and the toggle button, and 1 address and one for
-           the full address button */
-	for (i = 0; i < 4; i ++) {
-		widget_name = g_strdup_printf ("label-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-		widget_name = g_strdup_printf ("entry-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-	}
-	enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "label-address"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "text-address"), FALSE);
-
-	/* enable widgets that map directly from a field to a widget (the drop down items) */
-	iter = e_list_get_iterator (fields);
-	for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		char *field = (char*)e_iterator_get (iter);
-		GtkWidget *widget = g_hash_table_lookup (dropdown_hash, field);
-
-		if (widget) {
-			enable_widget (widget, TRUE);
-		}
-		else {
-			/* if it's not a field that's handled by the
-                           dropdown items, add it to the has to be
-                           used in the second step */
-			g_hash_table_insert (supported_hash, field, field);
-		}
-
-		/* ugh - this is needed to make sure we don't have a
-                   disabled label next to a drop down when the item in
-                   the menu (the one reflected in the label) is
-                   enabled. */
-		if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_email_to_field(editor->email_choice)))) {
-			enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-			enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-			enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->editable);
-		}
-		else if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_address_to_field(editor->address_choice)))) {
-			enable_widget (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-			enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->editable);
-		}
-		else for (i = 0; i < 4; i ++) {
-			if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_phone_to_field(editor->phone_choice[i])))) {
-				widget_name = g_strdup_printf ("label-phone%d", i+1);
-				enable_widget (glade_xml_get_widget (editor->gui, widget_name), TRUE);
-				g_free (widget_name);
-				widget_name = g_strdup_printf ("entry-phone%d", i+1);
-				enable_widget (glade_xml_get_widget (editor->gui, widget_name), editor->editable);
-				g_free (widget_name);
-			}
-		}
-	}
-
-	/* handle the label next to the dropdown widgets */
-
-	for (i = 0; i < num_widget_field_mappings; i ++) {
-		gboolean enabled;
-		GtkWidget *w;
-		const char *field;
-
-		w = glade_xml_get_widget(editor->gui, widget_field_mappings[i].widget_name);
-		if (!w) {
-			g_warning (_("Could not find widget for a field: `%s'"),
-				   widget_field_mappings[i].widget_name);
-			continue;
-		}
-		field = e_card_simple_get_ecard_field (simple,
-						       widget_field_mappings[i].field_id);
-
-		enabled = (g_hash_table_lookup (supported_hash, field) != NULL);
-
-		enable_widget (w, enabled);
-	}
-
-	g_hash_table_destroy (dropdown_hash);
-	g_hash_table_destroy (supported_hash);
-	gtk_object_unref (GTK_OBJECT(simple));
-	gtk_object_unref (GTK_OBJECT(card));
-}
-
-static void
-set_editable (EContactEditor *editor)
-{
-	int i;
-	char *entry;
-	/* set the sensitivity of all the non-dropdown entry/texts/dateedits */
-	for (i = 0; i < num_widget_field_mappings; i ++) {
-		if (widget_field_mappings[i].desensitize_for_read_only) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, widget_field_mappings[i].widget_name);
-			enable_widget (widget, editor->editable);
-		}
-	}
-
-	/* handle the phone dropdown entries */
-	for (i = 0; i < 4; i ++) {
-		entry = g_strdup_printf ("entry-phone%d", i+1);
-
-		enable_widget (glade_xml_get_widget(editor->gui, entry),
-			       editor->editable);
-
-		g_free (entry);
-	}
-
-	/* handle the email dropdown entry */
-	entry = "entry-email1";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->editable);
-	enable_widget (glade_xml_get_widget(editor->gui, "checkbutton-htmlmail"),
-		       editor->editable);
-
-	/* handle the address dropdown entry */
-	entry = "text-address";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->editable);
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		char *related_contacts;
-		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,
-			       "related_contacts", &related_contacts,
-			       "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);
-		}
-
-		find_address_mailing (editor);
-		
-		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_unref(editor->name);
-		editor->name = e_card_name_ref(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			EDateEdit *dateedit;
-			dateedit = E_DATE_EDIT(widget);
-			if (anniversary)
-				e_date_edit_set_date (dateedit,
-						      anniversary->year,
-						      anniversary->month,
-						      anniversary->day);
-			else
-				e_date_edit_set_time (dateedit, -1);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			EDateEdit *dateedit;
-			dateedit = E_DATE_EDIT(widget);
-			if (bday)
-				e_date_edit_set_date (dateedit,
-						      bday->year,
-						      bday->month,
-						      bday->day);
-			else
-				e_date_edit_set_time (dateedit, -1);
-		}
-
-		if (editor->select_names_contacts && related_contacts && *related_contacts) {
-			ESelectNamesModel *model = e_select_names_manager_get_source (editor->select_names_contacts,
-										      "contacts");
-			e_select_names_model_import_destinationv (model, related_contacts);
-		}
-
-		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;
-		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->select_names_contacts) {
-			ESelectNamesModel *model = e_select_names_manager_get_source (editor->select_names_contacts,
-										      "contacts");
-			char *string = e_select_names_model_export_destinationv (model);
-			if (string && *string)
-				gtk_object_set (GTK_OBJECT (card),
-						"related_contacts", string,
-						NULL);
-			else
-				gtk_object_set (GTK_OBJECT (card),
-						"related_contacts", NULL,
-						NULL);
-			g_free (string);
-		}
-
-		if (editor->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			if (e_date_edit_get_date (E_DATE_EDIT (widget),
-						  &anniversary.year,
-						  &anniversary.month,
-						  &anniversary.day)) {
-				/* g_print ("%d %d %d\n", anniversary.year, anniversary.month, anniversary.day); */
-				gtk_object_set(GTK_OBJECT(card),
-					       "anniversary", &anniversary,
-					       NULL);
-			} else
-				gtk_object_set(GTK_OBJECT(card),
-					       "anniversary", NULL,
-					       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			if (e_date_edit_get_date (E_DATE_EDIT (widget),
-						  &bday.year,
-						  &bday.month,
-						  &bday.day)) {
-				/* g_print ("%d %d %d\n", bday.year, bday.month, bday.day); */
-				gtk_object_set(GTK_OBJECT(card),
-					       "birth_date", &bday,
-					       NULL);
-			} else
-				gtk_object_set(GTK_OBJECT(card),
-					       "birth_date", NULL,
-					       NULL);
-		}
-	}
-}
-
-/**
- * e_contact_editor_raise:
- * @config: The %EContactEditor object.
- *
- * Raises the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_raise (EContactEditor *editor)
-{
-	/* FIXME: perhaps we should raise at realize time */
-	if (GTK_WIDGET (editor->app)->window)
-		gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
-
-/**
- * e_contact_editor_show:
- * @ce: The %EContactEditor object.
- *
- * Shows the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_show (EContactEditor *ce)
-{
-	gtk_widget_show (ce->app);
-}
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2)
-{
-	GtkWidget *widget = e_date_edit_new ();
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),
-					   TRUE);
-	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);
-	e_date_edit_set_time (E_DATE_EDIT (widget), -1);
-	return widget;
-}
-
-static void
-enable_widget (GtkWidget *widget, gboolean enabled)
-{
-	if (GTK_IS_ENTRY (widget)) {
-		gtk_entry_set_editable (GTK_ENTRY (widget), enabled);
-	}
-	else if (GTK_IS_TEXT (widget)) {
-		gtk_text_set_editable (GTK_TEXT (widget), enabled);
-	}
-	else if (GTK_IS_COMBO (widget)) {
-		gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (widget)->entry),
-					enabled);
-		gtk_widget_set_sensitive (GTK_COMBO (widget)->button, enabled);
-	}
-	else if (E_IS_DATE_EDIT (widget)) {
-		e_date_edit_set_editable (E_DATE_EDIT (widget), enabled);
-	}
-	else
-		gtk_widget_set_sensitive (widget, enabled);
-}
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 249640379b..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-
-#include "addressbook/gui/component/select-names/e-select-names-manager.h"
-#include "addressbook/backend/ebook/e-book.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 */
-	EBook *book;
-	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;
-
-	ESelectNamesManager *select_names_contacts;
-
-	ECardName *name;
-	char *company;
-
-	ECardSimpleEmailId email_choice;
-	ECardSimplePhoneId phone_choice[4];
-	ECardSimpleAddressId address_choice;
-	ECardSimpleAddressId address_mailing;
-	
-	GList *arbitrary_fields;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_card : 1;
-
-	/* Whether the card has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-
-	EList *writable_fields;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* card_added)    (EContactEditor *ce, EBookStatus status, ECard *card);
-	void (* card_modified) (EContactEditor *ce, EBookStatus status, ECard *card);
-	void (* card_deleted)  (EContactEditor *ce, EBookStatus status, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-EContactEditor *e_contact_editor_new             (EBook *book,
-						  ECard *card,
-						  gboolean is_new_card,
-						  gboolean editable);
-GtkType         e_contact_editor_get_type        (void);
-void            e_contact_editor_show            (EContactEditor *editor);
-void            e_contact_editor_close           (EContactEditor *editor);
-void            e_contact_editor_raise           (EContactEditor *editor);
-
-
-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-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
deleted file mode 100644
index f36d0b101e..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include "e-contact-editor.h"
-#include "e-contact-quick-add.h"
-#include "e-card-merging.h"
-
-typedef struct _QuickAdd QuickAdd;
-struct _QuickAdd {
-	gchar *name;
-	gchar *email;
-	ECard *card;
-
-	EContactQuickAddCallback cb;
-	gpointer closure;
-
-	GtkWidget *name_entry;
-	GtkWidget *email_entry;
-
-	gint refs;
-
-};
-
-static QuickAdd *
-quick_add_new (void)
-{
-	QuickAdd *qa = g_new0 (QuickAdd, 1);
-	qa->card = e_card_new ("");
-	qa->refs = 1;
-	return qa;
-}
-
-static void
-quick_add_ref (QuickAdd *qa)
-{
-	if (qa) {
-		++qa->refs;
-	}
-}
-
-static void
-quick_add_unref (QuickAdd *qa)
-{
-	if (qa) {
-		--qa->refs;
-		if (qa->refs == 0) {
-			g_free (qa->name);
-			g_free (qa->email);
-			gtk_object_unref (GTK_OBJECT (qa->card));
-			g_free (qa);
-		}
-	}
-}
-
-static void
-quick_add_set_name (QuickAdd *qa, const gchar *name)
-{
-	ECardSimple *simple;
-
-	if (name == qa->name)
-		return;
-
-	g_free (qa->name);
-	qa->name = g_strdup (name);
-
-	simple = e_card_simple_new (qa->card);
-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_FULL_NAME, name);
-	e_card_simple_sync_card (simple);
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-quick_add_set_email (QuickAdd *qa, const gchar *email)
-{
-	ECardSimple *simple;
-
-	if (email == qa->email)
-		return;
-
-	g_free (qa->email);
-	qa->email = g_strdup (email);
-
-	simple = e_card_simple_new (qa->card);
-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_EMAIL, email);
-	e_card_simple_sync_card (simple);
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-merge_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (book != NULL) {
-		e_card_merging_book_add_card (book, qa->card, NULL, NULL);
-		if (qa->cb)
-			qa->cb (qa->card, qa->closure);
-		gtk_object_unref (GTK_OBJECT (book));
-	} else {
-		/* Something went wrong. */
-		if (qa->cb)
-			qa->cb (NULL, qa->closure);
-	}
-	
-	quick_add_unref (qa);
-}
-
-static void
-quick_add_merge_card (QuickAdd *qa)
-{
-	EBook *book;
-
-	quick_add_ref (qa);
-
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, merge_cb, qa)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		merge_cb (book, E_BOOK_STATUS_OTHER_ERROR, qa);
-	}
-}
-
-
-/*
- * Raise a contact editor with all fields editable, and hook up all signals accordingly.
- */
-
-static void
-card_added_cb (EContactEditor *ce, EBookStatus status, ECard *card, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (ce), "quick_add");
-
-	if (qa) {
-
-		if (qa->cb)
-			qa->cb (qa->card, qa->closure);
-	
-		/* We don't need to unref qa because we set_data_full below */
-		gtk_object_set_data (GTK_OBJECT (ce), "quick_add", NULL);
-	}
-}
-
-static void
-editor_closed_cb (GtkWidget *w, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (w), "quick_add");
-
-	if (qa) {
-		/* We don't need to unref qa because we set_data_full below */
-		gtk_object_set_data (GTK_OBJECT (w), "quick_add", NULL);
-		gtk_object_unref (GTK_OBJECT (w));
-	}
-}
-
-static void
-ce_have_book (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (book == NULL) {
-		g_warning ("Couldn't open local address book.");
-		quick_add_unref (qa);
-	} else {
-		EContactEditor *contact_editor = e_contact_editor_new (book, qa->card, TRUE, TRUE /* XXX */);
-
-		/* mark it as changed so the Save buttons are enabled when we bring up the dialog. */
-		gtk_object_set (GTK_OBJECT(contact_editor),
-				"changed", TRUE,
-				NULL);
-
-		/* We pass this via object data, so that we don't get a dangling pointer referenced if both
-		   the "card_added" and "editor_closed" get emitted.  (Which, based on a backtrace in bugzilla,
-		   I think can happen and cause a crash. */
-		gtk_object_set_data_full (GTK_OBJECT (contact_editor), "quick_add", qa,
-					  (GtkDestroyNotify) quick_add_unref);
-
-		gtk_signal_connect (GTK_OBJECT (contact_editor),
-				    "card_added",
-				    GTK_SIGNAL_FUNC (card_added_cb),
-				    NULL);
-		gtk_signal_connect (GTK_OBJECT (contact_editor),
-				    "editor_closed",
-				    GTK_SIGNAL_FUNC (editor_closed_cb),
-				    NULL);
-
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-}
-
-static void
-edit_card (QuickAdd *qa)
-{
-	EBook *book;
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, ce_have_book, qa)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		ce_have_book (book, E_BOOK_STATUS_OTHER_ERROR, qa);
-	}
-}
-
-static void
-clicked_cb (GtkWidget *w, gint button, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	/* Get data out of entries. */
-	if (button == 0 || button == 1) {
-		gchar *name = NULL;
-		gchar *email = NULL;
-
-		if (qa->name_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->name_entry), 0, -1);
-			name = e_utf8_from_gtk_string (qa->name_entry, tmp);
-			g_free (tmp);
-		}
-
-		if (qa->email_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->email_entry), 0, -1);
-			email = e_utf8_from_gtk_string (qa->email_entry, tmp);
-			g_free (tmp);
-		}
-
-		quick_add_set_name (qa, name);
-		quick_add_set_email (qa, email);
-	
-		g_free (name);
-		g_free (email);
-	}
-
-	gtk_widget_destroy (w);
-
-	if (button == 0) {
-
-		/* OK */
-		quick_add_merge_card (qa);
-
-	} else if (button == 1) {
-		
-		/* EDIT FULL */
-		edit_card (qa);
-
-	} else {
-		/* CANCEL */
-		quick_add_unref (qa);
-	}
-
-}
-
-static GtkWidget *
-build_quick_add_dialog (QuickAdd *qa)
-{
-	GtkWidget *dialog;
-	GtkTable *table;
-	const gint xpad=1, ypad=1;
-
-	g_return_val_if_fail (qa != NULL, NULL);
-
-	dialog = gnome_dialog_new (_("Contact Quick-Add"),
-				   GNOME_STOCK_BUTTON_OK,
-				   _("Edit Full"),
-				   GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-
-	gtk_signal_connect (GTK_OBJECT (dialog),
-			    "clicked",
-			    clicked_cb,
-			    qa);
-
-	qa->name_entry = gtk_entry_new ();
-	if (qa->name) {
-		gchar *str = e_utf8_to_gtk_string (qa->name_entry, qa->name);
-		gtk_entry_set_text (GTK_ENTRY (qa->name_entry), str);
-		g_free (str);
-	}
-
-
-	qa->email_entry = gtk_entry_new ();
-	if (qa->email) {
-		gchar *str = e_utf8_to_gtk_string (qa->email_entry, qa->email);
-		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), str);
-		g_free (str);
-	}
-
-	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
-
-	gtk_table_attach (table, gtk_label_new (_("Full Name")),
-			  0, 1, 0, 1,
-			  0, 0, xpad, ypad);
-	gtk_table_attach (table, qa->name_entry,
-			  1, 2, 0, 1,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);
-	gtk_table_attach (table, gtk_label_new (_("E-mail")),
-			  0, 1, 1, 2,
-			  0, 0, xpad, ypad);
-	gtk_table_attach (table, qa->email_entry,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (table),
-			    TRUE, TRUE, 0);
-	gtk_widget_show_all (GTK_WIDGET (table));
-			  
-	
-	return dialog;
-}
-
-void
-e_contact_quick_add (const gchar *in_name, const gchar *email,
-		     EContactQuickAddCallback cb, gpointer closure)
-{
-	QuickAdd *qa;
-	GtkWidget *dialog;
-	gchar *name = NULL;
-	gint len;
-
-	/* We need to have *something* to work with. */
-	if (in_name == NULL && email == NULL) {
-		if (cb)
-			cb (NULL, closure);
-		return;
-	}
-
-	if (in_name) {
-		name = g_strdup (in_name);
-
-		/* Remove extra whitespace and the quotes some mailers put around names. */
-		g_strstrip (name);
-		len = strlen (name);
-		if ((name[0] == '\'' && name[len-1] == '\'') || (name[0] == '"' && name[len-1] == '"')) {
-			name[0] = ' ';
-			name[len-1] = ' ';
-		}
-		g_strstrip (name);
-	}
-
-	qa = quick_add_new ();
-	qa->cb = cb;
-	qa->closure = closure;
-	if (name)
-		quick_add_set_name (qa, name);
-	if (email)
-		quick_add_set_email (qa, email);
-
-	dialog = build_quick_add_dialog (qa);
-	gtk_widget_show_all (dialog);
-
-	g_free (name);
-}
-
-void
-e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure)
-{
-	gchar *name=NULL, *email=NULL;
-	const gchar *last_at, *s;
-	gboolean in_quote;
-
-	if (text == NULL) {
-		e_contact_quick_add (NULL, NULL, cb, closure);
-		return;
-	}
-
-	/* Look for things that look like e-mail addresses embedded in text */
-	in_quote = FALSE;
-	last_at = NULL;
-	for (s = text; *s; ++s) {
-		if (*s == '@' && !in_quote)
-			last_at = s;
-		else if (*s == '"')
-			in_quote = !in_quote;
-	}
-
-	
-	if (last_at == NULL) {
-		/* No at sign, so we treat it all as the name */
-		name = g_strdup (text);
-	} else {
-		gboolean bad_char = FALSE;
-		
-		/* walk backwards to whitespace or a < or a quote... */
-		while (last_at >= text && !bad_char
-		       && !(isspace ((gint) *last_at) || *last_at == '<' || *last_at == '"')) {
-			/* Check for some stuff that can't appear in a legal e-mail address. */
-			if (*last_at == '['
-			    || *last_at == ']'
-			    || *last_at == '('
-			    || *last_at == ')')
-				bad_char = TRUE;
-			--last_at;
-		}
-		if (last_at < text)
-			last_at = text;
-
-		/* ...and then split the text there */
-		if (!bad_char) {
-			if (text < last_at)
-				name = g_strndup (text, last_at-text);
-			email = g_strdup (last_at);
-		}
-	}
-
-	/* If all else has failed, make it the name. */
-	if (name == NULL && email == NULL) 
-		name = g_strdup (text);
-		
-
-
-	/* Clean up email, remove bracketing <>s */
-	if (email && *email) {
-		gboolean changed = FALSE;
-		g_strstrip (email);
-		if (*email == '<') {
-			*email = ' ';
-			changed = TRUE;
-		}
-		if (email[strlen (email)-1] == '>') {
-			email[strlen (email)-1] = ' ';
-			changed = TRUE;
-		}
-		if (changed)
-			g_strstrip (email);
-	}
-	
-
-	e_contact_quick_add (name, email, cb, closure);
-	g_free (name);
-	g_free (email);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
deleted file mode 100644
index 1bf69ee114..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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_CONTACT_QUICK_ADD_H__
-#define __E_CONTACT_QUICK_ADD_H__
-
-#include <addressbook/backend/ebook/e-card.h>
-
-typedef void (*EContactQuickAddCallback) (ECard *new_card, gpointer closure);
-
-void e_contact_quick_add (const gchar *name, const gchar *email, 
-			  EContactQuickAddCallback cb, gpointer closure);
-
-void e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure);
-
-#endif /* __E_CONTACT_QUICK_ADD_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 78994ea405..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-contact-save-as.h"
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <errno.h>
-#include <string.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-
-static int file_exists(GtkFileSelection *filesel, const char *filename);
-
-typedef struct {
-	GtkFileSelection *filesel;
-	char *vcard;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gint error = 0;
-	gint response = 0;
-	
-	const char *filename = gtk_file_selection_get_filename (info->filesel);
-
-	error = e_write_file (filename, info->vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-
-	if (error == EEXIST) {
-		response = file_exists(info->filesel, filename);
-		switch (response) {
-			case 0 : /* Overwrite */
-				e_write_file(filename, info->vcard, O_WRONLY | O_CREAT | O_TRUNC);
-				break;
-			case 1 : /* cancel */
-				return;
-		}
-	} else if (error != 0) {
-		GtkWidget *dialog;
-		char *str;
-
-		str = g_strdup_printf ("Error saving %s: %s", filename, strerror(errno));
-		dialog = gnome_message_box_new (str, GNOME_MESSAGE_BOX_ERROR, GNOME_STOCK_BUTTON_OK, NULL);
-		g_free (str);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (info->filesel));
-
-		gtk_widget_show (dialog);
-		
-		return;
-	}
-	
-	g_free (info->vcard);
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	g_free (info->vcard);
-	gtk_widget_destroy (GTK_WIDGET (info->filesel));
-	g_free (info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	g_free (info->vcard);
-	g_free (info);
-}
-
-static char *
-make_safe_filename (const char *prefix, char *name)
-{
-	char *safe, *p;
-
-	if (!name) {
-		/* This is a filename. Translators take note. */
-		name = _("card.vcf");
-	}
-
-	p = strrchr (name, '/');
-	if (p)
-		safe = g_strdup_printf ("%s%s%s", prefix, p, ".vcf");
-	else
-		safe = g_strdup_printf ("%s/%s%s", prefix, name, ".vcf");
-	
-	p = strrchr (safe, '/') + 1;
-	if (p)
-		e_filename_make_safe (p);
-	
-	return safe;
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	char *file;
-	char *name;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	gtk_object_get (GTK_OBJECT (card),
-			"file_as", &name,
-			NULL);
-	file = make_safe_filename (g_get_home_dir(), name);
-	gtk_file_selection_set_filename (filesel, file);
-	g_free (file);
-
-	info->filesel = filesel;
-	info->vcard = e_card_get_vcard(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));
-}
-
-void
-e_contact_list_save_as(char *title, GList *list)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	/* This is a filename. Translators take note. */
-	if (list && list->data && list->next == NULL) {
-		char *name, *file;
-		gtk_object_get (GTK_OBJECT (list->data),
-				"file_as", &name,
-				NULL);
-		file = make_safe_filename (g_get_home_dir(), name);
-		gtk_file_selection_set_filename (filesel, file);
-		g_free (file);
-	} else {
-		char *file;
-		file = make_safe_filename (g_get_home_dir(), _("list"));
-		gtk_file_selection_set_filename (filesel, file);
-		g_free (file);
-	}
-
-	info->filesel = filesel;
-	info->vcard = e_card_list_get_vcard (list);
-	
-	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));
-}
-
-static int
-file_exists(GtkFileSelection *filesel, const char *filename)
-{
-	GnomeDialog *dialog = NULL;
-	GtkWidget *label;
-	GladeXML *gui = NULL;
-	int result = 0;
-	char *string;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/file-exists.glade", NULL);
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "dialog-exists"));
-	
-	label = glade_xml_get_widget (gui, "label-exists");
-	if (GTK_IS_LABEL (label)) {
-		string = g_strdup_printf (_("%s already exists\nDo you want to overwrite it?"), filename);
-		gtk_label_set_text (GTK_LABEL (label), string);
-		g_free (string);
-	}
-
-	gnome_dialog_set_parent(dialog, GTK_WINDOW(filesel));
-
-	gtk_widget_show (GTK_WIDGET (dialog));
-	result = gnome_dialog_run_and_close(dialog);
-
-	g_free(gui);
-
-	return result;
-}
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 b97d25ee3a..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  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <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);
-void
-e_contact_list_save_as(gchar *title, GList *list);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/file-exists.glade b/addressbook/gui/contact-editor/file-exists.glade
deleted file mode 100644
index 7c457cb892..0000000000
--- a/addressbook/gui/contact-editor/file-exists.glade
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>File_exists.glade</name>
-  <program_name>file_exists.glade</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>GnomeDialog</class>
-  <name>dialog-exists</name>
-  <visible>False</visible>
-  <title>Confirm Overwrite</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>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Overwrite</label>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label-exists</name>
-      <label>Don't bother translating this string.  It's not used.</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>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index d66b9163e8..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,473 +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>
-</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>
-	<can_focus>True</can_focus>
-	<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>
-	  <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/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index 17be70647c..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>
-</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.
-Ms.
-Miss
-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/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index e6b46adb83..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.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@ximian.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, Ximian, 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_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE);
-	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-list-editor/.cvsignore b/addressbook/gui/contact-list-editor/.cvsignore
deleted file mode 100644
index 5eaae75530..0000000000
--- a/addressbook/gui/contact-list-editor/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.pure
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
deleted file mode 100644
index f710729826..0000000000
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/addressbook/gui/merging	\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_builddir)/shell			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-list-editor\"	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecontactlisteditor.a
-
-libecontactlisteditor_a_SOURCES = 		\
-	e-contact-list-editor.c			\
-	e-contact-list-editor.h			\
-	e-contact-list-model.c			\
-	e-contact-list-model.h
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 					\
-	contact-list-editor.glade
-
-EXTRA_DIST = $(glade_DATA)
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
deleted file mode 100644
index 92c6aa013f..0000000000
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>contact-list-editor</name>
-  <program_name>contact-list-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>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact list editor</name>
-  <title>contact-list-editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>426</default_width>
-  <default_height>304</default_height>
-  <allow_shrink>True</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>GtkVBox</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>vbox8</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox6</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label>List _name:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>list-name-entry</default_focus_target>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>list-name-entry</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>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts-plain.png</string1>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Sat, 23 Jun 2001 05:59:21 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame3</name>
-	<border_width>3</border_width>
-	<label>Members</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>hbox7</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label11</name>
-	      <label>Type an email address or drag a contact into the list below:</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>email-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>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>contact-list-table</name>
-	      <creation_function>e_contact_list_editor_create_table</creation_function>
-	      <string1></string1>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sat, 23 Jun 2001 06:00:16 GMT</last_modification_time>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>visible-addrs-checkbutton</name>
-	      <can_focus>True</can_focus>
-	      <label>_Hide addresses when sending mail to this list</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox10</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label>
-</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>GtkVButtonBox</class>
-	      <name>vbuttonbox4</name>
-	      <layout_style>GTK_BUTTONBOX_START</layout_style>
-	      <spacing>0</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-email-button</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>_Add</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>remove-button</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>_Remove</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
deleted file mode 100644
index c88af3005e..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ /dev/null
@@ -1,980 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-contact-list-editor.h"
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/widgets/e-unicode.h>
-#include "shell/evolution-shell-component-utils.h"
-
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-contact-list-model.h"
-
-/* Signal IDs */
-enum {
-	LIST_ADDED,
-	LIST_MODIFIED,
-	LIST_DELETED,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_list_editor_init		(EContactListEditor		 *editor);
-static void e_contact_list_editor_class_init	(EContactListEditorClass	 *klass);
-static void e_contact_list_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_list_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_list_editor_destroy (GtkObject *object);
-
-static void create_ui (EContactListEditor *ce);
-static void set_editable (EContactListEditor *editor);
-static void command_state_changed (EContactListEditor *editor);
-static void close_dialog (EContactListEditor *cle);
-static void extract_info(EContactListEditor *editor);
-static void fill_in_info(EContactListEditor *editor);
-
-static void add_email_cb (GtkWidget *w, EContactListEditor *editor);
-static void remove_entry_cb (GtkWidget *w, EContactListEditor *editor);
-static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);
-static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
-
-static gint app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
-static gboolean table_drag_drop_cb (ETable *table, int row, int col, GdkDragContext *context,
-				    gint x, gint y, guint time, EContactListEditor *editor);
-static gboolean table_drag_motion_cb (ETable *table, int row, int col, GdkDragContext *context,
-				      gint x, gint y, guint time, EContactListEditor *editor);
-static void table_drag_data_received_cb (ETable *table, int row, int col,
-					 GdkDragContext *context,
-					 gint x, gint y,
-					 GtkSelectionData *selection_data, guint info, guint time,
-					 EContactListEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_list_editor_signals[LAST_SIGNAL];
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD,
-};
-#define VCARD_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },
-};
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_CARD,
-	ARG_IS_NEW_LIST,
-	ARG_EDITABLE
-};
-
-GtkType
-e_contact_list_editor_get_type (void)
-{
-  static GtkType contact_list_editor_type = 0;
-
-  if (!contact_list_editor_type)
-    {
-      static const GtkTypeInfo contact_list_editor_info =
-      {
-        "EContactListEditor",
-        sizeof (EContactListEditor),
-        sizeof (EContactListEditorClass),
-        (GtkClassInitFunc) e_contact_list_editor_class_init,
-        (GtkObjectInitFunc) e_contact_list_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_list_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_list_editor_info);
-    }
-
-  return contact_list_editor_type;
-}
-
-
-typedef void (*GtkSignal_NONE__INT_OBJECT) (GtkObject * object,
-					    gint arg1,
-					    GtkObject *arg2,
-					    gpointer user_data);
-
-static void
-e_marshal_NONE__INT_OBJECT (GtkObject * object,
-			    GtkSignalFunc func,
-			    gpointer func_data, GtkArg * args)
-{
-	GtkSignal_NONE__INT_OBJECT rfunc;
-	rfunc = (GtkSignal_NONE__INT_OBJECT) func;
-	(*rfunc) (object,
-		  GTK_VALUE_INT (args[0]),
-		  GTK_VALUE_OBJECT (args[1]),
-		  func_data);
-}
-
-static void
-e_contact_list_editor_class_init (EContactListEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactListEditor::book", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_BOOK);
-  gtk_object_add_arg_type ("EContactListEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactListEditor::is_new_list", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_LIST);
-  gtk_object_add_arg_type ("EContactListEditor::editable", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_EDITABLE);
-
-  contact_list_editor_signals[LIST_ADDED] =
-	  gtk_signal_new ("list_added",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_added),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_list_editor_signals[LIST_MODIFIED] =
-	  gtk_signal_new ("list_modified",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_modified),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_list_editor_signals[LIST_DELETED] =
-	  gtk_signal_new ("list_deleted",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_deleted),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_list_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_list_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_list_editor_set_arg;
-  object_class->get_arg = e_contact_list_editor_get_arg;
-  object_class->destroy = e_contact_list_editor_destroy;
-}
-
-static void
-e_contact_list_editor_init (EContactListEditor *editor)
-{
-	GladeXML *gui;
-	GtkWidget *bonobo_win;
-	BonoboUIContainer *container;
-
-	editor->card = NULL;
-	editor->changed = FALSE;
-	editor->editable = TRUE;
-	editor->in_async_call = FALSE;
-	editor->is_new_list = FALSE;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL);
-	editor->gui = gui;
-
-	editor->app = glade_xml_get_widget (gui, "contact list editor");
-
-	editor->table = glade_xml_get_widget (gui, "contact-list-table");
-	editor->model = gtk_object_get_data (GTK_OBJECT(editor->table), "model");
-
-	editor->add_button = glade_xml_get_widget (editor->gui, "add-email-button");
-	editor->remove_button = glade_xml_get_widget (editor->gui, "remove-button");
-
-	editor->email_entry = glade_xml_get_widget (gui, "email-entry");
-	editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry");
-
-	editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-list-editor", _("Contact List Editor"));
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_list_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 (editor->app);
-		editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor->app));
-
-	editor->uic = bonobo_ui_component_new_default ();
-	if (!editor->uic) {
-		g_message ("e_contact_list_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (editor->uic,
-					   bonobo_object_corba_objref (
-								       BONOBO_OBJECT (container)));
-
-	create_ui (editor);
-
-	/* connect signals */
-	gtk_signal_connect (GTK_OBJECT(editor->add_button),
-			    "clicked", GTK_SIGNAL_FUNC(add_email_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->email_entry),
-			    "activate", GTK_SIGNAL_FUNC(add_email_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->remove_button),
-			    "clicked", GTK_SIGNAL_FUNC(remove_entry_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->list_name_entry),
-			    "changed", GTK_SIGNAL_FUNC(list_name_changed_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->visible_addrs_checkbutton),
-			    "toggled", GTK_SIGNAL_FUNC(visible_addrs_toggled_cb), editor);
-
-	e_table_drag_dest_set (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			       0, drag_types, num_drag_types, GDK_ACTION_LINK);
-
-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table))),
-			    "table_drag_motion", GTK_SIGNAL_FUNC(table_drag_motion_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table))),
-			    "table_drag_drop", GTK_SIGNAL_FUNC(table_drag_drop_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table))),
-			    "table_drag_data_received", GTK_SIGNAL_FUNC(table_drag_data_received_cb), editor);
-
-	command_state_changed (editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), editor);
-}
-
-static void
-e_contact_list_editor_destroy (GtkObject *object)
-{
-}
-
-typedef struct {
-	EContactListEditor *cle;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-list_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	e_card_set_id (cle->card, id);
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_ADDED],
-			 status, cle->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		cle->is_new_list = FALSE;
-
-		if (should_close)
-			close_dialog (cle);
-		else
-			command_state_changed (cle);
-	}
-
-	gtk_object_unref (GTK_OBJECT (cle));
-	g_free (ecs);
-}
-
-static void
-list_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_MODIFIED],
-			 status, cle->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		if (should_close)
-			close_dialog (cle);
-	}
-
-	gtk_object_unref (GTK_OBJECT (cle)); /* release ref held for ebook callback */
-	g_free (ecs);
-}
-
-static void
-save_card (EContactListEditor *cle, gboolean should_close)
-{
-	extract_info (cle);
-
-	if (cle->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->cle = cle;
-		gtk_object_ref (GTK_OBJECT (cle));
-		ecs->should_close = should_close;
-
-		if (cle->app)
-			gtk_widget_set_sensitive (cle->app, FALSE);
-		cle->in_async_call = TRUE;
-
-		if (cle->is_new_list)
-			e_book_add_card (cle->book, cle->card, GTK_SIGNAL_FUNC(list_added_cb), ecs);
-		else
-			e_book_commit_card (cle->book, cle->card, GTK_SIGNAL_FUNC(list_modified_cb), ecs);
-
-		cle->changed = FALSE;
-	}
-}
-
-static gboolean
-prompt_to_save_changes (EContactListEditor *editor)
-{
-	if (!editor->changed)
-		return TRUE;
-
-	switch (e_addressbook_prompt_save_dialog (GTK_WINDOW(editor->app))) {
-	case 0: /* Save */
-		save_card (editor, FALSE);
-		return TRUE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-	}
-}
-
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	if (!prompt_to_save_changes (cle))
-		return;
-
-	close_dialog (cle);
-}
-
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	save_card (cle, FALSE);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	e_contact_save_as(_("Save List as VCard"), cle->card);
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	e_card_send(cle->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	e_card_send(cle->card, E_CARD_DISPOSITION_AS_TO);
-}
-
-static void
-tb_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-	save_card (cle, TRUE);
-}
-
-static void
-list_deleted_cb (EBook *book, EBookStatus status, EContactListEditor *cle)
-{
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_DELETED],
-			 status, cle->card);
-
-	/* always close the dialog after we successfully delete a list */
-	if (status == E_BOOK_STATUS_SUCCESS)
-		close_dialog (cle);
-
-	gtk_object_unref (GTK_OBJECT (cle)); /* release reference held for callback */
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-	ECard *card = cle->card;
-
-	gtk_object_ref(GTK_OBJECT(card));
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(cle->app))) {
-
-		extract_info (cle);
-		
-		if (!cle->is_new_list) {
-			gtk_widget_set_sensitive (cle->app, FALSE);
-			cle->in_async_call = TRUE;
-			
-			gtk_object_ref (GTK_OBJECT (cle)); /* hold reference for callback */
-			e_book_remove_card (cle->book, card, GTK_SIGNAL_FUNC(list_deleted_cb), cle);
-		}
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorClose", file_close_cb),
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps[] = {
-	E_PIXMAP ("/commands/ContactListEditorSave", "save-16.png"),
-	E_PIXMAP ("/commands/ContactListEditorSaveClose", "save-16.png"),
-	E_PIXMAP ("/commands/ContactListEditorSaveAs", "save-as-16.png"),
-
-	E_PIXMAP ("/commands/ContactListEditorDelete", "evolution-trash-mini.png"),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	E_PIXMAP ("/commands/ContactListEditorPrint", "print.xpm"),
-	E_PIXMAP ("/commands/ContactListEditorPrintEnvelope", "print.xpm"),
-#endif
-	E_PIXMAP ("/Toolbar/ContactListEditorSaveClose", "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/ContactListEditorDelete", "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/ContactListEditorPrint", "buttons/print.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-create_ui (EContactListEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-list-editor.xml",
-			       "evolution-contact-list-editor");
-
-	e_pixmaps_update (ce->uic, pixmaps);
-}
-
-EContactListEditor *
-e_contact_list_editor_new (EBook *book,
-			   ECard *list_card,
-			   gboolean is_new_list,
-			   gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = E_CONTACT_LIST_EDITOR (gtk_type_new (E_CONTACT_LIST_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"book", book,
-			"card", list_card,
-			"is_new_list", is_new_list,
-			"editable", editable,
-			NULL);
-
-	return ce;
-}
-
-static void
-e_contact_list_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (editor->book)
-			gtk_object_unref(GTK_OBJECT(editor->book));
-		editor->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref (GTK_OBJECT (editor->book));
-		/* XXX more here about editable/etc. */
-		break;
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		fill_in_info(editor);
-		editor->changed = FALSE;
-		command_state_changed (editor);
-		break;
-
-	case ARG_IS_NEW_LIST: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->is_new_list != new_value);
-
-		editor->is_new_list = new_value;
-
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-
-	case ARG_EDITABLE: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-
-	}
-}
-
-static void
-e_contact_list_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(editor->book);
-		break;
-
-	case ARG_CARD:
-		extract_info(editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(editor->card);
-		break;
-
-	case ARG_IS_NEW_LIST:
-		GTK_VALUE_BOOL (*arg) = editor->is_new_list ? TRUE : FALSE;
-		break;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = editor->editable ? TRUE : FALSE;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-void
-e_contact_list_editor_show (EContactListEditor *editor)
-{
-	gtk_widget_show (editor->app);
-}
-
-void
-e_contact_list_editor_raise (EContactListEditor *editor)
-{
-	gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
-
-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\" selection-mode=\"single\"> \
- <ETableColumn model_col= \"0\" _title=\"Contact\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\" /> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping> </grouping>				       \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-GtkWidget *
-e_contact_list_editor_create_table(gchar *name,
-				   gchar *string1, gchar *string2,
-				   gint int1, gint int2);
-
-GtkWidget *
-e_contact_list_editor_create_table(gchar *name,
-				   gchar *string1, gchar *string2,
-				   gint int1, gint int2)
-{
-	
-	ETableModel *model;
-	GtkWidget *table;
-
-	model = e_contact_list_model_new ();
-
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-
-	return table;
-}
-
-static void
-add_email_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor->table));
-	char *text = gtk_entry_get_text (GTK_ENTRY(editor->email_entry));
-
-	if (text && *text) {
-		e_contact_list_model_add_email (E_CONTACT_LIST_MODEL(editor->model), text);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-	}
-
-	gtk_entry_set_text (GTK_ENTRY(editor->email_entry), "");
-
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-remove_row (int model_row, EContactListEditor *editor)
-{
-	e_contact_list_model_remove_row (E_CONTACT_LIST_MODEL (editor->model), model_row);
-}
-
-static void
-remove_entry_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	e_table_selected_row_foreach (e_table_scrolled_get_table(E_TABLE_SCROLLED(editor->table)),
-				      (EForeachFunc)remove_row, editor);
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-list_name_changed_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_editable (EContactListEditor *editor)
-{
-	gtk_widget_set_sensitive (editor->email_entry, editor->editable);
-	gtk_widget_set_sensitive (editor->list_name_entry, editor->editable);
-	gtk_widget_set_sensitive (editor->add_button, editor->editable);
-	gtk_widget_set_sensitive (editor->remove_button, editor->editable);
-	gtk_widget_set_sensitive (editor->table, editor->editable);
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactListEditor *cle)
-{
-	g_assert (cle->app != NULL);
-
-	gtk_widget_destroy (cle->app);
-	cle->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Callback used when the editor is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactListEditor *ce;
-
-	ce = E_CONTACT_LIST_EDITOR (data);
-
-	/* if we're in an async call, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (!prompt_to_save_changes (ce))
-		return TRUE;
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static gboolean
-table_drag_motion_cb (ETable *table, int row, int col,
-		      GdkDragContext *context,
-		      gint x, gint y, guint time, EContactListEditor *editor)
-{
-	GList *p;
-
-	for (p = context->targets; p != NULL; p = p->next) {
-		char *possible_type;
-
-		possible_type = gdk_atom_name ((GdkAtom) p->data);
-		if (!strcmp (possible_type, VCARD_TYPE)) {
-			g_free (possible_type);
-			gdk_drag_status (context, GDK_ACTION_LINK, time);
-			return TRUE;
-		}
-
-		g_free (possible_type);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-table_drag_drop_cb (ETable *table, int row, int col,
-		    GdkDragContext *context,
-		    gint x, gint y, guint time, EContactListEditor *editor)
-{
-	if (context->targets != NULL) {
-		gtk_drag_get_data (GTK_WIDGET (table), context,
-				   GPOINTER_TO_INT (context->targets->data),
-				   time);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-table_drag_data_received_cb (ETable *table, int row, int col,
-			     GdkDragContext *context,
-			     gint x, gint y,
-			     GtkSelectionData *selection_data,
-			     guint info, guint time, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor->table));
-	char *target_type;
-	gboolean changed = FALSE;
-
-	target_type = gdk_atom_name (selection_data->target);
-
-	if (!strcmp (target_type, VCARD_TYPE)) {
-
-		GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data->data, "ISO-8859-1");
-		GList *c;
-
-		for (c = card_list; c; c = c->next) {
-			ECard *ecard = c->data;
-
-			if (!e_card_evolution_list (ecard)) {
-				ECardSimple *simple = e_card_simple_new (ecard);
-
-				e_contact_list_model_add_card (E_CONTACT_LIST_MODEL (editor->model),
-							       simple);
-
-				gtk_object_unref (GTK_OBJECT (simple));
-
-				changed = TRUE;
-			}
-		}
-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);
-		g_list_free (card_list);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-	}
-
-	if (changed && !editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-command_state_changed (EContactListEditor *editor)
-{
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorSaveClose",
-				      "sensitive",
-				      editor->changed && editor->editable ? "1" : "0", NULL);
-
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorSave",
-				      "sensitive",
-				      editor->changed && editor->editable ? "1" : "0", NULL);
-
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorDelete",
-				      "sensitive",
-				      editor->editable && !editor->is_new_list ? "1" : "0", NULL);
-}
-
-static void
-extract_info(EContactListEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		int i;
-		EList *email_list;
-		EIterator *email_iter;
-		char *string = e_utf8_gtk_editable_get_chars(GTK_EDITABLE (editor->list_name_entry), 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       "file_as", string,
-				       "full_name", string,
-				       NULL);
-
-		g_free (string);
-
-		
-		gtk_object_set (GTK_OBJECT(card),
-				"list", GINT_TO_POINTER (TRUE),
-				"list_show_addresses",
-				GINT_TO_POINTER (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton))),
-				NULL);
-
-		gtk_object_get (GTK_OBJECT(card),
-				"email", &email_list,
-				NULL);
-
-		/* clear the email list */
-		email_iter = e_list_get_iterator (email_list);
-		e_iterator_last (email_iter);
-		while (e_iterator_is_valid (E_ITERATOR (email_iter))) {
-			e_iterator_delete (E_ITERATOR (email_iter));
-		}
-		gtk_object_unref (GTK_OBJECT (email_iter));
-
-		/* then refill it from the contact list model */
-		for (i = 0; i < e_table_model_row_count (editor->model); i ++) {
-			const EDestination *dest = e_contact_list_model_get_destination (E_CONTACT_LIST_MODEL (editor->model), i);
-			gchar *dest_xml = e_destination_export (dest);
-			if (dest_xml) {
-				e_list_append (email_list, dest_xml);
-			}
-			g_free (dest_xml);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactListEditor *editor)
-{
-	if (editor->card) {
-		char *file_as;
-		gboolean show_addresses = FALSE;
-		gboolean is_evolution_list = FALSE;
-		EList *email_list;
-		EIterator *email_iter;
-
-		gtk_object_get (GTK_OBJECT (editor->card),
-				"file_as", &file_as,
-				"email", &email_list,
-				"list", &is_evolution_list,
-				"list_show_addresses", &show_addresses,
-				NULL);
-
-		gtk_editable_delete_text (GTK_EDITABLE (editor->list_name_entry), 0, -1);
-		if (file_as) {
-			int position = 0;
-			gchar *u = e_utf8_to_gtk_string (editor->list_name_entry, file_as);
-			gtk_editable_insert_text (GTK_EDITABLE (editor->list_name_entry), u, strlen (u), &position);
-			g_free (u);
-		}
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton), !show_addresses);
-
-		e_contact_list_model_remove_all (E_CONTACT_LIST_MODEL (editor->model));
-
-		email_iter = e_list_get_iterator (email_list);
-		
-		while (e_iterator_is_valid (email_iter)) {
-			const char *dest_xml = e_iterator_get (email_iter);
-			EDestination *dest;
-
-			/* g_message ("incoming xml: [%s]", dest_xml); */
-			dest = e_destination_import (dest_xml);
-
-			if (dest != NULL) {
-				e_contact_list_model_add_destination (E_CONTACT_LIST_MODEL (editor->model), dest);
-			}
-
-			e_iterator_next (email_iter);
-		}
-	}
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
deleted file mode 100644
index 37f54df170..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.h
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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_LIST_EDITOR_H__
-#define __E_CONTACT_LIST_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_CONTACT_LIST_EDITOR_TYPE			(e_contact_list_editor_get_type ())
-#define E_CONTACT_LIST_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_LIST_EDITOR_TYPE, EContactListEditor))
-#define E_CONTACT_LIST_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_LIST_EDITOR_TYPE, EContactListEditorClass))
-#define E_IS_CONTACT_LIST_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_LIST_EDITOR_TYPE))
-#define E_IS_CONTACT_LIST_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_LIST_EDITOR_TYPE))
-
-
-typedef struct _EContactListEditor       EContactListEditor;
-typedef struct _EContactListEditorClass  EContactListEditorClass;
-
-struct _EContactListEditor
-{
-	GtkObject object;
-
-	/* item specific fields */
-	EBook *book;
-	ECard *card;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-
-	GladeXML *gui;
-	GtkWidget *app;
-
-	GtkWidget *table;
-	ETableModel *model;
-	GtkWidget *email_entry;
-	GtkWidget *list_name_entry;
-	GtkWidget *add_button;
-	GtkWidget *remove_button;
-	GtkWidget *visible_addrs_checkbutton;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_list : 1;
-
-	/* Whether the card has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-};
-
-struct _EContactListEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* list_added)    (EContactListEditor *cle, EBookStatus status, ECard *card);
-	void (* list_modified) (EContactListEditor *cle, EBookStatus status, ECard *card);
-	void (* list_deleted)  (EContactListEditor *cle, EBookStatus status, ECard *card);
-	void (* editor_closed) (EContactListEditor *cle);
-};
-
-EContactListEditor *e_contact_list_editor_new             (EBook *book,
-							   ECard *list_card,
-							   gboolean is_new_list,
-							   gboolean editable);
-GtkType             e_contact_list_editor_get_type        (void);
-void                e_contact_list_editor_show            (EContactListEditor *editor);
-void                e_contact_list_editor_raise           (EContactListEditor *editor);
-
-gboolean            e_contact_list_editor_confirm_delete  (GtkWindow      *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_LIST_EDITOR_H__ */
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
deleted file mode 100644
index c4321c2820..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include "e-contact-list-model.h"
-
-#define PARENT_TYPE e_table_model_get_type()
-static ETableModelClass *parent_class;
-
-#define COLS 1
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-contact_list_col_count (ETableModel *etc)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-contact_list_row_count (ETableModel *etc)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
-	return model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-contact_list_value_at (ETableModel *etc, int col, int row)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
-
-	return (void *) e_destination_get_address (model->data[row]);
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-contact_list_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	/* nothing */
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-contact_list_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-contact_list_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-contact_list_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-contact_list_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-contact_list_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-contact_list_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-contact_list_model_destroy (GtkObject *o)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (o);
-	int i;
-
-	for (i = 0; i < model->data_count; i ++) {
-		gtk_object_unref (GTK_OBJECT (model->data[i]));
-	}
-	g_free (model->data);
-
-	model->data_count = 0;
-	model->data_alloc = 0;
-}
-
-static void
-e_contact_list_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = contact_list_model_destroy;
-
-	model_class->column_count = contact_list_col_count;
-	model_class->row_count = contact_list_row_count;
-	model_class->value_at = contact_list_value_at;
-	model_class->set_value_at = contact_list_set_value_at;
-	model_class->is_cell_editable = contact_list_is_cell_editable;
-	model_class->duplicate_value = contact_list_duplicate_value;
-	model_class->free_value = contact_list_free_value;
-	model_class->initialize_value = contact_list_initialize_value;
-	model_class->value_is_empty = contact_list_value_is_empty;
-	model_class->value_to_string = contact_list_value_to_string;
-}
-
-static void
-e_contact_list_model_init (GtkObject *object)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL(object);
-
-	model->data_alloc = 10;
-	model->data_count = 0;
-	model->data = g_new (EDestination*, model->data_alloc);
-}
-
-GtkType
-e_contact_list_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EContactListModel",
-			sizeof (EContactListModel),
-			sizeof (EContactListModelClass),
-			(GtkClassInitFunc) e_contact_list_model_class_init,
-			(GtkObjectInitFunc) e_contact_list_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-void
-e_contact_list_model_construct (EContactListModel *model)
-{
-}
-
-ETableModel *
-e_contact_list_model_new ()
-{
-	EContactListModel *model;
-
-	model = gtk_type_new (e_contact_list_model_get_type ());
-
-	e_contact_list_model_construct (model);
-
-	return E_TABLE_MODEL(model);
-}
-
-void
-e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_DESTINATION (dest));
-
-	if (model->data_count + 1 >= model->data_alloc) {
-		model->data_alloc *= 2;
-		model->data = g_renew (EDestination*, model->data, model->data_alloc);
-	}
-
-	model->data[model->data_count ++] = dest;
-	gtk_object_ref (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-void
-e_contact_list_model_add_email (EContactListModel *model,
-				const char *email)
-{
-	EDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (email != NULL);
-
-	new_dest = e_destination_new ();
-	e_destination_set_email (new_dest, email);
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_add_card (EContactListModel *model,
-			       ECardSimple *simple)
-{
-	EDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_CARD_SIMPLE (simple));
-
-	new_dest = e_destination_new ();
-	e_destination_set_card (new_dest, simple->card, 0); /* Hard-wired for default e-mail */
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_remove_row (EContactListModel *model, int row)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (0 <= row && row < model->data_count);
-
-	gtk_object_unref (GTK_OBJECT (model->data[row]));
-	memmove (model->data + row, model->data + row + 1, sizeof (EDestination*) * (model->data_count - row - 1));
-	model->data_count --;
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-void
-e_contact_list_model_remove_all (EContactListModel *model)
-{
-	int i;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-
-	for (i = 0; i < model->data_count; i ++) {
-		gtk_object_unref (GTK_OBJECT (model->data[i]));
-		model->data[i] = NULL;
-	}
-
-	model->data_count = 0;
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-const EDestination *
-e_contact_list_model_get_destination (EContactListModel *model, int row)
-{
-	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= row && row < model->data_count, NULL);
-
-	return model->data[row];
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
deleted file mode 100644
index 1c2d6ac8d0..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CONTACT_LIST_MODEL_H_
-#define _E_CONTACT_LIST_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"
-#include "addressbook/backend/ebook/e-destination.h"
-
-#define E_CONTACT_LIST_MODEL_TYPE        (e_contact_list_model_get_type ())
-#define E_CONTACT_LIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CONTACT_LIST_MODEL_TYPE, EContactListModel))
-#define E_CONTACT_LIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CONTACT_LIST_MODEL_TYPE, EContactListModelClass))
-#define E_IS_CONTACT_LIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CONTACT_LIST_MODEL_TYPE))
-#define E_IS_CONTACT_LIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CONTACT_LIST_MODEL_TYPE))
-
-typedef struct _EContactListModel EContactListModel;
-typedef struct _EContactListModelClass EContactListModelClass;
-
-struct _EContactListModel {
-	ETableModel parent;
-
-	EDestination **data;
-	int data_count;
-	int data_alloc;
-};
-
-
-struct _EContactListModelClass {
-	ETableModelClass parent_class;
-};
-
-
-GtkType      e_contact_list_model_get_type (void);
-void         e_contact_list_model_construct (EContactListModel *model);
-ETableModel *e_contact_list_model_new (void);
-
-void         e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest);
-void         e_contact_list_model_add_email       (EContactListModel *model, const char *email);
-void         e_contact_list_model_add_card        (EContactListModel *model, ECardSimple *simple);
-
-void	     e_contact_list_model_remove_row (EContactListModel *model, int row);
-void         e_contact_list_model_remove_all (EContactListModel *model);
-
-const EDestination *e_contact_list_model_get_destination (EContactListModel *model, int row);
-
-#endif /* _E_CONTACT_LIST_MODEL_H_ */
diff --git a/addressbook/gui/merging/.cvsignore b/addressbook/gui/merging/.cvsignore
deleted file mode 100644
index d6c55c7345..0000000000
--- a/addressbook/gui/merging/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
deleted file mode 100644
index 7df0ac4fcc..0000000000
--- a/addressbook/gui/merging/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-card-gui\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecardmerging.a
-
-libecardmerging_a_SOURCES =			\
-	e-card-merging.c			\
-	e-card-merging.h
-
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = 	e-card-duplicate-detected.glade	\
-		e-card-merging-book-commit-duplicate-detected.glade
-
-EXTRA_DIST = 			\
-	 $(glade_DATA)
diff --git a/addressbook/gui/merging/e-card-duplicate-detected.glade b/addressbook/gui/merging/e-card-duplicate-detected.glade
deleted file mode 100644
index bc6624e8fd..0000000000
--- a/addressbook/gui/merging/e-card-duplicate-detected.glade
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-card-duplicate-detected</name>
-  <program_name>e-card-duplicate-detected</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>GnomeDialog</class>
-  <name>dialog-duplicate-contact</name>
-  <title>Duplicate Contact Detected</title>
-  <type>GTK_WINDOW_POPUP</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>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Add Anyway</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</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>table1</name>
-      <rows>5</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>Custom</class>
-	<name>custom-old-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<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>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>The name or email address of this contact already exists
-in this folder.  Would you like to add it anyway?</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>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>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Original Contact:</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>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>GtkLabel</class>
-	<name>label4</name>
-	<label>New Contact:</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>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>Custom</class>
-	<name>custom-new-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<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>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment1</name>
-	<xalign>0.5</xalign>
-	<yalign>0</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>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>Custom</class>
-	  <name>custom2</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 08 Jun 2001 00:18:39 GMT</last_modification_time>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
deleted file mode 100644
index 0bc60ba13a..0000000000
--- a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-card-merging-book-commit-duplicate-detected</name>
-  <program_name>e-card-merging-book-commit-duplicate-detected</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>GnomeDialog</class>
-  <name>dialog-duplicate-contact</name>
-  <title>Duplicate Contact Detected</title>
-  <type>GTK_WINDOW_POPUP</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>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Change Anyway</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</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>table1</name>
-      <rows>5</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>Custom</class>
-	<name>custom-old-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<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>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>The changed email or name of this contact already
-exists in this folder.  Would you like to add it anyway?</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>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>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Conflicting Contact:</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>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>GtkLabel</class>
-	<name>label4</name>
-	<label>Changed Contact:</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>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>Custom</class>
-	<name>custom-new-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<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>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment1</name>
-	<xalign>0.5</xalign>
-	<yalign>0</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>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>Custom</class>
-	  <name>custom2</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 08 Jun 2001 00:18:39 GMT</last_modification_time>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c
deleted file mode 100644
index b9aacabde7..0000000000
--- a/addressbook/gui/merging/e-card-merging.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Code for checking for duplicates when doing ECard work.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- */
-
-#include <config.h>
-
-#include "e-card-merging.h"
-#include <libgnomeui/gnome-dialog.h>
-#include "e-card-compare.h"
-#include <glade/glade.h>
-#include <gtk/gtksignal.h>
-#include "addressbook/gui/widgets/e-minicard-widget.h"
-
-typedef enum {
-	E_CARD_MERGING_ADD,
-	E_CARD_MERGING_COMMIT
-} ECardMergingOpType;
-
-typedef struct {
-	ECardMergingOpType op;
-	EBook *book;
-	ECard *card;
-	EBookIdCallback id_cb;
-	EBookCallback   cb;
-	gpointer closure;
-} ECardMergingLookup;
-
-static void
-doit (ECardMergingLookup *lookup)
-{
-	if (lookup->op == E_CARD_MERGING_ADD)
-		e_book_add_card (lookup->book, lookup->card, lookup->id_cb, lookup->closure);
-	else if (lookup->op == E_CARD_MERGING_COMMIT)
-		e_book_commit_card (lookup->book, lookup->card, lookup->cb, lookup->closure);
-}
-
-static void
-cancelit (ECardMergingLookup *lookup)
-{
-	if (lookup->op == E_CARD_MERGING_ADD) {
-		if (lookup->id_cb)
-			lookup->id_cb (lookup->book, E_BOOK_STATUS_CANCELLED, NULL, lookup->closure);
-	} else if (lookup->op == E_CARD_MERGING_COMMIT) {
-		if (lookup->cb)
-			lookup->cb (lookup->book, E_BOOK_STATUS_CANCELLED, lookup->closure);
-	}
-}
-
-static void
-clicked (GnomeDialog *dialog, int button, ECardMergingLookup *lookup)
-{
-	switch (button) {
-	case 0:
-		doit (lookup);
-		break;
-	case 1:
-		cancelit (lookup);
-		break;
-	}
-	g_free (lookup);
-	gnome_dialog_close (dialog);
-}
-
-static void
-match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer closure)
-{
-	ECardMergingLookup *lookup = closure;
-
-	if ((gint) type <= (gint) E_CARD_MATCH_VAGUE) {
-		doit (lookup);
-		g_free (lookup);
-	} else {
-		GladeXML *ui;
-		
-		GtkWidget *widget;
-
-		if (lookup->op == E_CARD_MERGING_ADD)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL);
-		else if (lookup->op == E_CARD_MERGING_COMMIT)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL);
-		else {
-			doit (lookup);
-			g_free (lookup);
-			return;
-		}
-
-		widget = glade_xml_get_widget (ui, "custom-old-card");
-		gtk_object_set (GTK_OBJECT (widget),
-				"card", match,
-				NULL);
-
-		widget = glade_xml_get_widget (ui, "custom-new-card");
-		gtk_object_set (GTK_OBJECT (widget),
-				"card", card,
-				NULL);
-
-		widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");
-
-		gtk_signal_connect (GTK_OBJECT (widget), "clicked",
-				    GTK_SIGNAL_FUNC (clicked), lookup);
-	}
-}
-
-gboolean
-e_card_merging_book_add_card (EBook           *book,
-			      ECard           *card,
-			      EBookIdCallback  cb,
-			      gpointer         closure)
-{
-	ECardMergingLookup *lookup;
-
-	lookup = g_new (ECardMergingLookup, 1);
-
-	lookup->op = E_CARD_MERGING_ADD;
-	lookup->book = book;
-	lookup->card = card;
-	lookup->id_cb = cb;
-	lookup->closure = closure;
-
-	e_card_locate_match_full (book, card, NULL, match_query_callback, lookup);
-
-	return TRUE;
-}
-
-gboolean
-e_card_merging_book_commit_card (EBook                 *book,
-				 ECard                 *card,
-				 EBookCallback          cb,
-				 gpointer               closure)
-{
-	ECardMergingLookup *lookup;
-	GList *avoid;
-	
-	lookup = g_new (ECardMergingLookup, 1);
-
-	lookup->op = E_CARD_MERGING_COMMIT;
-	lookup->book = book;
-	lookup->card = card;
-	lookup->cb = cb;
-	lookup->closure = closure;
-
-	avoid = g_list_append (NULL, card);
-
-	e_card_locate_match_full (book, card, avoid, match_query_callback, lookup);
-
-	g_list_free (avoid);
-
-	return TRUE;
-}
-
-GtkWidget *
-e_card_merging_create_old_card(gchar *name,
-			       gchar *string1, gchar *string2,
-			       gint int1, gint int2);
-
-GtkWidget *
-e_card_merging_create_old_card(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2)
-{
-	return e_minicard_widget_new ();
-}
diff --git a/addressbook/gui/merging/e-card-merging.h b/addressbook/gui/merging/e-card-merging.h
deleted file mode 100644
index c4d9483beb..0000000000
--- a/addressbook/gui/merging/e-card-merging.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- */
-
-#ifndef __E_CARD_MERGING_H__
-#define __E_CARD_MERGING_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-book.h>
-
-BEGIN_GNOME_DECLS
-
-gboolean  e_card_merging_book_add_card     (EBook           *book,
-					    ECard           *card,
-					    EBookIdCallback  cb,
-					    gpointer         closure);
-gboolean  e_card_merging_book_commit_card  (EBook           *book,
-					    ECard           *card,
-					    EBookCallback    cb,
-					    gpointer         closure);
-
-END_GNOME_DECLS
-
-#endif /* ! __E_CARD_MERGING_H__ */
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 db4117c785..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			\
-	-I$(top_builddir)/shell				\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(EVOLUTION_ADDRESSBOOK_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 4ee23af613..0000000000
--- a/addressbook/gui/search/addresstypes.xml
+++ /dev/null
@@ -1,83 +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="category">
-  <title>Category</title>
-   <input type="optionlist" name="category-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "category" ${category})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "category" ${category}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "category" ${category})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "category" ${category}))</code>
-    </option>
-   </input>
-   <input type="string" name="category"/>
- </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 2dbe9b1e7a..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-
-#include "e-addressbook-search-dialog.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_destroy       (GtkObject *object);
-
-static GnomeDialog *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;
-
-	object_class = (GtkObjectClass*) 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->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, int button, EAddressbookSearchDialog *dialog)
-{
-	char *query;
-
-	if (button == 0) {
-		query = get_query(dialog);
-		gtk_object_set(GTK_OBJECT(dialog->view),
-			       "query", query,
-			       NULL);
-		g_free(query);
-	}
-
-	gnome_dialog_close(GNOME_DIALOG (dialog));
-}
-
-static void
-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
-{
-	GnomeDialog *dialog = GNOME_DIALOG (view);
-
-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (view), 550, 400);
-	gtk_window_set_title(GTK_WINDOW(view), _("Advanced Search"));
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, TRUE, TRUE, 0);
-	gtk_widget_show(view->search);
-
-	gnome_dialog_append_buttons(dialog,
-				    _("Search"),
-				    GNOME_STOCK_BUTTON_CLOSE, NULL);
-	
-	gnome_dialog_set_default(dialog, 0);
-
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   GTK_SIGNAL_FUNC(button_press), view);
-}
-
-GtkWidget *
-e_addressbook_search_dialog_new (EAddressbookView *addr_view)
-{
-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());
-	view->view = addr_view;
-	return GTK_WIDGET(view);
-}
-
-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 a8c4067d29..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <ebook/e-book.h>
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <libgnomeui/gnome-dialog.h>
-
-#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;
-
-	EAddressbookView *view;
-
-	RuleContext *context;
-	FilterRule *rule;
-};
-
-struct _EAddressbookSearchDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkType    e_addressbook_search_dialog_get_type (void);
-
-GtkWidget *e_addressbook_search_dialog_new (EAddressbookView *view);
-
-#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 fe1b29d7c6..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,132 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-minicard\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/addressbook/gui/component	\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeminicard.a
-
-libeminicard_a_SOURCES =			\
-	e-addressbook-reflow-adapter.c		\
-	e-addressbook-reflow-adapter.h		\
-	e-addressbook-table-adapter.c		\
-	e-addressbook-table-adapter.h		\
-	e-addressbook-model.c			\
-	e-addressbook-model.h			\
-	e-addressbook-util.c			\
-	e-addressbook-util.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				\
-	gal-view-factory-minicard.c		\
-	gal-view-factory-minicard.h		\
-	gal-view-minicard.c			\
-	gal-view-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 =				\
-#	 libeminicard.a					\
-#	 $(EVOLUTION_ADDRESSBOOK_LIBS)			\
-#	 $(top_builddir)/e-util/libeutil.la
-#
-#minicard_test_SOURCES = 	\
-#	 test-minicard.c
-#
-#minicard_test_LDADD =							\
-#	 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/gui/contact-editor/libecontacteditor.a \
-#	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
-#	 libeminicard.a
-#
-#reflow_test_SOURCES = 	\
-#	 test-reflow.c
-#
-#reflow_test_LDADD =							\
-#	 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				\
-#	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-#minicard_view_test_SOURCES = 	\
-#	test-minicard-view.c
-
-#minicard_view_test_LDADD =						\
-#	$(EVOLUTION_ADDRESSBOOK_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 =						\
-#	 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/gui/contact-editor/libecontacteditor.a \
-#	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
-#	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-#	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = 
-
-EXTRA_DIST = 			\
-	$(glade_DATA)
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index 5647e1d88e..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 1999 Ximian, 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>
-#include <gal/widgets/e-gui-utils.h>
-#include "e-addressbook-util.h"
-
-#define PARENT_TYPE gtk_object_get_type()
-GtkObjectClass *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,
-};
-
-enum {
-	WRITABLE_STATUS,
-	STATUS_MESSAGE,
-	FOLDER_BAR_MESSAGE,
-	CARD_ADDED,
-	CARD_REMOVED,
-	CARD_CHANGED,
-	MODEL_CHANGED,
-	STOP_STATE_CHANGED,
-	LAST_SIGNAL
-};
-
-#define COLS (E_CARD_SIMPLE_FIELD_LAST)
-
-static guint e_addressbook_model_signals [LAST_SIGNAL] = {0, };
-
-static void
-free_data (EAddressbookModel *model)
-{
-	int i;
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-
-	g_free(model->data);
-	model->data = NULL;
-	model->data_count = 0;
-	model->allocated_count = 0;
-}
-
-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);
-	if (model->book_view && model->status_message_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->status_message_id);
-	if (model->book_view && model->sequence_complete_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->sequence_complete_id);
-
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-	model->status_message_id = 0;
-	model->sequence_complete_id = 0;
-
-	model->search_in_progress = FALSE;
-
-	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);
-
-	if (model->get_view_idle) {
-		g_source_remove(model->get_view_idle);
-		model->get_view_idle = 0;
-	}
-
-	remove_book_view(model);
-	free_data (model);
-
-	if (model->book) {
-		if (model->writable_status_id)
-			gtk_signal_disconnect(GTK_OBJECT (model->book),
-					      model->writable_status_id);
-
-		model->writable_status_id = 0;
-
-		gtk_object_unref(GTK_OBJECT(model->book));
-		model->book = NULL;
-	}
-}
-
-static void
-update_folder_bar_message (EAddressbookModel *model)
-{
-	int count;
-	char *message;
-
-	count = model->data_count;
-
-	switch (count) {
-	case 0:
-		message = g_strdup (_("No cards"));
-		break;
-	case 1:
-		message = g_strdup (_("1 card"));
-		break;
-	default:
-		message = g_strdup_printf (_("%d cards"), count);
-		break;
-	}
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [FOLDER_BAR_MESSAGE],
-			 message);
-
-	g_free (message);
-}
-
-static void
-create_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	int old_count = model->data_count;
-	int length = g_list_length ((GList *)cards);
-
-	if (model->data_count + length > model->allocated_count) {
-		while (model->data_count + length > model->allocated_count)
-			model->allocated_count = model->allocated_count * 2 + 1;
-		model->data = g_renew(ECard *, model->data, model->allocated_count);
-	}
-
-	for ( ; cards; cards = cards->next) {
-		model->data[model->data_count++] = cards->data;
-		gtk_object_ref (cards->data);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [CARD_ADDED],
-			 old_count, model->data_count - old_count);
-
-	update_folder_bar_message (model);
-}
-
-static void
-remove_card(EBookView *book_view,
-	    const char *id,
-	    EAddressbookModel *model)
-{
-	int i;
-
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_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 *));
-			model->data_count--;
-
-			gtk_signal_emit (GTK_OBJECT (model),
-					 e_addressbook_model_signals [CARD_REMOVED],
-					 i);
-			update_folder_bar_message (model);
-			break;
-		}
-	}
-}
-
-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_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_duplicate(E_CARD(cards->data));
-				gtk_signal_emit (GTK_OBJECT (model),
-						 e_addressbook_model_signals [CARD_CHANGED],
-						 i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-status_message (EBookView *book_view,
-		char* status,
-		EAddressbookModel *model)
-{
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-sequence_complete (EBookView *book_view,
-		   EAddressbookModel *model)
-{
-	model->search_in_progress = FALSE;
-	status_message (book_view, NULL, model);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-}
-
-static void
-writable_status (EBook *book,
-		 gboolean writable,
-		 EAddressbookModel *model)
-{
-	if (!model->editable_set) {
-		model->editable = writable;
-
-		gtk_signal_emit (GTK_OBJECT (model),
-				 e_addressbook_model_signals [WRITABLE_STATUS],
-				 writable);
-	}
-}
-
-static void
-e_addressbook_model_class_init (GtkObjectClass *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);
-
-	e_addressbook_model_signals [WRITABLE_STATUS] =
-		gtk_signal_new ("writable_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, writable_status),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1, GTK_TYPE_BOOL);
-
-	e_addressbook_model_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_model_signals [FOLDER_BAR_MESSAGE] =
-		gtk_signal_new ("folder_bar_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, folder_bar_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_model_signals [CARD_ADDED] =
-		gtk_signal_new ("card_added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_added),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_addressbook_model_signals [CARD_REMOVED] =
-		gtk_signal_new ("card_removed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_removed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_addressbook_model_signals [CARD_CHANGED] =
-		gtk_signal_new ("card_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_addressbook_model_signals [MODEL_CHANGED] =
-		gtk_signal_new ("model_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, model_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_addressbook_model_signals [STOP_STATE_CHANGED] =
-		gtk_signal_new ("stop_state_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, stop_state_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_addressbook_model_signals, LAST_SIGNAL);
-}
-
-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->status_message_id = 0;
-	model->writable_status_id = 0;
-	model->sequence_complete_id = 0;
-	model->data = NULL;
-	model->data_count = 0;
-	model->allocated_count = 0;
-	model->search_in_progress = FALSE;
-	model->editable = FALSE;
-	model->editable_set = FALSE;
-	model->first_get_view = TRUE;
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EAddressbookModel *model = closure;
-
-	remove_book_view(model);
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (_("Error getting book view"), status);
-		return;
-	}
-
-	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);
-	model->status_message_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						      "status_message",
-						      GTK_SIGNAL_FUNC(status_message),
-						      model);
-	model->sequence_complete_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-							 "sequence_complete",
-							 GTK_SIGNAL_FUNC(sequence_complete),
-							 model);
-
-	free_data (model);
-
-	model->search_in_progress = TRUE;
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [MODEL_CHANGED]);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-}
-
-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 (capabilities && strstr (capabilities, "local")) {
-				e_book_get_book_view (model->book, model->query, book_view_loaded, model);
-			} else {
-				remove_book_view(model);
-				free_data (model);
-				gtk_signal_emit (GTK_OBJECT (model),
-						 e_addressbook_model_signals [MODEL_CHANGED]);
-				gtk_signal_emit (GTK_OBJECT (model),
-						 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-			}
-			model->first_get_view = FALSE;
-			g_free (capabilities);
-		}
-		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 && 0 <= row && row < model->data_count) {
-		ECard *card;
-		card = e_card_duplicate (model->data[row]);
-		return card;
-	}
-	return NULL;
-}
-
-const ECard *
-e_addressbook_model_peek_card(EAddressbookModel *model,
-			      int                row)
-{
-	if (model->data && 0 <= row && row < model->data_count) {
-		return model->data[row];
-	}
-	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) {
-			if (model->writable_status_id)
-				gtk_signal_disconnect(GTK_OBJECT (model->book),
-						      model->writable_status_id);
-
-			model->writable_status_id = 0;
-
-			gtk_object_unref(GTK_OBJECT(model->book));
-		}
-		model->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		if (model->book) {
-			model->first_get_view = TRUE;
-			gtk_object_ref(GTK_OBJECT(model->book));
-			if (model->get_view_idle == 0)
-				model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-			gtk_signal_connect (GTK_OBJECT(model->book),
-					    "writable_status",
-					    writable_status, 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);
-		model->editable_set = TRUE;
-		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;
-}
-
-EAddressbookModel*
-e_addressbook_model_new (void)
-{
-	EAddressbookModel *et;
-
-	et = gtk_type_new (e_addressbook_model_get_type ());
-	
-	return et;
-}
-
-void   e_addressbook_model_stop    (EAddressbookModel *model)
-{
-	remove_book_view(model);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STATUS_MESSAGE],
-			 "Search Interrupted.");
-}
-
-gboolean
-e_addressbook_model_can_stop (EAddressbookModel *model)
-{
-	return model->search_in_progress;
-}
-
-void
-e_addressbook_model_force_folder_bar_message (EAddressbookModel *model)
-{
-	update_folder_bar_message (model);
-}
-
-int
-e_addressbook_model_card_count (EAddressbookModel *model)
-{
-	return model->data_count;
-}
-
-ECard *
-e_addressbook_model_card_at (EAddressbookModel *model, int index)
-{
-	return model->data[index];
-}
-
-gboolean
-e_addressbook_model_editable (EAddressbookModel *model)
-{
-	return model->editable;
-}
-
-EBook *
-e_addressbook_model_get_ebook (EAddressbookModel *model)
-{
-	return model->book;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
deleted file mode 100644
index 5e018388b8..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,78 +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 "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))
-
-typedef struct _EAddressbookModel EAddressbookModel;
-typedef struct _EAddressbookModelClass EAddressbookModelClass;
-
-struct _EAddressbookModel {
-	GtkObject parent;
-
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	ECard **data;
-	int data_count;
-	int allocated_count;
-
-	int create_card_id, remove_card_id, modify_card_id, status_message_id, writable_status_id, sequence_complete_id;
-
-	guint search_in_progress : 1;
-	guint editable : 1;
-	guint editable_set : 1;
-	guint first_get_view : 1;
-};
-
-
-struct _EAddressbookModelClass {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*writable_status)    (EAddressbookModel *model, gboolean writable);
-	void (*status_message)     (EAddressbookModel *model, const gchar *message);
-	void (*folder_bar_message) (EAddressbookModel *model, const gchar *message);
-	void (*card_added)         (EAddressbookModel *model, gint index, gint count);
-	void (*card_removed)       (EAddressbookModel *model, gint index);
-	void (*card_changed)       (EAddressbookModel *model, gint index);
-	void (*model_changed)      (EAddressbookModel *model);
-	void (*stop_state_changed) (EAddressbookModel *model);
-};
-
-
-GtkType            e_addressbook_model_get_type                  (void);
-EAddressbookModel *e_addressbook_model_new                       (void);
-
-/* Returns object with ref count of 1. */
-ECard             *e_addressbook_model_get_card                  (EAddressbookModel *model,
-								  int                row);
-const ECard       *e_addressbook_model_peek_card                 (EAddressbookModel *model,
-								  int                row);
-EBook             *e_addressbook_model_get_ebook                 (EAddressbookModel *model);
-
-void               e_addressbook_model_stop                      (EAddressbookModel *model);
-gboolean           e_addressbook_model_can_stop                  (EAddressbookModel *model);
-
-void               e_addressbook_model_force_folder_bar_message  (EAddressbookModel *model);
-
-int                e_addressbook_model_card_count                (EAddressbookModel *model);
-ECard             *e_addressbook_model_card_at                   (EAddressbookModel *model,
-								  int                index);
-gboolean           e_addressbook_model_editable                  (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_MODEL_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
deleted file mode 100644
index 16e61a2d89..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ /dev/null
@@ -1,472 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#include <config.h>
-
-#include "e-addressbook-reflow-adapter.h"
-#include "e-addressbook-model.h"
-#include "e-addressbook-view.h"
-#include "e-addressbook-util.h"
-
-#include <gal/util/e-i18n.h>
-
-#include "e-minicard.h"
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-font.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/unicode/gunicode.h>
-#include "e-contact-save-as.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-
-struct _EAddressbookReflowAdapterPrivate {
-	EAddressbookModel *model;
-	
-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;
-};
-
-#define PARENT_TYPE e_reflow_model_get_type()
-EReflowModel *parent_class;
-
-#define d(x)
-
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE,
-	ARG_MODEL,
-};
-
-enum {
-	DRAG_BEGIN,
-	LAST_SIGNAL
-};
-
-static guint e_addressbook_reflow_adapter_signals [LAST_SIGNAL] = {0, };
-
-static void
-unlink_model(EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->create_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->remove_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->modify_card_id);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-
-	gtk_object_unref(GTK_OBJECT(priv->model));
-
-	priv->model = NULL;
-}
-
-
-static int
-count_lines (const gchar *text)
-{
-	int num_lines = 1;
-	gunichar unival;
-
-	for (text = e_unicode_get_utf8 (text, &unival); (unival && text); text = e_unicode_get_utf8 (text, &unival)) {
-		if (unival == '\n') {
-			num_lines ++;
-		}
-	}
-
-	return num_lines;
-}
-
-static int
-text_height (GnomeCanvas *canvas, const gchar *text)
-{
-	EFont *font = e_font_from_gdk_font (((GtkWidget *) canvas)->style->font);
-	gint height = e_font_height (font) * count_lines (text) / canvas->pixels_per_unit;
-
-	e_font_unref (font);
-	return height;
-}
-
-static void
-addressbook_finalize(GtkObject *object)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-
-	unlink_model (adapter);
-}
-
-static void
-addressbook_set_width (EReflowModel *erm, int width)
-{
-}
-
-/* This function returns the number of items in our EReflowModel. */
-static int
-addressbook_count (EReflowModel *erm)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return e_addressbook_model_card_count (priv->model);
-}
-
-/* This function returns the number of items in our EReflowModel. */
-static int
-addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	/* FIXME */
-	ECardSimpleField field;
-	int count = 0;
-	int height;
-	char *string;
-	ECardSimple *simple = e_card_simple_new (e_addressbook_model_card_at (priv->model, i));
-
-	string = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string ? string : "") + 10.0;
-	g_free(string);
-
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING && count < 5; field++) {
-
-		if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)
-			continue;
-
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			int this_height;
-			int field_text_height;
-
-			this_height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, e_card_simple_get_name(simple, field));
-
-			field_text_height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string);
-			if (this_height < field_text_height)
-				this_height = field_text_height;
-
-			this_height += 3;
-
-			height += this_height;
-			count ++;
-		}
-		g_free (string);
-	}
-	height += 2;
-
-	gtk_object_unref (GTK_OBJECT (simple));
-
-	return height;
-}
-
-static int
-addressbook_compare (EReflowModel *erm, int n1, int n2)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	ECard *card1, *card2;
-	
-	card1 = e_addressbook_model_card_at (priv->model, n1);
-	card2 = e_addressbook_model_card_at (priv->model, n2);
-
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		file_as1 = card1->file_as;
-		file_as2 = card2->file_as;
-		if (file_as1 && file_as2)
-			return g_utf8_collate(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));
-	}
-	if (card1)
-		return -1;
-	if (card2)
-		return 1;
-	return 0;
-}
-
-static int
-adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)
-{
-	gint ret_val = 0;
-
-	gtk_signal_emit (GTK_OBJECT(adapter),
-			 e_addressbook_reflow_adapter_signals[DRAG_BEGIN],
-			 event, &ret_val);
-
-	return ret_val;
-}
-
-static GnomeCanvasItem *
-addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	GnomeCanvasItem *item;
-
-	item = gnome_canvas_item_new(parent,
-				     e_minicard_get_type(),
-				     "card", e_addressbook_model_card_at (priv->model, i),
-				     "editable", e_addressbook_model_editable (priv->model),
-				     NULL);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (item), "selected",
-			    GTK_SIGNAL_FUNC(card_selected), emvm);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (item), "drag_begin",
-			    GTK_SIGNAL_FUNC(adapter_drag_begin), adapter);
-
-	return item;
-}
-
-static void
-addressbook_reincarnate (EReflowModel *erm, int i, GnomeCanvasItem *item)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	gnome_canvas_item_set(item,
-			      "card", e_addressbook_model_card_at (priv->model, i),
-			      NULL);
-}
-
-
-
-static void
-create_card(EAddressbookModel *model,
-	    gint index, gint count,
-	    EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_items_inserted (E_REFLOW_MODEL (adapter),
-				       index,
-				       count);
-}
-
-static void
-remove_card(EAddressbookModel *model,
-	    gint index,
-	    EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-modify_card(EAddressbookModel *model,
-	    gint index,
-	    EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_item_changed (E_REFLOW_MODEL (adapter), index);
-}
-
-static void
-model_changed(EAddressbookModel *model,
-	      EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-addressbook_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(o);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (arg_id){
-	case ARG_BOOK:
-		gtk_object_set (GTK_OBJECT (priv->model),
-				"book", GTK_VALUE_OBJECT (*arg),
-				NULL);
-		break;
-	case ARG_QUERY:
-		gtk_object_set (GTK_OBJECT (priv->model),
-				"query", GTK_VALUE_STRING (*arg),
-				NULL);
-		break;
-	case ARG_EDITABLE:
-		gtk_object_set (GTK_OBJECT (priv->model),
-				"editable", GTK_VALUE_BOOL (*arg),
-				NULL);
-		break;
-	}
-}
-
-static void
-addressbook_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(o);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (arg_id) {
-	case ARG_BOOK: {
-		EBook *book;
-		gtk_object_get (GTK_OBJECT (priv->model),
-				"book", &book,
-				NULL);
-		if (book)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(book);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	}
-	case ARG_QUERY: {
-		char *query;
-		gtk_object_get (GTK_OBJECT (priv->model),
-				"query", &query,
-				NULL);
-		GTK_VALUE_STRING (*arg) = query;
-		break;
-	}
-	case ARG_EDITABLE: {
-		gboolean editable;
-		gtk_object_get (GTK_OBJECT (priv->model),
-				"editable", &editable,
-				NULL);
-		GTK_VALUE_BOOL (*arg) = editable;
-		break;
-	}
-	case ARG_MODEL:
-		if (priv->model)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (priv->model);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_reflow_adapter_class_init (GtkObjectClass *object_class)
-{
-	EReflowModelClass *model_class = (EReflowModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = addressbook_set_arg;
-	object_class->get_arg = addressbook_get_arg;
-	object_class->finalize = addressbook_finalize;
-
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::model", E_ADDRESSBOOK_MODEL_TYPE,
-				 GTK_ARG_READABLE, ARG_MODEL);
-
-	e_addressbook_reflow_adapter_signals [DRAG_BEGIN] =
-		gtk_signal_new ("drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookReflowAdapterClass, drag_begin),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-
-	gtk_object_class_add_signals (object_class, e_addressbook_reflow_adapter_signals, LAST_SIGNAL);
-
-	model_class->set_width = addressbook_set_width;
-	model_class->count = addressbook_count;
-	model_class->height = addressbook_height;
-	model_class->compare = addressbook_compare;
-	model_class->incarnate = addressbook_incarnate;
-	model_class->reincarnate = addressbook_reincarnate;
-}
-
-static void
-e_addressbook_reflow_adapter_init (GtkObject *object)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookReflowAdapterPrivate, 1);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-}
-
-GtkType
-e_addressbook_reflow_adapter_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookReflowAdapter",
-			sizeof (EAddressbookReflowAdapter),
-			sizeof (EAddressbookReflowAdapterClass),
-			(GtkClassInitFunc) e_addressbook_reflow_adapter_class_init,
-			(GtkObjectInitFunc) e_addressbook_reflow_adapter_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter,
-					EAddressbookModel *model)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	gtk_object_ref (GTK_OBJECT (priv->model));
-
-	priv->create_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  adapter);
-	priv->remove_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  adapter);
-	priv->modify_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  adapter);
-	priv->model_changed_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						    "model_changed",
-						    GTK_SIGNAL_FUNC(model_changed),
-						    adapter);
-}
-
-EReflowModel *
-e_addressbook_reflow_adapter_new (EAddressbookModel *model)
-{
-	EAddressbookReflowAdapter *et;
-
-	et = gtk_type_new (e_addressbook_reflow_adapter_get_type ());
-
-	e_addressbook_reflow_adapter_construct (et, model);
-
-	return E_REFLOW_MODEL(et);
-}
-
-
-ECard *
-e_addressbook_reflow_adapter_get_card (EAddressbookReflowAdapter *adapter,
-				       int index)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return e_addressbook_model_get_card (priv->model, index);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
deleted file mode 100644
index b3f6ab9c0d..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
-#define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
-
-#include <gal/widgets/e-reflow-model.h>
-#include <gal/widgets/e-selection-model.h>
-#include "e-addressbook-model.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card.h"
-
-#define E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE        (e_addressbook_reflow_adapter_get_type ())
-#define E_ADDRESSBOOK_REFLOW_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapter))
-#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapterClass))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE))
-
-typedef struct _EAddressbookReflowAdapter EAddressbookReflowAdapter;
-typedef struct _EAddressbookReflowAdapterPrivate EAddressbookReflowAdapterPrivate;
-typedef struct _EAddressbookReflowAdapterClass EAddressbookReflowAdapterClass;
-
-struct _EAddressbookReflowAdapter {
-	EReflowModel parent;
-
-	EAddressbookReflowAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookReflowAdapterClass {
-	EReflowModelClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	gint (* drag_begin) (EAddressbookReflowAdapter *adapter, GdkEvent *event);
-};
-
-
-GtkType       e_addressbook_reflow_adapter_get_type          (void);
-void          e_addressbook_reflow_adapter_construct         (EAddressbookReflowAdapter *adapter,
-							      EAddressbookModel         *model);
-EReflowModel *e_addressbook_reflow_adapter_new               (EAddressbookModel         *model);
-
-/* Returns object with ref count of 1. */
-ECard        *e_addressbook_reflow_adapter_get_card          (EAddressbookReflowAdapter *adapter,
-							      int                        index);
-#endif /* _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
deleted file mode 100644
index 08c03863aa..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include "e-addressbook-table-adapter.h"
-#include "e-card-merging.h"
-#include "e-addressbook-util.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-struct _EAddressbookTableAdapterPrivate {
-	EAddressbookModel *model;
-
-	ECardSimple **simples;
-	int count;
-
-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;
-};
-
-#define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
-
-#define COLS (E_CARD_SIMPLE_FIELD_LAST)
-
-static void
-unlink_model(EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->create_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->remove_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->modify_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->model_changed_id);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			gtk_object_unref (GTK_OBJECT (priv->simples[i]));
-		g_free (priv->simples);
-		priv->simples = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(priv->model));
-
-	priv->model = NULL;
-}
-
-static void
-build_simple_mapping(EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			gtk_object_unref (GTK_OBJECT (priv->simples[i]));
-		g_free (priv->simples);
-	}
-
-	/* build up our mapping to ECardSimple*'s */
-	priv->count = e_addressbook_model_card_count (priv->model);
-	priv->simples = g_new (ECardSimple*, priv->count);
-	for (i = 0; i < priv->count; i ++) {
-		priv->simples[i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, i));
-		gtk_object_ref (GTK_OBJECT (priv->simples[i]));
-	}
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);
-
-	unlink_model(adapter);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-addressbook_col_count (ETableModel *etc)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-addressbook_row_count (ETableModel *etc)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	return e_addressbook_model_card_count (priv->model);
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-addressbook_value_at (ETableModel *etc, int col, int row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	const char *value;
-
-	if ( col >= COLS || row >= e_addressbook_model_card_count (priv->model) )
-		return NULL;
-
-	value = e_card_simple_get_const(priv->simples[row], col);
-
-	if (value && !strncmp (value, "<?xml", 5)) {
-		EDestination *dest = e_destination_import (value);
-		if (dest) {
-			g_free ((gchar *) value);
-			value = g_strdup (e_destination_get_address (dest));
-			gtk_object_unref (GTK_OBJECT (dest));
-		}
-	}
-
-
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	/* g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__); */
-	if (status != E_BOOK_STATUS_SUCCESS)
-		e_addressbook_error_dialog (_("Error modifying card"), status);
-}
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	if (e_addressbook_model_editable (priv->model)) {
-		ECard *card;
-
-		if ( col >= COLS|| row >= e_addressbook_model_card_count (priv->model) )
-			return;
-
-		e_table_model_pre_change(etc);
-
-		e_card_simple_set(priv->simples[row],
-				  col,
-				  val);
-		gtk_object_get(GTK_OBJECT(priv->simples[row]),
-			       "card", &card,
-			       NULL);
-
-		e_card_merging_book_commit_card(e_addressbook_model_get_ebook(priv->model),
-						card, card_modified_cb, NULL);
-
-		/* XXX do we need this?  shouldn't the commit_card generate a changed signal? */
-		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)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	ECard *card;
-
-	if (row >= 0 && row < e_addressbook_model_card_count (priv->model))
-		card = e_addressbook_model_card_at (priv->model, row);
-	else
-		card = NULL;
-
-	if (!e_addressbook_model_editable(priv->model))
-		return FALSE;
-	else if (card && e_card_evolution_list (card))
-		/* we only allow editing of the name and file as for
-                   lists */
-		return col == E_CARD_SIMPLE_FIELD_FULL_NAME || col == E_CARD_SIMPLE_FIELD_FILE_AS; 
-	else
-		return col < E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etm);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	ECard *card;
-	ECardSimple *simple;
-	int col;
-
-	card = e_card_new("");
-	simple = e_card_simple_new(card);
-
-	for (col = 0; col < E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; col++) {
-		const void *val = e_table_model_value_at(source, col, row);
-		e_card_simple_set(simple, col, val);
-	}
-	e_card_simple_sync_card(simple);
-	e_card_merging_book_add_card (e_addressbook_model_get_ebook (priv->model), 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
-e_addressbook_table_adapter_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = addressbook_destroy;
-
-	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_table_adapter_init (GtkObject *object)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);
-	EAddressbookTableAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookTableAdapterPrivate, 1);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-	priv->simples = NULL;
-	priv->count = 0;
-}
-
-
-static void
-create_card (EAddressbookModel *model,
-	     gint index, gint count,
-	     EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	priv->count += count;
-	priv->simples = g_renew(ECardSimple *, priv->simples, priv->count);
-	memmove (priv->simples + index + count, priv->simples + index, (priv->count - index - count) * sizeof (ECardSimple *));
-
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	for (i = 0; i < count; i ++) {
-		priv->simples[index + i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index + i));
-	}
-	e_table_model_rows_inserted (E_TABLE_MODEL (adapter), index, count);
-}
-
-static void
-remove_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-
-	gtk_object_unref (GTK_OBJECT (priv->simples[index]));
-	memmove (priv->simples + index, priv->simples + index + 1, (priv->count - index - 1) * sizeof (ECardSimple *));
-	priv->count --;
-	e_table_model_rows_deleted (E_TABLE_MODEL (adapter), index, 1);
-}
-
-static void
-modify_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-
-	gtk_object_unref (GTK_OBJECT (priv->simples[index]));
-	priv->simples[index] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index));
-	gtk_object_ref (GTK_OBJECT (priv->simples[index]));
-	e_table_model_row_changed (E_TABLE_MODEL (adapter), index);
-}
-
-static void
-model_changed (EAddressbookModel *model,
-	       EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	build_simple_mapping (adapter);
-	e_table_model_changed (E_TABLE_MODEL (adapter));
-}
-
-GtkType
-e_addressbook_table_adapter_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookTableAdapter",
-			sizeof (EAddressbookTableAdapter),
-			sizeof (EAddressbookTableAdapterClass),
-			(GtkClassInitFunc) e_addressbook_table_adapter_class_init,
-			(GtkObjectInitFunc) e_addressbook_table_adapter_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter,
-				       EAddressbookModel *model)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	gtk_object_ref (GTK_OBJECT (priv->model));
-
-	priv->create_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  adapter);
-	priv->remove_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  adapter);
-	priv->modify_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  adapter);
-	priv->model_changed_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						    "model_changed",
-						    GTK_SIGNAL_FUNC(model_changed),
-						    adapter);
-
-	build_simple_mapping (adapter);
-}
-
-ETableModel *
-e_addressbook_table_adapter_new (EAddressbookModel *model)
-{
-	EAddressbookTableAdapter *et;
-
-	et = gtk_type_new (e_addressbook_table_adapter_get_type ());
-
-	e_addressbook_table_adapter_construct (et, model);
-
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
deleted file mode 100644
index d76434e80a..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_TABLE_ADAPTER_H_
-#define _E_ADDRESSBOOK_TABLE_ADAPTER_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_TABLE_ADAPTER_TYPE        (e_addressbook_table_adapter_get_type ())
-#define E_ADDRESSBOOK_TABLE_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapter))
-#define E_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapterClass))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct _EAddressbookTableAdapter EAddressbookTableAdapter;
-typedef struct _EAddressbookTableAdapterPrivate EAddressbookTableAdapterPrivate;
-typedef struct _EAddressbookTableAdapterClass EAddressbookTableAdapterClass;
-
-struct _EAddressbookTableAdapter {
-	ETableModel parent;
-
-	EAddressbookTableAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookTableAdapterClass {
-	ETableModelClass parent_class;
-};
-
-
-GtkType      e_addressbook_table_adapter_get_type (void);
-void         e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter,
-						    EAddressbookModel *model);
-ETableModel *e_addressbook_table_adapter_new (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_TABLE_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
deleted file mode 100644
index b1c40bd483..0000000000
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-addressbook-util.h"
-
-#include <gnome.h>
-
-#include "e-card-merging.h"
-#include <shell/evolution-shell-client.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-
-void
-e_addressbook_error_dialog (const gchar *msg, EBookStatus status)
-{
-	static char *status_to_string[] = {
-		N_("Success"),
-		N_("Unknown error"),
-		N_("Repository offline"),
-		N_("Permission denied"),
-		N_("Card not found"),
-		N_("Card ID already exists"),
-		N_("Protocol not supported"),
-		N_("Cancelled"),
-		N_("Other error")
-	};
-	char *error_msg;
-
-	error_msg = g_strdup_printf ("%s: %s", msg, _(status_to_string [status]));
-
-	gtk_widget_show (gnome_error_dialog (error_msg));
-
-	g_free (error_msg);
-}
-
-gint
-e_addressbook_prompt_save_dialog (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("Do you want to save changes?"),
-					GNOME_MESSAGE_BOX_QUESTION,
-					GNOME_STOCK_BUTTON_YES,
-					GNOME_STOCK_BUTTON_NO,
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_grab_focus (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);
-
-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-added_cb (EBook* book, EBookStatus status, const char *id,
-	  gboolean is_list)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (is_list ? _("Error adding list") : _("Error adding card"), status);
-	}
-}
-
-static void
-modified_cb (EBook* book, EBookStatus status,
-	     gboolean is_list)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (is_list ? _("Error modifying list") : _("Error modifying card"),
-					    status);
-	}
-}
-
-static void
-deleted_cb (EBook* book, EBookStatus status,
-	    gboolean is_list)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (is_list ? _("Error removing list") : _("Error removing card"),
-					    status);
-	}
-}
-
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	gtk_object_unref (editor);
-}
-
-EContactEditor *
-e_addressbook_show_contact_editor (EBook *book, ECard *card,
-				   gboolean is_new_card,
-				   gboolean editable)
-{
-	EContactEditor *ce;
-
-	ce = e_contact_editor_new (book, card, is_new_card, editable);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "card_added",
-			    GTK_SIGNAL_FUNC (added_cb), GINT_TO_POINTER (FALSE));
-	gtk_signal_connect (GTK_OBJECT (ce), "card_modified",
-			    GTK_SIGNAL_FUNC (modified_cb), GINT_TO_POINTER (FALSE));
-	gtk_signal_connect (GTK_OBJECT (ce), "card_deleted",
-			    GTK_SIGNAL_FUNC (deleted_cb), GINT_TO_POINTER (FALSE));
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	return ce;
-}
-
-EContactListEditor *
-e_addressbook_show_contact_list_editor (EBook *book, ECard *card,
-					gboolean is_new_card,
-					gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = e_contact_list_editor_new (book, card, is_new_card, editable);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "list_added",
-			    GTK_SIGNAL_FUNC (added_cb), GINT_TO_POINTER (TRUE));
-	gtk_signal_connect (GTK_OBJECT (ce), "list_modified",
-			    GTK_SIGNAL_FUNC (modified_cb), GINT_TO_POINTER (TRUE));
-	gtk_signal_connect (GTK_OBJECT (ce), "list_deleted",
-			    GTK_SIGNAL_FUNC (deleted_cb), GINT_TO_POINTER (TRUE));
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), GINT_TO_POINTER (TRUE));
-
-	e_contact_list_editor_show (ce);
-
-	return ce;
-}
-
-typedef struct {
-	EBook *book;
-	GList *list;
-	gboolean editable;
-} BookAndList;
-
-static void
-view_cards (EBook *book, GList *list, gboolean editable)
-{
-	for (; list; list = list->next) {
-		ECard *card = list->data;
-		if (e_card_evolution_list (card))
-			e_addressbook_show_contact_list_editor (book, card, FALSE, editable);
-		else
-			e_addressbook_show_contact_editor (book, card, FALSE, editable);
-	}
-}
-
-static void
-view_question_clicked (GtkObject *object, int button, BookAndList *bnl)
-{
-	GnomeDialog *dialog = GNOME_DIALOG (object);
-	switch (button) {
-	case 0:
-		view_cards (bnl->book, bnl->list, bnl->editable);
-		break;
-	}
-	gnome_dialog_close(dialog);
-}
-
-static void
-view_question_destroyed (GtkObject *object, GList *list)
-{
-	gtk_main_quit();
-}
-
-void
-e_addressbook_show_multiple_cards (EBook *book,
-				   GList *list,
-				   gboolean editable)
-{
-	if (list) {
-		int length = g_list_length (list);
-		if (length > 5) {
-			char *string;
-			GtkWidget *dialog;
-			BookAndList bnl;
-
-			bnl.book = book;
-			bnl.list = list;
-			bnl.editable = editable;
-
-			dialog = gnome_dialog_new (_("Display Cards?"),
-						   _("Display Cards"),
-						   GNOME_STOCK_BUTTON_CANCEL,
-						   NULL);
-
-			string = g_strdup_printf (_("You have requested that %d cards be cards. This will cause %d new windows to be\n"
-						    "displayed on your screen. Do you really want to display all of these cards?"), length, length);
-			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), gtk_label_new (string), FALSE, FALSE, 0);
-			g_free (string);
-
-			gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-					    GTK_SIGNAL_FUNC (view_question_destroyed), &bnl);
-			gtk_signal_connect (GTK_OBJECT (dialog), "clicked",
-					    GTK_SIGNAL_FUNC (view_question_clicked), &bnl);
-
-			gtk_widget_show_all (dialog);
-
-			gtk_main();
-		} else {
-			view_cards (book, list, editable);
-		}
-	}
-}
-
-
-
-typedef struct CardCopyProcess_ CardCopyProcess;
-
-typedef void (*CardCopyDone) (CardCopyProcess *process);
-
-struct CardCopyProcess_ {
-	int count;
-	GList *cards;
-	EBook *source;
-	EBook *destination;
-	CardCopyDone done_cb;
-};
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (_("Error removing card"), status);
-	}
-}
-
-static void
-do_delete (gpointer data, gpointer user_data)
-{
-	EBook *book = user_data;
-	ECard *card = data;
-
-	e_book_remove_card(book, card, card_deleted_cb, NULL);
-}
-
-static void
-delete_cards (CardCopyProcess *process)
-{
-	g_list_foreach (process->cards,
-			do_delete,
-			process->source);
-}
-
-static void
-process_unref (CardCopyProcess *process)
-{
-	process->count --;
-	if (process->count == 0) {
-		if (process->done_cb) {
-			process->done_cb (process);
-		}
-		e_free_object_list(process->cards);
-		gtk_object_unref (GTK_OBJECT (process->source));
-		gtk_object_unref (GTK_OBJECT (process->destination));
-		g_free (process);
-	}
-}
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)
-{
-	CardCopyProcess *process = user_data;
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (_("Error adding card"), status);
-	} else {
-		process_unref (process);
-	}
-}
-
-static void
-do_copy (gpointer data, gpointer user_data)
-{
-	EBook *book;
-	ECard *card;
-	CardCopyProcess *process;
-
-	process = user_data;
-	card = data;
-
-	book = process->destination;
-
-	process->count ++;
-	e_book_add_card(book, card, card_added_cb, process);
-}
-
-static void
-got_book_cb (EBook *book, gpointer closure)
-{
-	CardCopyProcess *process;
-	process = closure;
-	if (book) {
-		process->destination = book;
-		gtk_object_ref (GTK_OBJECT (book));
-		g_list_foreach (process->cards,
-				do_copy,
-				process);
-	}
-	process_unref (process);
-}
-
-extern EvolutionShellClient *global_shell_client;
-
-void
-e_addressbook_transfer_cards (EBook *source, GList *cards /* adopted */, gboolean delete_from_source, GtkWindow *parent_window)
-{
-	const char *allowed_types[] = { "contacts", NULL };
-	GNOME_Evolution_Folder *folder;
-	static char *last_uri = NULL;
-	CardCopyProcess *process;
-	char *desc;
-
-	if (cards == NULL)
-		return;
-
-	if (last_uri == NULL)
-		last_uri = g_strdup ("");
-
-	if (cards->next == NULL) {
-		if (delete_from_source)
-			desc = _("Move card to");
-		else
-			desc = _("Copy card to");
-	} else {
-		if (delete_from_source)
-			desc = _("Move cards to");
-		else
-			desc = _("Copy cards to");
-	}
-
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   parent_window,
-						   desc, last_uri, allowed_types,
-						   &folder);
-	if (!folder)
-		return;
-
-	if (strcmp (last_uri, folder->evolutionUri) != 0) {
-		g_free (last_uri);
-		last_uri = g_strdup (folder->evolutionUri);
-	}
-
-	process = g_new (CardCopyProcess, 1);
-	process->count = 1;
-	process->source = source;
-	gtk_object_ref (GTK_OBJECT (source));
-	process->cards = cards;
-	process->destination = NULL;
-
-	if (delete_from_source)
-		process->done_cb = delete_cards;
-	else
-		process->done_cb = NULL;
-
-	e_book_use_address_book_by_uri (folder->physicalUri, got_book_cb, process);
-
-	CORBA_free (folder);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-util.h b/addressbook/gui/widgets/e-addressbook-util.h
deleted file mode 100644
index f0681cea4d..0000000000
--- a/addressbook/gui/widgets/e-addressbook-util.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-util.h
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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_UTIL_H__
-#define __E_ADDRESSBOOK_UTIL_H__
-
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void                e_addressbook_error_dialog              (const gchar *msg,
-							     EBookStatus  status);
-gint                e_addressbook_prompt_save_dialog        (GtkWindow   *parent);
-EContactEditor     *e_addressbook_show_contact_editor       (EBook       *book,
-							     ECard       *card,
-							     gboolean     is_new_card,
-							     gboolean     editable);
-EContactListEditor *e_addressbook_show_contact_list_editor  (EBook       *book,
-							     ECard       *card,
-							     gboolean     is_new_card,
-							     gboolean     editable);
-void                e_addressbook_show_multiple_cards       (EBook       *book,
-							     GList       *list,
-							     gboolean     editable);
-void                e_addressbook_transfer_cards            (EBook       *source,
-							     GList       *cards, /* adopted */
-							     gboolean     delete_from_source,
-							     GtkWindow   *parent_window);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_UTIL_H__ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index 83fab4685e..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,2025 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gtk/gtkinvisible.h>
-
-#include <libgnome/gnome-paper.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.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 <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/util/e-xml-utils.h>
-#include <gal/unicode/gunicode.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.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/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-
-#include "e-addressbook-view.h"
-#include "e-addressbook-model.h"
-#include "e-addressbook-util.h"
-#include "e-addressbook-table-adapter.h"
-#include "e-addressbook-reflow-adapter.h"
-#include "e-minicard-view-widget.h"
-#include "e-contact-save-as.h"
-#include "e-card-merging.h"
-
-#include "e-contact-editor.h"
-#include <gdk/gdkkeysyms.h>
-#include <ctype.h>
-
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-
-#define SHOW_ALL_SEARCH "(contains \"x-evolution-any-field\" \"\")"
-
-#define d(x)
-
-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 void status_message     (GtkObject *object, const gchar *status, EAddressbookView *eav);
-static void folder_bar_message (GtkObject *object, const gchar *status, EAddressbookView *eav);
-static void stop_state_changed (GtkObject *object, EAddressbookView *eav);
-static void writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav);
-static void command_state_change (EAddressbookView *eav);
-static void alphabet_state_change (EAddressbookView *eav, gunichar letter);
-
-static void selection_clear_event (GtkWidget *invisible, GdkEventSelection *event,
-				   EAddressbookView *view);
-static void selection_received (GtkWidget *invisible, GtkSelectionData *selection_data,
-				guint time, EAddressbookView *view);
-static void selection_get (GtkWidget *invisible, GtkSelectionData *selection_data,
-			   guint info, guint time_stamp, EAddressbookView *view);
-static void invisible_destroyed (GtkWidget *invisible, EAddressbookView *view);
-
-static GtkTableClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_TYPE,
-};
-
-enum {
-	STATUS_MESSAGE,
-	FOLDER_BAR_MESSAGE,
-	COMMAND_STATE_CHANGE,
-	ALPHABET_STATE_CHANGE,
-	LAST_SIGNAL
-};
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD,
-};
-#define VCARD_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },
-};
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-static guint e_addressbook_view_signals [LAST_SIGNAL] = {0, };
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-static GalViewCollection *collection = NULL;
-
-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;
-	GtkWidgetClass *widget_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_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);
-
-	e_addressbook_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_view_signals [FOLDER_BAR_MESSAGE] =
-		gtk_signal_new ("folder_bar_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, folder_bar_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_view_signals [COMMAND_STATE_CHANGE] =
-		gtk_signal_new ("command_state_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, command_state_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_addressbook_view_signals [ALPHABET_STATE_CHANGE] =
-		gtk_signal_new ("alphabet_state_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, alphabet_state_change),
-				gtk_marshal_NONE__UINT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_UINT);
-
-	gtk_object_class_add_signals (object_class, e_addressbook_view_signals, LAST_SIGNAL);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-static void
-e_addressbook_view_init (EAddressbookView *eav)
-{
-	eav->view_type = E_ADDRESSBOOK_VIEW_NONE;
-
-	eav->model = e_addressbook_model_new ();
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "status_message",
-			    GTK_SIGNAL_FUNC (status_message),
-			    eav);
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "folder_bar_message",
-			    GTK_SIGNAL_FUNC (folder_bar_message),
-			    eav);
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "stop_state_changed",
-			    GTK_SIGNAL_FUNC (stop_state_changed),
-			    eav);
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "writable_status",
-			    GTK_SIGNAL_FUNC (writable_status),
-			    eav);
-
-	eav->editable = FALSE;
-	eav->book = NULL;
-	eav->query = g_strdup (SHOW_ALL_SEARCH);
-
-	eav->object = NULL;
-	eav->widget = NULL;
-
-	eav->view_instance = NULL;
-	eav->view_menus = NULL;
-	eav->uic = NULL;
-	eav->current_alphabet_widget = NULL;
-
-	eav->invisible = gtk_invisible_new ();
-
-	gtk_selection_add_target (eav->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-		
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get), 
-			    eav);
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    eav);
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    eav);
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    eav);
-}
-
-static void
-e_addressbook_view_destroy (GtkObject *object)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	if (eav->model) {
-		gtk_object_unref(GTK_OBJECT(eav->model));
-		eav->model = NULL;
-	}
-
-	if (eav->book) {
-		gtk_object_unref(GTK_OBJECT(eav->book));
-		eav->book = NULL;
-	}
-
-	g_free(eav->query);
-	eav->query = NULL;
-
-	eav->uic = NULL;
-
-	if (eav->view_instance) {
-		gtk_object_unref (GTK_OBJECT (eav->view_instance));
-		eav->view_instance = NULL;
-	}
-
-	if (eav->view_menus) {
-		gtk_object_unref (GTK_OBJECT (eav->view_menus));
-		eav->view_menus = NULL;
-	}
-
-	if (eav->clipboard_cards) {
-		g_list_foreach (eav->clipboard_cards, (GFunc)gtk_object_unref, NULL);
-		g_list_free (eav->clipboard_cards);
-		eav->clipboard_cards = NULL;
-	}
-		
-	if (eav->invisible) {
-		gtk_widget_destroy (eav->invisible);
-		eav->invisible = NULL;
-	}
-
-	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
-writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav)
-{
-	eav->editable = writable;
-	command_state_change (eav);
-}
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("* Click here to add a contact *"),
-	N_("File As"),
-	N_("Full Name"),
-	N_("Email"),
-	N_("Primary Phone"),
-	N_("Assistant Phone"),
-	N_("Business Phone"),
-	N_("Callback Phone"),
-	N_("Company Phone"),
-	N_("Home Phone"),
-	N_("Organization"),
-	N_("Business Address"),
-	N_("Home Address"),
-	N_("Mobile Phone"),
-	N_("Car Phone"),
-	N_("Business Fax"),
-	N_("Home Fax"),
-	N_("Business Phone 2"),
-	N_("Home Phone 2"),
-	N_("ISDN"),
-	N_("Other Phone"),
-	N_("Other Fax"),
-	N_("Pager"),
-	N_("Radio"),
-	N_("Telex"),
-	N_("TTY"),
-	N_("Other Address"),
-	N_("Email 2"),
-	N_("Email 3"),
-	N_("Web Site"),
-	N_("Department"),
-	N_("Office"),
-	N_("Title"),
-	N_("Profession"),
-	N_("Manager"),
-	N_("Assistant"),
-	N_("Nickname"),
-	N_("Spouse"),
-	N_("Note"),
-	N_("Free-busy URL"),
-};
-#endif
-
-#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=\"File As\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"1\" _title=\"Full Name\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"2\" _title=\"Email\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"3\" _title=\"Primary Phone\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"4\" _title=\"Assistant Phone\"  expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"5\" _title=\"Business Phone\"   expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"6\" _title=\"Callback Phone\"   expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"7\" _title=\"Company Phone\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"8\" _title=\"Home Phone\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"9\" _title=\"Organization\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"10\" _title=\"Business Address\" expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"11\" _title=\"Home Address\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"12\" _title=\"Mobile Phone\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"13\" _title=\"Car Phone\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"14\" _title=\"Business Fax\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"15\" _title=\"Home Fax\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"16\" _title=\"Business Phone 2\" expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"17\" _title=\"Home Phone 2\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"18\" _title=\"ISDN\"             expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"19\" _title=\"Other Phone\"      expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"20\" _title=\"Other Fax\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"21\" _title=\"Pager\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"22\" _title=\"Radio\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"23\" _title=\"Telex\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"24\" _title=\"TTY\"              expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"25\" _title=\"Other Address\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"26\" _title=\"Email 2\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"27\" _title=\"Email 3\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"28\" _title=\"Web Site\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"29\" _title=\"Department\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"30\" _title=\"Office\"           expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"31\" _title=\"Title\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"32\" _title=\"Profession\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"33\" _title=\"Manager\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"34\" _title=\"Assistant\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"35\" _title=\"Nickname\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"36\" _title=\"Spouse\"           expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"37\" _title=\"Note\"             expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"38\" _title=\"Free-busy URL\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableState>                            \
-    <column source=\"0\"/>                 \
-    <column source=\"1\"/>                 \
-    <column source=\"5\"/>                 \
-    <column source=\"2\"/>                 \
-    <column source=\"3\"/>                 \
-    <grouping>                             \
-      <leaf column=\"0\" ascending=\"true\"/> \
-    </grouping>                            \
-  </ETableState>                           \
-</ETableSpecification>"
-
-static void
-init_collection (void)
-{
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new();
-
-		galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");
-		gal_view_collection_set_storage_directories
-			(collection,
-			 EVOLUTION_DATADIR "/evolution/views/addressbook/",
-			 galview);
-		g_free(galview);
-
-		spec = e_table_specification_new();
-		e_table_specification_load_from_string(spec, SPEC);
-
-		factory = gal_view_factory_etable_new (spec);
-		gtk_object_unref (GTK_OBJECT (spec));
-		gal_view_collection_add_factory (collection, factory);
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		factory = gal_view_factory_minicard_new ();
-		gal_view_collection_add_factory (collection, factory);
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		gal_view_collection_load(collection);
-	}
-}
-
-static void
-display_view(GalViewInstance *instance,
-	     GalView *view,
-	     gpointer data)
-{
-	EAddressbookView *address_view = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_TABLE);
-		gal_view_etable_attach_table (GAL_VIEW_ETABLE(view), e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view->widget)));
-	} else if (GAL_IS_VIEW_MINICARD(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_MINICARD);
-		gal_view_minicard_attach (GAL_VIEW_MINICARD(view), E_MINICARD_VIEW_WIDGET (address_view->object));
-	}
-	address_view->current_view = view;
-}
-
-static void
-setup_menus (EAddressbookView *view)
-{
-	if (view->book && view->view_instance == NULL) {
-		init_collection ();
-		view->view_instance = gal_view_instance_new (collection, e_book_get_uri (view->book));
-	}
-
-	if (view->view_instance && view->uic) {
-		view->view_menus = gal_view_menus_new(view->view_instance);
-		gal_view_menus_apply(view->view_menus, view->uic, NULL);
-
-		display_view (view->view_instance, gal_view_instance_get_current_view (view->view_instance), view);
-
-		gtk_signal_connect(GTK_OBJECT(view->view_instance), "display_view",
-				   display_view, view);
-	}
-}
-
-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->view_instance) {
-			gtk_object_unref (GTK_OBJECT (eav->view_instance));
-			eav->view_instance = NULL;
-		}
-
-		gtk_object_set(GTK_OBJECT(eav->model),
-			       "book", eav->book,
-			       NULL);
-
-		setup_menus (eav);
-
-		break;
-	case ARG_QUERY:
-#if 0 /* This code will mess up ldap a bit.  We need to think about the ramifications of this more. */
-		if ((GTK_VALUE_STRING (*arg) == NULL && !strcmp (eav->query, SHOW_ALL_SEARCH)) ||
-		    (GTK_VALUE_STRING (*arg) != NULL && !strcmp (eav->query, GTK_VALUE_STRING (*arg))))
-			break;
-#endif
-		g_free(eav->query);
-		eav->query = g_strdup(GTK_VALUE_STRING(*arg));
-		if (!eav->query)
-			eav->query = g_strdup (SHOW_ALL_SEARCH);
-		gtk_object_set(GTK_OBJECT(eav->model),
-			       "query", eav->query,
-			       NULL);
-		if (eav->current_alphabet_widget != NULL) {
-			GtkWidget *current = eav->current_alphabet_widget;
-
-			eav->current_alphabet_widget = NULL;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (current), FALSE);
-		}
-		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;
-	}
-}
-
-static ESelectionModel*
-get_selection_model (EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD)
-		return e_minicard_view_widget_get_selection_model (E_MINICARD_VIEW_WIDGET(view->object));
-	else
-		return e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(view->widget)));
-}
-
-/* Popup menu stuff */
-typedef struct {
-	EAddressbookView *view;
-	EPopupMenu *submenu;
-	gpointer closure;
-} CardAndBook;
-
-static ESelectionModel*
-card_and_book_get_selection_model (CardAndBook *card_and_book)
-{
-	return get_selection_model (card_and_book->view);
-}
-
-static void
-card_and_book_free (CardAndBook *card_and_book)
-{
-	EAddressbookView *view = card_and_book->view;
-	ESelectionModel *selection;
-
-	if (card_and_book->submenu)
-		gal_view_instance_free_popup_menu (view->view_instance,
-						   card_and_book->submenu);
-
-	selection = card_and_book_get_selection_model (card_and_book);
-	if (selection)
-		e_selection_model_right_click_up(selection);
-
-	gtk_object_unref(GTK_OBJECT(view));
-}
-
-static void
-get_card_list_1(gint model_row,
-		      gpointer closure)
-{
-	CardAndBook *card_and_book;
-	GList **list;
-	EAddressbookView *view;
-	ECard *card;
-
-	card_and_book = closure;
-	list = card_and_book->closure;
-	view = card_and_book->view;
-
-	card = e_addressbook_model_get_card(view->model, model_row);
-	*list = g_list_prepend(*list, card);
-}
-
-static GList *
-get_card_list (CardAndBook *card_and_book)
-{
-	GList *list = NULL;
-	ESelectionModel *selection;
-
-	selection = card_and_book_get_selection_model (card_and_book);
-
-	if (selection) {
-		card_and_book->closure = &list;
-		e_selection_model_foreach (selection, get_card_list_1, card_and_book);
-	}
-
-	return list;
-}
-
-static void
-has_email_address_1(gint model_row,
-			  gpointer closure)
-{
-	CardAndBook *card_and_book;
-	gboolean *has_email;
-	EAddressbookView *view;
-	const ECard *card;
-	EList *email;
-
-	card_and_book = closure;
-	has_email = card_and_book->closure;
-	view = card_and_book->view;
-
-	if (*has_email)
-		return;
-
-	card = e_addressbook_model_peek_card(view->model, model_row);
-
-	gtk_object_get (GTK_OBJECT (card),
-			"email", &email,
-			NULL);
-
-	if (e_list_length (email) > 0)
-		*has_email = TRUE;
-}
-
-static gboolean
-get_has_email_address (CardAndBook *card_and_book)
-{
-	ESelectionModel *selection;
-	gboolean has_email = FALSE;
-
-	selection = card_and_book_get_selection_model (card_and_book);
-
-	if (selection) {
-		card_and_book->closure = &has_email;
-		e_selection_model_foreach (selection, has_email_address_1, card_and_book);
-	}
-
-	return has_email;
-}
-
-static void
-save_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	GList *cards = get_card_list (card_and_book);
-	if (cards) {
-		e_contact_list_save_as(_("Save as VCard"), cards);
-		e_free_object_list(cards);
-	}
-}
-
-static void
-send_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	GList *cards = get_card_list (card_and_book);
-	if (cards) {
-		e_card_list_send(cards, E_CARD_DISPOSITION_AS_ATTACHMENT);
-		e_free_object_list(cards);
-	}
-}
-
-static void
-send_to (GtkWidget *widget, CardAndBook *card_and_book)
-
-{
-	GList *cards = get_card_list (card_and_book);
-
-	if (cards) {
-		e_card_list_send(cards, E_CARD_DISPOSITION_AS_TO);
-		e_free_object_list(cards);
-	}
-}
-
-static void
-print (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	GList *cards = get_card_list (card_and_book);
-	if (cards) {
-		if (cards->next)
-			gtk_widget_show(e_contact_print_card_list_dialog_new(cards));
-		else
-			gtk_widget_show(e_contact_print_card_dialog_new(cards->data));
-		e_free_object_list(cards);
-	}
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-static void
-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	GList *cards = get_card_list (card_and_book);
-	if (cards) {
-		gtk_widget_show(e_contact_list_print_envelope_dialog_new(card_and_book->card));
-		e_free_object_list(cards);
-	}
-}
-#endif
-
-static void
-copy (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_addressbook_view_copy (card_and_book->view);
-}
-
-static void
-paste (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_addressbook_view_paste (card_and_book->view);
-}
-
-static void
-cut (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_addressbook_view_cut (card_and_book->view);
-}
-
-static void
-delete (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->view->widget)))) {
-		EBook *book;
-
-		GList *list = get_card_list(card_and_book);
-		GList *iterator;
-
-		gtk_object_get(GTK_OBJECT(card_and_book->view->model),
-			       "book", &book,
-			       NULL);
-
-		for (iterator = list; iterator; iterator = iterator->next) {
-			ECard *card = iterator->data;
-			/* Remove the card. */
-			e_book_remove_card (book,
-					    card,
-					    NULL,
-					    NULL);
-		}
-		e_free_object_list(list);
-	}
-}
-
-static void
-copy_to_folder (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_addressbook_view_copy_to_folder (card_and_book->view);
-}
-
-static void
-move_to_folder (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_addressbook_view_move_to_folder (card_and_book->view);
-}
-
-static void
-free_popup_info (GtkWidget *w, CardAndBook *card_and_book)
-{
-	card_and_book_free (card_and_book);
-}
-
-static void
-new_card (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	EBook *book;
-
-	gtk_object_get(GTK_OBJECT(card_and_book->view->model),
-		       "book", &book,
-		       NULL);
-	e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, TRUE);
-}
-
-static void
-new_list (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	EBook *book;
-
-	gtk_object_get(GTK_OBJECT(card_and_book->view->model),
-		       "book", &book,
-		       NULL);
-	e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, TRUE);
-}
-
-#if 0
-static void
-sources (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	BonoboControl *control;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	control = gtk_object_get_data (GTK_OBJECT (gcal), "control");
-	if (control == NULL)
-		return;
-
-	shell_view = get_shell_view_interface (control);
-	if (shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_ShellView_showSettings (shell_view, &ev);
-	
-	if (BONOBO_EX (&ev))
-		g_message ("control_util_show_settings(): Could not show settings");
-
-	CORBA_exception_free (&ev);
-}
-#endif
-
-#define POPUP_READONLY_MASK 0x1
-#define POPUP_NOSELECTION_MASK 0x2
-#define POPUP_NOEMAIL_MASK 0x4
-
-static void
-do_popup_menu(EAddressbookView *view, GdkEvent *event)
-{
-	CardAndBook *card_and_book;
-	GtkMenu *popup;
-	EPopupMenu *submenu = NULL;
-	ESelectionModel *selection_model;
-	gboolean selection = FALSE;
-
-	EPopupMenu menu[] = {
-		E_POPUP_ITEM (N_("New Contact..."), GTK_SIGNAL_FUNC(new_card), POPUP_READONLY_MASK),
-		E_POPUP_ITEM (N_("New Contact List..."), GTK_SIGNAL_FUNC(new_list), POPUP_READONLY_MASK),
-		E_POPUP_SEPARATOR,
-#if 0
-		E_POPUP_ITEM (N_("Go to Folder..."), GTK_SIGNAL_FUNC (goto_folder), 0),
-		E_POPUP_ITEM (N_("Import..."), GTK_SIGNAL_FUNC (import), POPUP_READONLY_MASK),
-		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Search for Contacts..."), GTK_SIGNAL_FUNC (search), 0),
-		E_POPUP_ITEM (N_("Addressbook Sources..."), GTK_SIGNAL_FUNC (sources), 0),
-		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Pilot Settings..."), GTK_SIGNAL_FUNC (pilot_settings), 0),
-#endif
-		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Save as VCard"), GTK_SIGNAL_FUNC(save_as), POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Forward Contact"), GTK_SIGNAL_FUNC(send_as), POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Send Message to Contact"), GTK_SIGNAL_FUNC(send_to), POPUP_NOSELECTION_MASK | POPUP_NOEMAIL_MASK),
-		E_POPUP_ITEM (N_("Print"), GTK_SIGNAL_FUNC(print), POPUP_NOSELECTION_MASK),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-		E_POPUP_ITEM (N_("Print Envelope"), GTK_SIGNAL_FUNC(print_envelope), POPUP_NOSELECTION_MASK),
-#endif
-		E_POPUP_SEPARATOR,
-
-		E_POPUP_ITEM (N_("Copy to folder..."), GTK_SIGNAL_FUNC(copy_to_folder), POPUP_NOSELECTION_MASK), 
-		E_POPUP_ITEM (N_("Move to folder..."), GTK_SIGNAL_FUNC(move_to_folder), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),
-		E_POPUP_SEPARATOR,
-
-		E_POPUP_ITEM (N_("Cut"), GTK_SIGNAL_FUNC (cut), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Copy"), GTK_SIGNAL_FUNC (copy), POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Paste"), GTK_SIGNAL_FUNC (paste), POPUP_READONLY_MASK),
-		E_POPUP_ITEM (N_("Delete"), GTK_SIGNAL_FUNC(delete), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),
-		E_POPUP_SEPARATOR,
-
-		E_POPUP_SUBMENU (N_("Current View"), submenu = gal_view_instance_get_popup_menu (view->view_instance), 0),
-		E_POPUP_TERMINATOR
-	};
-
-	card_and_book = g_new(CardAndBook, 1);
-	card_and_book->view = view;
-	card_and_book->submenu = submenu;
-
-	gtk_object_ref(GTK_OBJECT(card_and_book->view));
-
-	selection_model = card_and_book_get_selection_model (card_and_book);
-	if (selection_model)
-		selection = e_selection_model_selected_count (selection_model) > 0;
-
-	popup = e_popup_menu_create (menu,
-				     0,
-				     (e_addressbook_model_editable (view->model) ? 0 : POPUP_READONLY_MASK) +
-				     (selection ? 0 : POPUP_NOSELECTION_MASK) +
-				     (get_has_email_address (card_and_book) ? 0 : POPUP_NOEMAIL_MASK),
-				     card_and_book);
-
-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",
-			    GTK_SIGNAL_FUNC (free_popup_info), card_and_book);
-	e_popup_menu (popup, event);
-
-}
-
-
-/* Minicard view stuff */
-
-/* Translators: put here a list of labels you want to see on buttons in
-   addressbook. You may use any character to separate labels but it must
-   also be placed at the begining ot the string */
-const char *button_labels = N_(",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z");
-/* Translators: put here a list of characters that correspond to buttons
-   in addressbook. You may use any character to separate labels but it
-   must also be placed at the begining ot the string.
-   Use lower case letters if possible. */
-const char *button_letters = N_(",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z");
-
-typedef struct {
-	EAddressbookView *view;
-	GtkWidget *button;
-	GtkWidget *vbox;
-	gunichar letter;
-} LetterClosure;
-
-static char **
-e_utf8_split (const char *utf8_str, gunichar delim)
-{
-	GSList *str_list = NULL, *sl;
-	int n = 0;
-	const char *str, *s;
-	char **str_array;
-
-	g_return_val_if_fail (utf8_str != NULL, NULL);
-
-	str = utf8_str;
-	while (*str != '\0') {
-		int len;
-		char *new_str;
-
-		for (s = str; *s != '\0' && g_utf8_get_char (s) != delim; s = g_utf8_next_char (s))
-			;
-		len = s - str;
-		new_str = g_new (char, len + 1);
-		if (len > 0) {
-			memcpy (new_str, str, len);
-		}
-		new_str[len] = '\0';
-		str_list = g_slist_prepend (str_list, new_str);
-		n++;
-		if (*s != '\0') {
-			str = g_utf8_next_char (s);
-		} else {
-			str = s;
-		}		
-	}
-
-	str_array = g_new (char *, n + 1);
-	str_array[n--] = NULL;
-	for (sl = str_list; sl != NULL; sl = sl->next) {
-		str_array[n--] = sl->data;
-	}
-	g_slist_free (str_list);
-
-	return str_array;
-}
-
-static void
-jump_to_letter(EAddressbookView *view, gunichar letter)
-{
-	char *query;
-
-	if (g_unichar_isdigit (letter)) {
-		const char *letters = U_(button_letters);
-		char **letter_v;
-		GString *gstr;
-		char **p;
-
-		letter_v = e_utf8_split (g_utf8_next_char (letters),
-		                         g_utf8_get_char (letters));
-		g_assert (letter_v != NULL && letter_v[0] != NULL);
-		gstr = g_string_new ("(not (or ");
-		for (p = letter_v + 1; *p != NULL; p++) {
-			g_string_sprintfa (gstr, "(beginswith \"file_as\" \"%s\")", *p);
-		}
-		g_string_append (gstr, "))");
-		query = gstr->str;
-		g_strfreev (letter_v);
-		g_string_free (gstr, FALSE);
-	} else {
-		char s[6 + 1];
-
-		s [g_unichar_to_utf8 (letter, s)] = '\0';
-		query = g_strdup_printf ("(beginswith \"file_as\" \"%s\")", s);
-	}
-	gtk_object_set (GTK_OBJECT (view),
-			"query", query,
-			NULL);
-	g_free (query);
-}
-
-static void
-button_toggled(GtkWidget *button, LetterClosure *closure)
-{
-	EAddressbookView *view = closure->view;
-
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
-		GtkWidget *current = view->current_alphabet_widget;
-
-		view->current_alphabet_widget = NULL;
-		if (current && current != button)
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (current), FALSE);
-		jump_to_letter (view, closure->letter);
-		view->current_alphabet_widget = button;
-		alphabet_state_change (view, closure->letter);
-	} else {
-		if (view->current_alphabet_widget != NULL &&
-		    view->current_alphabet_widget == button) {
-			view->current_alphabet_widget = NULL;
-			gtk_object_set (GTK_OBJECT (view),
-					"query", NULL,
-					NULL);
-			alphabet_state_change (view, 0);
-		}
-	}
-}
-
-static void
-free_closure(GtkWidget *button, LetterClosure *closure)
-{
-	if (button != NULL &&
-	    button == closure->view->current_alphabet_widget) {
-		closure->view->current_alphabet_widget = NULL;
-	}
-	g_free(closure);
-}
-
-static GtkWidget *
-create_alphabet (EAddressbookView *view)
-{
-	GtkWidget *widget, *viewport, *vbox;
-	const char *labels, *letters;
-	char **label_v, **letter_v;
-	char **pl, **pc;
-	gunichar sep;
-
-	widget = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
-	                                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-	viewport = gtk_viewport_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (widget), viewport);
-	gtk_container_set_border_width (GTK_CONTAINER (viewport), 4);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
-
-	vbox = gtk_vbox_new (FALSE, 4);
-	gtk_container_add (GTK_CONTAINER (viewport), vbox);
-	gtk_widget_set_usize (vbox, 27, 0);
-
-	labels = U_(button_labels);
-	sep = g_utf8_get_char (labels);
-	label_v = e_utf8_split (g_utf8_next_char (labels), sep);
-	letters = U_(button_letters);
-	sep = g_utf8_get_char (letters);
-	letter_v = e_utf8_split (g_utf8_next_char (letters), sep);
-	g_assert (label_v != NULL && letter_v != NULL);
-	for (pl = label_v, pc = letter_v; *pl != NULL && *pc != NULL; pl++, pc++) {
-		GtkWidget *button;
-		LetterClosure *closure;
-		char *label;
-
-		label = e_utf8_to_locale_string (*pl);
-		button = gtk_toggle_button_new_with_label (label);
-		g_free (label);
-		gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-		closure = g_new (LetterClosure, 1);
-		closure->view = view;
-		closure->letter = g_utf8_get_char (*pc);
-		closure->button = button;
-		closure->vbox = vbox;
-		gtk_signal_connect(GTK_OBJECT(button), "toggled",
-		                   GTK_SIGNAL_FUNC (button_toggled), closure);
-		gtk_signal_connect(GTK_OBJECT(button), "destroy",
-		                   GTK_SIGNAL_FUNC (free_closure), closure);
-
-	}
-	g_strfreev (label_v);
-	g_strfreev (letter_v);
-
-	gtk_widget_show_all (widget);
-
-	return widget;
-}
-
-static void
-minicard_selection_change (EMinicardViewWidget *widget, EAddressbookView *view)
-{
-	command_state_change (view);
-}
-
-static void
-minicard_button_press (GtkWidget *widget, GdkEventButton *event, EAddressbookView *view)
-{
-	d(g_print ("Button %d pressed with event type %d\n", event->button, event->type));
-}
-
-static void
-minicard_right_click (EMinicardView *minicard_view_item, GdkEvent *event, EAddressbookView *view)
-{
-	do_popup_menu(view, event);
-}
-
-static void
-create_minicard_view (EAddressbookView *view)
-{
-	GtkWidget *scrollframe;
-	GtkWidget *alphabet;
-	GtkWidget *minicard_view;
-	GtkWidget *minicard_hbox;
-	EAddressbookReflowAdapter *adapter;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	minicard_hbox = gtk_hbox_new(FALSE, 0);
-
-	adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(e_addressbook_reflow_adapter_new (view->model));
-	minicard_view = e_minicard_view_widget_new(adapter);
-
-	/* A hack */
-	gtk_object_set_data (GTK_OBJECT (adapter), "view", view);
-
-	gtk_signal_connect(GTK_OBJECT(minicard_view), "selection_change",
-			   GTK_SIGNAL_FUNC(minicard_selection_change), view);
-
-	gtk_signal_connect(GTK_OBJECT(minicard_view), "button_press_event",
-			   GTK_SIGNAL_FUNC(minicard_button_press), view);
-
-	gtk_signal_connect(GTK_OBJECT(minicard_view), "right_click",
-			   GTK_SIGNAL_FUNC(minicard_right_click), view);
-
-
-	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 ();
-
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-
-	gtk_object_unref (GTK_OBJECT (adapter));
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object)) {
-		EAddressbookModel *model = view->model;
-		ECard *card = e_addressbook_model_get_card(model, row);
-		EBook *book;
-
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &book,
-			       NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		if (e_card_evolution_list (card))
-			e_addressbook_show_contact_list_editor (book, card, FALSE, view->editable);
-		else
-			e_addressbook_show_contact_editor (book, card, FALSE, view->editable);
-	}
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	do_popup_menu(view, event);
-	return TRUE;
-}
-
-static gint
-table_white_space_event(ETableScrolled *table, GdkEvent *event, EAddressbookView *view)
-{
-	if (event->type == GDK_BUTTON_PRESS && ((GdkEventButton *)event)->button == 3) {
-		do_popup_menu(view, event);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-static void
-table_selection_change(ETableScrolled *table, EAddressbookView *view)
-{
-	command_state_change (view);
-}
-
-static void
-table_drag_data_get (ETable             *table,
-		     int                 row,
-		     int                 col,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     gpointer            user_data)
-{
-	EAddressbookView *view = user_data;
-
-	if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD: {
-		char *value;
-
-		row = e_table_view_to_model_row (table, row);
-		value = e_card_get_vcard(view->model->data[row]);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-}
-
-static void
-emit_status_message (EAddressbookView *eav, const gchar *status)
-{
-	gtk_signal_emit (GTK_OBJECT (eav),
-			 e_addressbook_view_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-emit_folder_bar_message (EAddressbookView *eav, const gchar *message)
-{
-	gtk_signal_emit (GTK_OBJECT (eav),
-			 e_addressbook_view_signals [FOLDER_BAR_MESSAGE],
-			 message);
-}
-
-static void
-status_message (GtkObject *object, const gchar *status, EAddressbookView *eav)
-{
-	emit_status_message (eav, status);
-}
-
-static void
-folder_bar_message (GtkObject *object, const gchar *status, EAddressbookView *eav)
-{
-	emit_folder_bar_message (eav, status);
-}
-
-static void
-stop_state_changed (GtkObject *object, EAddressbookView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-command_state_change (EAddressbookView *eav)
-{
-	/* Reffing during emission is unnecessary.  Gtk automatically refs during an emission. */
-	gtk_signal_emit (GTK_OBJECT (eav), e_addressbook_view_signals [COMMAND_STATE_CHANGE]);
-}
-
-static void
-alphabet_state_change (EAddressbookView *eav, gunichar letter)
-{
-	gtk_signal_emit (GTK_OBJECT (eav), e_addressbook_view_signals [ALPHABET_STATE_CHANGE], letter);
-}
-
-static void
-create_table_view (EAddressbookView *view)
-{
-	ETableModel *adapter;
-	ECardSimple *simple;
-	GtkWidget *table;
-	
-	simple = e_card_simple_new(NULL);
-
-	adapter = e_addressbook_table_adapter_new(view->model);
-
-	/* 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 (adapter, NULL, SPEC, NULL);
-
-	view->object = GTK_OBJECT(adapter);
-	view->widget = table;
-
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "double_click",
-			   GTK_SIGNAL_FUNC(table_double_click), view);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "right_click",
-			   GTK_SIGNAL_FUNC(table_right_click), view);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "white_space_event",
-			   GTK_SIGNAL_FUNC(table_white_space_event), view);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "selection_change",
-			   GTK_SIGNAL_FUNC(table_selection_change), view);
-
-	/* drag & drop signals */
-	e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)->table), GDK_BUTTON1_MASK,
-				 drag_types, num_drag_types, GDK_ACTION_MOVE);
-	
-	gtk_signal_connect (GTK_OBJECT (E_TABLE_SCROLLED(table)->table),
-			    "table_drag_data_get",
-			    GTK_SIGNAL_FUNC (table_drag_data_get),
-			    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;
-
-	command_state_change (view);
-}
-
-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_setup_menus (EAddressbookView *view,
-				BonoboUIComponent *uic)
-{
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	init_collection ();
-
-	view->uic = uic;
-
-	setup_menus (view);
-}
-
-/**
- * e_addressbook_view_discard_menus:
- * @view: An addressbook view.
- * 
- * Makes an addressbook view discard its GAL view menus and its views instance
- * objects.  This should be called when the corresponding Bonobo component is
- * deactivated.
- **/
-void
-e_addressbook_view_discard_menus (EAddressbookView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (view->view_instance);
-
-	if (view->view_menus) {
-		gal_view_menus_unmerge (view->view_menus, NULL);
-
-		gtk_object_unref (GTK_OBJECT (view->view_menus));
-		view->view_menus = NULL;
-	}
-
-	if (view->view_instance) {
-		gtk_object_unref (GTK_OBJECT (view->view_instance));
-		view->view_instance = NULL;
-	}
-
-	view->uic = NULL;
-}
-
-void
-e_addressbook_view_print(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		gtk_object_get (GTK_OBJECT(view->model),
-				"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;
-		ETable *etable;
-
-		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_get(GTK_OBJECT(view->widget), "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-
-		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);
-	}
-}
-
-void
-e_addressbook_view_print_preview(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-
-		gtk_object_get (GTK_OBJECT(view->model),
-				"query", &query,
-				"book", &book,
-				NULL);
-		e_contact_print_preview(book, query);
-		g_free(query);
-	} else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
-		EPrintable *printable;
-		ETable *etable;
-		GnomePrintMaster *master;
-		GnomePrintContext *pc;
-		GtkWidget *preview;
-
-		gtk_object_get(GTK_OBJECT(view->widget), "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-
-		master = gnome_print_master_new();
-		gnome_print_master_set_copies (master, 1, FALSE);
-		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));
-		gtk_object_unref(GTK_OBJECT(printable));
-	}
-}
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (_("Error removing card"), status);
-	}
-}
-
-static void
-do_remove (int i, gpointer user_data)
-{
-	EBook *book;
-	ECard *card;
-	EAddressbookView *view = user_data;
-
-	gtk_object_get (GTK_OBJECT(view->model),
-			"book", &book,
-			NULL);
-
-	card = e_addressbook_model_get_card (view->model, i);
-
-	e_book_remove_card(book, card, card_deleted_cb, view);
-
-	gtk_object_unref (GTK_OBJECT (card));
-}
-
-void
-e_addressbook_view_delete_selection(EAddressbookView *view)
-{
-	ESelectionModel *model = get_selection_model (view);
-
-	g_return_if_fail (model);
-
-	e_selection_model_foreach (model,
-				   do_remove,
-				   view);
-}
-
-static void
-invisible_destroyed (GtkWidget *invisible, EAddressbookView *view)
-{
-	view->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       EAddressbookView *view)
-{
-	char *value;
-
-	value = e_card_list_get_vcard(view->clipboard_cards);
-
-	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-				8, value, strlen (value));
-				
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       EAddressbookView *view)
-{
-	if (view->clipboard_cards) {
-		g_list_foreach (view->clipboard_cards, (GFunc)gtk_object_unref, NULL);
-		g_list_free (view->clipboard_cards);
-		view->clipboard_cards = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    EAddressbookView *view)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	}
-	else {
-		/* XXX make sure selection_data->data = \0 terminated */
-		GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data->data, "ISO-8859-1");
-		GList *l;
-		
-		if (!card_list /* it wasn't a vcard list */)
-			return;
-
-		for (l = card_list; l; l = l->next) {
-			ECard *card = l->data;
-
-			e_card_merging_book_add_card (view->book, card, NULL /* XXX */, NULL);
-		}
-
-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);
-		g_list_free (card_list);
-	}
-}
-
-static void
-add_to_list (int model_row, gpointer closure)
-{
-	GList **list = closure;
-	*list = g_list_prepend (*list, GINT_TO_POINTER (model_row));
-}
-
-static GList *
-get_selected_cards (EAddressbookView *view)
-{
-	GList *list;
-	GList *iterator;
-	ESelectionModel *selection = get_selection_model (view);
-
-	list = NULL;
-	e_selection_model_foreach (selection, add_to_list, &list);
-
-	for (iterator = list; iterator; iterator = iterator->next) {
-		iterator->data = e_addressbook_model_card_at (view->model, GPOINTER_TO_INT (iterator->data));
-		if (iterator->data)
-			gtk_object_ref (iterator->data);
-	}
-	list = g_list_reverse (list);
-	return list;
-}
-
-#if 0
-void
-e_addressbook_view_save_state (EAddressbookView *view, const char *filename)
-{
-	xmlDoc *doc;
-	xmlNode *node;
-
-	doc = xmlNewDoc ("1.0");
-	node = xmlNewDocNode (doc, NULL, "addressbook-view", NULL);
-	xmlDocSetRootElement (doc, node);
-
-	switch (view->view_type) {
-	case E_ADDRESSBOOK_VIEW_MINICARD: {
-		int column_width;
-		e_xml_set_string_prop_by_name (node, "style", "minicard");
-		gtk_object_get (GTK_OBJECT (view->object),
-				"column_width", &column_width,
-				NULL);
-		e_xml_set_integer_prop_by_name (node, "column-width", column_width);
-		break;	
-	}
-	case E_ADDRESSBOOK_VIEW_TABLE: {
-		ETableState *state;
-		state = e_table_get_state_object (E_TABLE (view->widget));
-
-		e_xml_set_string_prop_by_name (node, "style", "table");
-		e_table_state_save_to_node (state, node);
-		gtk_object_unref (GTK_OBJECT (state));
-		break;
-	}
-	default:
-		xmlFreeDoc(doc);
-		return;
-	}
-	xmlSaveFile (filename, doc);
-	xmlFreeDoc(doc);
-}
-
-void
-e_addressbook_view_load_state (EAddressbookView *view, const char *filename)
-{
-	xmlDoc *doc;
-
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *node;
-		char *type;
-
-		node = xmlDocGetRootElement (doc);
-		type = e_xml_get_string_prop_by_name (node, "style");
-
-		if (!strcmp (type, "minicard")) {
-			int column_width;
-
-			change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-			column_width = e_xml_get_integer_prop_by_name (node, "column-width");
-			gtk_object_set (GTK_OBJECT (view->object),
-					"column_width", column_width,
-					NULL);
-		} else if (!strcmp (type, "table")) {
-			ETableState *state;
-
-			change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE);
-
-			state = e_table_state_new();
-			e_table_state_load_from_node (state, node->xmlChildrenNode);
-			e_table_set_state_object (E_TABLE (view->widget), state);
-			gtk_object_unref (GTK_OBJECT (state));
-		}
-		xmlFreeDoc(doc);
-	}
-}
-#endif
-
-void
-e_addressbook_view_save_as (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	if (list)
-		e_contact_list_save_as (_("Save as VCard"), list);
-	e_free_object_list(list);
-}
-
-void
-e_addressbook_view_view (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	e_addressbook_show_multiple_cards (view->book, list, view->editable);
-	e_free_object_list(list);
-}
-
-void
-e_addressbook_view_send (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	e_free_object_list(list);
-}
-
-void
-e_addressbook_view_send_to (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_TO);
-	e_free_object_list(list);
-}
-
-void
-e_addressbook_view_cut (EAddressbookView *view)
-{
-	e_addressbook_view_copy (view);
-	e_addressbook_view_delete_selection (view);
-}
-
-void
-e_addressbook_view_copy (EAddressbookView *view)
-{
-	view->clipboard_cards = get_selected_cards (view);
-
-	gtk_selection_owner_set (view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-e_addressbook_view_paste (EAddressbookView *view)
-{
-	gtk_selection_convert (view->invisible, clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-void
-e_addressbook_view_select_all (EAddressbookView *view)
-{
-	ESelectionModel *model = get_selection_model (view);
-
-	g_return_if_fail (model);
-
-	e_selection_model_select_all (model);
-}
-
-void
-e_addressbook_view_show_all(EAddressbookView *view)
-{
-	gtk_object_set(GTK_OBJECT(view),
-		       "query", NULL,
-		       NULL);
-}
-
-void
-e_addressbook_view_stop(EAddressbookView *view)
-{
-	if (view)
-		e_addressbook_model_stop (view->model);
-}
-
-static void
-view_transfer_cards (EAddressbookView *view, gboolean delete_from_source)
-{
-	EBook *book;
-	GList *cards;
-	GtkWindow *parent_window;
-
-	gtk_object_get(GTK_OBJECT(view->model), 
-		       "book", &book,
-		       NULL);
-	cards = get_selected_cards (view);
-	parent_window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
-
-	e_addressbook_transfer_cards (book, cards, delete_from_source, parent_window);
-}
-
-void
-e_addressbook_view_copy_to_folder (EAddressbookView *view)
-{
-	view_transfer_cards (view, FALSE);
-}
-
-void
-e_addressbook_view_move_to_folder (EAddressbookView *view)
-{
-	view_transfer_cards (view, TRUE);
-}
-
-
-static gboolean
-e_addressbook_view_selection_nonempty (EAddressbookView  *view)
-{
-	ESelectionModel *selection_model;
-
-	selection_model = get_selection_model (view);
-	if (selection_model == NULL)
-		return FALSE;
-
-	return e_selection_model_selected_count (selection_model) != 0;
-}
-
-gboolean
-e_addressbook_view_can_create (EAddressbookView  *view)
-{
-	return view ? e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_print (EAddressbookView  *view)
-{
-	return view && view->model ? e_addressbook_model_card_count (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_save_as (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_view (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean 
-e_addressbook_view_can_send (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean   
-e_addressbook_view_can_send_to (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_delete (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) && e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_cut (EAddressbookView *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) && e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_copy (EAddressbookView *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_paste (EAddressbookView *view)
-{
-	return view ? e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_select_all (EAddressbookView *view)
-{
-	return view ? e_addressbook_model_card_count (view->model) != 0 : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_stop (EAddressbookView  *view)
-{
-	return view ? e_addressbook_model_can_stop (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_copy_to_folder (EAddressbookView *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_move_to_folder (EAddressbookView *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) && e_addressbook_model_editable (view->model) : FALSE;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index 58511845bd..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gtk/gtktable.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-instance.h>
-#include "e-addressbook-model.h"
-#include "widgets/menus/gal-view-menus.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include <gal/unicode/gunicode.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;
-
-	EAddressbookModel   *model;
-
-	GtkWidget *invisible;
-	GList *clipboard_cards;
-
-	EBook *book;
-	char  *query;
-	guint editable : 1;
-
-	GtkObject *object;
-	GtkWidget *widget;
-	GtkWidget *current_alphabet_widget;
-
-	GtkWidget *vbox;
-
-	/* Menus handler and the view instance */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-	GalView *current_view;
-	BonoboUIComponent *uic;
-};
-
-struct _EAddressbookViewClass
-{
-	GtkTableClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message)        (EAddressbookView *view, const gchar *message);
-	void (*folder_bar_message)    (EAddressbookView *view, const gchar *message);
-	void (*command_state_change)  (EAddressbookView *view);
-	void (*alphabet_state_change) (EAddressbookView *view, gunichar letter);
-};
-
-GtkWidget *e_addressbook_view_new                 (void);
-GtkType    e_addressbook_view_get_type            (void);
-
-void       e_addressbook_view_setup_menus         (EAddressbookView  *view,
-						   BonoboUIComponent *uic);
-
-void       e_addressbook_view_discard_menus       (EAddressbookView  *view);
-
-void       e_addressbook_view_save_as             (EAddressbookView  *view);
-void       e_addressbook_view_view                (EAddressbookView  *view);
-void       e_addressbook_view_send                (EAddressbookView  *view);
-void       e_addressbook_view_send_to             (EAddressbookView  *view);
-void       e_addressbook_view_print               (EAddressbookView  *view);
-void       e_addressbook_view_print_preview       (EAddressbookView  *view);
-void       e_addressbook_view_delete_selection    (EAddressbookView  *view);
-void       e_addressbook_view_cut                 (EAddressbookView  *view);
-void       e_addressbook_view_copy                (EAddressbookView  *view);
-void       e_addressbook_view_paste               (EAddressbookView  *view);
-void       e_addressbook_view_select_all          (EAddressbookView  *view);
-void       e_addressbook_view_show_all            (EAddressbookView  *view);
-void       e_addressbook_view_stop                (EAddressbookView  *view);
-void       e_addressbook_view_copy_to_folder      (EAddressbookView  *view);
-void       e_addressbook_view_move_to_folder      (EAddressbookView  *view);
-
-gboolean   e_addressbook_view_can_create          (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_print           (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_save_as         (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_view            (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_send            (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_send_to         (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_delete          (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_cut             (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_copy            (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_paste           (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_select_all      (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_stop            (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_copy_to_folder  (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_move_to_folder  (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 73417af78c..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-minicard-control.c
- *
- * Authors:
- *    Chris Lahey <clahey@ximian.com>
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <gal/util/e-util.h>
-
-#include <addressbook/gui/component/addressbook.h>
-
-#include "e-minicard-control.h"
-#include "e-minicard-widget.h"
-#include "e-card-merging.h"
-
-typedef struct {
-	EMinicardWidget *minicard;
-	GList *card_list;
-	GtkWidget *label;
-} EMinicardControl;
-
-#if 0
-enum {
-	PROP_RUNNING
-} MyArgs;
-
-#define RUNNING_KEY  "Clock::Running"
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  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,
-	  CORBA_Environment *ev,
-	  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 + 1);
-
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data)
-		data[length] = '\0';
-	else
-		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)
-{
-	GList *list;
-	char *vcard;
-	EMinicardControl *minicard_control = 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;
-	}
-
-	e_free_object_list (minicard_control->card_list);
-	list = e_card_load_cards_from_string_with_default_charset(vcard, "ISO-8859-1");
-	g_free(vcard);
-	minicard_control->card_list = list;
-	if (list)
-		gtk_object_set(GTK_OBJECT(minicard_control->minicard),
-			       "card", list->data,
-			       NULL);
-	if (list && list->next) {
-		char *message;
-		int length = g_list_length (list) - 1;
-		if (length > 1) {
-			message = g_strdup_printf (_("and %d other cards."), length);
-		} else {
-			message = g_strdup_printf (_("and one other card."));
-		}
-		gtk_label_set_text (GTK_LABEL (minicard_control->label), message);
-		g_free (message);
-		gtk_widget_show (minicard_control->label);
-	} else {
-		gtk_widget_hide (minicard_control->label);
-	}
-} /* 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)
-{
-	EMinicardControl *minicard_control = data;
-	char             *vcard;
-	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;
-	}
-
-	vcard = e_card_list_get_vcard(minicard_control->card_list);
-	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)
-{
-	EMinicardControl *minicard_control = data;
-	char *vcard;
-	gint length;
-
-	vcard = e_card_list_get_vcard(minicard_control->card_list);
-	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)
-{
-	GList *list = closure;
-	if (book) {
-		GList *p;
-		for (p = list; p; p = p->next) {
-			e_card_merging_book_add_card(book, p->data, NULL, NULL);
-		}
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-	e_free_object_list (list);
-}
-
-static void
-save_in_addressbook(GtkWidget *button, gpointer data)
-{
-	EMinicardControl *minicard_control = data;
-	GList *list, *p;
-	EBook *book;
-
-	book = e_book_new ();
-
-	list = g_list_copy (minicard_control->card_list);
-
-	for (p = list; p; p = p->next)
-		gtk_object_ref (GTK_OBJECT (p->data));
-
-	if (!addressbook_load_default_book (book, book_open_cb, list)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		book_open_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, list);
-	}
-}
-
-static void
-free_struct (GtkWidget *control, gpointer data)
-{
-	EMinicardControl *minicard_control = data;
-	e_free_object_list (minicard_control->card_list);
-	g_free (minicard_control);
-}
-
-static BonoboObject *
-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-#if 0
-	BonoboPropertyBag  *pb;
-#endif
-	BonoboControl       *control;
-	BonoboPersistStream *stream;
-	GtkWidget	    *minicard;
-	GtkWidget           *button;
-	GtkWidget           *label;
-	GtkWidget           *vbox;
-
-	EMinicardControl    *minicard_control = g_new (EMinicardControl, 1);
-
-
-	minicard_control->card_list = NULL;
-	minicard_control->minicard = NULL;
-	minicard_control->label = NULL;
-
-	/* Create the control. */
-
-	minicard = e_minicard_widget_new ();
-	gtk_widget_show (minicard);
-	minicard_control->minicard = E_MINICARD_WIDGET (minicard);
-
-	/* This is intentionally not shown. */
-	label = gtk_label_new ("");
-	minicard_control->label = label;
-
-	button = gtk_button_new_with_label(_("Save in addressbook"));
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   save_in_addressbook, minicard_control);
-	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), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	gtk_signal_connect (GTK_OBJECT (control), "destroy",
-			    free_struct, minicard_control);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    minicard_control);
-
-#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:GNOME_Evolution_Addressbook_MiniCard_ControlFactory",
-			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 b59ff46ae3..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-minicard-label.h"
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.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>
-#include <gdk/gdkkeysyms.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,
-	ARG_EDITABLE
-};
-
-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);
-  gtk_object_add_arg_type ("EMinicardLabel::editable", GTK_TYPE_BOOL, 
-			   GTK_ARG_READWRITE, ARG_EDITABLE);
- 
-  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, FALSE);
-		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;
-	case ARG_EDITABLE:
-		e_minicard_label->editable = GTK_VALUE_BOOL (*arg);
-		gtk_object_set (GTK_OBJECT (e_minicard_label->field), "editable", e_minicard_label->editable, NULL);
-		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;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_minicard_label->editable;
-		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",
-				 "draw_background", FALSE,
-				 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", e_minicard_label->editable,
-				 "draw_background", FALSE,
-				 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_KEY_PRESS:
-	    if (event->key.keyval == GDK_Escape) {
-		    GnomeCanvasItem *parent;
-
-		    e_text_cancel_editing (E_TEXT (e_minicard_label->field));
-
-		    parent = GNOME_CANVAS_ITEM (e_minicard_label)->parent;
-		    if (parent)
-			    e_canvas_item_grab_focus(parent, FALSE);
-	    }
-	    break;
-    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 32792991a7..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <glib.h>
-#include <libgnomeui/gnome-canvas.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;
-	guint editable : 1;
-	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 1f6e1bd26b..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gtk/gtksignal.h>
-#include <gal/widgets/e-canvas-background.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,
-	ARG_EDITABLE,
-	ARG_COLUMN_WIDTH
-};
-
-enum {
-	SELECTION_CHANGE,
-	COLUMN_WIDTH_CHANGED,
-	RIGHT_CLICK,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-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);
-	gtk_object_add_arg_type ("EMinicardViewWidget::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EMinicardViewWidget::column_width", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_COLUMN_WIDTH);
-
-	signals [SELECTION_CHANGE] =
-		gtk_signal_new ("selection_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, selection_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	signals [COLUMN_WIDTH_CHANGED] =
-		gtk_signal_new ("column_width_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, column_width_changed),
-				e_marshal_NONE__DOUBLE,
-				GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
-
-	signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, right_click),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_GDK_EVENT);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	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;
-
-	klass->selection_change     = NULL;
-	klass->column_width_changed = NULL;
-	klass->right_click          = NULL;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-	view->editable = FALSE;
-	view->column_width = 150;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter)
-{
-	EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));
-
-	widget->adapter = adapter;
-	gtk_object_ref (GTK_OBJECT (widget->adapter));
-
-	return GTK_WIDGET (widget);
-}
-
-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;
-	case ARG_EDITABLE:
-		emvw->editable = GTK_VALUE_BOOL(*arg);
-		if (emvw->emv)
-			gtk_object_set (GTK_OBJECT(emvw->emv),
-					"editable", emvw->editable,
-					NULL);
-		break;
-	case ARG_COLUMN_WIDTH:
-		emvw->column_width = GTK_VALUE_INT (*arg);
-		if (emvw->emv) {
-			gtk_object_set (GTK_OBJECT(emvw->emv),
-					"column_width", (int) emvw->column_width,
-					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;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = emvw->editable;
-		break;
-	case ARG_COLUMN_WIDTH:
-		GTK_VALUE_INT (*arg) = emvw->column_width;
-		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_unref (GTK_OBJECT (view->adapter));
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)
-{
-	gtk_signal_emit (GTK_OBJECT(widget),
-			 signals [SELECTION_CHANGE]);
-}
-
-static void
-column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget)
-{
-	gtk_signal_emit (GTK_OBJECT(widget),
-			 signals [COLUMN_WIDTH_CHANGED], width);
-}
-
-static guint
-right_click (EMinicardView *view, GdkEvent *event, EMinicardViewWidget *widget)
-{
-	guint ret_val;
-	gtk_signal_emit (GTK_OBJECT(widget),
-			 signals [RIGHT_CLICK],
-			 event, &ret_val);
-	return ret_val;
-}
-
-static void
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS(view) ),
-			      e_canvas_background_get_type(),
-			      "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,
-		"adapter", view->adapter,
-		"column_width", (int) view->column_width,
-		NULL );
-
-	gtk_signal_connect (GTK_OBJECT (E_REFLOW(view->emv)->selection),
-			    "selection_changed",
-			    selection_change, view);
-	gtk_signal_connect (GTK_OBJECT (view->emv),
-			    "column_width_changed",
-			    column_width_changed, view);
-	gtk_signal_connect (GTK_OBJECT (view->emv),
-			    "right_click",
-			    GTK_SIGNAL_FUNC (right_click), view);
-
-	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);
-	}
-}
-
-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);
-}
-
-ESelectionModel *
-e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view)
-{
-	if (view->emv)
-		return E_SELECTION_MODEL (E_REFLOW (view->emv)->selection);
-	else
-		return NULL;
-}
-
-EMinicardView *
-e_minicard_view_widget_get_view             (EMinicardViewWidget       *view)
-{
-	if (view->emv)
-		return E_MINICARD_VIEW (view->emv);
-	else
-		return NULL;
-}
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 c55bb6e636..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gal/widgets/e-canvas.h>
-#include <gal/unicode/gunicode.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "e-minicard-view.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 *emv;
-
-	EAddressbookReflowAdapter *adapter;
-
-	EBook *book;
-	char *query;
-	guint editable : 1;
-
-	double column_width;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-	void         (*selection_change)     (EMinicardViewWidget *emvw);
-	void         (*column_width_changed) (EMinicardViewWidget *emvw, double width);
-	guint        (*right_click)          (EMinicardViewWidget *emvw);
-};
-
-
-GtkType          e_minicard_view_widget_get_type             (void);
-GtkWidget       *e_minicard_view_widget_new                  (EAddressbookReflowAdapter *adapter);
-
-/* Get parts of the view widget. */
-ESelectionModel *e_minicard_view_widget_get_selection_model  (EMinicardViewWidget       *view);
-EMinicardView   *e_minicard_view_widget_get_view             (EMinicardViewWidget       *view);
-
-#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 8c758bb746..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-minicard-view.h"
-
-#include "e-addressbook-util.h"
-
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdnd.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnome/gnome-i18n.h>
-
-static void e_minicard_view_drag_data_get(GtkWidget *widget,
-					  GdkDragContext *context,
-					  GtkSelectionData *selection_data,
-					  guint info,
-					  guint time,
-					  EMinicardView *view);
-
-static EReflowClass *parent_class = NULL;
-#define PARENT_TYPE (E_REFLOW_TYPE)
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADAPTER,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE
-};
-
-
-enum {
-	RIGHT_CLICK,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD_LIST,
-};
-#define VCARD_LIST_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-static void
-e_minicard_view_drag_data_get(GtkWidget *widget,
-			      GdkDragContext *context,
-			      GtkSelectionData *selection_data,
-			      guint info,
-			      guint time,
-			      EMinicardView *view)
-{
-	if (!E_IS_MINICARD_VIEW(view))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD_LIST: {
-		char *value;
-		
-		value = e_card_list_get_vcard(view->drag_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-
-	g_list_foreach (view->drag_list, (GFunc)gtk_object_unref, NULL);
-	g_list_free (view->drag_list);
-	view->drag_list = NULL;
-}
-
-static int
-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
-{
-	GdkDragContext *context;
-	GtkTargetList *target_list;
-	GdkDragAction actions = GDK_ACTION_MOVE | GDK_ACTION_COPY;
-	
-	view->drag_list = e_minicard_view_get_card_list (view);
-
-	g_print ("dragging %d card(s)\n", g_list_length (view->drag_list));
-
-	target_list = gtk_target_list_new (drag_types, num_drag_types);
-
-	context = gtk_drag_begin (GTK_WIDGET (GNOME_CANVAS_ITEM (view)->canvas),
-				  target_list, actions, 1/*XXX*/, event);
-
-	if (!view->canvas_drag_data_get_id)
-		view->canvas_drag_data_get_id = gtk_signal_connect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)->canvas),
-								    "drag_data_get",
-								    GTK_SIGNAL_FUNC (e_minicard_view_drag_data_get),
-								    view);
-
-	gtk_drag_set_icon_default (context);
-
-	return TRUE;
-}
-
-static void
-set_empty_message (EMinicardView *view)
-{
-	char *empty_message;
-	gboolean editable = FALSE;
-
-	if (view->adapter) {
-		gtk_object_get (GTK_OBJECT (view->adapter),
-				"editable", &editable,
-				NULL);
-	}
-
-	if (editable)
-		empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view.\n\n"
-							    "Double-click here to create a new Contact."));
-	else
-		empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view."));
-
-	gtk_object_set (GTK_OBJECT(view),
-			"empty_message", empty_message,
-			NULL);
-
-	g_free (empty_message);
-}
-
-static void
-writable_status_change (EAddressbookModel *model, gboolean writable, EMinicardView *view)
-{
-	set_empty_message (view);
-}
-
-static void
-adapter_changed (EMinicardView *view)
-{
-	set_empty_message (view);
-
-	gtk_signal_connect (GTK_OBJECT (view->adapter), "drag_begin",
-			    GTK_SIGNAL_FUNC (e_minicard_view_drag_begin), view);
-}
-
-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_ADAPTER:
-		if (view->adapter) {
-			if (view->writable_status_id) {
-				EAddressbookModel *model;
-				gtk_object_get (GTK_OBJECT (view->adapter),
-						"model", &model,
-						NULL);
-				if (model) {
-					gtk_signal_disconnect (GTK_OBJECT (model), view->writable_status_id);
-				}
-			}
-
-			gtk_object_unref (GTK_OBJECT(view->adapter));
-		}
-		view->writable_status_id = 0;
-		view->adapter = GTK_VALUE_POINTER (*arg);
-		gtk_object_ref (GTK_OBJECT (view->adapter));
-		adapter_changed (view);
-		gtk_object_set (GTK_OBJECT (view),
-				"model", view->adapter,
-				NULL);
-		if (view->adapter) {
-			EAddressbookModel *model;
-			gtk_object_get (GTK_OBJECT (view->adapter),
-					"model", &model,
-					NULL);
-			if (model) {
-				view->writable_status_id =
-					gtk_signal_connect (GTK_OBJECT (model), "writable_status",
-							    GTK_SIGNAL_FUNC (writable_status_change), view);
-			}
-							    
-		}
-		break;
-	case ARG_BOOK:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "book", GTK_VALUE_OBJECT (*arg),
-					    NULL);
-		set_empty_message (view);
-		break;
-	case ARG_QUERY:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "query", GTK_VALUE_STRING (*arg),
-					    NULL);
-		break;
-	case ARG_EDITABLE:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "editable", GTK_VALUE_BOOL (*arg),
-					    NULL);
-		set_empty_message (view);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardView *view;
-
-	view = E_MINICARD_VIEW (object);
-
-	switch (arg_id) {
-	case ARG_ADAPTER:
-		GTK_VALUE_POINTER (*arg) = view->adapter;
-		break;
-	case ARG_BOOK:
-		gtk_object_get (GTK_OBJECT (view->adapter),
-					    "book", &GTK_VALUE_OBJECT (*arg),
-					    NULL);
-		break;
-	case ARG_QUERY:
-		gtk_object_get (GTK_OBJECT (view->adapter),
-					    "query", &GTK_VALUE_STRING (*arg),
-					    NULL);
-		break;
-	case ARG_EDITABLE:
-		gtk_object_get (GTK_OBJECT (view->adapter),
-					    "editable", &GTK_VALUE_BOOL (*arg),
-					    NULL);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_destroy (GtkObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	if (view->canvas_drag_data_get_id) {
-		gtk_signal_disconnect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)->canvas),
-				       view->canvas_drag_data_get_id);
-	}
-
-	if (view->adapter) {
-		if (view->writable_status_id) {
-			EAddressbookModel *model;
-			gtk_object_get (GTK_OBJECT (view->adapter),
-					"model", &model,
-					NULL);
-			if (model) {
-				gtk_signal_disconnect (GTK_OBJECT (model), view->writable_status_id);
-			}
-		}
-
-		gtk_object_unref (GTK_OBJECT(view->adapter));
-	}
-	view->writable_status_id = 0;
-	view->adapter = NULL;
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static guint
-e_minicard_view_right_click (EMinicardView *view, GdkEvent *event)
-{
-	guint ret_val = 0;
-	gtk_signal_emit (GTK_OBJECT (view), signals[RIGHT_CLICK],
-			 event, &ret_val);
-	return ret_val;
-}
-
-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)
-		{
-			EBook *book;
-			gboolean editable;
-
-			gtk_object_get(GTK_OBJECT(view), "book", &book, NULL);
-			gtk_object_get(GTK_OBJECT(view->adapter), "editable", &editable, NULL);
-
-			g_assert (E_IS_BOOK (book));
-
-			e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, editable);
-			return TRUE;
-		}
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			e_minicard_view_right_click (view, event);
-		}
-		break;
-	default:
-		break;
-	}
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-	else
-		return FALSE;
-}
-
-static gint
-e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
-	int return_val = FALSE;
-
-	view = E_MINICARD_VIEW (reflow);
-	if (parent_class->selection_event) {
-		return_val = parent_class->selection_event (reflow, item, event);
-	}
-
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in) {
-			int i;
-			for (i = 0; i < reflow->count; i++) {
-				if (reflow->items[i] == item) {
-					e_selection_model_maybe_do_something(reflow->selection, i, 0, 0);
-					break;
-				}
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			return_val = e_minicard_view_right_click (view, event);
-			if (!return_val)
-				e_selection_model_right_click_up(reflow->selection);
-		}
-		break;
-	default:
-		break;
-	}
-	return return_val;
-}
-
-typedef struct {
-	EMinicardView *view;
-	EBookCallback cb;
-	gpointer closure;
-} ViewCbClosure;
-
-static void
-do_remove (int i, gpointer user_data)
-{
-	EBook *book;
-	ECard *card;
-	ViewCbClosure *viewcbclosure = user_data;
-	EMinicardView *view = viewcbclosure->view;
-	EBookCallback cb = viewcbclosure->cb;
-	gpointer closure = viewcbclosure->closure;
-
-	gtk_object_get (GTK_OBJECT(view->adapter),
-			"book", &book,
-			NULL);
-
-	card = e_addressbook_reflow_adapter_get_card (view->adapter, i);
-
-	e_book_remove_card(book, card, cb, closure);
-
-	gtk_object_unref (GTK_OBJECT (card));
-}
-
-#if 0
-static int
-compare_to_utf_str (EMinicard *card, const char *utf_str)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (g_unichar_isdigit (g_utf8_get_char (utf_str))) {
-		return 1;
-	}
-
-	if (card->card) {
-		char *file_as;
-		gtk_object_get(GTK_OBJECT(card->card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as)
-			return g_utf8_strcasecmp (file_as, utf_str);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-#endif
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	EReflowClass *reflow_class;
-	
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-	reflow_class = (EReflowClass *) klass;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	gtk_object_add_arg_type ("EMinicardView::adapter", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_ADAPTER);
-	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);
-	gtk_object_add_arg_type ("EMinicardView::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewClass, right_click),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_GDK_EVENT);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	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;
-
-	reflow_class->selection_event = e_minicard_view_selection_event;
-	/* GnomeCanvasItem method overrides */
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->adapter = NULL;
-	view->canvas_drag_data_get_id = 0;
-	view->writable_status_id = 0;
-
-	set_empty_message (view);
-}
-
-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 (PARENT_TYPE, &reflow_info);
-	}
-
-	return reflow_type;
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	ViewCbClosure viewcbclosure;
-	viewcbclosure.view = view;
-	viewcbclosure.cb = cb;
-	viewcbclosure.closure = closure;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection,
-				   do_remove,
-				   &viewcbclosure);
-}
-
-void
-e_minicard_view_jump_to_letter (EMinicardView *view,
-                                gunichar letter)
-{
-#if 0
-	char uft_str[6 + 1];
-
-	utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';
-	e_reflow_sorted_jump (E_REFLOW_SORTED (view),
-	                      (GCompareFunc) compare_to_utf_str,
-	                      utf_str);
-#endif
-}
-
-typedef struct {
-	GList *list;
-	EAddressbookReflowAdapter *adapter;
-} ModelAndList;
-
-static void
-add_to_list (int index, gpointer closure)
-{
-	ModelAndList *mal = closure;
-	mal->list = g_list_prepend (mal->list, e_addressbook_reflow_adapter_get_card (mal->adapter, index));
-}
-
-GList *
-e_minicard_view_get_card_list (EMinicardView *view)
-{
-	ModelAndList mal;
-
-	mal.adapter = view->adapter;
-	mal.list = NULL;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection, add_to_list, &mal);
-
-	mal.list = g_list_reverse (mal.list);
-	return mal.list;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index 1f23c62754..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-minicard.h"
-
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-selection-model-simple.h>
-#include <gal/unicode/gunicode.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "e-addressbook-reflow-adapter.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
-{
-	EReflow parent;
-
-	EAddressbookReflowAdapter *adapter;
-	
-	/* item specific fields */
-
-	GList *drag_list;
-
-	guint canvas_drag_data_get_id;
-
-	guint writable_status_id;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowClass parent_class;
-
-	void (*right_click) (EMinicardView *view, GdkEvent *event);
-};
-
-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,
-					    gunichar       letter);
-GList   *e_minicard_view_get_card_list     (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 04ef2f0823..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget-test.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Ximian, 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@ximian.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 <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.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, Ximian, 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 566a43b087..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-canvas-rect-ellipse.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);
-	gpointer ptr;
-
-	switch (arg_id){
-	case ARG_CARD:
-		ptr = GTK_VALUE_POINTER (*arg);
-		e_minicard_widget_set_card (emw, ptr ? E_CARD (ptr) : 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;
-	}
-}
-
-void
-e_minicard_widget_set_card (EMinicardWidget *emw, ECard *card)
-{
-	g_return_if_fail (emw && E_IS_MINICARD_WIDGET (emw));
-	g_return_if_fail (card == NULL || E_IS_CARD (card));
-
-	if (card != emw->card) {
-
-		if (emw->card)
-			gtk_object_unref (GTK_OBJECT (emw->card));
-
-		emw->card = card;
-
-		if (emw->card)
-			gtk_object_ref (GTK_OBJECT (emw->card));
-
-		if (emw->item)
-			gtk_object_set (GTK_OBJECT (emw->item),
-				       "card", emw->card,
-				       NULL);
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
deleted file mode 100644
index eaf0f8edb6..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  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-card.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);
-
-void e_minicard_widget_set_card (EMinicardWidget *, ECard *);
-
-#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 d8e34577b2..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <glib.h>
-#include <gtk/gtkdnd.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.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/unicode/gunicode.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "e-addressbook-util.h"
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "e-minicard-view.h"
-#include "e-contact-editor.h"
-#include "e-card-merging.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 void e_minicard_finalize (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 gint e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-typedef struct _EMinicardField EMinicardField;
-
-struct _EMinicardField {
-	ECardSimpleField field;
-	GnomeCanvasItem *label;
-};
-
-#define d(x)
-
-#define LIST_ICON_FILENAME "contact-is-a-list.png"
-
-#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_SELECTED,
-	ARG_HAS_CURSOR,
-	ARG_EDITABLE,
-	ARG_CARD
-};
-
-enum {
-	SELECTED,
-	DRAG_BEGIN,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_signals [LAST_SIGNAL] = {0, };
-
-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::selected", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_SELECTED);
-	gtk_object_add_arg_type ("EMinicard::has_cursor", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_HAS_CURSOR);
-	gtk_object_add_arg_type ("EMinicard::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_CARD);
-
-	e_minicard_signals [SELECTED] =
-		gtk_signal_new ("selected",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardClass, selected),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-	e_minicard_signals [DRAG_BEGIN] =
-		gtk_signal_new ("drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardClass, drag_begin),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_minicard_signals, LAST_SIGNAL);
- 
-	object_class->set_arg  = e_minicard_set_arg;
-	object_class->get_arg  = e_minicard_get_arg;
-	object_class->destroy  = e_minicard_destroy;
-	object_class->finalize = e_minicard_finalize;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->realize    = e_minicard_realize;
-	item_class->unrealize  = e_minicard_unrealize;
-	item_class->event      = e_minicard_event;
-
-	klass->selected        = NULL;
-}
-
-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->selected         = FALSE;
-	minicard->editable         = FALSE;
-	minicard->has_cursor       = FALSE;
-
-	minicard->card             = NULL;
-	minicard->simple           = e_card_simple_new(NULL);
-
-	minicard->list_icon_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME);
-	minicard->list_icon_size   = gdk_pixbuf_get_height (minicard->list_icon_pixbuf);
-
-	minicard->editor           = NULL;
-
-	minicard->changed          = FALSE;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
-}
-
-static void
-set_selected (EMinicard *minicard, gboolean selected)
-{
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas);
-	if (selected) {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
-				       NULL);
-	} else {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color", NULL, 
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				       NULL);
-	}
-	minicard->selected = selected;
-}
-
-static void
-set_has_cursor (EMinicard *minicard, gboolean has_cursor)
-{
-	if (!minicard->has_focus && has_cursor)
-		e_canvas_item_grab_focus(GNOME_CANVAS_ITEM (minicard), FALSE);
-	minicard->has_cursor = has_cursor;
-}
-
-
-static void
-e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-	GList *l;
-
-	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 {
-			if (!e_minicard->has_focus)
-				e_canvas_item_grab_focus(item, FALSE);
-		}
-		break;
-	case ARG_SELECTED:
-		if (e_minicard->selected != GTK_VALUE_BOOL(*arg))
-			set_selected (e_minicard, GTK_VALUE_BOOL(*arg));
-		break;
-	case ARG_EDITABLE:
-		e_minicard->editable = GTK_VALUE_BOOL(*arg);
-		for (l = e_minicard->fields; l; l = l->next)
-			gtk_object_set (GTK_OBJECT (E_MINICARD_FIELD (l->data)->label),
-					"editable", e_minicard->editable,
-					NULL);
-		break;
-	case ARG_HAS_CURSOR:
-		d(g_print("%s: ARG_HAS_CURSOR\n", __FUNCTION__));
-		if (e_minicard->has_cursor != GTK_VALUE_BOOL(*arg))
-			set_has_cursor (e_minicard, GTK_VALUE_BOOL(*arg));
-		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_SELECTED:
-		GTK_VALUE_BOOL (*arg) = e_minicard->selected;
-		break;
-	case ARG_HAS_CURSOR:
-		GTK_VALUE_BOOL (*arg) = e_minicard->has_cursor;
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_minicard->editable;
-		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);
-
-	gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-static void
-e_minicard_finalize (GtkObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	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)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (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", "",
-				 "draw_background", FALSE,
-				 NULL );
-
-	e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
-
-	e_minicard->list_icon = 
-		gnome_canvas_item_new ( group,
-					gnome_canvas_pixbuf_get_type(),
-					"pixbuf", e_minicard->list_icon_pixbuf,
-					NULL);
-
-	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_modified_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	d(g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__));
-	if (status != E_BOOK_STATUS_SUCCESS)
-		e_addressbook_error_dialog (_("Error modifying card"), status);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	EMinicard *minicard = data;
-	gtk_object_unref (GTK_OBJECT (editor));
-	minicard->editor = NULL;
-}
-
-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;
-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", __FUNCTION__, focus_event->in?"in":"out"));
-			if (focus_event->in) {
-				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */
-				e_minicard->has_focus = TRUE;
-				if (!e_minicard->selected) {
-					e_minicard_selected(e_minicard, event);
-				}
-			} 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_card_merging_book_commit_card (book,
-										 e_minicard->card,
-										 card_modified_cb,
-										 NULL);
-					} else {
-						remodel(e_minicard);
-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));
-					}
-					e_minicard->changed = FALSE;
-				}
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS: {
-		if (1 <= event->button.button && event->button.button <= 2) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			GdkEventMask mask = ((1 << (4 + event->button.button)) |
-					     GDK_POINTER_MOTION_MASK |
-					     GDK_BUTTON_PRESS_MASK |
-					     GDK_BUTTON_RELEASE_MASK);
-			
-			e_canvas_item_grab_focus(item, TRUE);
-
-			if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (e_minicard),
-						    mask, NULL, event->button.time)) {
-				return FALSE;
-			}
-			gtk_grab_add (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-			e_minicard->button_x = event->button.x;
-			e_minicard->button_y = event->button.y;
-			e_minicard->drag_button = event->button.button;
-			e_minicard->drag_button_down = TRUE;
-			return ret_val;
-		} else if (event->button.button == 3) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			if (ret_val != 0)
-				return ret_val;
-		}
-		break;
-	}
-	case GDK_BUTTON_RELEASE:
-		if (e_minicard->drag_button == event->button.button) {
-			e_minicard->drag_button = 0;
-			e_minicard->drag_button_down = FALSE;
-			e_minicard->button_x = -1;
-			e_minicard->button_y = -1;
-
-			if (GTK_WIDGET_HAS_GRAB (GNOME_CANVAS_ITEM (e_minicard)->canvas)) {
-				gtk_grab_remove (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-				gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (e_minicard), event->button.time);
-			}
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (e_minicard->drag_button_down && event->motion.state & GDK_BUTTON1_MASK) {
-			if (MAX (abs (e_minicard->button_x - event->motion.x),
-				 abs (e_minicard->button_y - event->motion.y)) > 3) {
-				gint ret_val;
-
-				ret_val = e_minicard_drag_begin(e_minicard, event);
-
-				e_minicard->drag_button_down = FALSE;
-
-				return ret_val;
-			}
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) {
-			if (e_minicard->editor) {
-				if (e_card_evolution_list (e_minicard->card))
-					e_contact_list_editor_raise (E_CONTACT_LIST_EDITOR(e_minicard->editor));
-				else
-					e_contact_editor_raise(E_CONTACT_EDITOR(e_minicard->editor));
-			} else {
-				EBook *book = NULL;
-				if (E_IS_MINICARD_VIEW(item->parent)) {
-					gtk_object_get(GTK_OBJECT(item->parent),
-						       "book", &book,
-						       NULL);
-				}
-
-				if (book != NULL) {
-					if (e_card_evolution_list (e_minicard->card)) {
-						EContactListEditor *editor = e_addressbook_show_contact_list_editor (book, e_minicard->card,
-														     FALSE, e_minicard->editable);
-						e_minicard->editor = GTK_OBJECT (editor);
-					}
-					else {
-						EContactEditor *editor = e_addressbook_show_contact_editor (book, e_minicard->card,
-													    FALSE, e_minicard->editable);
-						e_minicard->editor = GTK_OBJECT (editor);
-					}
-					gtk_object_ref (e_minicard->editor);
-
-					gtk_signal_connect (e_minicard->editor, "editor_closed",
-							    GTK_SIGNAL_FUNC (editor_closed_cb), e_minicard);
-
-				}
-			}
-			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 
-						 - (e_card_evolution_list (e_minicard->card) ? e_minicard->list_icon_size : 0.0)),
-				       NULL );
-	}
-	if (e_minicard->list_icon) {
-		e_canvas_item_move_absolute(e_minicard->list_icon,
-					    e_minicard->width - e_minicard->list_icon_size - 3,
-					    3);
-	}
-	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
-field_activated (EText *text, EMinicard *e_minicard)
-{
-	e_text_stop_editing (text);
-	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (e_minicard), FALSE);
-}
-
-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);
-
-	/* Magically convert embedded XML into an address. */
-	if (!strncmp (string, "<?xml", 5)) {
-		EDestination *dest = e_destination_import (string);
-		if (dest != NULL) {
-			gchar *new_string = g_strdup (e_destination_get_address (dest));
-			g_free (string);
-			string = new_string;
-			gtk_object_unref (GTK_OBJECT (dest));
-		}
-	}
-
-	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,
-			       "editable", e_minicard->editable,
-			       NULL );
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "activate", GTK_SIGNAL_FUNC(field_activated), e_minicard);
-	gtk_object_set(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-		       "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->simple, field),
-		       NULL);
-	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 ( !(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
-		return;
-	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);
-		}
-
-		if (e_minicard->card && e_card_evolution_list (e_minicard->card) ) {
-			gnome_canvas_item_show (e_minicard->list_icon);
-		}
-		else {
-			gnome_canvas_item_hide (e_minicard->list_icon);
-		}
-
-		list = e_minicard->fields;
-		e_minicard->fields = NULL;
-
-		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING && 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) {
-					/* Magically convert embedded XML into an address. */
-					if (!strncmp (string, "<?xml", 4)) {
-						EDestination *dest = e_destination_import (string);
-						if (dest != NULL) {
-							gchar *new_string = g_strdup (e_destination_get_address (dest));
-							g_free (string);
-							string = new_string;
-							gtk_object_unref (GTK_OBJECT (dest));
-						}
-					}
-
-					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);
-	}
-}
-
-const 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 g_utf8_collate(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;
-	}
-}
-
-int
-e_minicard_selected (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard);
-	if (item->parent) {
-		guint signal_id = gtk_signal_lookup ("selection_event", GTK_OBJECT_TYPE (item->parent));
-		/* We should probably check the signature here, but I
-		 * don't think it's worth the time required to code
-		 * it.
-		 */
-		if (signal_id != 0) {
-			gtk_signal_emit(GTK_OBJECT(item->parent),
-					signal_id,
-					item, event, &ret_val);
-		}
-	}
-	return ret_val;
-}
-
-static gint
-e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	gtk_signal_emit (GTK_OBJECT(minicard),
-			 e_minicard_signals[DRAG_BEGIN],
-			 event, &ret_val);
-	return ret_val;
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index bb6a3c072e..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "addressbook/gui/contact-editor/e-contact-editor.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;
-	GnomeCanvasItem *list_icon;
-
-	GdkPixbuf *list_icon_pixbuf;
-	double list_icon_size;
-
-	GtkObject *editor;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-
-	guint selected : 1;
-	guint has_cursor : 1;
-
-	guint has_focus : 1;
-
-	guint editable : 1;
-
-	guint drag_button_down : 1;
-	gint drag_button;
-
-	gint button_x;
-	gint button_y;
-
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	gint (* selected) (EMinicard *minicard, GdkEvent *event);
-	gint (* drag_begin) (EMinicard *minicard, GdkEvent *event);
-};
-
-
-GtkType     e_minicard_get_type     (void);
-const char *e_minicard_get_card_id  (EMinicard *minicard);
-int         e_minicard_compare      (EMinicard *minicard1,
-				     EMinicard *minicard2);
-
-int         e_minicard_selected     (EMinicard *minicard,
-				     GdkEvent  *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
deleted file mode 100644
index 10e13d9bdf..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-
-#define GVFE_CLASS(e) ((GalViewFactoryMinicardClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gal_view_factory_get_type ()
-
-static GalViewFactoryClass *gal_view_factory_minicard_parent_class;
-
-static const char *
-gal_view_factory_minicard_get_title       (GalViewFactory *factory)
-{
-	return _("Card View");
-}
-
-static GalView *
-gal_view_factory_minicard_new_view        (GalViewFactory *factory,
-					   const char     *name)
-{
-	return gal_view_minicard_new(name);
-}
-
-static const char *
-gal_view_factory_minicard_get_type_code (GalViewFactory *factory)
-{
-	return "minicard";
-}
-
-static void
-gal_view_factory_minicard_destroy         (GtkObject *object)
-{
-#if 0
-	GalViewFactoryMinicard *factory = GAL_VIEW_FACTORY_MINICARD(object);
-#endif
-}
-
-static void
-gal_view_factory_minicard_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_minicard_parent_class    = gtk_type_class (PARENT_TYPE);
-
-	view_factory_class->get_title           = gal_view_factory_minicard_get_title;
-	view_factory_class->new_view            = gal_view_factory_minicard_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_minicard_get_type_code;
-
-	object_class->destroy                   = gal_view_factory_minicard_destroy;
-}
-
-static void
-gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)
-{
-}
-
-/**
- * gal_view_minicard_new
- *
- * A new GalViewFactory for creating Minicard views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_new        (void)
-{
-	return gal_view_factory_minicard_construct (gtk_type_new (gal_view_factory_minicard_get_type ()));
-}
-
-/**
- * gal_view_minicard_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)
-{
-	return GAL_VIEW_FACTORY(factory);
-}
-
-GtkType
-gal_view_factory_minicard_get_type  (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactoryMinicard",
-			sizeof (GalViewFactoryMinicard),
-			sizeof (GalViewFactoryMinicardClass),
-			(GtkClassInitFunc) gal_view_factory_minicard_class_init,
-			(GtkObjectInitFunc) gal_view_factory_minicard_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
deleted file mode 100644
index 3816fdba46..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_FACTORY_MINICARD_H_
-#define _GAL_VIEW_FACTORY_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#define GAL_VIEW_FACTORY_MINICARD_TYPE        (gal_view_factory_minicard_get_type ())
-#define GAL_VIEW_FACTORY_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicard))
-#define GAL_VIEW_FACTORY_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicardClass))
-#define GAL_IS_VIEW_FACTORY_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_MINICARD_TYPE))
-#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_MINICARD_TYPE))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryMinicard;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryMinicardClass;
-
-/* Standard functions */
-GtkType         gal_view_factory_minicard_get_type   (void);
-GalViewFactory *gal_view_factory_minicard_new        (void);
-GalViewFactory *gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory);
-
-#endif /* _GAL_VIEW_FACTORY_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
deleted file mode 100644
index b3162e51d1..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.c: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-minicard.h"
-#include <gnome-xml/parser.h>
-#include <gal/util/e-xml-utils.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-#define d(x) x
-
-static GalViewClass *gal_view_minicard_parent_class;
-
-static void
-gal_view_minicard_edit            (GalView *view)
-{
-	/* GalViewMinicard *minicard_view = GAL_VIEW_MINICARD(view); */
-}
-
-static void  
-gal_view_minicard_load (GalView *view,
-			const char *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *root = xmlDocGetRootElement(doc);
-		GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150);
-		xmlFreeDoc(doc);
-	}
-}
-
-static void
-gal_view_minicard_save (GalView *view,
-			const char *filename)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode (NULL, "EMinicardViewState");
-	e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_MINICARD (view)->column_width);
-	xmlDocSetRootElement(doc, root);
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-}
-
-static const char *
-gal_view_minicard_get_title       (GalView *view)
-{
-	return GAL_VIEW_MINICARD(view)->title;
-}
-
-static void
-gal_view_minicard_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_MINICARD(view)->title);
-	GAL_VIEW_MINICARD(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_minicard_get_type_code (GalView *view)
-{
-	return "minicard";
-}
-
-static GalView *
-gal_view_minicard_clone       (GalView *view)
-{
-	GalViewMinicard *gvm, *new;
-
-	gvm = GAL_VIEW_MINICARD(view);
-
-	new               = gtk_type_new (gal_view_minicard_get_type ());
-	new->title        = g_strdup (gvm->title);
-	new->column_width = gvm->column_width;
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_minicard_destroy         (GtkObject *object)
-{
-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);
-	gal_view_minicard_detach (view);
-	g_free(view->title);
-}
-
-static void
-gal_view_minicard_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_minicard_parent_class  = gtk_type_class (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_minicard_edit         ;
-	gal_view_class->load          = gal_view_minicard_load         ;
-	gal_view_class->save          = gal_view_minicard_save         ;
-	gal_view_class->get_title     = gal_view_minicard_get_title    ;
-	gal_view_class->set_title     = gal_view_minicard_set_title    ;
-	gal_view_class->get_type_code = gal_view_minicard_get_type_code;
-	gal_view_class->clone         = gal_view_minicard_clone        ;
-
-	object_class->destroy         = gal_view_minicard_destroy      ;
-}
-
-static void
-gal_view_minicard_init      (GalViewMinicard *gvm)
-{
-	gvm->title = NULL;
-	gvm->column_width = 150.0;
-
-	gvm->emvw = NULL;
-	gvm->emvw_column_width_changed_id = 0;
-}
-
-/**
- * gal_view_minicard_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewMinicard.  This is primarily for use by
- * GalViewFactoryMinicard.
- *
- * Returns: The new GalViewMinicard.
- */
-GalView *
-gal_view_minicard_new (const gchar *title)
-{
-	return gal_view_minicard_construct (gtk_type_new (gal_view_minicard_get_type ()), title);
-}
-
-/**
- * gal_view_minicard_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * constructs the GalViewMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewMinicard.
- */
-GalView *
-gal_view_minicard_construct  (GalViewMinicard *view,
-			      const gchar *title)
-{
-	view->title = g_strdup(title);
-	return GAL_VIEW(view);
-}
-
-GtkType
-gal_view_minicard_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewMinicard",
-			sizeof (GalViewMinicard),
-			sizeof (GalViewMinicardClass),
-			(GtkClassInitFunc) gal_view_minicard_class_init,
-			(GtkObjectInitFunc) gal_view_minicard_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-column_width_changed (ETable *table, double width, GalViewMinicard *view)
-{
-	d(g_print("%s: Old width = %f, New width = %f\n", __FUNCTION__, view->column_width, width));
-	if (view->column_width != width) {
-		view->column_width = width;
-		gal_view_changed(GAL_VIEW(view));
-	}
-}
-
-void
-gal_view_minicard_attach (GalViewMinicard *view, EMinicardViewWidget *emvw)
-{
-	gal_view_minicard_detach (view);
-
-	view->emvw = emvw;
-
-	gtk_object_ref (GTK_OBJECT (view->emvw));
-
-	gtk_object_set (GTK_OBJECT (view->emvw),
-			"column_width", (int) view->column_width,
-			NULL);
-
-	view->emvw_column_width_changed_id =
-		gtk_signal_connect(GTK_OBJECT(view->emvw), "column_width_changed",
-				   GTK_SIGNAL_FUNC (column_width_changed), view);
-}
-
-void
-gal_view_minicard_detach (GalViewMinicard *view)
-{
-	if (view->emvw == NULL)
-		return;
-	if (view->emvw_column_width_changed_id) {
-		gtk_signal_disconnect (GTK_OBJECT (view->emvw),
-				       view->emvw_column_width_changed_id);
-		view->emvw_column_width_changed_id = 0;
-	}
-	gtk_object_unref (GTK_OBJECT (view->emvw));
-	view->emvw = NULL;
-}
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
deleted file mode 100644
index 31a28c56d9..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.h: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_MINICARD_H_
-#define _GAL_VIEW_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-#include <e-minicard-view-widget.h>
-
-#define GAL_VIEW_MINICARD_TYPE        (gal_view_minicard_get_type ())
-#define GAL_VIEW_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MINICARD_TYPE, GalViewMinicard))
-#define GAL_VIEW_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MINICARD_TYPE, GalViewMinicardClass))
-#define GAL_IS_VIEW_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MINICARD_TYPE))
-#define GAL_IS_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MINICARD_TYPE))
-
-typedef struct {
-	GalView              base;
-
-	char                *title;
-	double               column_width;
-
-	EMinicardViewWidget *emvw;
-	guint                emvw_column_width_changed_id;
-} GalViewMinicard;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewMinicardClass;
-
-/* Standard functions */
-GtkType  gal_view_minicard_get_type   (void);
-GalView *gal_view_minicard_new        (const gchar         *title);
-GalView *gal_view_minicard_construct  (GalViewMinicard     *view,
-				       const gchar         *title);
-void     gal_view_minicard_attach     (GalViewMinicard     *view,
-				       EMinicardViewWidget *emvw);
-void     gal_view_minicard_detach     (GalViewMinicard     *view);
-
-#endif /* _GAL_VIEW_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 7b1919aef4..0000000000
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard-label.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-init.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-label.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, Ximian, 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 caa9dac270..0000000000
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <libgnorba/gnorba.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, Ximian, 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 b84a591bbb..0000000000
--- a/addressbook/gui/widgets/test-minicard.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.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, Ximian, 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 14066c4cd0..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#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@ximian.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 <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-init.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-minicard.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, Ximian, 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, NULL);
-    }
-  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 bd532b86cc..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,65 +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)"\"		\
-	$(EVOLUTION_ADDRESSBOOK_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 =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/ename/libename.la		\
-	libecontactprint.a					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/ename/libename.la		\
-	libecontactprint.a					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-EXTRA_DIST = 		\
-	$(glade_DATA)	\
-	$(ecps_DATA)
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index 2f65afa81b..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "addressbook/printing/e-contact-print-envelope.h"
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <time.h>
-#include <libgnome/gnome-paper.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 * 9.5)
-
-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_utf8_sized (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;
-	gnome_print_setfont(pc, font);
-	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, gboolean as_return)
-{
-	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);
-	if (as_return)
-		font = gnome_font_new("Helvetica", 9);
-	else
-		font = gnome_font_new("Helvetica", 12);
-	ecpe_linelist_dimensions(font, address, linelist, NULL, &y);
-	if (as_return) {
-		x = 36;
-		y = ENVELOPE_HEIGHT - 36;
-	} else {
-		x = ENVELOPE_WIDTH / 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, FALSE);
-		
-		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, FALSE);
-		
-		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;
-}
-
-/* FIXME: Print all the contacts selected. */
-GtkWidget *
-e_contact_print_envelope_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	ECard *card;
-
-	if (list == NULL)
-		return NULL;
-
-	dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(list->data);
-	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 4302c4c5d7..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  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <addressbook/backend/ebook/e-card.h>
-#include <gtk/gtkwidget.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);
-GtkWidget *e_contact_print_envelope_list_dialog_new(GList *list);
-
-#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 f05a508ed8..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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-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 e4604d551c..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gtk/gtkvbox.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 b7082b41f6..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <glib.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 81f5c4e965..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1207 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "e-contact-print.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-paper.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 <gal/widgets/e-unicode.h>
-#include <gal/unicode/gunicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include <addressbook/backend/ebook/e-destination.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_utf8(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_utf8_sized(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_utf8(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_utf8_sized(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(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_utf8(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_utf8_sized(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_utf8(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_utf8(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_utf8(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_utf8(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_utf8(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_utf8(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_utf8(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_utf8(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_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_utf8(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;
-
-	/* g_message ("%s %g", e_card_simple_get (simple, E_CARD_SIMPLE_FIELD_FILE_AS), height); */
-	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_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-
-		if (string && !strncmp (string, "<?xml", 4)) {
-			EDestination *dest = e_destination_import (string);
-			if (dest != NULL) {
-				gchar *new_string = g_strdup (e_destination_get_address (dest));
-				g_free (string);
-				string = new_string;
-				gtk_object_unref (GTK_OBJECT (dest));
-			}
-		}
-
-		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_utf8(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_utf8(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;
-		gchar *letter_str = NULL;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as != NULL) {
-			letter_str = g_strndup (file_as, g_utf8_next_char (file_as) - (gchar *) file_as);
-		}
-		if ( file_as && (!ctxt->character || g_utf8_collate (ctxt->character, letter_str) != 0) ) {
-			g_free (ctxt->character);
-			ctxt->character = g_strdup (letter_str);
-			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->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);
-		}
-		g_free (letter_str);
-		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 g_utf8_collate(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_SIMPLE_STRING; 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_utf8(ctxt->style->body_font, e_card_get_string_fileas(card)) - 
-		gnome_font_get_width_utf8(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_utf8(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_closest("Helvetica", GNOME_FONT_BOLD, FALSE, 8);
-	style->body_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 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_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-
-	style->footer_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 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;
-}
-
-void
-e_contact_print_preview(EBook *book, char *query)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gdouble font_size;
-
-	master = gnome_print_master_new();
-	gnome_print_master_set_copies (master, 1, FALSE);
-	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);
-	ctxt->cards = NULL;
-	gtk_object_ref(GTK_OBJECT(book));
-	e_contact_do_print(book, ctxt->query, ctxt);
-}
-
-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;
-}
-
-/* FIXME: Print all the contacts selected. */
-GtkWidget *
-e_contact_print_card_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	ECard *card;
-
-	if (list == NULL)
-		return NULL;
-	
-	dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(list->data);
-	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 292fc8cc85..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2003 +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>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</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>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>
-      <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>F_ont...</label>
-		      <relief>GTK_RELIEF_NORMAL</relief>
-		    </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>
-		      <relief>GTK_RELIEF_NORMAL</relief>
-		    </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>F_ont...</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </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>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </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>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index 12f13f4573..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <glib.h>
-#include <gtk/gtkwidget.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-void e_contact_print_preview(EBook *book, char *query);
-GtkWidget *e_contact_print_card_dialog_new(ECard *card);
-GtkWidget *e_contact_print_card_list_dialog_new(GList *list);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index ef76c0b46e..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 980750a6b2..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 0bb19aa92e..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 0ac169468c..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.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, Ximian, 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 fc868318d8..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-init.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, Ximian, 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/16_copy.png b/art/16_copy.png
deleted file mode 100644
index 31ede839ea..0000000000
--- a/art/16_copy.png
+++ /dev/null
diff --git a/art/16_customize.png b/art/16_customize.png
deleted file mode 100644
index 1a0e15ad4e..0000000000
--- a/art/16_customize.png
+++ /dev/null
diff --git a/art/16_cut.png b/art/16_cut.png
deleted file mode 100644
index 5860a9c56f..0000000000
--- a/art/16_cut.png
+++ /dev/null
diff --git a/art/16_paste.png b/art/16_paste.png
deleted file mode 100644
index 56f15c5cc3..0000000000
--- a/art/16_paste.png
+++ /dev/null
diff --git a/art/ChangeLog b/art/ChangeLog
deleted file mode 100644
index cb4c3b76f0..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,567 +0,0 @@
-2002-04-25  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): font.png: Add for the font config
-	prefs.
-
-2002-04-17  Dan Winship  <danw@ximian.com>
-
-	* monkey-16.png: Replace with an antialiased version
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA), folder-settings.png: Add. (Copied
-	from Unscalable Gorilla because it was handy. Will probably get
-	changed to something else...)
-
-2002-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar-and-tasks-settings.png: New.
-	* composer-settings.png: New.
-	* ldap-settings.png: New.
-	* mail-accounts-settings.png: New.
-	* summary-settings.png: New.
-
-2002-03-25  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Add working-16.png (the GNOME2 stock
-	"wait" icon, from Jakub)
-
-2002-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* forward.xpm, reply.xpm, reply_to_all.xpm: Rename the internal
-	structure to coincide with the filenames.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New cool artwork from Jakub.
-	
-2002-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Remove meeting_widget.png from the build since it
-	doesn't seem to be in cvs?
-
-2002-02-20  Jakub Steiner <jimmac@ximian.com>
-
-	* summary_preferences-16.png: menu icon for summary preferences
-	* Makefile.am: added the icon
-
-2002-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* flag-for-followup.xpm:
-	* flag-for-followup-16.png:
-	* flag-for-followup-48.png: New icons.
-
-	* Makefile.am: Added the new icons...
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install mail-new.xpm, mail-read.xpm and
-	priority-high.xpm in the same place as other bonobo-ui menu
-	pixmaps so we can use these in menus too.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* connect_to_url-16.xpm: new icon
-
-	* new_all_day_event.png: ditto
-
-	* Makefile.am: install and dist new images
-
-2001-12-11  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: A new icon that sucks less.  We still need
-	some Tuomas-love.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: Added a really, really ugly and
-	awful icon to symbolize "message needs a reply".
-
-	* Makefile.am (EXTRA_DIST): Added mail-need-reply.xpm.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.png: New, updated icon from Tuomas.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): dist the glade data
-
-2001-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (gladedir): New.
-	(glade_DATA): Pixmap files required to be installed by the glade
-	files.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Install `evolution.png', not `evolution-icon.png'.
-
-	* evolution.png: Renamed from `evolution-icon.png', removing the
-	old, now unused `evolution.png'.
-
-2001-10-30  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: new style splash 
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* splash.png: Remove the "1" from "1.0 Release Candidate 1" so it
-	looks better.
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* Makefile.am (appicon_DATA): Changed the filename here too 
-	so the icon gets installed.
-
-	* evolution-icon.png: New icon that scales better.
-
-2001-10-22  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: update the layout a bit
-	* splash.png: update to 0.17 
-
-2001-10-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Add `about-box.png'.
-
-	* about-box.png: New image for the about box from Jakub.
-
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): add alarm.png for the new alarm
-	notification code.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): change ldap-16.png to ldap-mini.png,
-	and add ldap.png.
-
-2001-10-04  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: bump to 0.16
-	* ldap.png: 48x48 version for shortcut bar
-
-2001-09-25  Iain Holmes  <iain@ximian.com>
-
-	* add task.png
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* remove timezone.png...dunno where it came from.
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* install timezone-16.xpm
-
-2001-09-21  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta4
-
-2001-09-08  Jakub Steiner <jimmac@ximian.com>
-
-	* pgp-signature-*: for the pgp signature checking
-	* Makefile.am (images_DATA): add the icon files
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add ldap-16.png.
-
-2001-09-05  Jakub Steiner <jimmac@ximian.com>
-
-	* meeting-request.png: for the inline .ics stuff
-	* Makefile.am (images_DATA): add the icon file
-
-2001-09-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-48.png: for the timezone configuration step in the
-	  first-time-druid
-	* Makefile.am (images_DATA): add the icon file
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: install new file
-
-	* talking-heads.png: new graphic for meeting requests
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added goto-16.png & new_task-16.png.
-	(buttons_DATA): added save-24.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (buttons_DATA): added cut.png, copy.png & paste.png,
-	so we can use them for the tasks toolbar.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added 16_copy.png, 16_customize.png,
-	16_cut.png & 16_paste.png.
-	(buttons_DATA): added new_task.png, which I made from scaling up the
-	smaller task.xpm icon.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Added `delete-message.png'.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): moved task.xpm here, so it gets installed,
-	so we can use it for the menus. Note that we don't have an icon to
-	use in the toolbar for a new task, and we need one. Jakub?
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* wax-seal.png: Added.
-
-	* wax-seal-broken.png: Added.
-
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: marketing spoils the fun. boring splash again.
-	
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: Ruperzilla splash
-	
-	* splash-1-0.png: 1.0 candidate
-
-2001-08-16  Jakub Steiner <jimmac@ximian.com>
-
-	* {next,previous}-message.png: use new document template. maybe
-	  still a bit dark.
-	
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* add-attachment.png: get rid of the yellow
-
-	* compose-message.png: the old one seemed too dark to me. This one
-	shares the same document base as the new stuff.
-
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* all_contacts.xpm, new_contact.xpm: Nat wanted something bigger
-	  that would match the new button style. The filename of
-	  all_contacts.xpm is crap, maybe you guys can fix it to be
-	  "new_list.xpm" or something. Didn't want to break things.
-	 
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* save-16.png, save-as-16.png: fix bottom. Tuomas didn't like too
-	  much detail.
-
-2001-08-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* goto-24.png: Icon for "Goto date.." -button. Someone could add
-	this into the code?
-
-2001-08-14  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* arrow-[left,right]-24.png: new arrow icons for calendar
-	toolbar..
-
-2001-08-14  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-today-mini.png: new summary tree view icon.
-
-2001-08-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* 16_category_*: removed these files, which are now in gal
-
-2001-08-09  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-receive.xpm: Updated this to have the yellow/green arrows
-	so it matches the style of other icons. Noticed that tasklist
-	scales 16x16 icons larger, so they generally look Bad(tm). (fixes
-	#6475)
-
-2001-08-07  Damon Chaplin  <damon@ximian.com>
-
-	* timezone-16.xpm: copied from the international category icon.
-	It would be better to have 2 different icons for these, but I had
-	to get rid of that square timezone icon!
-
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-trash-mini.png: scaled down Tuomas' trash icon.
-	  tweaked a bit. looks a lot better than the previous one.
-	
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox-*, outbox-*: tree view icons * filters.xpm, edit-16.xpm,
-	marlboro_filters.xpm: remove unused * vfolder-16.xpm,
-	delete-message.xpm, undelete-message.xpm: let's not use xpms *
-	evolution-trash-mini.png: new version for edit>delete message,
-	tree view and everything * undelete_message-16.png,
-	folder-move-16.png, open-in-new-window-16.png, folder-copy-16.png:
-	tree view icons * faq-16.png, mark-as-important-16.png: menu icons
-	* Makefile.am (images_DATA): add new icons, change some xpms to
-	pngs
-      
-
-2001-08-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-16.png, imap-16.png, local-16.png: tree view icons for
-	  imap, ldap and local folders.
-
-2001-08-02  Jakub Steiner <jimmac@ximian.com>
-
-	* myevo-mail-summary.png, myevo-post-it.png, *
-	myevo-appointments.png: icons for My Evolution -- mail summary,
-	tasks, appointments. These are _NOT_TO_ replace the shortcut
-	icons, but solely for My Evolution.
-	
-2001-08-02  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* receive-24.png: Icon for the send/receive dialog at least.
-
-2001-07-31  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta2 splash
-
-2001-07-31  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-24-receive.png: New version, looks more consistent with the
-	other icons.
-
-2001-07-30  Jakub Steiner <jimmac@ximian.com>
-
-	* search-16.png, search-and-replace-16.png: menu versions for
-	  shell and editor.  * properties-16.png: properties for shel
-	  (maybe other places too) * send-16.png, send-later-16.png:
-	  editor, shell menu.  * work_online-16.png: to accompany work
-	  online menu toggle.  * save-16.png, save-as-16.png:
-	  everywhere. (based on Tuomas new gnome stock panel icon)
-	
-2001-07-27    <tigert@ximian.com>
-
-	* new_appointment.[xpm,png]: New version, fixes bug #4704
-	hopefully.
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added print-preview-24.png.
-
-2001-07-25  Jakub Steiner <jimmac@ximian.com>
-
-	* print-preview-24.png: toolbar icon for calendar's appointment
-	  dialog (now using the menu version)
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* Pull in new splash screen
-
-2001-07-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install 2 new category icons
-	(16_category_suppliers.png and 16_category_time-and-expenses.png)
-
-2001-07-20    <tigert@ximian.com>
-
-	* 16_category_time-and-expenses.png: Icon for "Time & Expenses"
-	category..
-
-	* 16_category_suppliers.png: Icon for "Suppliers" category..
-
-	* evolution-calendar.png, evolution-contacts.png,
-	evolution-inbox.png, evolution-tasks.png, evolution-today.png:
-	Took out the colored background circles from the icons, apparently
-	people found them confusing rather than useful, especially on
-	small icons -mode of the shortcutbar.
-
-2001-07-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install the 2 new category icons
-
-2001-07-19    <tigert@ximian.com>
-
-	* 16_category_strategies.png, 16_category_status.png: New category
-	icons.
-
-2001-07-19  Jakub Steiner <jimmac@ximian.com>
-
-	* insert-link-24.png, insert-table-24.png, insert-image-24.png:
-	  toolbar icons for message editor.
-
-2001-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install category icons
-
-2001-07-17  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_holiday-cards.png 16_category_hot-contacts.png
-	16_category_ideas.png: new category icons..
-
-2001-07-16  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_favorites.png 16_category_gifts.png
-	16_category_goals.png: New additions for the category stuff..
-	still more to do..
-
-2001-07-13  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_*.png: Some category icons for calendar/tasks, to
-	match the different category types for events. Still many to do,
-	but I wanted to commit them so you people can start hacking on the
-	code already. More to follow shortly.
-
-	* 16_customize.png: Icon for "Customize toolbars" or whatever menu
-	item that deals with customizing stuff (the icon is a wrench)
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: extra dist another xpm
-
-2001-07-12    <tigert@ximian.com>
-
-	* delete_message.[png,xpm]: New versions for the trashcan icon.  I
-	am wondering if we should do some filename cleanup here, all menu
-	icons should really be 16_foo.png, whereas the toolbar ones should
-	be foo.png. Currently we are mixing PNG and XPM here with some
-	files having otherwise same names (like this one)..
-
-2001-07-11    <tigert@ximian.com>
-
-	* new_appointment.[png,xpm]: New versions
-
-2001-07-10  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* new_appointment.png: New appointment icon.  *
-	new_appointment.xpm: Small version.. (should we change this to
-	16_new_appointment.png btw?
-
-2001-07-09  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Install the myweather-* icons.
-
-2001-07-07    <tigert@ximian.com>
-
-	* 16_[cut,copy,paste].png: New icons for the
-	Edit->[Cut,Copy,Paste] entries, the current gnome-stock ones start
-	to look bad when scaled down, so these are already 16x16 pixels.
-
-2001-07-05  Jakub Steiner <jimmac@ximian.com>
-
-	* myweather-*: weather status icons for My Evolution
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* Makefile.am: install apply-filters-16.xpm
-
-2001-07-03  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* cut.png, copy.png, paste.png: icons for cut/copy/paste to fit
-	the general style.
-
-2001-07-01  Jakub Steiner <jimmac@ximian.com>
-
-	* print.xpm, print-preview.xpm: nat didn't like the jaggy
-	  version. This one is based on tuomas 48x48 print icon.
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Add `print.png', `next-message.png',
-	`previous-message.png'.
-
-2001-06-29  Jakub Steiner <jimmac@ximian.com>
-
-	* remove-nntp-folder-24.png, add-nntp-folder-24.png,
-	  refresh-nntp-folders-24.png: manage subscriptions toolbar icons
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* print.png: Icon for print message.
-
-	* next-message.png, previous-message.png: New icons to replace the
-	< > arrows in the mailer.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add contact-is-a-list.png
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* contact-is-a-list.png: icon for toshok, for contact lists.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install the add-attachment.png icon.
-
-2001-06-27  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* evolution-calendar-mini.png: New version of the folder tree's
-	calendar icon. Doesnt look too much like the contacts icon.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* world_map-960.png: world map picture used for selecting
-	timezones.  * Makefile.am (images_DATA): added world_map-960.png
-	for timezones.
-
-2001-06-14  Jakub Steiner <jimmac@ximian.com>
-
-	* apply-filters-16.xpm: for mailer menu.  * vfolder-16.xpm:
-	vfolder icon for menu items * hand-16.xpm: originally ment for
-	customize toolbars. might not work * edit-16.xpm: edit message
-	(message open)
-	
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* rdf.png, ico-rdf.png: ximianize those
-
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: Initial mockup for the final splash.  Didn't
-	  wan't to overwrite the unstable splash.png.
-	
-2001-06-07  Iain Holmes  <iain@ximian.com>
-
-	* empty.gif: es-weather.png es-appointments.png ico-calendar.png
-	  ico-mail.png ico-rdf.png ico-weather.png bcg.png rdf.png
-	  pattern.png: Added all these for the new My Evolution
-
-2001-06-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-16.xpm: for events in a diffrent timezone
-
-2001-05-22  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-inbox-mini.png: fixed the shadow
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Install Jakub's new icons
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* mail-config-druid-48.png, mail-config-druid-identity.png,
-	  mail-config-druid-account-name.png,
-	  mail-config-druid-receive.png, mail-config-druid-send.png,
-	  thankyou.png: config druid icons
-	  
-	      thankyou.png can be used for the last step in every evo
-	      druid (like the import one)
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-calendar.png, evolution-contacts.png,
-	  evolution-inbox.png, evolution-today.png, evolution-tasks.png:
-	  fixed bug #2862. Also changed the envelope icon Oh and we use
-	  #b39169 for calendar now
-	  
-2001-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Added `online.png' and `offline.png'.
-
-	* online.png: New icon by Tuomas.  * offline.png: New icon by
-	Tuomas.
-
-2001-05-14  Duncan Mak  <duncan@ximian.com>
-
-	* Makefile.am (images_DATA): add in the new find_message.xpm
-
-2001-05-14  Jakub Steiner <jimmac@ximian.com>
-
-	* find_message.xpm: Duncan requested this
-
diff --git a/art/Makefile.am b/art/Makefile.am
deleted file mode 100644
index 931fd0213c..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,251 +0,0 @@
-imagesdir = $(datadir)/images/evolution
-images_DATA = \
-	16_copy.png			\
-	16_customize.png		\
-	16_cut.png			\
-	16_paste.png			\
-	about-box.png			\
-	alarm.png			\
-	all_contacts.xpm		\
-	apply-filters-16.xpm		\
-	bcg.png				\
-	briefcase.png       		\
-	butterfly.png			\
-	calendar-and-tasks-settings.png \
-	cellphone.png       		\
-	compose-message.png		\
-	composer-settings.png		\
-	configure_16_addressbook.xpm	\
-	configure_16_calendar.xpm	\
-	configure_16_folder.xpm		\
-	configure_16_mail.xpm		\
-	connect_to_url-16.xpm		\
-	contact-is-a-list.png		\
-	copy_16_message.xpm		\
-	edit.xpm			\
-	empty.gif			\
-	encrypt.xpm			\
-	envelope.png        		\
-	es-appointments.png		\
-	es-weather.png			\
-	evolution-calendar-mini.png 	\
-	evolution-calendar.png 		\
-	evolution-contacts-mini.png 	\
-	evolution-contacts-plain.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-mini.png	\
-	evolution-today.png 		\
-	evolution-trash-mini.png 	\
-	evolution-trash.png 		\
-	executive-summary-bg.png	\
-	executive-summary-curve.png	\
-	faq-16.png			\
-	fetch-mail.png			\
-	find_contact.xpm		\
-	find_message.xpm		\
-	flag-for-followup-16.png	\
-	folder-copy-16.png		\
-	folder-move-16.png		\
-	folder-settings.png		\
-	folder.xpm			\
-	font.png			\
-	forward.xpm			\
-	globe.png           		\
-	goto-16.png			\
-	hide_deleted_messages.xpm	\
-	hide_read_messages.xpm		\
-	hide_selected_messages.xpm	\
-	house.png           		\
-	ico-calendar.png		\
-	ico-mail.png			\
-	ico-rdf.png			\
-	ico-weather.png			\
-	import.png			\
-	import.xpm			\
-	inbox-16.png			\
-	inbox-full-16.png		\
-	ldap-mini.png			\
-	ldap-settings.png		\
-	ldap.png			\
-	mail-accounts-settings.png	\
-	mail-config-druid-account-name.png \
-	mail-config-druid-identity.png	\
-	mail-config-druid-receive.png	\
-	mail-config-druid-send.png	\
-	mail-config-druid.png		\
-	mail-new.xpm			\
-	mail-read.xpm			\
-	malehead.png			\
-	mark-as-important-16.png	\
-	meeting-request.png		\
-	meeting-request.png 		\
-	meeting.xpm			\
-	monkey-16.png			\
-	move_message.xpm		\
-	myevo-appointments.png		\
-	myevo-mail-summary.png		\
-	myevo-post-it.png		\
-	myweather-clouds.png		\
-	myweather-fog.png		\
-	myweather-rain.png		\
-	myweather-snow.png		\
-	myweather-storm.png		\
-	myweather-sun.png		\
-	myweather-suncloud.png		\
-	new-message.xpm			\
-	new_all_day_event.png		\
-	new_appointment.xpm		\
-	new_contact.xpm			\
-	new_task-16.png			\
-	offline.png			\
-	online.png			\
-	open-in-new-window-16.png 	\
-	outbox-16.png 			\
-	outbox-full-16.png 		\
-	pattern.png			\
-	pgp-signature-bad.png 		\
-	pgp-signature-nokey.png 	\
-	pgp-signature-ok.png 		\
-	print-preview.xpm		\
-	print.xpm			\
-	priority-high.xpm		\
-	rdf.png				\
-	reply.xpm			\
-	reply_to_all.xpm		\
-	save-16.png			\
-	save-as-16.png			\
-	save.xpm			\
-	search-16.png			\
-	search-and-replace-16.png	\
-	send-16.png                     \
-	send-later-16.png		\
-	send-receive.xpm		\
-	service-close.png		\
-	service-configure.png		\
-	service-down-disabled.png	\
-	service-down.png		\
-	service-left-disabled.png	\
-	service-left.png		\
-	service-right-disabled.png	\
-	service-right.png		\
-	service-up-disabled.png		\
-	service-up.png			\
-	show_all_messages.xpm		\
-	splash.png			\
-	summary-settings.png		\
-	summary_preferences-16.png	\
-	talking-heads.png		\
-	task.png			\
-	task.xpm			\
-	thankyou.png			\
-	timezone-16.xpm			\
-	timezone-48.png 		\
-	undelete_message-16.png		\
-	wax-seal-broken.png		\
-	wax-seal.png			\
-	work_offline.xpm		\
-	work_online-16.png		\
-	working-16.png			\
-	world_map-960.png
-
-buttonsdir = $(datadir)/images/evolution/buttons
-buttons_DATA = 				\
-	arrow-right-24.png		\
-	arrow-left-24.png		\
-	add-attachment.png		\
-	add-service.png			\
-	compose-message.png		\
-	copy-message.png		\
-	copy.png			\
-	cut.png				\
-	dayview.xpm			\
-	delete-message.png		\
-	fetch-mail.png			\
-	forward.png			\
-	goto-24.png  			\
-	monthview.xpm  			\
-	move-message.png		\
-	next-message.png		\
-	new_appointment.png		\
-	new_task.png			\
-	paste.png			\
-	previous-message.png		\
-	print.png			\
-	print-preview-24.png		\
-	reply.png			\
-	reply-to-all.png		\
-	receive-24.png		\
-	save-24.png			\
-	send-24-receive.png		\
-	send-24.png		\
-	weekview.xpm  			\
-	workweekview.xpm		\
-	yearview.xpm
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA = 					\
-	evolution.png				\
-	import.png				\
-	flag-for-followup-48.png		\
-	mail-config-druid-account-name.png	\
-	mail-config-druid-identity.png		\
-	mail-config-druid.png			\
-	mail-config-druid-receive.png		\
-	mail-config-druid-send.png		\
-	thankyou.png				\
-	timezone-48.png
-
-conduitsdir = $(datadir)/images/evolution/conduits
-conduits_DATA =				\
-	evo-16-address-conduit.png   	\
-	evo-16-todo-conduit.png     	\
-	evo-16-calendar-conduit.png  	\
-	evo-48-calendar-conduit.png	\
-	evo-48-address-conduit.png  	\
-	evo-48-todo-conduit.png
-
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-EXTRA_DIST = \
-	attachment.xpm			\
-	bell.xpm			\
-	check-filled.xpm		\
-	empty.xpm			\
-	jump.xpm			\
-	mail-need-reply.xpm		\
-	mail-new.xpm			\
-	mail-read.xpm			\
-	mail-replied.xpm		\
-	flag-for-followup.xpm		\
-	mark.xpm			\
-	meeting.xpm			\
-	priority-high.xpm		\
-	priority-low.xpm		\
-	recur.xpm			\
-	score-higher.xpm		\
-	score-highest.xpm		\
-	score-high.xpm			\
-	score-lower.xpm			\
-	score-lowest.xpm		\
-	score-low.xpm			\
-	score-normal.xpm		\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	timezone-16.xpm			\
-	tree-expanded.xpm		\
-	tree-unexpanded.xpm		\
-	$(images_DATA)			\
-	$(buttons_DATA)			\
-	$(conduits_DATA)		\
-	$(glade_DATA)			\
-	$(appicon_DATA)
-
-
diff --git a/art/about-box.png b/art/about-box.png
deleted file mode 100644
index 721cdb8a51..0000000000
--- a/art/about-box.png
+++ /dev/null
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index adbec9900b..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-nntp-folder-24.png b/art/add-nntp-folder-24.png
deleted file mode 100644
index 4941fe9250..0000000000
--- a/art/add-nntp-folder-24.png
+++ /dev/null
diff --git a/art/add-service.png b/art/add-service.png
deleted file mode 100644
index eb20f4e068..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/alarm.png b/art/alarm.png
deleted file mode 100644
index 71a9be8a48..0000000000
--- a/art/alarm.png
+++ /dev/null
diff --git a/art/all_contacts.xpm b/art/all_contacts.xpm
deleted file mode 100644
index 817bff7649..0000000000
--- a/art/all_contacts.xpm
+++ /dev/null
@@ -1,158 +0,0 @@
-/* XPM */
-static char * all_contacts_xpm[] = {
-"24 24 131 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #FDFDFD",
-"@ 	c #F5F5F5",
-"# 	c #F6F6F6",
-"$ 	c #D0D0D0",
-"% 	c #C1C1C1",
-"& 	c #C3C3C3",
-"* 	c #C6C6C6",
-"= 	c #C8C8C8",
-"- 	c #8D8D8D",
-"; 	c #CACACA",
-"> 	c #919191",
-", 	c #EFEFEF",
-"' 	c #878787",
-") 	c #8A8A8A",
-"! 	c #5C5C5C",
-"~ 	c #F8F8F8",
-"{ 	c #EAEAEA",
-"] 	c #CCCCCC",
-"^ 	c #CECECE",
-"/ 	c #979797",
-"( 	c #D2D2D2",
-"_ 	c #9A9A9A",
-": 	c #646464",
-"< 	c #939393",
-"[ 	c #9D9D9D",
-"} 	c #6B6B6B",
-"| 	c #BDBDBD",
-"1 	c #FFFFFF",
-"2 	c #A1A1A1",
-"3 	c #D9D9D9",
-"4 	c #E3E3E3",
-"5 	c #EDEDED",
-"6 	c #EEEEEE",
-"7 	c #C9B49B",
-"8 	c #8E7151",
-"9 	c #876E51",
-"0 	c #BAB1A5",
-"a 	c #FBFBFB",
-"b 	c #FEFEFE",
-"c 	c #DEDCD7",
-"d 	c #9E9E9E",
-"e 	c #BABABA",
-"f 	c #D1D1D1",
-"g 	c #A3A3A3",
-"h 	c #F3F3F3",
-"i 	c #A88D6E",
-"j 	c #DFD0BF",
-"k 	c #5E432B",
-"l 	c #7E6C5B",
-"m 	c #313131",
-"n 	c #575757",
-"o 	c #FCFCFC",
-"p 	c #555555",
-"q 	c #D5D3CF",
-"r 	c #868686",
-"s 	c #A6A6A6",
-"t 	c #CDCDCD",
-"u 	c #DBDBDB",
-"v 	c #EEDFCC",
-"w 	c #F4EEE6",
-"x 	c #765E45",
-"y 	c #736251",
-"z 	c #D9D7D2",
-"A 	c #606060",
-"B 	c #7D7D7D",
-"C 	c #9C9C9C",
-"D 	c #A5A5A5",
-"E 	c #7C7C7C",
-"F 	c #FAFAFA",
-"G 	c #7590AE",
-"H 	c #C1665A",
-"I 	c #445B71",
-"J 	c #D7D6D3",
-"K 	c #ADADAD",
-"L 	c #9B9B9B",
-"M 	c #B6B6B6",
-"N 	c #E6E6E6",
-"O 	c #F1F1F1",
-"P 	c #A8A8A8",
-"Q 	c #4B6983",
-"R 	c #9DB8D2",
-"S 	c #486481",
-"T 	c #314E6C",
-"U 	c #667A8D",
-"V 	c #D4D3CE",
-"W 	c #787878",
-"X 	c #D3D3D3",
-"Y 	c #E1E1E1",
-"Z 	c #ABABAB",
-"` 	c #5F7C96",
-" .	c #5D7A95",
-"..	c #4D6B87",
-"+.	c #3B556D",
-"@.	c #344A60",
-"#.	c #999999",
-"$.	c #C7C7C7",
-"%.	c #DDDBD6",
-"&.	c #DADADA",
-"*.	c #E2E2E2",
-"=.	c #898989",
-"-.	c #A9A9A9",
-";.	c #B0B0B0",
-">.	c #5D5D5D",
-",.	c #CBC9C2",
-"'.	c #BBBBBB",
-").	c #ECECEC",
-"!.	c #EAE8E3",
-"~.	c #DAD8D3",
-"{.	c #D3D2CD",
-"].	c #CECCC8",
-"^.	c #CCCAC6",
-"/.	c #D1CFCA",
-"(.	c #D2D0CB",
-"_.	c #C8C5BF",
-":.	c #737169",
-"<.	c #8F8F8F",
-"[.	c #B3B3B3",
-"}.	c #DCDCDC",
-"|.	c #E8E8E8",
-"1.	c #B5B5B5",
-"2.	c #565656",
-"3.	c #A0A0A0",
-"4.	c #C2C2C2",
-"5.	c #848484",
-"6.	c #838383",
-"7.	c #7B7B7B",
-"8.	c #8B8B8B",
-"9.	c #B2B2B2",
-"0.	c #B8B8B8",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . . . . . . . . ",
-"        . + @ @ @ @ @ @ @ # # # # # # # # # $ . ",
-"        . @ % % % & & & & * * * * * = = = = - . ",
-"        . # & & & * * * * = = = = = ; ; ; ; > . ",
-"        . , ' ' ' ) ) ) ) - - - - - > > > > ! . ",
-"        . ~ { { { { { { { { { { { { { { { { ; . ",
-"        . # ; ; ; ] ] ] ] ] ^ ^ ^ ^ $ $ $ $ / . ",
-"        . # ] ] ] ^ ^ ^ ^ ^ $ & ^ $ ( ( ( ( _ . ",
-"  . . . . . . . . . . . . . . : < / [ [ [ [ } . ",
-". | 1 1 1 1 1 1 1 1 1 1 1 1 2 . 3 4 5 6 6 6 * . ",
-". 1 ~ 7 8 9 0 1 + 1 a 1 1 b c . d e f 3 3 3 g . ",
-". 1 h i j k l 1 m n o p + 1 q . r s t u u u g . ",
-". 1 h v w x y 1 1 1 1 1 1 1 z . A B C D D D E . ",
-". 1 F G H I J 1 K 1 L K 1 1 q . ) M N O O , P . ",
-". 1 Q R S T U 1 1 1 1 1 1 1 V . W D X Y Y Y Z . ",
-". 1 `  ...+.@.1 #.L 5 $.1 1 %.. E K &.*.*.*.K . ",
-". 1 1 1 1 1 1 1 1 1 1 1 1 1 c . A =.-.;.;.;.[ . ",
-". 1 1 >.1 >.1 W 1 L 1 * o F ,.. =.'.).@ @ @ $ . ",
-". g !.!.!.~.~.~.{.].^./.(._.:.. <.[.}.N |.|.1.. ",
-"  . . . . . . . . . . . . . . 2.3.% Y N |.|.1.. ",
-"        . 4.< - =.' 5.) r 6.7.E 8.2 9.1.0.0.e . ",
-"        . . . . . . . . . . . . . . . . . . . . "};
diff --git a/art/apply-filters-16.xpm b/art/apply-filters-16.xpm
deleted file mode 100644
index 28410fe30b..0000000000
--- a/art/apply-filters-16.xpm
+++ /dev/null
@@ -1,48 +0,0 @@
-/* XPM */
-static char * apply_filers_16_xpm[] = {
-"16 16 29 1",
-" 	c None",
-".	c #161616",
-"+	c #EDEAE8",
-"@	c #CDC1BA",
-"#	c #6A4E3D",
-"$	c #C6B8AF",
-"%	c #333333",
-"&	c #F3F1EE",
-"*	c #5E4537",
-"=	c #D6CCC5",
-"-	c #916C56",
-";	c #5A4235",
-">	c #BBA9A0",
-",	c #C3B3AC",
-"'	c #CEC1BB",
-")	c #BBAAA0",
-"!	c #A1897A",
-"~	c #664B3B",
-"{	c #383838",
-"]	c #856B60",
-"^	c #C2B3A9",
-"/	c #E9E3E0",
-"(	c #EEE9E7",
-"_	c #7B5A46",
-":	c #F5F4F2",
-"<	c #B8A69B",
-"[	c #AE998D",
-"}	c #553E32",
-"|	c #725442",
-"                ",
-"  .+.           ",
-"  .@.     .#    ",
-"  .$.     %&*   ",
-"  .$.......=-;  ",
-"  .$>$$$$$,'--. ",
-"  .$.......)-*  ",
-"  .$.     .!*   ",
-"  .$.     .~    ",
-"  .$.     {]    ",
-"  .^.     ./~   ",
-"  .(.......,-#  ",
-"  _$:,$$$$$<--. ",
-"   ~.......[-}  ",
-"          .!#   ",
-"          .|    "};
diff --git a/art/arrow-left-24.png b/art/arrow-left-24.png
deleted file mode 100644
index a977b3fb1a..0000000000
--- a/art/arrow-left-24.png
+++ /dev/null
diff --git a/art/arrow-right-24.png b/art/arrow-right-24.png
deleted file mode 100644
index 393b0dca3e..0000000000
--- a/art/arrow-right-24.png
+++ /dev/null
diff --git a/art/attachment.xpm b/art/attachment.xpm
deleted file mode 100644
index 21f2ecdb0e..0000000000
--- a/art/attachment.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"                ",
-"     ...        ",
-"    .+++. .     ",
-"   .+...+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+..+..+.    ",
-"   .+.....+.    ",
-"    .+...+.     ",
-"     .+++.      ",
-"      ...       "};
diff --git a/art/bcg.png b/art/bcg.png
deleted file mode 100644
index ec03f8ab6e..0000000000
--- a/art/bcg.png
+++ /dev/null
diff --git a/art/bell.xpm b/art/bell.xpm
deleted file mode 100644
index b1ab537a17..0000000000
--- a/art/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/art/briefcase.png b/art/briefcase.png
deleted file mode 100644
index 424ad09632..0000000000
--- a/art/briefcase.png
+++ /dev/null
diff --git a/art/butterfly.png b/art/butterfly.png
deleted file mode 100644
index 00089774e0..0000000000
--- a/art/butterfly.png
+++ /dev/null
diff --git a/art/calendar-and-tasks-settings.png b/art/calendar-and-tasks-settings.png
deleted file mode 100644
index a457bb3cc8..0000000000
--- a/art/calendar-and-tasks-settings.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/check-filled.xpm b/art/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/art/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/art/compose-message.png b/art/compose-message.png
deleted file mode 100644
index 0be2101b6f..0000000000
--- a/art/compose-message.png
+++ /dev/null
diff --git a/art/composer-settings.png b/art/composer-settings.png
deleted file mode 100644
index f255c755e7..0000000000
--- a/art/composer-settings.png
+++ /dev/null
diff --git a/art/configure_16_addressbook.xpm b/art/configure_16_addressbook.xpm
deleted file mode 100644
index 4e037fe7b5..0000000000
--- a/art/configure_16_addressbook.xpm
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XPM */
-static char * 16_configure_addressbook_xpm[] = {
-"16 16 58 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #EAEAEA",
-"%	c #BDBDBD",
-"&	c #CFCFCF",
-"*	c #898989",
-"=	c #A8A8A8",
-"-	c #A3A3A3",
-";	c #F8F8F8",
-">	c #C9B49B",
-",	c #8E7151",
-"'	c #876E51",
-")	c #BAB1A5",
-"!	c #9D9D9D",
-"~	c #EAE8E3",
-"{	c #F3F3F3",
-"]	c #A88D6E",
-"^	c #DFD0BF",
-"/	c #5E432B",
-"(	c #7E6C5B",
-"_	c #A6A6A6",
-":	c #EEEEEE",
-"<	c #EEDFCC",
-"[	c #F4EEE6",
-"}	c #765E45",
-"|	c #736251",
-"1	c #C1C1C1",
-"2	c #B4B4B4",
-"3	c #FAFAFA",
-"4	c #7590AE",
-"5	c #C1665A",
-"6	c #445B71",
-"7	c #AEADAB",
-"8	c #E8E8E8",
-"9	c #4B6983",
-"0	c #9DB8D2",
-"a	c #486481",
-"b	c #314E6C",
-"c	c #BDBCB8",
-"d	c #5F7C96",
-"e	c #5D7A95",
-"f	c #4D6B87",
-"g	c #3B556D",
-"h	c #999794",
-"i	c #ADABA8",
-"j	c #5D5D5D",
-"k	c #9B9B9B",
-"l	c #DEDEDE",
-"m	c #C3C0BA",
-"n	c #DAD8D3",
-"o	c #B1AFAB",
-"p	c #CBC9C5",
-"q	c #A5A3A0",
-"r	c #96948F",
-"s	c #918E85",
-"       ..  ..   ",
-"      .+.  .@.  ",
-"      .+....@.  ",
-"      .+@@@@#.  ",
-" .......$@@#... ",
-".%+++++&.+#.*=-.",
-".+;>,')+.+@.!&~.",
-".+{]^/(+.+#._:~.",
-".+{<[}|1.+@.2&~.",
-".+34567.8@##.2~.",
-".+90ab.&@@@@#.c.",
-".+defg.+....@.h.",
-".+++++.+.!2.@.i.",
-".++j+j+..kl..!m.",
-".-~~~~~noc~pqrs.",
-" .............. "};
diff --git a/art/configure_16_calendar.xpm b/art/configure_16_calendar.xpm
deleted file mode 100644
index 3dd7392a1d..0000000000
--- a/art/configure_16_calendar.xpm
+++ /dev/null
@@ -1,76 +0,0 @@
-/* XPM */
-static char * configure_16_calendar_xpm[] = {
-"16 16 57 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #A8A8A8",
-"$	c #C3C3C3",
-"%	c #D4D4D4",
-"&	c #939393",
-"*	c #F5F5F5",
-"=	c #EAEAEA",
-"-	c #E05232",
-";	c #DF4623",
-">	c #E78B76",
-",	c #868686",
-"'	c #4A4A4A",
-")	c #DF502F",
-"!	c #E87F68",
-"~	c #FDF6F4",
-"{	c #A7A7A7",
-"]	c #747474",
-"^	c #CFCFCF",
-"/	c #DF4B29",
-"(	c #F1B2A3",
-"_	c #E05231",
-":	c #F3BFB4",
-"<	c #EEEEEE",
-"[	c #FAE8E4",
-"}	c #F9DDD6",
-"|	c #E87B62",
-"1	c #8D8D8D",
-"2	c #7B7B7B",
-"3	c #9C9C9C",
-"4	c #989898",
-"5	c #707070",
-"6	c #E2E2E2",
-"7	c #E8E8E8",
-"8	c #B4B4B4",
-"9	c #E1E1E1",
-"0	c #B0B0B0",
-"a	c #DEDEDE",
-"b	c #E0E0E0",
-"c	c #F4F4F4",
-"d	c #9D9D9D",
-"e	c #979797",
-"f	c #BDBDBD",
-"g	c #A0A0A0",
-"h	c #C1C1C1",
-"i	c #DADADA",
-"j	c #D9D9D9",
-"k	c #CECECE",
-"l	c #7C7C7C",
-"m	c #EDEDED",
-"n	c #9F9F9F",
-"o	c #ECECEC",
-"p	c #E6E6E6",
-"q	c #E7E7E7",
-"r	c #808080",
-" ..  ..         ",
-".+....@........ ",
-".+....@.++++++#.",
-".+@@@@$.++++%&*.",
-" .=@@$.++-+;>,*.",
-"  .+$.'#++)!~{*.",
-"  .+@.]^+/(_:+*.",
-"  .+$.#<+[+}|+<.",
-"  .+@.12$3$4$56.",
-" .7@$$.8++++++9.",
-".^@@@@$.^+++0ab.",
-".+....@.{+++c#b.",
-".+.de.@.f+++ghi.",
-" ..jk..da+++++b.",
-"  .lm^#n<op96qr.",
-"   ............ "};
diff --git a/art/configure_16_folder.xpm b/art/configure_16_folder.xpm
deleted file mode 100644
index 4d016ca91a..0000000000
--- a/art/configure_16_folder.xpm
+++ /dev/null
@@ -1,85 +0,0 @@
-/* XPM */
-static char * 16_configure_folder_xpm[] = {
-"16 16 66 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #E4E5DF",
-"%	c #D5D6CB",
-"&	c #D6D7CA",
-"*	c #F5F6F0",
-"=	c #ADB198",
-"-	c #C2C6A9",
-";	c #C0C3A7",
-">	c #B4B89D",
-",	c #EAECDB",
-"'	c #F6F6F4",
-")	c #EAECDA",
-"!	c #AAAB9E",
-"~	c #E5E8D4",
-"{	c #E4E7D2",
-"]	c #C7C9B6",
-"^	c #F7F7F7",
-"/	c #DADEBF",
-"(	c #DADEBE",
-"_	c #D8DCBC",
-":	c #D6DBB9",
-"<	c #797D66",
-"[	c #CDD2AD",
-"}	c #CBD1AA",
-"|	c #95997C",
-"1	c #F3F3EA",
-"2	c #70745E",
-"3	c #A3A889",
-"4	c #F3F4EA",
-"5	c #D5D9B7",
-"6	c #7F8369",
-"7	c #ABB08E",
-"8	c #929778",
-"9	c #F1F3E9",
-"0	c #D3D7B4",
-"a	c #7C7F65",
-"b	c #8F9474",
-"c	c #F0F1E7",
-"d	c #D1D6B2",
-"e	c #CFD4AF",
-"f	c #7A7D61",
-"g	c #8D9270",
-"h	c #EFF1E5",
-"i	c #86896D",
-"j	c #909273",
-"k	c #707459",
-"l	c #EBECDE",
-"m	c #CACFA8",
-"n	c #C8CDA5",
-"o	c #B8BD97",
-"p	c #848769",
-"q	c #BFC598",
-"r	c #60634C",
-"s	c #989E79",
-"t	c #C9CCB9",
-"u	c #919576",
-"v	c #848869",
-"w	c #686B52",
-"x	c #838768",
-"y	c #595C46",
-"z	c #797D60",
-"A	c #666951",
-"      ..  ..    ",
-"     .+.  .@.   ",
-"     .+....@.   ",
-"   ...+@@@@#.   ",
-"  .$%&.+@@#.    ",
-" .*=-;>.+#..... ",
-" .,',,).+@.!~{].",
-" .^/(_:.+#.<[}|.",
-" .1/(_:.+@.23}|.",
-" .4_:5.+@##.678.",
-" .950.+@@@@#.ab.",
-" .cde.+....@.fg.",
-" .h[}.+.ij.@.kg.",
-" .lmno..pq..rsg.",
-" .t8ubvwwgxyzgA.",
-"  ............. "};
diff --git a/art/configure_16_mail.xpm b/art/configure_16_mail.xpm
deleted file mode 100644
index b6416735ef..0000000000
--- a/art/configure_16_mail.xpm
+++ /dev/null
@@ -1,61 +0,0 @@
-/* XPM */
-static char * 16_configure_mail_xpm[] = {
-"16 16 42 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #010101",
-"%	c #2F2F2F",
-"&	c #A7A4A0",
-"*	c #FCFCFC",
-"=	c #F5F5F5",
-"-	c #5D5B57",
-";	c #EBEBEB",
-">	c #1B1B1B",
-",	c #FBFBF8",
-"'	c #716E6B",
-")	c #ECECEC",
-"!	c #BEBEBE",
-"~	c #EDEDED",
-"{	c #DFDFDF",
-"]	c #FBFAF7",
-"^	c #A5A29D",
-"/	c #E9E9E8",
-"(	c #797873",
-"_	c #8E8C8A",
-":	c #C6C3BD",
-"<	c #C9C5C0",
-"[	c #7D7A77",
-"}	c #F7F5F1",
-"|	c #FAF9F6",
-"1	c #F8F6F2",
-"2	c #DAD8D6",
-"3	c #656360",
-"4	c #E2DFD8",
-"5	c #090808",
-"6	c #D7D4CE",
-"7	c #D8D5CF",
-"8	c #D6D3CD",
-"9	c #D9D6D0",
-"0	c #D3D1CD",
-"a	c #BEBCB6",
-"b	c #E0DCD5",
-"c	c #222221",
-"         ..  .. ",
-"        .+.  .@.",
-"        .+....@.",
-"        .+@@@@#.",
-"         .+@@#. ",
-"          .+#.  ",
-"  $%$$$$$$.+@.  ",
-" $&******=.+#.  ",
-" $+-+++++;>+@.  ",
-" $+,'+++).!@##. ",
-" $+,,'+~.{@@@@#.",
-" $+,]^'/.+....@.",
-" $+](,,_.+.:<.@.",
-" $+[,}|12..34.. ",
-" $56777890abc$  ",
-"  $$$$$$$$$$$   "};
diff --git a/art/connect_to_url-16.xpm b/art/connect_to_url-16.xpm
deleted file mode 100644
index 5053d252f7..0000000000
--- a/art/connect_to_url-16.xpm
+++ /dev/null
@@ -1,123 +0,0 @@
-/* XPM */
-static char * connect_to_url_16_xpm[] = {
-"16 16 104 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #070808",
-"@ 	c #677B68",
-"# 	c #BECFC5",
-"$ 	c #B4C3C6",
-"% 	c #8AA0B6",
-"& 	c #95A1AC",
-"* 	c #AFB8B8",
-"= 	c #989D98",
-"- 	c #373737",
-"; 	c #AFC1B1",
-"> 	c #E0E7DE",
-", 	c #BACFC6",
-"' 	c #96AFC0",
-") 	c #728BA4",
-"! 	c #889BA4",
-"~ 	c #829176",
-"{ 	c #879A81",
-"] 	c #AAA89A",
-"^ 	c #585A5B",
-"/ 	c #1D1D1D",
-"( 	c #748E79",
-"_ 	c #DEEADF",
-": 	c #B1D9B3",
-"< 	c #AAD8B5",
-"[ 	c #79B7A5",
-"} 	c #7A9AB5",
-"| 	c #839DA3",
-"1 	c #74876C",
-"2 	c #7E8471",
-"3 	c #82755A",
-"4 	c #8F7F66",
-"5 	c #2D2E2D",
-"6 	c #CAD7CB",
-"7 	c #BCD9C2",
-"8 	c #96C69D",
-"9 	c #4D8550",
-"0 	c #597FA7",
-"a 	c #418093",
-"b 	c #637E61",
-"c 	c #73755B",
-"d 	c #86765A",
-"e 	c #949290",
-"f 	c #CDDACD",
-"g 	c #518355",
-"h 	c #989389",
-"i 	c #807D74",
-"j 	c #3B7480",
-"k 	c #449268",
-"l 	c #819395",
-"m 	c #797E67",
-"n 	c #9D907D",
-"o 	c #73816F",
-"p 	c #43423C",
-"q 	c #B7B3AA",
-"r 	c #C4C2BD",
-"s 	c #EAE8E3",
-"t 	c #4D5C5E",
-"u 	c #887664",
-"v 	c #000001",
-"w 	c #010101",
-"x 	c #E2E1DD",
-"y 	c #F0EFEC",
-"z 	c #AAA7A0",
-"A 	c #C5D2C8",
-"B 	c #E9EEEA",
-"C 	c #8B8572",
-"D 	c #476346",
-"E 	c #889079",
-"F 	c #F2F0ED",
-"G 	c #EBEAE6",
-"H 	c #8A857B",
-"I 	c #ECEBE8",
-"J 	c #4D6C8B",
-"K 	c #4B6963",
-"L 	c #53885E",
-"M 	c #6E7653",
-"N 	c #747F6C",
-"O 	c #0C0B0A",
-"P 	c #78756B",
-"Q 	c #BEBBB5",
-"R 	c #B3B1AA",
-"S 	c #7D786E",
-"T 	c #E1DFDB",
-"U 	c #46698F",
-"V 	c #598860",
-"W 	c #617853",
-"X 	c #818667",
-"Y 	c #030506",
-"Z 	c #8C8981",
-"` 	c #A6A29B",
-" .	c #726D63",
-"..	c #CECAC3",
-"+.	c #3D5143",
-"@.	c #020203",
-"#.	c #0F0F0D",
-"$.	c #F0F3F1",
-"%.	c #272622",
-"&.	c #8B877E",
-"*.	c #706C62",
-"=.	c #B1ADA4",
-"-.	c #6C685E",
-";.	c #646056",
-"          . . . + . . . .       ",
-"        . @ # $ % & * = - .     ",
-"      . ; > , ' ) ! ~ { ] ^ /   ",
-"    . ( _ : < [ } | 1 2 3 4 5 . ",
-"    . 6 7 8 9 . . 0 a b c d e . ",
-"    . f g . . h i . j k l m n . ",
-"    . o p q r s i . . . . t u v ",
-"    w . x y z s i . A A B . C v ",
-". . . i x y z s i . . . . D E v ",
-"s s s s F G H I i . J K L M N O ",
-"i i P P Q R S T P . U V W X Y   ",
-". . w P Z `  ...P . . . . +.@.  ",
-"      #.Z `  ...P . A A $..     ",
-"        %.&.*.=.-.. . . .       ",
-"          #.#.h ;..             ",
-"              #.#.              "};
diff --git a/art/contact-is-a-list.png b/art/contact-is-a-list.png
deleted file mode 100644
index 3a7bc1c143..0000000000
--- a/art/contact-is-a-list.png
+++ /dev/null
diff --git a/art/copy-message.png b/art/copy-message.png
deleted file mode 100644
index 907ec1a85d..0000000000
--- a/art/copy-message.png
+++ /dev/null
diff --git a/art/copy.png b/art/copy.png
deleted file mode 100644
index 23a6db32e3..0000000000
--- a/art/copy.png
+++ /dev/null
diff --git a/art/copy_16_message.xpm b/art/copy_16_message.xpm
deleted file mode 100644
index a4f56cfd6e..0000000000
--- a/art/copy_16_message.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * 16_copy_message_xpm[] = {
-"16 16 39 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 #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #F7F6F4",
-"{	c #B0ADA7",
-"]	c #83817E",
-"^	c #E1DFDA",
-"/	c #928F8B",
-"(	c #FBFBFA",
-"_	c #F7F5F2",
-":	c #F5F3F0",
-"<	c #B5B2AC",
-"[	c #A09C97",
-"}	c #F0EFEB",
-"|	c #E4E2DD",
-"1	c #AEABA6",
-"2	c #92908B",
-"3	c #E8E6E1",
-"4	c #F7F6F2",
-"5	c #F5F4F0",
-"6	c #6B6A68",
-"7	c #E2DFD9",
-"8	c #E2E0DB",
-"9	c #E3E1DC",
-"0	c #E6E4DF",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".#%&*#*=*-;>.   ",
-".#*,=*=*')'!.   ",
-".#**.+......... ",
-".#*.@#########$.",
-".#~.#%&*#*=*-;>.",
-".#{.#*,=*=*')'!.",
-".]^.#**/(*_)*:!.",
-" ...#*~<)#)[-}|.",
-"   .#~1**)__23|.",
-"   .#{*:45_:>63.",
-"   .]^777^8890$.",
-"    ........... ",
-"                "};
diff --git a/art/cut.png b/art/cut.png
deleted file mode 100644
index 7ffb512043..0000000000
--- a/art/cut.png
+++ /dev/null
diff --git a/art/dayview.xpm b/art/dayview.xpm
deleted file mode 100644
index dbabb24c5c..0000000000
--- a/art/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/art/delete-message.png b/art/delete-message.png
deleted file mode 100644
index 1bec6baac7..0000000000
--- a/art/delete-message.png
+++ /dev/null
diff --git a/art/drafts-16.png b/art/drafts-16.png
deleted file mode 100644
index 285646f60b..0000000000
--- a/art/drafts-16.png
+++ /dev/null
diff --git a/art/edit.xpm b/art/edit.xpm
deleted file mode 100644
index 28b8f090c4..0000000000
--- a/art/edit.xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-/* XPM */
-static char * 16_edit_xpm[] = {
-"16 16 65 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #E2E2E2",
-"#	c #BAA88F",
-"$	c #836B4E",
-"%	c #FEFEFE",
-"&	c #FCFCFC",
-"*	c #FBFBFB",
-"=	c #E5E5E5",
-"-	c #C5A985",
-";	c #DC9E55",
-">	c #9E6233",
-",	c #FFFFFF",
-"'	c #F2F2F2",
-")	c #D9D9D9",
-"!	c #E4E4E4",
-"~	c #C3A783",
-"{	c #DD9D53",
-"]	c #A76631",
-"^	c #EEEEEE",
-"/	c #D4D4D4",
-"(	c #FAFAFA",
-"_	c #7B7B7B",
-":	c #C5AA88",
-"<	c #A86631",
-"[	c #DCDCDC",
-"}	c #F0F0F0",
-"|	c #5E5E5E",
-"1	c #C3A47A",
-"2	c #DD9D52",
-"3	c #A66430",
-"4	c #D5D5D5",
-"5	c #6A6A6A",
-"6	c #C2A174",
-"7	c #DC9B4E",
-"8	c #A96630",
-"9	c #6E6E6E",
-"0	c #D8D8D8",
-"a	c #D6D6D6",
-"b	c #9F9F9F",
-"c	c #BEA686",
-"d	c #DD9D51",
-"e	c #AA682F",
-"f	c #F5F5F5",
-"g	c #DDDDDD",
-"h	c #F9F9F9",
-"i	c #7A7A7A",
-"j	c #BCAC9B",
-"k	c #A86E3F",
-"l	c #797979",
-"m	c #F4F4F4",
-"n	c #F3F3F3",
-"o	c #DFDFDF",
-"p	c #7C7C7C",
-"q	c #4F4F4F",
-"r	c #6C6C6C",
-"s	c #EAEAEA",
-"t	c #F8F8F8",
-"u	c #F6F6F6",
-"v	c #F7F7F7",
-"w	c #EBEBEB",
-"x	c #ECECEC",
-"y	c #E0E0E0",
-"z	c #E8E8E8",
-"       ..    .. ",
-"     ..+@.  .#$.",
-"   ..%+&*=..-;>.",
-" ..,%+')*!.~{]. ",
-".,%%^/)*(_:{<.  ",
-".%%)[**}|123.   ",
-" .+'*}456789.   ",
-" .&*0abcde.fg.  ",
-"  .((hijklfmno. ",
-"  .(hpq.rfmnsg. ",
-"   .tilufm^oo.  ",
-"   .vuufwoo..   ",
-"    .uxyo..     ",
-"    .zg..       ",
-"     ..         ",
-"                "};
diff --git a/art/empty.gif b/art/empty.gif
deleted file mode 100644
index 0be4006193..0000000000
--- a/art/empty.gif
+++ /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/encrypt.xpm b/art/encrypt.xpm
deleted file mode 100644
index 636345ad9d..0000000000
--- a/art/encrypt.xpm
+++ /dev/null
@@ -1,80 +0,0 @@
-/* XPM */
-static char * 16_encrypt_xpm[] = {
-"16 16 61 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #808080",
-"#	c #FEFEFE",
-"$	c #8F8F8F",
-"%	c #313131",
-"&	c #CDB86D",
-"*	c #EED680",
-"=	c #FFFFFF",
-"-	c #F2F2F2",
-";	c #343434",
-">	c #EEEEEE",
-",	c #D4D4D4",
-"'	c #D9D9D9",
-")	c #3D3D3D",
-"!	c #8D8D8D",
-"~	c #DCDCDC",
-"{	c #FBFBFB",
-"]	c #B2B2B2",
-"^	c #3A3A3A",
-"/	c #A9A9A9",
-"(	c #F0F0F0",
-"_	c #444444",
-":	c #E4E9F1",
-"<	c #B3C5D7",
-"[	c #AABDCE",
-"}	c #A2B4C5",
-"|	c #99ABBD",
-"1	c #8FA3B4",
-"2	c #3C5469",
-"3	c #FCFCFC",
-"4	c #D8D8D8",
-"5	c #D6D6D6",
-"6	c #6A6A6A",
-"7	c #BDCEE0",
-"8	c #8FAAC4",
-"9	c #819DB7",
-"0	c #7490AA",
-"a	c #66839D",
-"b	c #587690",
-"c	c #314456",
-"d	c #FAFAFA",
-"e	c #F9F9F9",
-"f	c #676767",
-"g	c #DFDFDF",
-"h	c #5F5F5F",
-"i	c #F8F8F8",
-"j	c #F7F7F7",
-"k	c #696969",
-"l	c #92A1B0",
-"m	c #5E7081",
-"n	c #556879",
-"o	c #4C5F70",
-"p	c #435668",
-"q	c #394E5F",
-"r	c #23313E",
-"s	c #F6F6F6",
-"t	c #7E7E7E",
-"u	c #E8E8E8",
-"v	c #DDDDDD",
-"                ",
-"        ..      ",
-"      ..+@...   ",
-"    ..#+$%&*&.  ",
-"  ..=#+-;&@. &. ",
-" .=##>,')*!. *. ",
-" .##'~{]^&!/.&..",
-"  .+-{(_:<[}|12.",
-"  .3{4567890abc.",
-"   .ddef7890abc.",
-"   .degh7890abc.",
-"    .ijklmnopqr.",
-"    .jsghkkt....",
-"     .sssg..    ",
-"     .uv..      ",
-"      ..        "};
diff --git a/art/envelope.png b/art/envelope.png
deleted file mode 100644
index 3e801181aa..0000000000
--- a/art/envelope.png
+++ /dev/null
diff --git a/art/es-appointments.png b/art/es-appointments.png
deleted file mode 100644
index e194232051..0000000000
--- a/art/es-appointments.png
+++ /dev/null
diff --git a/art/es-weather.png b/art/es-weather.png
deleted file mode 100644
index 3d31469e78..0000000000
--- a/art/es-weather.png
+++ /dev/null
diff --git a/art/evo-16-address-conduit.png b/art/evo-16-address-conduit.png
deleted file mode 100644
index 18a2e5809e..0000000000
--- a/art/evo-16-address-conduit.png
+++ /dev/null
diff --git a/art/evo-16-calendar-conduit.png b/art/evo-16-calendar-conduit.png
deleted file mode 100644
index dd8e8ab85e..0000000000
--- a/art/evo-16-calendar-conduit.png
+++ /dev/null
diff --git a/art/evo-16-todo-conduit.png b/art/evo-16-todo-conduit.png
deleted file mode 100644
index d36d2c61fd..0000000000
--- a/art/evo-16-todo-conduit.png
+++ /dev/null
diff --git a/art/evo-48-address-conduit.png b/art/evo-48-address-conduit.png
deleted file mode 100644
index 342a061088..0000000000
--- a/art/evo-48-address-conduit.png
+++ /dev/null
diff --git a/art/evo-48-calendar-conduit.png b/art/evo-48-calendar-conduit.png
deleted file mode 100644
index bb0a49791e..0000000000
--- a/art/evo-48-calendar-conduit.png
+++ /dev/null
diff --git a/art/evo-48-todo-conduit.png b/art/evo-48-todo-conduit.png
deleted file mode 100644
index dd4899e984..0000000000
--- a/art/evo-48-todo-conduit.png
+++ /dev/null
diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png
deleted file mode 100644
index cddb0396dc..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 5ddb92c1ce..0000000000
--- a/art/evolution-contacts-mini.png
+++ /dev/null
diff --git a/art/evolution-contacts-plain.png b/art/evolution-contacts-plain.png
deleted file mode 100644
index 542a81a508..0000000000
--- a/art/evolution-contacts-plain.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 66a4ba89cd..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 a3771c23eb..0000000000
--- a/art/evolution-tasks.png
+++ /dev/null
diff --git a/art/evolution-today-mini.png b/art/evolution-today-mini.png
deleted file mode 100644
index 6039b15e82..0000000000
--- a/art/evolution-today-mini.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/evolution-trash-mini.png b/art/evolution-trash-mini.png
deleted file mode 100644
index 56a8daa51f..0000000000
--- a/art/evolution-trash-mini.png
+++ /dev/null
diff --git a/art/evolution-trash.png b/art/evolution-trash.png
deleted file mode 100644
index c2ac8da173..0000000000
--- a/art/evolution-trash.png
+++ /dev/null
diff --git a/art/evolution.png b/art/evolution.png
deleted file mode 100644
index 412dcfbbc0..0000000000
--- a/art/evolution.png
+++ /dev/null
diff --git a/art/executive-summary-bg.png b/art/executive-summary-bg.png
deleted file mode 100644
index fdcde6613d..0000000000
--- a/art/executive-summary-bg.png
+++ /dev/null
diff --git a/art/executive-summary-curve.png b/art/executive-summary-curve.png
deleted file mode 100644
index 3ba42dd02b..0000000000
--- a/art/executive-summary-curve.png
+++ /dev/null
diff --git a/art/faq-16.png b/art/faq-16.png
deleted file mode 100644
index fcf71658da..0000000000
--- a/art/faq-16.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/find_contact.xpm b/art/find_contact.xpm
deleted file mode 100644
index 37d957b13b..0000000000
--- a/art/find_contact.xpm
+++ /dev/null
@@ -1,127 +0,0 @@
-/* XPM */
-static char * 24_find_contact_xpm[] = {
-"24 24 100 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #BDBDBD",
-"@ 	c #FFFFFF",
-"# 	c #A3A3A3",
-"$ 	c #F8F8F8",
-"% 	c #C9B49B",
-"& 	c #8E7151",
-"* 	c #876E51",
-"= 	c #BAB1A5",
-"- 	c #FDFDFD",
-"; 	c #FBFBFB",
-"> 	c #EAE8E3",
-", 	c #F3F3F3",
-"' 	c #A88D6E",
-") 	c #DFD0BF",
-"! 	c #5E432B",
-"~ 	c #7E6C5B",
-"{ 	c #313131",
-"] 	c #575757",
-"^ 	c #FCFCFC",
-"/ 	c #555555",
-"( 	c #EEDFCC",
-"_ 	c #F4EEE6",
-": 	c #765E45",
-"< 	c #736251",
-"[ 	c #FAFAFA",
-"} 	c #7590AE",
-"| 	c #C1665A",
-"1 	c #445B71",
-"2 	c #D7D6D3",
-"3 	c #ADADAD",
-"4 	c #9B9B9B",
-"5 	c #4B6983",
-"6 	c #9DB8D2",
-"7 	c #486481",
-"8 	c #314E6C",
-"9 	c #667A8D",
-"0 	c #E0E0E0",
-"a 	c #BCBCBC",
-"b 	c #C5C5C5",
-"c 	c #5F7C96",
-"d 	c #5D7A95",
-"e 	c #4D6B87",
-"f 	c #3B556D",
-"g 	c #344A60",
-"h 	c #47473F",
-"i 	c #0A0A09",
-"j 	c #4B4B43",
-"k 	c #999999",
-"l 	c #34342E",
-"m 	c #9D9D8D",
-"n 	c #CFCFB9",
-"o 	c #C4C4AF",
-"p 	c #8D8D7F",
-"q 	c #353530",
-"r 	c #A2A2A2",
-"s 	c #D2D2D2",
-"t 	c #5D5D5D",
-"u 	c #46463F",
-"v 	c #9C9C8C",
-"w 	c #E2E2D0",
-"x 	c #EDEDE7",
-"y 	c #C0C0AC",
-"z 	c #B2B29F",
-"A 	c #828274",
-"B 	c #4C4C44",
-"C 	c #B9B9B9",
-"D 	c #D1CFC8",
-"E 	c #090908",
-"F 	c #D5D5BF",
-"G 	c #FBFBFA",
-"H 	c #C3C3AE",
-"I 	c #B5B5A2",
-"J 	c #A6A695",
-"K 	c #959586",
-"L 	c #080807",
-"M 	c #72706D",
-"N 	c #918E85",
-"O 	c #090909",
-"P 	c #CACAB5",
-"Q 	c #DDDDD0",
-"R 	c #B7B7A4",
-"S 	c #AAAA98",
-"T 	c #9B9B8B",
-"U 	c #8C8C7D",
-"V 	c #474740",
-"W 	c #929283",
-"X 	c #BABAA7",
-"Y 	c #ADAD9B",
-"Z 	c #9F9F8E",
-"` 	c #909081",
-" .	c #727266",
-"..	c #4C4C45",
-"+.	c #34342F",
-"@.	c #878779",
-"#.	c #A0A090",
-"$.	c #737367",
-"%.	c #010101",
-"&.	c #414141",
-"                                                ",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . .             ",
-"      . + @ @ @ @ @ @ @ @ @ @ @ @ # .           ",
-"      . @ $ % & * = @ - @ ; @ @ @ > .           ",
-"      . @ , ' ) ! ~ @ { ] ^ / - @ > .           ",
-"      . @ , ( _ : < @ @ @ @ @ @ @ > .           ",
-"      . @ [ } | 1 2 @ 3 @ 4 3 @ @ > .           ",
-"      . @ 5 6 7 8 9 0 3 a b 0 @ @ > .           ",
-"      . @ c d e f g h i i j k b @ > .           ",
-"      . @ @ @ @ @ l m n o p q r s > .           ",
-"      . @ @ t @ u v w x y z A B C D .           ",
-"      . # > > > E F G H I J K L M N .           ",
-"        . . . . O P Q R S T U i . .             ",
-"                V W X Y Z `  ...                ",
-"                  +.@.#.W $.%.%.                ",
-"                    j i i &.  %.%.              ",
-"                              %.%.%.            ",
-"                                %.%.%.          ",
-"                                  %.%.%.        ",
-"                                    %.%.        ",
-"                                                ",
-"                                                "};
diff --git a/art/find_message.xpm b/art/find_message.xpm
deleted file mode 100644
index 04465b4ff8..0000000000
--- a/art/find_message.xpm
+++ /dev/null
@@ -1,130 +0,0 @@
-/* XPM */
-static char * find_message_xpm[] = {
-"24 24 103 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #E9E9E9",
-"@ 	c #E2E2E2",
-"# 	c #D7D7D7",
-"$ 	c #FDFDFD",
-"% 	c #FCFCFC",
-"& 	c #FBFBFB",
-"* 	c #D8D8D8",
-"= 	c #FEFEFE",
-"- 	c #E4E4E4",
-"; 	c #BABABA",
-"> 	c #E0E0E0",
-", 	c #FAFAFA",
-"' 	c #F9F9F9",
-") 	c #EAEAEA",
-"! 	c #F8F8F8",
-"~ 	c #CECECE",
-"{ 	c #BDBDBD",
-"] 	c #E6E6E6",
-"^ 	c #E7E7E7",
-"/ 	c #FFFFFF",
-"( 	c #C2C2C2",
-"_ 	c #E5E5E5",
-": 	c #47473F",
-"< 	c #0A0A09",
-"[ 	c #4B4B43",
-"} 	c #8E8E8E",
-"| 	c #AFAFAF",
-"1 	c #34342E",
-"2 	c #9D9D8D",
-"3 	c #CFCFB9",
-"4 	c #C4C4AF",
-"5 	c #8D8D7F",
-"6 	c #353530",
-"7 	c #848484",
-"8 	c #BFBFBF",
-"9 	c #F7F7F7",
-"0 	c #F5F5F5",
-"a 	c #46463F",
-"b 	c #9C9C8C",
-"c 	c #E2E2D0",
-"d 	c #EDEDE7",
-"e 	c #C0C0AC",
-"f 	c #B2B29F",
-"g 	c #828274",
-"h 	c #45453D",
-"i 	c #A7A7A7",
-"j 	c #D2D2D2",
-"k 	c #D5D5D5",
-"l 	c #090908",
-"m 	c #D5D5BF",
-"n 	c #FBFBFA",
-"o 	c #C3C3AE",
-"p 	c #B5B5A2",
-"q 	c #A6A695",
-"r 	c #959586",
-"s 	c #080807",
-"t 	c #979797",
-"u 	c #F4F4F4",
-"v 	c #090909",
-"w 	c #CACAB5",
-"x 	c #DDDDD0",
-"y 	c #B7B7A4",
-"z 	c #AAAA98",
-"A 	c #9B9B8B",
-"B 	c #8C8C7D",
-"C 	c #929292",
-"D 	c #CBCBCB",
-"E 	c #D3D3D3",
-"F 	c #474740",
-"G 	c #929283",
-"H 	c #BABAA7",
-"I 	c #ADAD9B",
-"J 	c #9F9F8E",
-"K 	c #909081",
-"L 	c #727266",
-"M 	c #4C4C45",
-"N 	c #A6A6A6",
-"O 	c #DFDFDF",
-"P 	c #34342F",
-"Q 	c #878779",
-"R 	c #A0A090",
-"S 	c #737367",
-"T 	c #010101",
-"U 	c #919191",
-"V 	c #C1C1C1",
-"W 	c #D1D1D1",
-"X 	c #414141",
-"Y 	c #4B4B4B",
-"Z 	c #131313",
-"` 	c #646464",
-" .	c #8B8B8B",
-"..	c #AEAEAE",
-"+.	c #5E5E5E",
-"@.	c #6E6E6E",
-"#.	c #575757",
-"$.	c #595959",
-"%.	c #585858",
-"&.	c #C4C4C4",
-"*.	c #DDDDDD",
-"=.	c #797979",
-"-.	c #2F2F2F",
-"                                                ",
-"                                                ",
-"                      . .                       ",
-"                  . . + @ .                     ",
-"              . . # $ % & .                     ",
-"          . . * = = = = & - .                   ",
-"        . ; = = = = > > , ' .   . .             ",
-"        . ) = = > > = = = ! . . + @ .           ",
-"          . $ = = = = ~ . . # $ % & .           ",
-"          . % & = { . . * = = = = & - .         ",
-"        . . . , ] . * ^ ^ ^ = > > , ' .         ",
-"      . / = . ( _ : < < [ } | ^ = = ! - .       ",
-"      . # = = . 1 2 3 4 5 6 7 8 > > 9 0 .       ",
-"        . $ = a b c d e f g h i j = = 0 - .     ",
-"        . k & l m n o p q r s t j > > 0 u .     ",
-"          . , v w x y z A B < C D = = = = - .   ",
-"          . E F G H I J K L M N j = = = O O .   ",
-"            . ! P Q R G S T T U V ^ O O . .     ",
-"            . W = [ < < X Y Z `  .... .         ",
-"              . = = > O +.@.#.T $.%.            ",
-"              . &.*.. .     =.. T -.            ",
-"                . .             T T T           ",
-"                                  T T           ",
-"                                                "};
diff --git a/art/flag-for-followup-16.png b/art/flag-for-followup-16.png
deleted file mode 100644
index c21a388135..0000000000
--- a/art/flag-for-followup-16.png
+++ /dev/null
diff --git a/art/flag-for-followup-48.png b/art/flag-for-followup-48.png
deleted file mode 100644
index 76f5c0b04e..0000000000
--- a/art/flag-for-followup-48.png
+++ /dev/null
diff --git a/art/flag-for-followup.xpm b/art/flag-for-followup.xpm
deleted file mode 100644
index ddb3b37ca9..0000000000
--- a/art/flag-for-followup.xpm
+++ /dev/null
@@ -1,78 +0,0 @@
-/* XPM */
-static char * flag_for_followup_xpm[] = {
-"16 16 59 1",
-" 	c None",
-".	c #000000",
-"+	c #282E33",
-"@	c #C1D1E0",
-"#	c #929EA9",
-"$	c #69737C",
-"%	c #32404B",
-"&	c #363F47",
-"*	c #AEC0D1",
-"=	c #DAE3EB",
-"-	c #C4D4E4",
-";	c #6F8498",
-">	c #4D5D6C",
-",	c #3F4D5B",
-"'	c #3F4952",
-")	c #AABBCB",
-"!	c #C6D3DE",
-"~	c #E4EAF0",
-"{	c #C0D0E0",
-"]	c #73889C",
-"^	c #526271",
-"/	c #41505E",
-"(	c #56636F",
-"_	c #41484E",
-":	c #97A9B8",
-"<	c #5D7B95",
-"[	c #6A87A1",
-"}	c #B5C4D2",
-"|	c #D8E1E9",
-"1	c #CFDBE6",
-"2	c #9DB8D2",
-"3	c #455461",
-"4	c #465665",
-"5	c #45515B",
-"6	c #30363A",
-"7	c #C0B094",
-"8	c #4B6983",
-"9	c #57758F",
-"0	c #64819B",
-"a	c #B3C2D0",
-"b	c #D2DBE4",
-"c	c #DCE4EC",
-"d	c #A4BBD1",
-"e	c #97A1AB",
-"f	c #74797F",
-"g	c #727A81",
-"h	c #606A74",
-"i	c #B39169",
-"j	c #516F89",
-"k	c #AEBECC",
-"l	c #AFBFCE",
-"m	c #DCE4EB",
-"n	c #7D94A8",
-"o	c #BBC8D3",
-"p	c #0E0E0E",
-"q	c #D7DEE4",
-"r	c #040404",
-"s	c #9EA4AA",
-"t	c #0B0F13",
-"       .        ",
-"    ...+.       ",
-"   .@#$%&.      ",
-"  .*=-;>,'..    ",
-"  .)!~{]^/(_..  ",
-" .:<[}|12;3456. ",
-".7.890abcdefgh. ",
-" .i.8j<klm....  ",
-"  .i.88nop      ",
-"   .i.88qr      ",
-"    .i.8s.      ",
-"     .i.t       ",
-"      .i.       ",
-"       .i.      ",
-"        .i.     ",
-"         ..     "};
diff --git a/art/folder-copy-16.png b/art/folder-copy-16.png
deleted file mode 100644
index 5c0a3c9dbd..0000000000
--- a/art/folder-copy-16.png
+++ /dev/null
diff --git a/art/folder-move-16.png b/art/folder-move-16.png
deleted file mode 100644
index 4a94499f1c..0000000000
--- a/art/folder-move-16.png
+++ /dev/null
diff --git a/art/folder-settings.png b/art/folder-settings.png
deleted file mode 100644
index 37a7c86f35..0000000000
--- a/art/folder-settings.png
+++ /dev/null
diff --git a/art/folder.xpm b/art/folder.xpm
deleted file mode 100644
index 4ef29bcad7..0000000000
--- a/art/folder.xpm
+++ /dev/null
@@ -1,73 +0,0 @@
-/* XPM */
-static char * folder_xpm[] = {
-"16 16 54 1",
-" 	c None",
-".	c #000000",
-"+	c #E4E5DF",
-"@	c #D5D6CB",
-"#	c #D6D7CA",
-"$	c #A3A39D",
-"%	c #F5F6F0",
-"&	c #ADB198",
-"*	c #C2C6A9",
-"=	c #C0C3A7",
-"-	c #B4B89D",
-";	c #6D705F",
-">	c #EAECDB",
-",	c #F6F6F4",
-"'	c #EAECDA",
-")	c #E8EAD8",
-"!	c #E9EBDB",
-"~	c #E7E9D6",
-"{	c #E6E8D5",
-"]	c #E5E8D4",
-"^	c #E4E7D2",
-"/	c #C7C9B6",
-"(	c #F7F7F7",
-"_	c #DADEBF",
-":	c #DADEBE",
-"<	c #D8DCBC",
-"[	c #D6DBB9",
-"}	c #D5D9B7",
-"|	c #D3D7B4",
-"1	c #D1D6B2",
-"2	c #CFD4AF",
-"3	c #CDD2AD",
-"4	c #CBD1AA",
-"5	c #95997C",
-"6	c #F3F3EA",
-"7	c #F3F4EA",
-"8	c #CACFA8",
-"9	c #C8CDA5",
-"0	c #929778",
-"a	c #F1F3E9",
-"b	c #C6CCA3",
-"c	c #C4CAA0",
-"d	c #8F9474",
-"e	c #F0F1E7",
-"f	c #C2C89D",
-"g	c #C1C79B",
-"h	c #8D9270",
-"i	c #EFF1E5",
-"j	c #BFC598",
-"k	c #EBECDE",
-"l	c #C9CCB9",
-"m	c #919576",
-"n	c #8F9372",
-"o	c #666951",
-"                ",
-"                ",
-"   ....         ",
-"  .+@#$.        ",
-" .%&*=-;....... ",
-" .>,>>')!~~{]^/.",
-" .(_:<[}|112345.",
-" .6_:<[}|112345.",
-" .7<[}|12334890.",
-" .a}|1234889bcd.",
-" .e123489bbcfgh.",
-" .i3489bcffgjjh.",
-" .k89bcfgjjjjjh.",
-" .l0mdnhhhhhhho.",
-"  ............. ",
-"                "};
diff --git a/art/font.png b/art/font.png
deleted file mode 100644
index 8c5e8ee2a7..0000000000
--- a/art/font.png
+++ /dev/null
diff --git a/art/forget_passwords.xpm b/art/forget_passwords.xpm
deleted file mode 100644
index a121300716..0000000000
--- a/art/forget_passwords.xpm
+++ /dev/null
@@ -1,125 +0,0 @@
-/* XPM */
-static char * forget_passwords_xpm[] = {
-"16 16 106 2",
-"  	c None",
-". 	c #010101",
-"+ 	c #C0B09D",
-"@ 	c #FEC6BC",
-"# 	c #FFCDB4",
-"$ 	c #C2A887",
-"% 	c #DCB9A8",
-"& 	c #AF843A",
-"* 	c #755C5C",
-"= 	c #655E37",
-"- 	c #DBBCAE",
-"; 	c #FFC4B8",
-"> 	c #FFCDBC",
-", 	c #DDBCA3",
-"' 	c #DBBEB5",
-") 	c #B9933A",
-"! 	c #D3AF84",
-"~ 	c #BE933A",
-"{ 	c #CDA86F",
-"] 	c #A3753F",
-"^ 	c #554F2E",
-"/ 	c #FFC5A3",
-"( 	c #FFFFE3",
-"_ 	c #D4B584",
-": 	c #DCBEB5",
-"< 	c #CDAE95",
-"[ 	c #E6BAA8",
-"} 	c #BDA897",
-"| 	c #CCA871",
-"1 	c #B9841D",
-"2 	c #CCAF95",
-"3 	c #A8753F",
-"4 	c #C4B29C",
-"5 	c #E3B89E",
-"6 	c #E6BEA8",
-"7 	c #C89E58",
-"8 	c #DCB5A0",
-"9 	c #B5841D",
-"0 	c #E6B593",
-"a 	c #BA9E58",
-"b 	c #B4841D",
-"c 	c #C79E58",
-"d 	c #3B250B",
-"e 	c #FFE5BE",
-"f 	c #F2C7B2",
-"g 	c #F3BE9E",
-"h 	c #C7B5A9",
-"i 	c #F3C8B9",
-"j 	c #C29E58",
-"k 	c #E6C2AE",
-"l 	c #BBAAB1",
-"m 	c #C7A887",
-"n 	c #BE9E58",
-"o 	c #6D572C",
-"p 	c #CDB6AC",
-"q 	c #E6BE9E",
-"r 	c #C7AE95",
-"s 	c #E6C3B5",
-"t 	c #DCB593",
-"u 	c #B9A073",
-"v 	c #CAA49D",
-"w 	c #AE841D",
-"x 	c #A6781B",
-"y 	c #BA8E51",
-"z 	c #B1813F",
-"A 	c #C6A871",
-"B 	c #DCBEAF",
-"C 	c #E6BEB5",
-"D 	c #D4B0AE",
-"E 	c #BDA058",
-"F 	c #AC761B",
-"G 	c #A77D3F",
-"H 	c #A06422",
-"I 	c #B59358",
-"J 	c #BDA187",
-"K 	c #D3B5A0",
-"L 	c #BD933A",
-"M 	c #B09960",
-"N 	c #BD9D60",
-"O 	c #AC8131",
-"P 	c #935511",
-"Q 	c #753F20",
-"R 	c #753D1D",
-"S 	c #D4AE84",
-"T 	c #B09264",
-"U 	c #BDA475",
-"V 	c #B48431",
-"W 	c #B08431",
-"X 	c #A86813",
-"Y 	c #975C16",
-"Z 	c #A06413",
-"` 	c #5C3D1D",
-" .	c #A46A36",
-"..	c #903801",
-"+.	c #953D1D",
-"@.	c #751801",
-"#.	c #681601",
-"$.	c #844116",
-"%.	c #1D0101",
-"&.	c #A0581D",
-"*.	c #933A01",
-"=.	c #A67531",
-"-.	c #87581D",
-";.	c #A86F1D",
-">.	c #A1713A",
-",.	c #B09358",
-"                                ",
-"          . . . . . .           ",
-"      . . + @ # $ % & * .       ",
-"    = - ; > , ' ) ! ~ { ] .     ",
-"  ^ / ( _ : < [ } | 1 2 ) 3 .   ",
-". 4 5 6 7 : 8 9 0 a 2 b c ~ d   ",
-". e f g h i j k l m $ < n 1 o . ",
-". p q r s t b u v 2 c w c x y . ",
-"  . z A B 1 ) C D $ E j F G H . ",
-"    . I ~ J K L M 2 ~ N O P Q . ",
-"      . . R S T U V W X Y Z .   ",
-"            `  ...+.@.#.$..     ",
-"              . %.&.*.=.        ",
-"                . -.;.>.        ",
-"                  . ` ,..       ",
-"                    . . .       "};
diff --git a/art/forward.png b/art/forward.png
deleted file mode 100644
index bbce8ad3c7..0000000000
--- a/art/forward.png
+++ /dev/null
diff --git a/art/forward.xpm b/art/forward.xpm
deleted file mode 100644
index fcb25802a1..0000000000
--- a/art/forward.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char * forward_xpm[] = {
-"16 16 32 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #000000",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #797873",
-"]	c #BBC2CC",
-"^	c #576E87",
-"/	c #EFEFEF",
-"(	c #CCCCCC",
-"_	c #7D7A77",
-":	c #F7F5F1",
-"<	c #FAF9F6",
-"[	c #314E6C",
-"}	c #090808",
-"|	c #D7D4CE",
-"1	c #D8D5CF",
-"2	c #181818",
-"3	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%%%%%>,'.  ",
-" .%--;%)))))))))",
-" .%-!~;)%%%%%%%)",
-" .%!{--)%]^///()",
-" .%_-:<)%^[[/[()",
-" .}|111)%/[[[[()",
-"  .....)%//[[[()",
-"       )%/[[[[()",
-"       )%((((((2",
-"       ))3))))))"};
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/goto-16.png b/art/goto-16.png
deleted file mode 100644
index 800db10e41..0000000000
--- a/art/goto-16.png
+++ /dev/null
diff --git a/art/goto-24.png b/art/goto-24.png
deleted file mode 100644
index b6fc82fd73..0000000000
--- a/art/goto-24.png
+++ /dev/null
diff --git a/art/hand-16.xpm b/art/hand-16.xpm
deleted file mode 100644
index d925e2d968..0000000000
--- a/art/hand-16.xpm
+++ /dev/null
@@ -1,115 +0,0 @@
-/* XPM */
-static char * hand_16_xpm[] = {
-"16 16 96 2",
-"  	c None",
-". 	c #010100",
-"+ 	c #010000",
-"@ 	c #090600",
-"# 	c #030000",
-"$ 	c #E8E6E1",
-"% 	c #A3A09C",
-"& 	c #080000",
-"* 	c #D6D2CD",
-"= 	c #8F8A84",
-"- 	c #FFFAF7",
-"; 	c #98938D",
-"> 	c #F1EDE9",
-", 	c #88827E",
-"' 	c #181510",
-") 	c #F8EEE4",
-"! 	c #F8ECE0",
-"~ 	c #F8ECDE",
-"{ 	c #0D0600",
-"] 	c #F8EBDE",
-"^ 	c #F6E7D7",
-"/ 	c #D5C5B6",
-"( 	c #070000",
-"_ 	c #F6E5D3",
-": 	c #F7E9D9",
-"< 	c #050200",
-"[ 	c #080300",
-"} 	c #312722",
-"| 	c #EFE7E0",
-"1 	c #F6F2EF",
-"2 	c #F6F1EE",
-"3 	c #EDE4DB",
-"4 	c #F1E4D6",
-"5 	c #9D9790",
-"6 	c #12110D",
-"7 	c #958E88",
-"8 	c #DDCFC2",
-"9 	c #F6E8D9",
-"0 	c #F6F1EC",
-"a 	c #F5F1EE",
-"b 	c #E5D7CB",
-"c 	c #F7E8D8",
-"d 	c #EEDFD3",
-"e 	c #CAC0B6",
-"f 	c #645951",
-"g 	c #E7D9CA",
-"h 	c #F6E6D5",
-"i 	c #F7EBDE",
-"j 	c #E9DCD2",
-"k 	c #040000",
-"l 	c #F7EFE7",
-"m 	c #EDDECF",
-"n 	c #D6C8BA",
-"o 	c #CBB9AC",
-"p 	c #D2C8BC",
-"q 	c #F8EEE3",
-"r 	c #F5EEE8",
-"s 	c #EFE3D7",
-"t 	c #B8A99D",
-"u 	c #060100",
-"v 	c #D7CFC7",
-"w 	c #F9F2E9",
-"x 	c #F3E3D4",
-"y 	c #F1DFCF",
-"z 	c #E6D7C7",
-"A 	c #F8F2ED",
-"B 	c #EDE1D4",
-"C 	c #0A0300",
-"D 	c #D7CFC9",
-"E 	c #FAF2EC",
-"F 	c #F1E0D1",
-"G 	c #F6EEE8",
-"H 	c #000000",
-"I 	c #171111",
-"J 	c #A79D9D",
-"K 	c #C8BDBC",
-"L 	c #A59D9A",
-"M 	c #ABA8A3",
-"N 	c #BFB7B5",
-"O 	c #060000",
-"P 	c #0E0403",
-"Q 	c #0A0000",
-"R 	c #0A0200",
-"S 	c #080401",
-"T 	c #FCF4F2",
-"U 	c #F9F1EF",
-"V 	c #F8F0EE",
-"W 	c #F2EDEA",
-"X 	c #DDD9D6",
-"Y 	c #E5E4E0",
-"Z 	c #030400",
-"` 	c #0B0505",
-" .	c #050000",
-"..	c #14100F",
-"+.	c #090806",
-"@.	c #000100",
-"              . +               ",
-"          @ # $ % + +           ",
-"        & * = - ; > , '         ",
-"        & ) ; ! ; ~ ; {         ",
-"        & ] ; ^ ; ] ; / (       ",
-"        & _ ; _ ; : ; / (       ",
-"    < [ } | 1 2 3 4 5 / (       ",
-"  6 _ 7 & 8 _ 9 0 a b / (       ",
-"  + c d e f g h _ i j / (       ",
-"    k l m n o p q r s t (       ",
-"    u v w x y z A B _ t (       ",
-"      C D E _ F G _ / H         ",
-"        I J K _ _ L M &         ",
-"        N O P Q R k S           ",
-"        k T U V W X Y Z         ",
-"        k `  ...# +.H @.        "};
diff --git a/art/hide_deleted_messages.xpm b/art/hide_deleted_messages.xpm
deleted file mode 100644
index 189d8d350e..0000000000
--- a/art/hide_deleted_messages.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * hide_deleted_messages_xpm[] = {
-"16 16 20 1",
-" 	c None",
-".	c #828282",
-"+	c #A0A0A0",
-"@	c #AAAAAA",
-"#	c #898989",
-"$	c #9A9A9A",
-"%	c #8F8F8F",
-"&	c #A9A9A9",
-"*	c #A5A5A5",
-"=	c #959595",
-"-	c #A8A8A8",
-";	c #AEAEAE",
-">	c #B1B1B1",
-",	c #B3B3B3",
-"'	c #9B9B9B",
-")	c #DF421E",
-"!	c #000000",
-"~	c #B7B7B7",
-"{	c #ADADAD",
-"]	c #AFAFAF",
-"                ",
-"                ",
-"                ",
-" .. .+.@#$..    ",
-" .. ..%&$*=$    ",
-" .. .@.-;$#>    ",
-"                ",
-" .%.; .%, '.  ) ",
-"!!!!!!!!!!!!! ))",
-" .~$. ... ..  ) ",
-"                ",
-" .+ .+.'% .+    ",
-" .{ .#%.] '&    ",
-" .' .$;.% ..    ",
-"                ",
-"                "};
diff --git a/art/hide_read_messages.xpm b/art/hide_read_messages.xpm
deleted file mode 100644
index 8df1313651..0000000000
--- a/art/hide_read_messages.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * hide_read_messages_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000",
-"+	c #DF421E",
-"@	c #828282",
-"                ",
-"                ",
-"                ",
-"  .. .......    ",
-"              + ",
-"  @ @@@ @@ @  ++",
-"              + ",
-"  ... .. ...    ",
-"                ",
-"  ... . ....    ",
-"              + ",
-"  @@ @@@ @@@  ++",
-"              + ",
-"  . ... ....    ",
-"                ",
-"                "};
diff --git a/art/hide_selected_messages.xpm b/art/hide_selected_messages.xpm
deleted file mode 100644
index cb1989b84c..0000000000
--- a/art/hide_selected_messages.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_selected_messages_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #4B6983",
-"+	c #DF421E",
-"@	c #FFFFFF",
-"#	c #798FA2",
-"$	c #BEC8D0",
-"%	c #F1F3F5",
-"&	c #CDD5DC",
-"*	c #A9B6C2",
-"=	c #000000",
-"-	c #647E94",
-";	c #A2B1BE",
-">	c #E4E8EC",
-",	c #D8DEE4",
-"                ",
-"                ",
-"                ",
-" ............ + ",
-" .@#$%%#@&*%. ++",
-" ............ + ",
-"                ",
-"  === == ===    ",
-"                ",
-"  === = ====    ",
-"                ",
-" ............ + ",
-" .@%-@&@;>,%. ++",
-" ............ + ",
-"                ",
-"                "};
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/ico-calendar.png b/art/ico-calendar.png
deleted file mode 100644
index 3010528d7f..0000000000
--- a/art/ico-calendar.png
+++ /dev/null
diff --git a/art/ico-mail.png b/art/ico-mail.png
deleted file mode 100644
index 66a4ba89cd..0000000000
--- a/art/ico-mail.png
+++ /dev/null
diff --git a/art/ico-rdf.png b/art/ico-rdf.png
deleted file mode 100644
index 0e39037b95..0000000000
--- a/art/ico-rdf.png
+++ /dev/null
diff --git a/art/ico-weather.png b/art/ico-weather.png
deleted file mode 100644
index 25eb161f8c..0000000000
--- a/art/ico-weather.png
+++ /dev/null
diff --git a/art/imap-16.png b/art/imap-16.png
deleted file mode 100644
index 1e2932a728..0000000000
--- a/art/imap-16.png
+++ /dev/null
diff --git a/art/import.png b/art/import.png
deleted file mode 100644
index 151b60a270..0000000000
--- a/art/import.png
+++ /dev/null
diff --git a/art/import.xpm b/art/import.xpm
deleted file mode 100644
index a996072772..0000000000
--- a/art/import.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_import_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #A50B05",
-"@	c #A1A1A1",
-"#	c #FFFFFF",
-"$	c #A7A7A7",
-"%	c #980000",
-"&	c #DBDBDB",
-"*	c #9B9B9B",
-"=	c #9C9C9C",
-"-	c #E4E4E4",
-";	c #9F0502",
-">	c #A90F07",
-",	c #D23618",
-"'	c #AEAEAE",
-")	c #A3A3A3",
-"!	c #D83C1B",
-"~	c #E46243",
-"{	c #E87E64",
-"]	c #2C2C2C",
-"^	c #9E8754",
-"/	c #6B5B39",
-"(	c #826E46",
-"_	c #9E8655",
-":	c #BFA367",
-"<	c #DCCBA3",
-"[	c #99804F",
-"}	c #D8C7A2",
-"|	c #F0DBAC",
-"1	c #E4D3AF",
-"2	c #76520D",
-"3	c #865F10",
-"4	c #E1BB65",
-"5	c #D1940C",
-"6	c #906612",
-"7	c #7D5C14",
-"8	c #CF920B",
-"9	c #714F0C",
-"0	c #E2BE6C",
-"a	c #7B560E",
-".......  +      ",
-".@###$. %+      ",
-".&*#=-.%;>,,    ",
-".'-$-). ++ !    ",
-".......  + ~    ",
-"           {    ",
-"                ",
-"       ......]. ",
-"      .^/(_:<[. ",
-"     .}||||123. ",
-"     .45555567. ",
-"     .45555567. ",
-"     .45555567. ",
-"     .45585569. ",
-"     .055555a.  ",
-"     ........   "};
diff --git a/art/inbox-16.png b/art/inbox-16.png
deleted file mode 100644
index 88071fa91e..0000000000
--- a/art/inbox-16.png
+++ /dev/null
diff --git a/art/inbox-full-16.png b/art/inbox-full-16.png
deleted file mode 100644
index 289335eaa2..0000000000
--- a/art/inbox-full-16.png
+++ /dev/null
diff --git a/art/insert-image-24.png b/art/insert-image-24.png
deleted file mode 100644
index 4b2fd4ffae..0000000000
--- a/art/insert-image-24.png
+++ /dev/null
diff --git a/art/insert-link-24.png b/art/insert-link-24.png
deleted file mode 100644
index 9824bc8ae6..0000000000
--- a/art/insert-link-24.png
+++ /dev/null
diff --git a/art/insert-table-24.png b/art/insert-table-24.png
deleted file mode 100644
index 21344caea6..0000000000
--- a/art/insert-table-24.png
+++ /dev/null
diff --git a/art/jump.xpm b/art/jump.xpm
deleted file mode 100644
index d974142d9a..0000000000
--- a/art/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/art/ldap-mini.png b/art/ldap-mini.png
deleted file mode 100644
index 85c4dc0cf7..0000000000
--- a/art/ldap-mini.png
+++ /dev/null
diff --git a/art/ldap-settings.png b/art/ldap-settings.png
deleted file mode 100644
index 6a2bcff352..0000000000
--- a/art/ldap-settings.png
+++ /dev/null
diff --git a/art/ldap.png b/art/ldap.png
deleted file mode 100644
index 5ff8180b35..0000000000
--- a/art/ldap.png
+++ /dev/null
diff --git a/art/local-16.png b/art/local-16.png
deleted file mode 100644
index 1fc929bbf7..0000000000
--- a/art/local-16.png
+++ /dev/null
diff --git a/art/mail-accounts-settings.png b/art/mail-accounts-settings.png
deleted file mode 100644
index 565b1b300a..0000000000
--- a/art/mail-accounts-settings.png
+++ /dev/null
diff --git a/art/mail-config-druid-48.png b/art/mail-config-druid-48.png
deleted file mode 100644
index 35b452b4e9..0000000000
--- a/art/mail-config-druid-48.png
+++ /dev/null
diff --git a/art/mail-config-druid-account-name.png b/art/mail-config-druid-account-name.png
deleted file mode 100644
index 2cad5eb941..0000000000
--- a/art/mail-config-druid-account-name.png
+++ /dev/null
diff --git a/art/mail-config-druid-identity.png b/art/mail-config-druid-identity.png
deleted file mode 100644
index f895a1e168..0000000000
--- a/art/mail-config-druid-identity.png
+++ /dev/null
diff --git a/art/mail-config-druid-receive.png b/art/mail-config-druid-receive.png
deleted file mode 100644
index df75812db3..0000000000
--- a/art/mail-config-druid-receive.png
+++ /dev/null
diff --git a/art/mail-config-druid-send.png b/art/mail-config-druid-send.png
deleted file mode 100644
index 1bf501ddb2..0000000000
--- a/art/mail-config-druid-send.png
+++ /dev/null
diff --git a/art/mail-config-druid.png b/art/mail-config-druid.png
deleted file mode 100644
index 35b452b4e9..0000000000
--- a/art/mail-config-druid.png
+++ /dev/null
diff --git a/art/mail-need-reply.xpm b/art/mail-need-reply.xpm
deleted file mode 100644
index 283ef3d83f..0000000000
--- a/art/mail-need-reply.xpm
+++ /dev/null
@@ -1,101 +0,0 @@
-/* XPM */
-static char * mail_need_reply_xpm[] = {
-"16 16 82 1",
-" 	c None",
-".	c #2A2A2A",
-"+	c #AAAAAA",
-"@	c #A2A2A2",
-"#	c #949494",
-"$	c #E4E4E4",
-"%	c #F6F6F6",
-"&	c #F7F7F7",
-"*	c #F8F8F8",
-"=	c #E5E5E5",
-"-	c #898989",
-";	c #7A7A7A",
-">	c #DADADA",
-",	c #F5F5F5",
-"'	c #818181",
-")	c #B1B1B1",
-"!	c #858585",
-"~	c #EDEDED",
-"{	c #8E8E8E",
-"]	c #E1E1E1",
-"^	c #E2E2E2",
-"/	c #7F7F7F",
-"(	c #B7B7B7",
-"_	c #E0E0E0",
-":	c #BEBEBE",
-"<	c #737373",
-"[	c #848484",
-"}	c #E8E8E8",
-"|	c #DBDBDB",
-"1	c #363636",
-"2	c #9C9C9C",
-"3	c #C9C9C9",
-"4	c #919191",
-"5	c #B4B4B4",
-"6	c #AFAFAF",
-"7	c #C3C3C3",
-"8	c #6F635C",
-"9	c #372B24",
-"0	c #EBEBEB",
-"a	c #F1F1F1",
-"b	c #D7D7D7",
-"c	c #C7C7C7",
-"d	c #E9E9E9",
-"e	c #F3F3F3",
-"f	c #BDBDBD",
-"g	c #CDCDCD",
-"h	c #372E28",
-"i	c #F6B893",
-"j	c #88634D",
-"k	c #534339",
-"l	c #2C211A",
-"m	c #8F8F8F",
-"n	c #A8A8A8",
-"o	c #6F6F6F",
-"p	c #473B34",
-"q	c #DBA585",
-"r	c #F4A677",
-"s	c #F5AD82",
-"t	c #F5B189",
-"u	c #72503C",
-"v	c #3F3F3F",
-"w	c #1C1C1C",
-"x	c #2B1E15",
-"y	c #DC976F",
-"z	c #DA8A5B",
-"A	c #583725",
-"B	c #984816",
-"C	c #A75223",
-"D	c #43210E",
-"E	c #261102",
-"F	c #853F12",
-"G	c #A55123",
-"H	c #9C4C20",
-"I	c #984B20",
-"J	c #42200E",
-"K	c #853E12",
-"L	c #4A240E",
-"M	c #291408",
-"N	c #160A04",
-"O	c #200E01",
-"P	c #180B01",
-"Q	c #000000",
-"                ",
-"   .++++++++++. ",
-"   @#$%&**%&=-; ",
-"   +>#,,,,,,')! ",
-"   +*~{],,^/(_! ",
-"   +*,:<,,;[]}! ",
-"   +|1234-567}! ",
-"   +890abcdefg! ",
-"   hijkklmbbbno ",
-"  pqrsttu.vvvvw ",
-" xyzzzzzA       ",
-" xBCCCCCD       ",
-"  EFGHIIJ       ",
-"   EKLMMN       ",
-"    OP          ",
-"     Q          "};
diff --git a/art/mail-new.xpm b/art/mail-new.xpm
deleted file mode 100644
index 767ec6366f..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 b4e3160ab4..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 06f4a7420a..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-as-important-16.png b/art/mark-as-important-16.png
deleted file mode 100644
index 393d86e77c..0000000000
--- a/art/mark-as-important-16.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-request.png b/art/meeting-request.png
deleted file mode 100644
index 0fba577bfe..0000000000
--- a/art/meeting-request.png
+++ /dev/null
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/monkey-16.png b/art/monkey-16.png
deleted file mode 100644
index 02fb7b6eb5..0000000000
--- a/art/monkey-16.png
+++ /dev/null
diff --git a/art/monthview.xpm b/art/monthview.xpm
deleted file mode 100644
index 21c76151d5..0000000000
--- a/art/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/art/move-message.png b/art/move-message.png
deleted file mode 100644
index 143cea1a93..0000000000
--- a/art/move-message.png
+++ /dev/null
diff --git a/art/move_message.xpm b/art/move_message.xpm
deleted file mode 100644
index 846febbe49..0000000000
--- a/art/move_message.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_move_message_xpm[] = {
-"16 16 40 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 #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #000000",
-"{	c #928F8B",
-"]	c #FBFBFA",
-"^	c #F7F5F2",
-"/	c #F5F3F0",
-"(	c #F7F6F4",
-"_	c #B5B2AC",
-":	c #A09C97",
-"<	c #F0EFEB",
-"[	c #E4E2DD",
-"}	c #AEABA6",
-"|	c #92908B",
-"1	c #E8E6E1",
-"2	c #B0ADA7",
-"3	c #F7F6F2",
-"4	c #F5F4F0",
-"5	c #6B6A68",
-"6	c #83817E",
-"7	c #E1DFDA",
-"8	c #E2DFD9",
-"9	c #E2E0DB",
-"0	c #E3E1DC",
-"a	c #E6E4DF",
-"                ",
-" . . . . . .    ",
-".           .   ",
-"                ",
-".           .   ",
-"    .+......... ",
-".  .@#########$.",
-"   .#%&*#*=*-;>.",
-".  .#*,=*=*')'!.",
-" ~ .#**{]*^)*/!.",
-"   .#*(_)#):-<[.",
-"   .#(}**)^^|1[.",
-"   .#2*/34^/>51.",
-"   .678887990a$.",
-"    ........... ",
-"                "};
diff --git a/art/myevo-appointments.png b/art/myevo-appointments.png
deleted file mode 100644
index 873528a964..0000000000
--- a/art/myevo-appointments.png
+++ /dev/null
diff --git a/art/myevo-mail-summary.png b/art/myevo-mail-summary.png
deleted file mode 100644
index 453f9938ac..0000000000
--- a/art/myevo-mail-summary.png
+++ /dev/null
diff --git a/art/myevo-post-it.png b/art/myevo-post-it.png
deleted file mode 100644
index f0ef421549..0000000000
--- a/art/myevo-post-it.png
+++ /dev/null
diff --git a/art/myweather-clouds.png b/art/myweather-clouds.png
deleted file mode 100644
index fa1fa4b80f..0000000000
--- a/art/myweather-clouds.png
+++ /dev/null
diff --git a/art/myweather-fog.png b/art/myweather-fog.png
deleted file mode 100644
index 60db197df7..0000000000
--- a/art/myweather-fog.png
+++ /dev/null
diff --git a/art/myweather-rain.png b/art/myweather-rain.png
deleted file mode 100644
index 3ce291f788..0000000000
--- a/art/myweather-rain.png
+++ /dev/null
diff --git a/art/myweather-snow.png b/art/myweather-snow.png
deleted file mode 100644
index 8a45248692..0000000000
--- a/art/myweather-snow.png
+++ /dev/null
diff --git a/art/myweather-storm.png b/art/myweather-storm.png
deleted file mode 100644
index cef334a43c..0000000000
--- a/art/myweather-storm.png
+++ /dev/null
diff --git a/art/myweather-sun.png b/art/myweather-sun.png
deleted file mode 100644
index 26349305bf..0000000000
--- a/art/myweather-sun.png
+++ /dev/null
diff --git a/art/myweather-suncloud.png b/art/myweather-suncloud.png
deleted file mode 100644
index a2058e77b0..0000000000
--- a/art/myweather-suncloud.png
+++ /dev/null
diff --git a/art/new-message.xpm b/art/new-message.xpm
deleted file mode 100644
index add4263a4d..0000000000
--- a/art/new-message.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * new_message_xpm[] = {
-"16 16 19 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #E2E2E2",
-"#	c #FEFEFE",
-"$	c #FCFCFC",
-"%	c #FBFBFB",
-"&	c #FFFFFF",
-"*	c #E4E4E4",
-"=	c #E0E0E0",
-"-	c #FAFAFA",
-";	c #F9F9F9",
-">	c #F8F8F8",
-",	c #F7F7F7",
-"'	c #F5F5F5",
-")	c #F4F4F4",
-"!	c #DFDFDF",
-"~	c #E8E8E8",
-"{	c #DDDDDD",
-"                ",
-"        ..      ",
-"      ..+@.     ",
-"    ..#+$%.     ",
-"  ..&####%*.    ",
-" .&####==-;.    ",
-" .###==###>*.   ",
-"  .+####==,'.   ",
-"  .$%#==###'*.  ",
-"   .--###==').  ",
-"   .-;#==####*. ",
-"    .>######!!. ",
-"    .,####!!..  ",
-"     .##=!..    ",
-"     .~{..      ",
-"      ..        "};
diff --git a/art/new_all_day_event.png b/art/new_all_day_event.png
deleted file mode 100644
index ee15651725..0000000000
--- a/art/new_all_day_event.png
+++ /dev/null
diff --git a/art/new_appointment.png b/art/new_appointment.png
deleted file mode 100644
index 5dc61801da..0000000000
--- a/art/new_appointment.png
+++ /dev/null
diff --git a/art/new_appointment.xpm b/art/new_appointment.xpm
deleted file mode 100644
index d55eb396e8..0000000000
--- a/art/new_appointment.xpm
+++ /dev/null
@@ -1,126 +0,0 @@
-/* XPM */
-static char * new_appointment_xpm[] = {
-"16 16 107 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #FEFEFE",
-"@ 	c #FDFDFD",
-"# 	c #E0E0E0",
-"$ 	c #C1C1C1",
-"% 	c #F1F1F1",
-"& 	c #C3C3C3",
-"* 	c #FBFBFB",
-"= 	c #A8A8A8",
-"- 	c #525252",
-"; 	c #141414",
-"> 	c #111111",
-", 	c #383838",
-"' 	c #6E6E6E",
-") 	c #ADADAD",
-"! 	c #717171",
-"~ 	c #5D5D5D",
-"{ 	c #404040",
-"] 	c #BA8D31",
-"^ 	c #EAB23D",
-"/ 	c #403011",
-"( 	c #E5E5E5",
-"_ 	c #B4B4B4",
-": 	c #606060",
-"< 	c #DADADA",
-"[ 	c #777777",
-"} 	c #4B4B49",
-"| 	c #161616",
-"1 	c #EFB63E",
-"2 	c #F6D591",
-"3 	c #F3B840",
-"4 	c #916D26",
-"5 	c #F8F8F8",
-"6 	c #F3F3F3",
-"7 	c #E7E7E7",
-"8 	c #B5B5B5",
-"9 	c #A1A1A1",
-"0 	c #919191",
-"a 	c #EEB53E",
-"b 	c #FAE7BC",
-"c 	c #FCD584",
-"d 	c #FEC142",
-"e 	c #FFC243",
-"f 	c #FFFFFF",
-"g 	c #CECECE",
-"h 	c #0B0B0B",
-"i 	c #B9B9B9",
-"j 	c #E4E4E4",
-"k 	c #B88B30",
-"l 	c #F9E2B2",
-"m 	c #FDD789",
-"n 	c #D0D0D0",
-"o 	c #373737",
-"p 	c #898989",
-"q 	c #ABABAB",
-"r 	c #33332D",
-"s 	c #CFCFB9",
-"t 	c #E7AF3C",
-"u 	c #F9DDA4",
-"v 	c #FECA5E",
-"w 	c #D09E36",
-"x 	c #8B8B8B",
-"y 	c #F6F6F6",
-"z 	c #131313",
-"A 	c #3A2B0F",
-"B 	c #8F6C25",
-"C 	c #FDC042",
-"D 	c #2D220C",
-"E 	c #6F6F6F",
-"F 	c #8F8F8F",
-"G 	c #353535",
-"H 	c #C3C3AE",
-"I 	c #DFDFDF",
-"J 	c #F0F0F0",
-"K 	c #FCFCFC",
-"L 	c #363636",
-"M 	c #AAAAAA",
-"N 	c #C8C8C8",
-"O 	c #A9A9A9",
-"P 	c #E1E1E1",
-"Q 	c #4A4A4A",
-"R 	c #FAFAFA",
-"S 	c #C4C4C4",
-"T 	c #3C3C36",
-"U 	c #ADAD9B",
-"V 	c #CCCCCC",
-"W 	c #D6D6D6",
-"X 	c #F4F4F4",
-"Y 	c #F7F7F7",
-"Z 	c #BABABA",
-"` 	c #BFBFBF",
-" .	c #C9C9C9",
-"..	c #767676",
-"+.	c #CBCBCB",
-"@.	c #ACACAC",
-"#.	c #B3B3B3",
-"$.	c #5C5C5C",
-"%.	c #C5C5C5",
-"&.	c #A0A0A0",
-"*.	c #444444",
-"=.	c #A7A7A7",
-"-.	c #989898",
-";.	c #4B4B4B",
-">.	c #9C9C9C",
-",.	c #A2A2A2",
-"'.	c #BBBBBB",
-"        . . . . . . . . .       ",
-"      . + + + + + + @ # $ .     ",
-"      . + % % % % % % & * = .   ",
-"      . - ; . > , ' % ) ! ~ { . ",
-"    . . ] ^ / ( _ . : < [ } | . ",
-"  . . 1 2 3 4 5 6 7 . : 8 9 0 . ",
-"  . a b c d e f g h i . 9 j 0 . ",
-". k l m e e e n o p % q r s 0 . ",
-". t u v e e w o x + y < z j 0 . ",
-". A B C e e D E f + F G . H 0 . ",
-". I J K f f n L M @ J N z j 0 . ",
-". O P y + + f n Q R S 9 T U 0 . ",
-"  . V W X R K * Y V Z . 9 j 0 . ",
-"  . . ` Z  ...+.@.#.. $.%.j 0 . ",
-"    . . &.@.*.=.-.. ;.>.,.'.&.. ",
-"      . . . . . . . . . . . .   "};
diff --git a/art/new_contact.xpm b/art/new_contact.xpm
deleted file mode 100644
index 9b7e778102..0000000000
--- a/art/new_contact.xpm
+++ /dev/null
@@ -1,98 +0,0 @@
-/* XPM */
-static char * new_contact_xpm[] = {
-"24 24 71 1",
-" 	c None",
-".	c #000000",
-"+	c #BABABA",
-"@	c #FDFDFD",
-"#	c #FCFCFC",
-"$	c #959595",
-"%	c #FBFBFB",
-"&	c #FAFAFA",
-"*	c #F9F9F9",
-"=	c #F8F8F8",
-"-	c #F7F7F7",
-";	c #E3E3E3",
-">	c #BDBDBD",
-",	c #9D9C9A",
-"'	c #999896",
-")	c #A4A4A3",
-"!	c #391414",
-"~	c #B1B1B1",
-"{	c #D4D4D4",
-"]	c #E2E2E2",
-"^	c #DCD4C7",
-"/	c #C1B8A6",
-"(	c #878682",
-"_	c #BFBFBF",
-":	c #7C7C7C",
-"<	c #909090",
-"[	c #747474",
-"}	c #818181",
-"|	c #A8A8A8",
-"1	c #B6B6B6",
-"2	c #F6F6F6",
-"3	c #7F742E",
-"4	c #E1E1E1",
-"5	c #959FA4",
-"6	c #678690",
-"7	c #9A9891",
-"8	c #959490",
-"9	c #F5F5F5",
-"0	c #2B6776",
-"a	c #294E70",
-"b	c #294770",
-"c	c #284D6F",
-"d	c #232362",
-"e	c #B1B3B4",
-"f	c #979797",
-"g	c #B0B0B0",
-"h	c #AFAFAF",
-"i	c #D3D3D3",
-"j	c #E0E0E0",
-"k	c #27276C",
-"l	c #28286D",
-"m	c #282A6F",
-"n	c #2A5A73",
-"o	c #DFDFDF",
-"p	c #A2A2A2",
-"q	c #B5B5B5",
-"r	c #727272",
-"s	c #BCBCBC",
-"t	c #F4F4F4",
-"u	c #DEDEDE",
-"v	c #D5D5D5",
-"w	c #DDDDDD",
-"x	c #BEBEBE",
-"y	c #D1D1D1",
-"z	c #F3F3F3",
-"A	c #DCDCDC",
-"B	c #E7E7E7",
-"C	c #E6E6E6",
-"D	c #E5E5E5",
-"E	c #E4E4E4",
-"F	c #686868",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"  ..................... ",
-" .+@@@@@@@@@@@@@@@@@@#$.",
-" .@%%%%%&&&&*****===--;.",
-" .@%>>,')>&*****==----;.",
-" .@%>>!..,***~={=>----].",
-" .@%>>^/.(**_:<[<}|1-2].",
-" .@%>>^3.'**={=----2224.",
-" .@&>567.8*===----22294.",
-" .@&0abcde==1<f{ghi>99j.",
-" .@&akklmn==----222999o.",
-" .@*****===-pg|qiprs9tu.",
-" .@*vvv=1>----222999ttw.",
-" .@*vxf=p---gi2h$syytzw.",
-" .@*===-----22999tttzzA.",
-" .hBBCDDE;]]]44joouwwAF.",
-"  ..................... ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/art/new_task-16.png b/art/new_task-16.png
deleted file mode 100644
index 7937d8d53b..0000000000
--- a/art/new_task-16.png
+++ /dev/null
diff --git a/art/new_task.png b/art/new_task.png
deleted file mode 100644
index 16a1c94b6b..0000000000
--- a/art/new_task.png
+++ /dev/null
diff --git a/art/next-message.png b/art/next-message.png
deleted file mode 100644
index 80de893ecf..0000000000
--- a/art/next-message.png
+++ /dev/null
diff --git a/art/offline.png b/art/offline.png
deleted file mode 100644
index 57bdd27be2..0000000000
--- a/art/offline.png
+++ /dev/null
diff --git a/art/online.png b/art/online.png
deleted file mode 100644
index 9a6a3980c2..0000000000
--- a/art/online.png
+++ /dev/null
diff --git a/art/open-in-new-window-16.png b/art/open-in-new-window-16.png
deleted file mode 100644
index 07496e8b81..0000000000
--- a/art/open-in-new-window-16.png
+++ /dev/null
diff --git a/art/outbox-16.png b/art/outbox-16.png
deleted file mode 100644
index e52e00a7f3..0000000000
--- a/art/outbox-16.png
+++ /dev/null
diff --git a/art/outbox-full-16.png b/art/outbox-full-16.png
deleted file mode 100644
index cb138fa2b3..0000000000
--- a/art/outbox-full-16.png
+++ /dev/null
diff --git a/art/paste.png b/art/paste.png
deleted file mode 100644
index 736900531a..0000000000
--- a/art/paste.png
+++ /dev/null
diff --git a/art/pattern.png b/art/pattern.png
deleted file mode 100644
index 33abc187ef..0000000000
--- a/art/pattern.png
+++ /dev/null
diff --git a/art/pgp-signature-bad.png b/art/pgp-signature-bad.png
deleted file mode 100644
index 82318fbb4d..0000000000
--- a/art/pgp-signature-bad.png
+++ /dev/null
diff --git a/art/pgp-signature-nokey.png b/art/pgp-signature-nokey.png
deleted file mode 100644
index 00250e090c..0000000000
--- a/art/pgp-signature-nokey.png
+++ /dev/null
diff --git a/art/pgp-signature-ok.png b/art/pgp-signature-ok.png
deleted file mode 100644
index 51782b0e40..0000000000
--- a/art/pgp-signature-ok.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/previous-message.png b/art/previous-message.png
deleted file mode 100644
index 17c3dcadb6..0000000000
--- a/art/previous-message.png
+++ /dev/null
diff --git a/art/print-preview-24.png b/art/print-preview-24.png
deleted file mode 100644
index cd6b90e6bd..0000000000
--- a/art/print-preview-24.png
+++ /dev/null
diff --git a/art/print-preview.xpm b/art/print-preview.xpm
deleted file mode 100644
index a4b36d639d..0000000000
--- a/art/print-preview.xpm
+++ /dev/null
@@ -1,153 +0,0 @@
-/* XPM */
-static char * print_preview_xpm[] = {
-"16 16 134 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #9D9D8D",
-"@ 	c #CFCFB9",
-"# 	c #C4C4AF",
-"$ 	c #8D8D7F",
-"% 	c #353530",
-"& 	c #828282",
-"* 	c #9C9C8C",
-"= 	c #E2E2D0",
-"- 	c #EDEDE7",
-"; 	c #C0C0AC",
-"> 	c #B2B29F",
-", 	c #828274",
-"' 	c #4C4C44",
-") 	c #FFFFFF",
-"! 	c #EFEFEF",
-"~ 	c #ECECEC",
-"{ 	c #090908",
-"] 	c #D5D5BF",
-"^ 	c #FBFBFA",
-"/ 	c #C3C3AE",
-"( 	c #B5B5A2",
-"_ 	c #A6A695",
-": 	c #959586",
-"< 	c #080807",
-"[ 	c #E3E3E3",
-"} 	c #CDCDCD",
-"| 	c #D7D7D7",
-"1 	c #090909",
-"2 	c #CACAB5",
-"3 	c #DDDDD0",
-"4 	c #B7B7A4",
-"5 	c #AAAA98",
-"6 	c #9B9B8B",
-"7 	c #8C8C7D",
-"8 	c #0A0A09",
-"9 	c #E9E9E9",
-"0 	c #EBEBEB",
-"a 	c #DBDBDB",
-"b 	c #929283",
-"c 	c #BABAA7",
-"d 	c #ADAD9B",
-"e 	c #9F9F8E",
-"f 	c #909081",
-"g 	c #727266",
-"h 	c #52524C",
-"i 	c #A4A4A4",
-"j 	c #34342F",
-"k 	c #878779",
-"l 	c #A0A090",
-"m 	c #737367",
-"n 	c #010101",
-"o 	c #575757",
-"p 	c #A6A6A6",
-"q 	c #4B4B43",
-"r 	c #414141",
-"s 	c #777777",
-"t 	c #979797",
-"u 	c #BCBBBB",
-"v 	c #D4D4D3",
-"w 	c #878787",
-"x 	c #323232",
-"y 	c #A5A5A5",
-"z 	c #D0D0CF",
-"A 	c #B5B5B5",
-"B 	c #C2C2C2",
-"C 	c #FBFBFB",
-"D 	c #FAFAFA",
-"E 	c #999999",
-"F 	c #363636",
-"G 	c #9E9E9E",
-"H 	c #ECECEB",
-"I 	c #AEADAB",
-"J 	c #F7F7F7",
-"K 	c #E5E5E4",
-"L 	c #8D8D8D",
-"M 	c #F1F1F1",
-"N 	c #A0A0A0",
-"O 	c #E2E2E2",
-"P 	c #D9D9D8",
-"Q 	c #898988",
-"R 	c #0C0C0C",
-"S 	c #302F2F",
-"T 	c #A4A3A1",
-"U 	c #CCCAC6",
-"V 	c #1B1B1B",
-"W 	c #969594",
-"X 	c #D6D4D2",
-"Y 	c #DDDBDA",
-"Z 	c #DCDCDB",
-"` 	c #DEDDDD",
-" .	c #DFDEDD",
-"..	c #DDDCDB",
-"+.	c #DBDBD9",
-"@.	c #7E7E7D",
-"#.	c #383838",
-"$.	c #555453",
-"%.	c #9F9E9A",
-"&.	c #A8A7A6",
-"*.	c #9E9D9C",
-"=.	c #615E59",
-"-.	c #54514E",
-";.	c #54524E",
-">.	c #514F4B",
-",.	c #52504C",
-"'.	c #504D49",
-").	c #4D4B47",
-"!.	c #4F4D49",
-"~.	c #514F4C",
-"{.	c #535251",
-"].	c #8E8D8A",
-"^.	c #B4B3B1",
-"/.	c #C0BFBC",
-"(.	c #B9B8B5",
-"_.	c #B3B1AF",
-":.	c #B1B1AE",
-"<.	c #AFAEAC",
-"[.	c #B0AEAC",
-"}.	c #ACACA9",
-"|.	c #A6A6A4",
-"1.	c #ABAAA7",
-"2.	c #AEADAA",
-"3.	c #AAA9A6",
-"4.	c #201F1E",
-"5.	c #403F3D",
-"6.	c #444341",
-"7.	c #454542",
-"8.	c #42423F",
-"9.	c #3F3E3C",
-"0.	c #3A3936",
-"a.	c #393835",
-"b.	c #31302D",
-"c.	c #1E1D1B",
-"      . . . .                   ",
-"    . + @ # $ % & . . . .       ",
-"  . * = - ; > , ' ) ! ~ .       ",
-"  { ] ^ / ( _ : < [ } | .       ",
-"  1 2 3 4 5 6 7 8 9 0 a .       ",
-"  . b c d e f g h . i a .       ",
-"    j k l b m n o p 0 a .       ",
-"      q 8 8 r s n . t a . .     ",
-"    . u v ) 9 9 w n x y z A .   ",
-"  . B C ) D ) D C E n F G H I . ",
-"  . D J K L M N O P Q R S T U V ",
-"  . W X Y Z `  ...P +.@.#.$.%.. ",
-"  . &.*.=.-.;.>.,.'.).!.~.{.].. ",
-"  . ^./.(._.:.<.[.}.|.1.2.<.3.. ",
-"  . 4.5.6.7.7.7.8.5.9.0.a.b.c.. ",
-"    . . . . . . . . . . . . .   "};
diff --git a/art/print.png b/art/print.png
deleted file mode 100644
index f223a1146d..0000000000
--- a/art/print.png
+++ /dev/null
diff --git a/art/print.xpm b/art/print.xpm
deleted file mode 100644
index da46eb0157..0000000000
--- a/art/print.xpm
+++ /dev/null
@@ -1,107 +0,0 @@
-/* XPM */
-static char * print_xpm[] = {
-"16 16 88 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #ECECEC",
-"#	c #353535",
-"$	c #D3D3D3",
-"%	c #131313",
-"&	c #C7C7C7",
-"*	c #D7D7D7",
-"=	c #EBEBEB",
-"-	c #E9E9E9",
-";	c #DBDBDB",
-">	c #4D4D4D",
-",	c #A4A4A4",
-"'	c #414141",
-")	c #8C8C8C",
-"!	c #979797",
-"~	c #BCBBBB",
-"{	c #D4D4D3",
-"]	c #D0D0CF",
-"^	c #B5B5B5",
-"/	c #C2C2C2",
-"(	c #FBFBFB",
-"_	c #FAFAFA",
-":	c #F8F8F8",
-"<	c #F4F4F3",
-"[	c #ECECEB",
-"}	c #AEADAB",
-"|	c #F7F7F7",
-"1	c #E5E5E4",
-"2	c #8D8D8D",
-"3	c #F1F1F1",
-"4	c #A0A0A0",
-"5	c #E2E2E2",
-"6	c #D9D9D8",
-"7	c #DEDDDC",
-"8	c #DCDCDA",
-"9	c #D8D7D4",
-"0	c #B3B2B0",
-"a	c #CCCAC6",
-"b	c #1B1B1B",
-"c	c #969594",
-"d	c #D6D4D2",
-"e	c #DDDBDA",
-"f	c #DCDCDB",
-"g	c #DEDDDD",
-"h	c #DFDEDD",
-"i	c #DDDCDB",
-"j	c #DBDBD9",
-"k	c #DAD9D7",
-"l	c #D9D8D6",
-"m	c #81807E",
-"n	c #9F9E9A",
-"o	c #A8A7A6",
-"p	c #9E9D9C",
-"q	c #615E59",
-"r	c #54514E",
-"s	c #54524E",
-"t	c #514F4B",
-"u	c #52504C",
-"v	c #504D49",
-"w	c #4D4B47",
-"x	c #4F4D49",
-"y	c #514F4C",
-"z	c #939291",
-"A	c #9B9A97",
-"B	c #B4B3B1",
-"C	c #C0BFBC",
-"D	c #B9B8B5",
-"E	c #B3B1AF",
-"F	c #B1B1AE",
-"G	c #AFAEAC",
-"H	c #B0AEAC",
-"I	c #ACACA9",
-"J	c #A6A6A4",
-"K	c #ABAAA7",
-"L	c #AEADAA",
-"M	c #AAA9A6",
-"N	c #201F1E",
-"O	c #403F3D",
-"P	c #444341",
-"Q	c #454542",
-"R	c #42423F",
-"S	c #3F3E3C",
-"T	c #3A3936",
-"U	c #393835",
-"V	c #31302D",
-"W	c #1E1D1B",
-"                ",
-"    .........   ",
-"    .++++++@.   ",
-"    .+#$.%&*.   ",
-"    .+=---=;.   ",
-"    .+>.=.,;.   ",
-"    .+=====;.   ",
-"   ..+'=).!;..  ",
-"  .~{+------]^. ",
-" ./(+_+_((_:<[}.",
-" ._|1234567890ab",
-" .cdefghi6jklmn.",
-" .opqrstuvwxyzA.",
-" .BCDEFGHIJKLGM.",
-" .NOPQQQROSTUVW.",
-"  ............. "};
diff --git a/art/priority-high.xpm b/art/priority-high.xpm
deleted file mode 100644
index 884c8b8236..0000000000
--- a/art/priority-high.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * priority_high_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"X	c #A7453E",
-"                ",
-"                ",
-"        .       ",
-"       .X.      ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XX.      ",
-"      .XX.      ",
-"      .X.       ",
-"      ..        ",
-"     .XX.       ",
-"     .XX.       ",
-"      ..        ",
-"                ",
-"                "};
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/properties-16.png b/art/properties-16.png
deleted file mode 100644
index 7586e3ab27..0000000000
--- a/art/properties-16.png
+++ /dev/null
diff --git a/art/rdf.png b/art/rdf.png
deleted file mode 100644
index b4bdbafa99..0000000000
--- a/art/rdf.png
+++ /dev/null
diff --git a/art/receive-24.png b/art/receive-24.png
deleted file mode 100644
index bfa7d972bc..0000000000
--- a/art/receive-24.png
+++ /dev/null
diff --git a/art/recur.xpm b/art/recur.xpm
deleted file mode 100644
index bb34fa4568..0000000000
--- a/art/recur.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * recur_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/art/refresh-nntp-folders-24.png b/art/refresh-nntp-folders-24.png
deleted file mode 100644
index b1c339a973..0000000000
--- a/art/refresh-nntp-folders-24.png
+++ /dev/null
diff --git a/art/remove-nntp-folder-24.png b/art/remove-nntp-folder-24.png
deleted file mode 100644
index 5500bdec23..0000000000
--- a/art/remove-nntp-folder-24.png
+++ /dev/null
diff --git a/art/reply-to-all.png b/art/reply-to-all.png
deleted file mode 100644
index fa64fdeecf..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index 70ee66b8eb..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/reply.xpm b/art/reply.xpm
deleted file mode 100644
index 681801c7d7..0000000000
--- a/art/reply.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char * reply_xpm[] = {
-"16 16 27 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #000000",
-",	c #FBFAF7",
-"'	c #A5A29D",
-")	c #990000",
-"!	c #EFEFEF",
-"~	c #CCCCCC",
-"{	c #797873",
-"]	c #7D7A77",
-"^	c #F7F5F1",
-"/	c #090808",
-"(	c #D7D4CE",
-"_	c #D8D5CF",
-":	c #7F0000",
-"<	c #181818",
-"[	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%>>>>>>>>> ",
-" .%--;>%%%%%%%> ",
-" .%-,'>%))))!~> ",
-" .%,{->%)))!!~> ",
-" .%]-^>%))))!~> ",
-" ./(__>%)!)):~> ",
-"  ....>%!!!::~> ",
-"      >%~~~~~~< ",
-"      >>[>>>>>> ",
-"                "};
diff --git a/art/reply_to_all.xpm b/art/reply_to_all.xpm
deleted file mode 100644
index be5c633f2a..0000000000
--- a/art/reply_to_all.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * reply_to_all_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #F7F5F1",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #000000",
-"]	c #797873",
-"^	c #7D7A77",
-"/	c #FAF9F6",
-"(	c #F8F6F2",
-"_	c #990000",
-":	c #EFEFEF",
-"<	c #CCCCCC",
-"[	c #090808",
-"}	c #D7D4CE",
-"|	c #D8D5CF",
-"1	c #D6D3CD",
-"2	c #7F0000",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".%&%%%%%%%*=..  ",
-".%-;%%%%%>,'.$. ",
-".%--;%%%;-)'.=. ",
-".%-!~;-{{{{{{{{{",
-".%!]--;{%%%%%%%{",
-".%^-)/({%____:<{",
-".[}|||1{%___::<{",
-" ......{%____:<{",
-"  .[}||{%_:__2<{",
-"   ....{%:::22<{",
-"       {%<<<<<<3",
-"       {{4{{{{{{"};
diff --git a/art/save-16.png b/art/save-16.png
deleted file mode 100644
index 20a27ca2a1..0000000000
--- a/art/save-16.png
+++ /dev/null
diff --git a/art/save-24.png b/art/save-24.png
deleted file mode 100644
index 51375a3f40..0000000000
--- a/art/save-24.png
+++ /dev/null
diff --git a/art/save-as-16.png b/art/save-as-16.png
deleted file mode 100644
index 3b9612efdf..0000000000
--- a/art/save-as-16.png
+++ /dev/null
diff --git a/art/save.xpm b/art/save.xpm
deleted file mode 100644
index 7b1812943e..0000000000
--- a/art/save.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * 16_save_xpm[] = {
-"16 16 26 1",
-" 	c None",
-".	c #000000",
-"+	c #B8CADB",
-"@	c #C5D4E3",
-"#	c #687B8D",
-"$	c #D8D8D8",
-"%	c #CFDBE6",
-"&	c #9DB8D2",
-"*	c #728699",
-"=	c #BCCEDF",
-"-	c #FFFFFF",
-";	c #D2DEEA",
-">	c #C0D1E2",
-",	c #CFDBE7",
-"'	c #798EA3",
-")	c #D0DDE9",
-"!	c #B7CBDE",
-"~	c #B6CADD",
-"{	c #B7CADD",
-"]	c #BACCDF",
-"^	c #9FB9D3",
-"/	c #7E94A9",
-"(	c #A4BDD5",
-"_	c #BABABA",
-":	c #556474",
-"<	c #2A303A",
-"                ",
-"                ",
-"  ............  ",
-" .+@#$$$$$$%&*. ",
-" .=&#------;&*. ",
-" .>&#$$$$$$,&*. ",
-" .>&'------)&*. ",
-" .>&&!~~{{]^&*. ",
-" .>&&&&&&&&&&*. ",
-" .>&&//////&&*. ",
-" .>(/$$_$-$/&*. ",
-" .>&/$_$-/$/&*. ",
-" .>&/$_-$/$/&*. ",
-" .=&/_$-$$$/**. ",
-"  .:........<.  ",
-"                "};
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/search-16.png b/art/search-16.png
deleted file mode 100644
index 6e9837d8ee..0000000000
--- a/art/search-16.png
+++ /dev/null
diff --git a/art/search-and-replace-16.png b/art/search-and-replace-16.png
deleted file mode 100644
index 5daa4c39a0..0000000000
--- a/art/search-and-replace-16.png
+++ /dev/null
diff --git a/art/send-16.png b/art/send-16.png
deleted file mode 100644
index 4cf96ead39..0000000000
--- a/art/send-16.png
+++ /dev/null
diff --git a/art/send-24-receive.png b/art/send-24-receive.png
deleted file mode 100644
index 1d3d4df420..0000000000
--- a/art/send-24-receive.png
+++ /dev/null
diff --git a/art/send-24.png b/art/send-24.png
deleted file mode 100644
index 5c7e4a261e..0000000000
--- a/art/send-24.png
+++ /dev/null
diff --git a/art/send-48-receive.png b/art/send-48-receive.png
deleted file mode 100644
index 53f8b15d9a..0000000000
--- a/art/send-48-receive.png
+++ /dev/null
diff --git a/art/send-later-16.png b/art/send-later-16.png
deleted file mode 100644
index 3b2bb791d4..0000000000
--- a/art/send-later-16.png
+++ /dev/null
diff --git a/art/send-receive.xpm b/art/send-receive.xpm
deleted file mode 100644
index f9ba82e5c8..0000000000
--- a/art/send-receive.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * send_receive_xpm[] = {
-"16 16 39 1",
-" 	c None",
-".	c #000000",
-"+	c #F7EFD0",
-"@	c #F7EFD1",
-"#	c #EED680",
-"$	c #C38909",
-"%	c #F6ECC9",
-"&	c #D1940C",
-"*	c #B98208",
-"=	c #A59458",
-"-	c #D1BC70",
-";	c #E9D17B",
-">	c #B07C08",
-",	c #916608",
-"'	c #F3E3A8",
-")	c #AE7B0A",
-"!	c #F4E4AD",
-"~	c #F5E9BC",
-"{	c #D8E6D2",
-"]	c #B9C9B1",
-"^	c #6F9059",
-"/	c #C6B26A",
-"(	c #D7E5D0",
-"_	c #AECCA1",
-":	c #557C3B",
-"<	c #D3E3CB",
-"[	c #D0E1C9",
-"}	c #DBE7D6",
-"|	c #B9C3B5",
-"1	c #BDCEB6",
-"2	c #A9C79C",
-"3	c #65894C",
-"4	c #748C64",
-"5	c #668154",
-"6	c #669447",
-"7	c #58833C",
-"8	c #E1EBDC",
-"9	c #5E8A41",
-"0	c #E0EADB",
-"    .           ",
-"   .+.          ",
-"  .@#$.         ",
-" .%##&*.        ",
-".%=-;>,,.       ",
-"...'#)...       ",
-"  .!#).  .....  ",
-"  .~#).  .{]^.  ",
-"  .#/).  .(_:.  ",
-"  .....  .<_:.  ",
-"       ...[_:...",
-"       .}|12345.",
-"        .}__67. ",
-"         .8_9.  ",
-"          .0.   ",
-"           .    "};
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 d8e7cea744..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 8c56dc4c7a..0000000000
--- a/art/service-configure.png
+++ /dev/null
diff --git a/art/service-down-disabled.png b/art/service-down-disabled.png
deleted file mode 100644
index f6742ff105..0000000000
--- a/art/service-down-disabled.png
+++ /dev/null
diff --git a/art/service-down.png b/art/service-down.png
deleted file mode 100644
index 49f532f527..0000000000
--- a/art/service-down.png
+++ /dev/null
diff --git a/art/service-left-disabled.png b/art/service-left-disabled.png
deleted file mode 100644
index fc4256346b..0000000000
--- a/art/service-left-disabled.png
+++ /dev/null
diff --git a/art/service-left.png b/art/service-left.png
deleted file mode 100644
index 38fe293e39..0000000000
--- a/art/service-left.png
+++ /dev/null
diff --git a/art/service-right-disabled.png b/art/service-right-disabled.png
deleted file mode 100644
index 848c2a499c..0000000000
--- a/art/service-right-disabled.png
+++ /dev/null
diff --git a/art/service-right.png b/art/service-right.png
deleted file mode 100644
index 7fdabac13d..0000000000
--- a/art/service-right.png
+++ /dev/null
diff --git a/art/service-up-disabled.png b/art/service-up-disabled.png
deleted file mode 100644
index 6258caa5d9..0000000000
--- a/art/service-up-disabled.png
+++ /dev/null
diff --git a/art/service-up.png b/art/service-up.png
deleted file mode 100644
index a24b336c6d..0000000000
--- a/art/service-up.png
+++ /dev/null
diff --git a/art/show_all_messages.xpm b/art/show_all_messages.xpm
deleted file mode 100644
index f38a42aebf..0000000000
--- a/art/show_all_messages.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * show_all_messages_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #9DB8D2",
-"@	c #FFFFFF",
-"#	c #89A1B9",
-"$	c #859DB4",
-"%	c #CACACA",
-"&	c #8199AF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .         . ",
-"   . .       . .",
-"  .         .  .",
-" ...........    ",
-" .+@+. .+@+.    ",
-" .#+$. .%+&.    ",
-"  ...   ...     ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/splash-1-0.png b/art/splash-1-0.png
deleted file mode 100644
index 13dabfd980..0000000000
--- a/art/splash-1-0.png
+++ /dev/null
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index 530e0f743c..0000000000
--- a/art/splash.png
+++ /dev/null
diff --git a/art/summary-settings.png b/art/summary-settings.png
deleted file mode 100644
index 011d94ac0a..0000000000
--- a/art/summary-settings.png
+++ /dev/null
diff --git a/art/summary_preferences-16.png b/art/summary_preferences-16.png
deleted file mode 100644
index 4a318c2fd1..0000000000
--- a/art/summary_preferences-16.png
+++ /dev/null
diff --git a/art/talking-heads.png b/art/talking-heads.png
deleted file mode 100644
index 1c2ba5b040..0000000000
--- a/art/talking-heads.png
+++ /dev/null
diff --git a/art/task-assigned-to.xpm b/art/task-assigned-to.xpm
deleted file mode 100644
index d60eeafa2d..0000000000
--- a/art/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/art/task-assigned.xpm b/art/task-assigned.xpm
deleted file mode 100644
index 9b245c0c49..0000000000
--- a/art/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/art/task-recurring.xpm b/art/task-recurring.xpm
deleted file mode 100644
index 634cd87a84..0000000000
--- a/art/task-recurring.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * task_recurring_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #BFBFC3",
-"*	c #A2A2B0",
-"=	c #454572",
-"-	c #9898A9",
-";	c #85859C",
-">	c #333366",
-",	c #4F4F79",
-"'	c #B3B3C3",
-")	c #A3A3B7",
-"!	c #9696AD",
-"~	c #464672",
-"{	c #7F7F99",
-"]	c #C9C9CA",
-"^	c #3D3D6D",
-"/	c #3B3B6B",
-"(	c #A4A4B8",
-"_	c #B5B5C4",
-":	c #D1D1D8",
-"<	c #9191A4",
-"[	c #B5B5BD",
-"}	c #9F9FAE",
-"|	c #4A4A76",
-"1	c #40406F",
-"2	c #E9E9E9",
-"3	c #8F8FA9",
-"4	c #9D9DAC",
-"5	c #9090A4",
-"6	c #55557F",
-"7	c #ADADBE",
-"8	c #484875",
-"9	c #B9B9C7",
-"0	c #DCDCE0",
-"a	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+&*=-#;>>,$.  ",
-" .+'>)%%!>>'$.  ",
-" .+~{]##;^/~$.  ",
-" .+>(%%%_:(>$.  ",
-" .+><[}###<>$.  ",
-" .+|^1!%%23|$.  ",
-" .+4>>;##5>4$.  ",
-" .+6>>!%7890$.  ",
-" .a$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/art/task.png b/art/task.png
deleted file mode 100644
index 5b3c7b7534..0000000000
--- a/art/task.png
+++ /dev/null
diff --git a/art/task.xpm b/art/task.xpm
deleted file mode 100644
index 4a53c3e9ab..0000000000
--- a/art/task.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * task_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .&$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/art/thankyou.png b/art/thankyou.png
deleted file mode 100644
index f08f553cc3..0000000000
--- a/art/thankyou.png
+++ /dev/null
diff --git a/art/timezone-16.xpm b/art/timezone-16.xpm
deleted file mode 100644
index 6f3094a395..0000000000
--- a/art/timezone-16.xpm
+++ /dev/null
@@ -1,162 +0,0 @@
-/* XPM */
-static char * timezone_16_xpm[] = {
-"16 16 143 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #2A2B2B",
-"@ 	c #020203",
-"# 	c #050709",
-"$ 	c #020202",
-"% 	c #7490B2",
-"& 	c #A6BDD4",
-"* 	c #C0D3E5",
-"= 	c #E6E7E6",
-"- 	c #C7CCC5",
-"; 	c #9BAC9F",
-"> 	c #030304",
-", 	c #010101",
-"' 	c #82848E",
-") 	c #80846B",
-"! 	c #7FA59B",
-"~ 	c #AECFE0",
-"{ 	c #C0D8EF",
-"] 	c #B4C4C2",
-"^ 	c #6A8B6C",
-"/ 	c #699678",
-"( 	c #51826F",
-"_ 	c #2D535E",
-": 	c #1C492A",
-"< 	c #5EA66A",
-"[ 	c #7BC280",
-"} 	c #67BA7A",
-"| 	c #7AC7A7",
-"1 	c #B1D1EC",
-"2 	c #94ADAF",
-"3 	c #719177",
-"4 	c #609996",
-"5 	c #5B9583",
-"6 	c #537762",
-"7 	c #6E9874",
-"8 	c #64A970",
-"9 	c #6DBD77",
-"0 	c #5FB565",
-"a 	c #5DAD6B",
-"b 	c #89BFF1",
-"c 	c #89BFF5",
-"d 	c #4C9DAB",
-"e 	c #459D82",
-"f 	c #55A395",
-"g 	c #557A5C",
-"h 	c #1A304E",
-"i 	c #74B678",
-"j 	c #5EB666",
-"k 	c #49A54F",
-"l 	c #4CA34F",
-"m 	c #90C4E4",
-"n 	c #7BB8F8",
-"o 	c #7FBCF8",
-"p 	c #49A09A",
-"q 	c #389B6F",
-"r 	c #81ACBF",
-"s 	c #617B65",
-"t 	c #5B735E",
-"u 	c #010202",
-"v 	c #7AAD6E",
-"w 	c #438C3D",
-"x 	c #6AA8A1",
-"y 	c #92C5F1",
-"z 	c #77B8F6",
-"A 	c #77B7F7",
-"B 	c #7BB7F2",
-"C 	c #5DA9BA",
-"D 	c #56A4A1",
-"E 	c #85B1D9",
-"F 	c #637679",
-"G 	c #586D86",
-"H 	c #040506",
-"I 	c #6B975F",
-"J 	c #749486",
-"K 	c #85BDD9",
-"L 	c #8FBFEF",
-"M 	c #82BBF4",
-"N 	c #82BAF2",
-"O 	c #84B9EE",
-"P 	c #71AFEE",
-"Q 	c #96ABBF",
-"R 	c #8AB7D4",
-"S 	c #668B77",
-"T 	c #557E74",
-"U 	c #040406",
-"V 	c #649D69",
-"W 	c #508B52",
-"X 	c #508074",
-"Y 	c #7EAEDD",
-"Z 	c #81BBF4",
-"` 	c #81B9F2",
-" .	c #83B8EE",
-"..	c #80ACD5",
-"+.	c #908466",
-"@.	c #64825C",
-"#.	c #5C7F5A",
-"$.	c #627F5C",
-"%.	c #5C7677",
-"&.	c #5C9D67",
-"*.	c #5D9071",
-"=.	c #617576",
-"-.	c #7DB2E8",
-";.	c #7EB4EA",
-">.	c #7BB0E6",
-",.	c #7698B8",
-"'.	c #66855E",
-").	c #53885E",
-"!.	c #51845C",
-"~.	c #61825D",
-"{.	c #3D362D",
-"].	c #0A1C14",
-"^.	c #609D73",
-"/.	c #68A879",
-"(.	c #628E77",
-"_.	c #7AAEE4",
-":.	c #70A4DB",
-"<.	c #72A7DD",
-"[.	c #6997C6",
-"}.	c #598860",
-"|.	c #51835C",
-"1.	c #638860",
-"2.	c #07090A",
-"3.	c #50716C",
-"4.	c #6FA779",
-"5.	c #5D8976",
-"6.	c #7AA7D4",
-"7.	c #73A5D7",
-"8.	c #6495C7",
-"9.	c #557FAB",
-"0.	c #65855F",
-"a.	c #5A875F",
-"b.	c #558462",
-"c.	c #778383",
-"d.	c #7B98B4",
-"e.	c #7CA0C3",
-"f.	c #7397BD",
-"g.	c #7D8FA0",
-"h.	c #809980",
-"i.	c #143325",
-"j.	c #597658",
-"k.	c #030505",
-"l.	c #030404",
-"                                ",
-"          . . + @ @ #           ",
-"      . $ % & * = - ; > ,       ",
-"    . ' ) ! ~ { ] ^ / ( _ ,     ",
-"    : < [ } | 1 2 3 4 5 6 $     ",
-"  , 7 8 9 0 a b c d e f g h ,   ",
-"  , i j k l m n o p q r s t u   ",
-"  , v w x y z A B C D E F G H   ",
-"  , I J K L M N O P Q R S T U   ",
-"  , V W X Y Z `  ...+.@.#.$.H   ",
-"  u %.&.*.=.-.;.>.,.'.).!.~.{.  ",
-"    ].^./.(._.:.<.[.}.|.1.2.    ",
-"    @ 3.4.5.6.7.8.9.0.a.b.>     ",
-"      @ H c.d.e.f.g.h.i.j.      ",
-"          u u k.> l.>           ",
-"                                "};
diff --git a/art/timezone-48.png b/art/timezone-48.png
deleted file mode 100644
index 2222e6f903..0000000000
--- a/art/timezone-48.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/art/undelete_message-16.png b/art/undelete_message-16.png
deleted file mode 100644
index 066cbfc99c..0000000000
--- a/art/undelete_message-16.png
+++ /dev/null
diff --git a/art/wax-seal-broken.png b/art/wax-seal-broken.png
deleted file mode 100644
index 951f062dcc..0000000000
--- a/art/wax-seal-broken.png
+++ /dev/null
diff --git a/art/wax-seal.png b/art/wax-seal.png
deleted file mode 100644
index 5b0ba63bff..0000000000
--- a/art/wax-seal.png
+++ /dev/null
diff --git a/art/weekview.xpm b/art/weekview.xpm
deleted file mode 100644
index 869b9e722a..0000000000
--- a/art/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/art/work_offline.xpm b/art/work_offline.xpm
deleted file mode 100644
index b4c2cdc17f..0000000000
--- a/art/work_offline.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * 16_work_offline_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #424242",
-"+	c #212121",
-"@	c #737373",
-"#	c #EFEFEF",
-"$	c #DEDEDE",
-"%	c #CECECE",
-"&	c #101010",
-"*	c #8C8C8C",
-"=	c #636363",
-"-	c #ADADAD",
-";	c #9C9C9C",
-">	c #000000",
-",	c #BDBDBD",
-"                ",
-"                ",
-"                ",
-"     .+++..@    ",
-"    . ###$$%&   ",
-"   @#*=*-*=*%@  ",
-"   .#;> %->;%+  ",
-"   .$-> %->,%+  ",
-"   .$;$#,;$ %+  ",
-"   .$$ %+% #%&  ",
-"   @%-$@>@%-%.  ",
-"    .,;;;;-,.   ",
-"     @++++&.    ",
-"                ",
-"                ",
-"                "};
diff --git a/art/work_online-16.png b/art/work_online-16.png
deleted file mode 100644
index b11d36d277..0000000000
--- a/art/work_online-16.png
+++ /dev/null
diff --git a/art/working-16.png b/art/working-16.png
deleted file mode 100644
index 5f12053a84..0000000000
--- a/art/working-16.png
+++ /dev/null
diff --git a/art/workweekview.xpm b/art/workweekview.xpm
deleted file mode 100644
index 35cceedbdc..0000000000
--- a/art/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/art/world_map-960.png b/art/world_map-960.png
deleted file mode 100644
index 0512d20115..0000000000
--- a/art/world_map-960.png
+++ /dev/null
diff --git a/art/yearview.xpm b/art/yearview.xpm
deleted file mode 100644
index 0d4fa4135b..0000000000
--- a/art/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/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 e4fda3d3bc..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-Miguel de Icaza <miguel@kernel.org>
-Federico Mena <federico@helixcode.com>
-Arturo Esponosa <arturo@nuclecu.unam.mx>
-Russell Steinthal <rms39@columbia.edu>
-Rodrigo Moya <rodrigo@ximian.com>
-JP Rosevear <jpr@ximian.com>
-Damon Chaplin <damon@ximian.com>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index 64748151dd..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,16584 +0,0 @@
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (schedule_page_construct): set the
-	working hours for the meeting time selector
-	
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: make the range datetime member a
-	struct not a pointer
-
-	* cal-util/cal-component.c (cal_component_get_recurid): take a
-	pointer to a range
-	(cal_component_set_recurid): ditto
-
-	* gui/itip-utils.c (comp_minimal): get/set the recurrence id
-	properly
-	
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): use
-	GNOME_Evolution_Storage__get_folderList instead of
-	GNOME_Evolution_Storage_getFolderList since I have now changed
-	that to be an attribute instead of a method.
-
-2002-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (start_calendar_server): start a server a
-	uri
-	(start_default_server): start a default server
-	(get_servers): get all clients for all folders of the given
-	type(s)
-	(find_server): locate a server for a particular uid
-	(init): get_servers, listen for object_requested signal
-	(destroy): destroy all clients
-	(write_html): put options is there own cell
-	(get_publish_options): place selector in if param is true
-	(get_request_options): ditto
-	(get_real_item): only try and look up the item if we know its in
-	the server
-	(show_current_event): find the server (if any) for the current
-	comp
-	(show_current_todo): ditto
-	(update_attendee_status): if there is no server for the comp, it
-	doesn't exist
-	(remove_item): ditto
-	(button_selected_cb): get a client for the selected folder
-	(object_requested_cb): draw the folder button in
-
-	* gui/calendar-config.h: new protos
-
-	* gui/calendar-config.c (calendar_config_default_tasks_folder):
-	get default tasks uri
-	(calendar_config_default_calendar_folder): get default calendar
-	uri
-
-	* cal-client/cal-client.c (get_default_uri): use
-	cal_util_expand_uri
-
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_expand_uri): tack on the file name
-	if its a file uri
-
-2002-05-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_selected):
-	(e_tasks_complete_selected): show progress messages
-	on the status bar.
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: #include <gtk/gtkmain.h> to avoid warnings.
-
-2002-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (free_view_popup): only discard the popup if
-	we created one
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: refactored a bit, to not do things in idle loops.
-
-2002-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c (print_day_details): modify the start and end hours
-	to accomodate all the events in the day
-
-	* gui/e-day-view.c (free_view_popup): only discard the popup if we
-	created one
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): remove setup_widgets
-	from here
-	(gnome_calendar_init): move setup_widgets back here
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Don't link to libibex anymore!!
-
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_pilot_settings): launch pilot
-	settings capplet
-
-	* gui/e-week-view.c (e_week_view_on_pilot_settings): ditto
-	
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (free_view_popup): free the view popup
-	(e_week_view_show_popup_menu): add the view popup to the
-	"main_item" menu and listen for destruction
-
-	* gui/e-day-view.c (free_view_popup): as above
-	(e_day_view_on_event_right_click): as above
-
-	* gui/e-week-view.h: add class member
-
-	* gui/e-day-view.h: add a class member
-
-	* gui/gnome-cal.h: new protos
-
-	* gui/gnome-cal.c (set_view): set the instance view id properly
-	when switching views
-	(gnome_calendar_setup_view_popup): generate a view popup
-	(gnome_calendar_discard_view_popup): destroy a view popup
-
-2002-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (impl_Cal_get_alarms_in_range): raise an exception if the
-	backend's method returns NULL, since we can't send a NULL pointer to
-	ORBit.
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages
-	and added accelerators for everything, as part of my config dialog
-	polishing project
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): properly
-	handle -ve recurrence values
-	(month_num_submenu_selection_done_cb): track the current date in
-	use
-	(make_recur_month_num_submenu): make a submenu of dates
-	(make_recur_month_num_menu): make the date/relation option menu
-	(month_num_menu_selection_done_cb): update the date properly and
-	keep both option menus consistent
-	(month_day_menu_selection_done_cb): keep both option menus
-	consistent
-	(make_monthly_special): listen for selection done signal
-	(make_recurrence_special): destroy old month_num_menu
-	(recurrence_page_fill_widgets): properly handle -ve recurrence
-	values
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-day-view.c (e_day_view_on_settings): show the settings
-
-	* gui/e-week-view.c (e_week_view_on_settings): ditto
-
-	* gui/calendar-commands.c (control_util_show_settings): show the
-	settings dialog
-
-	* gui/calendar-commands.h: new proto
-
-	* gui/control-factory.c (control_factory_new_control): set the
-	control as object data on the calendar
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/dialogs/meeting-page.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.[ch] (cal_backend_get_query): new method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_query): new method.
-
-	* pcs/cal.c (impl_Cal_get_query): call the CalBackend's implementation
-	instead of calling query_new directly.
-
-	* pcs/query.[ch]: fixed headers.
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch
-	used one of the functions I just removed. :)
-
-2002-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): use the default uri for
-	tasks (as stored in the configuration) when the calendar URI is not
-	a local one (connector, etc).
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): Use new-and-improved
-	default folder URI config paths.
-
-	* gui/calendar-config.c (calendar_config_{get,set}_default_uri,
-	calendar_config_{get,set}_default_tasks_uri): Remove these. The
-	shell owns this information now. (Weren't being used anyway.)
-
-	* gui/component-factory.c (get_data_uri): Fix another place that
-	hardcoded tacking foo.ics on to the end of URLs.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (create_view): Add view_info arg. If the
-	view_info is non-empty and this is a calendar folder, set the
-	"view" property on the control's propertybag.
-
-	* gui/control-factory.c (calendar_properties_init): Set up the
-	"view" property.
-	(get_prop, set_prop): handle the "view" property by
-	getting/setting the GnomeCalendar's view. Unfortunately, this
-	doesn't actually work. See #23208.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set the UI
-	component's container before calling
-	gnome_calendar_set_ui_component so that the search bar
-	initialization will work.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-db.[hc]: Remove dead files.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/GNOME_Evolution_Calendar.oaf.in: add config_item:type
-
-2002-04-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.c: Fix a string.
-	
-2002-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: simple fix for DB3 header inclusion in
-	Mac OS X, by Max Horn <max@quendi.de>
-
-2002-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free the my_address member
-	(find_my_address): fall back on a CN match if possible
-	(change_status): handle changing the status of a non-existent
-	address by adding a new attendee
-	(update_attendee_status): if the attendee response is not from a
-	user on the list of attendees, ask the user if they want to add
-	the attendee any how (as an optional participant)
-	(ok_clicked_cb): if we are suppose to rsvp and the status was ok,
-	but the attendee address is not known, find it
-	
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Set a priority for the
-	config item.  Rename to "Calendar and Tasks".
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: s/libversit.la/libversit.a/
-
-	* conduits/todo/Makefile.am: ditto
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-calendar-table.c: implement new pop up menu items for
-	"Save as", "Print", "Assign Task", "Forward as iCalendar"
-
-	* gui/e-day-view.c: similarly, also "Publish Free/Busy
-	Information" and "New Meeting" and "New Task"
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/task-editor.c (show_assignment): move the assignment
-	page stuff here
-	(task_editor_show_assignment): use it
-	(assign_task_cmd): ditto
-
-	* gui/dialogs/task-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (save_as_cmd): use new e-util file
-	selector function
-
-	* meeting-mockup.glade: Remove old file
-
-	* topic.dat
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am: s/libversit.la/libversit.a/
-
-	* cal-client/Makefile.am: Likewise
-
-	* gui/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/cal-search-bar.c: Removed `search_menu_items'.
-	(cal_search_bar_menu_activated): Removed.
-	(cal_search_bar_class_init): Don't install.
-	(cal_search_bar_construct): No menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-day-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-week-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-calendar-table.c: Updated to use new EPopupMenu API.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	`e_tasks_set_ui_component()' here to give it the
-	BonoboUIComponent.
-	(tasks_control_deactivate): Likewise, call it here to unset the
-	BonoboUIComponent.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): New.
-
-	* gui/calendar-commands.c (calendar_control_activate): Call
-	gnome_calendar_set_ui_component() here.
-	(calendar_control_deactivate): ...And here, with a NULL
-	BonoboUIComponent.
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.
-
-2002-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c: use bonobo exception macros to tidy
-
-	* gui/itip-control-factory.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/comp-editor-factory.c: ditto
-
-	* gui/calendar-commands.c: ditto
-
-2002-03-14  JP Rosevear  <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: add all day event editor mode
-
-	* gui/component-factory.c: clean up exception handling
-	(sc_user_create_new_item_cb): support the all day event id
-	(create_object): add a user creatable all day appointment item
-
-	* gui/comp-editor-factory.c (get_default_event): get a default
-	event either all day or starting at the top of the hour
-	(get_default_task): get a default task
-	(edit_new): support the all day event mode
-
-	* gui/calendar-commands.c: remove unused functions/verbs
-
-2002-03-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	"evolution:config_item:icon_path" attribute so we get an icon for
-	the calendar preferences.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Add <visible>False</visible>
-	to cal-prefs-dialog so it doesn't get shown when we load the Glade
-	file with libglade.
-
-	* gui/component-factory.c (owner_set_cb): Register the
-	ConfigControl factory.
-
-	* gui/tasks-control.c: Removed verb "TaskSettings".
-	(tasks_control_settings_cmd): Removed.
-
-	* gui/calendar-commands.c: Removed verb "CalendarSettings".
-	(settings_cmd): Removed.
-
-	* gui/dialogs/cal-prefs-dialog.c: Renamed `CalPrefsDialogPrivate'
-	to `DialogData'.  Replace `dialog' member with a `page' member.
-	Remove `toplevel_notebook' member.
-	(init_widgets): Renamed from `cal_prefs_dialog_init_widgets'.
-	Just get a DialogData.
-	(get_widgets): Get a DialogData pointer.
-	(cal_prefs_dialog_destroy): Removed.
-	(config_control_destroy_callback): New, signal handler for
-	::destroy for ConfigControl.
-	(cal_prefs_dialog_new): Create a new DialogData, connect all the
-	signal handlers.
-	(create_time_edit): Renamed from
-	`cal_prefs_dialog_create_time_edit'.
-	(cal_prefs_dialog_show): Removed.
-	(cal_prefs_dialog_button_clicked): Removed.
-	(show_task_list_config): Get a DialogData.
-	(show_config): Renamed from `cal_prefs_dialog_show_config'.
-	Likewise.
-	(update_task_list_config): Likewise.
-	(update_config): Renamed from
-	`cal_prefs_dialog_update_config'. Likewise.
-	(color_set_callback): New callback, makes the dialog report
-	changes when the setting in any of the color widgets is changed.
-	(widget_changed_callback): New callback, makes the dialog report
-	changes when any of the widgets changes status.
-	(connect_changed): New utility function to connect this callback
-	to all the widgets.
-	(setup_widgets): Connect all the widgets.
-	(cal_prefs_dialog_new): Call `setup_widgets'.
-
-	* gui/config-control-factory.c: New.
-	* gui/config-control-factory.h: New.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add
-	OAFIID:GNOME_Evolution_Calendar_ConfigControl and
-	OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory.
-
-2002-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix #21240
-
-	* gui/alarm-notify/alarm-notify.c: replaced use of GnomeVFSURI
-	with EUri, to allow non-registered methods.
-
-2002-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): reverted my last
-	change of adding the METHOD property to the incoming request.
-
-	* gui/itip-utils.c (comp_string): added extra
-	X-MICROSOFT-CDO-REPLYTIME property for broken Outlook. Should fix
-	#20783.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): Reset the DTSTAMP of the new
-	component. (RFC2245 says DTSTAMP corresponds to the time the
-	particular iCalendar representation of the object was created.)
-	Fixes #21198.
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c: remove unneeded parameter from print_text_size
-	everywhere
-	(get_font_for_size): calculate a font size based on the available
-	height
-	(print_text): calculate the top of where the font should be drawn
-	(print_text_size): use get_font_for_size
-	(print_day_background): use get_font_for_size
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): pass the real table
-	to e_meeting_model_etable_view_to_model_row
-	(e_meeting_time_selector_item_paint_busy_periods): ditto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): ditto
-	
-	* gui/e-meeting-model.h: update protos
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): take in to account the
-	fact the table used the without model
-	(e_meeting_model_etable_view_to_model_row): ditto
-
-2002-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added support for printing the Tasks table.
-	I hacked it a bit so the user could choose portrait or landscape mode.
-	This is bug #9677. ETable printing has a few issues, though, and it
-	isn't very pretty.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_subject): Prefix the subject with an
-	indicator like "Accepted" or "Cancelled" explaining what the
-	action is, since Outlook doesn't display any of that information
-	inline like we do. (20780)
-
-2002-02-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/gui/e-itip-control.c (e_itip_control_set_data): added the
-	METHOD property to the top level component we create.
-
-2002-02-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (set_prop):
-	* gui/tasks-control.c (tasks_control_set_property): display an error
-	message if the call to gnome_calendar_open or e_tasks_open does not
-	return TRUE. Fixes #20346.
-
-2002-02-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): use
-	GNOME_Evolution_Composer_setBody rather than _setMultipartType and
-	_attachData now, to send a message containing just a text/calendar
-	part. Fixes 14705. Mostly.
-	(comp_content_type): Include the filename here since we can't add
-	a Content-Disposition now.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_class_init): change
-	query_changed to search_activated.
-	(cal_search_bar_search_activated): rename
-	cal_search_bar_query_changed to this.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New helper
-	function.
-	(create_object): Add icons for the various user creatable items.
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): pass extra itip_send_comp
-	params
- 	(send_freebusy): ditto
- 	(ok_clicked_cb): ditto, including the timezones culled from the
-	component
- 
- 	* gui/e-week-view.c: pass extra itip_send_comp params
- 
- 	* gui/calendar-commands.c: ditto
- 
- 	* gui/e-day-view.c: ditto
- 
- 	* gui/dialogs/task-editor.c: ditto
- 
- 	* gui/dialogs/event-editor.c: ditto
- 
- 	* gui/dialogs/comp-editor.c: ditto
- 	
- 	* gui/itip-utils.h (itip_send_comp): update proto
- 
- 	* gui/itip-utils.c (foreach_tzid_callback): check the passed in
- 	zones, then the builtin time zones then the client
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (find_my_address): strip the ical value and
- 	do a case insensitive compare
- 	(find_attendee): ditto
- 	(change_status): put the error message here
- 	(ok_clicked_cb): don't update the item or rsvp unless
- 	change_status was successful, trip the ical value and do a case
- 	insensitive compare
- 
- 	* gui/itip-utils.c (get_address): strip the incoming address
- 	(itip_strip_mailto): use g_strncasecmp
- 	(comp_limit_attendees): strip the ical value and do a case
- 	insensitive compare
-
-2002-02-14  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-meeting-model.c: use new column enums
- 	(set_value_at): emit pre-change/cell change signals
- 	(destroy): destroy refresh_queue and refresh_data
- 	(init): init new elements
- 	(refresh_queue_add): if the attendee is being refreshed already,
- 	possibly update the start/end times to look for and update the
- 	callback info, otherwise add it to the queue
- 	(refresh_queue_remove): remove a refreshing attende from the queue
- 	(process_callbacks): make all the callbacks and remove the
- 	attendee from the queue
- 	(process_free_busy): process the callbacks immediately if parsing
- 	fails or on successful completion of processing
- 	(async_close): process free busy
-	(cursor_cb): we're only looking for one at a time now
- 	(refresh_busy_periods): idle callback to start processing the queue
- 	(e_meeting_model_refresh_all_busy_periods): add every row to the queue
- 	(e_meeting_model_refresh_busy_periods): add a single row to the queue
- 
- 	* gui/e-meeting-model.h: new protos, enum the columns
- 
- 	* gui/e-meeting-time-sel.c: use new compare time function
- 	(e_meeting_time_selector_construct): listen for a cell changed
- 	signal and use separate callbacks for rows_inserted and
- 	rows_deleted
- 	(e_meeting_time_selector_refresh_free_busy): util function to
- 	refresh free busy info
- 	(e_meeting_time_selector_on_update_free_busy): use above
- 	(rows_inserted_cb): refresh free busy on the new rows
- 	(cell_changed_cb): refresh free busy on the row when the address
- 	changes
- 	(rows_deleted_cb): redraw
- 
- 	* gui/e-meeting-utils.[hc]: a holding spot for a meeting time
- 	comparison function
- 
- 	* gui/Makefile.am: compile new files
-	
-2002-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/control-factory.c (set_prop): don't append 'calendar.ics'
-	to the URI.
-	(get_prop): finished.
-
-	* gui/tasks-control.c (tasks_control_set_property): don't append
-	'tasks.ics' to the URI.
-	(tasks_control_get_property): finished.
-
-	* gui/gnome-cal.c (gnome_calendar_open):
-	* gui/e-tasks.c (e_tasks_open): append $filename.ics to the uri to be
-	opened if the uri is local. Leave intact in other cases.
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): check if
-	the CalComponentDateTime values are set before trying to use them.
-	Possibly fixes bug #18529.
-
-	* importers/icalendar-importer.c: added vCalendar importer and
-	intelligent GnomeCalendar importer code here, as it shares a lot of
-	code with the iCalendar importer.
-
-	NOTE: check_folder_type() needs to be finished at some point.
-	It needs a new shell Corba call so it can decide whether to import
-	events or tasks into the folder. Currently it just imports both.
-
-	* importers/main.c (importer_factory_fn): create vCalendar importer
-	or GnomeCalendar importer if required.
-
-	* importers/evolution-calendar-importer.h: added declarations for
-	creating a vCalendar importer and intelligent Gnome Calendar importer.
-
-	* importers/Makefile.am: added -DEVOLUTION_SOUNDDIR so the importer
-	knows what filename to use for audio alarms in vCalendar files.
-	Added libicalvcal-evolution to LDADD.
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: added vCalendar
-	importer and intelligent Gnome Calendar importer.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the event uses UTC. We don't want to flag all events from Outlook,
-	which use UTC.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: change custom widget
-	creator to e_url_entry_new
-
-	* gui/dialogs/task-details-page.c (get_widgets): get the url entry
-	and its entry
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: add a custom widget created
-	with e_url_button_new
-
-	* gui/dialogs/task-details-page.c (task_details_page_init): init
-	url_button member to NULL
-	(init_widgets): set the url button entry
-	(get_widgets): get the url button
-
-	* gui/calendar-commands.c (pixmaps): use new all day event icon
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c: pass meeting boolean for
-	gnome_calendar_edit_object and gnome_calendar_new_appointment_for
-
-	* gui/e-week-view-event-item.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/tasks-control.c (confirm_expunge): kill warning
-
-	* gui/calendar-commands.c (new_meeting_cb): show a new meeting
-	dialog
-	(new_event_cb): pass new param
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): take meeting
-	boolean and show meeting page if true
-	(gnome_calendar_new_appointment_for): takeing meeting param and
-	pass to above
-	(gnome_calendar_new_appointment): add new param
-
-	* gui/gnome-cal.h: update proto
-
-	* gui/component-factory.c (create_component): take a comp editor
-	mode, determine vtype
-	(sc_user_create_new_item_cb): check for meeting user creatable
-	item
-	(create_object): add meeting as user creatable item
-
-	* gui/comp-editor-factory.c (edit_new): get a comp editor mode
-	now, determine vtype and show meeting page if required
-	(queue_edit_new): get comp editor mode
-	(impl_editNew): ditto, plus queue the mode directly instead of
-	determining the vtype
-
-	* gui/dialogs/event-editor.c (show_meeting): new internal util
-	function to show meeting page
-	(event_editor_show_meeting): show the meeting
-	(schedule_meeting_cmd): use show_meeting
-
-	* gui/dialogs/event-editor.h: new proto
-
-	* idl/evolution-calendar.idl: editNew takes a mode rather than a
-	type now
-
-	* cal-util/Makefile.am: fix includes
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Made these use the new
-	GalViewMenus stuff.
-
-2002-02-06  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): convert months
-	from 1-12 to 0-11. Fixes bug #19235.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (e_todo_gui_new): new gui routines
-	for conduit settings
-	(e_todo_gui_fill_config): ditto
-	(e_todo_gui_fill_widgets): ditto
-	(e_todo_gui_destroy): ditto
-	(e_todo_context_destroy): destroy new_cfg and gui properly
-	(local_record_from_comp): set the priority to the default setting
-	if none is set on the icalendar object
-	(fill_widgets): fill gui widgets
-	(create_settings_window): create gui
-
-2002-01-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): if this is a reply, print the
-	attendee status
-
-2002-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Use 1 instead of zero as the
-	minimum value for the repetitions spin button as we use a check
-	box to specify whether the alarm has repetitions or not.  Fixes
-	bug #19054.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD):
-	Ooops.  Forgot to use EVOLUTION_CALENDAR_LIBS here.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduits/calendar/Makefile.am: Use
-	EVOLUTION_CALENDAR_CONDUIT_LIBS and
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS.
-	* conduits/todo/Makefile.am: Likewise.
-
-	* cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and
-	EVOLUTION_CALENDAR_CFLAGS.
-	* cal-util/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* gui/Makefile.am: Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass a NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	return a new configuration struct, load default priority setting
-	(todoconduit_save_configuration): save default priority setting
-	(e_todo_context_new): dupe configuration
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	set ps to NULL
-
-2002-01-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): save the alarm string
-	in the correct variable (str), so it actually gets shown for alarms
-	with specific trigger times. Fixes bug #18801.
-
-2002-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): default component
-	classification to PUBLIC. Fixes internal bug #1066
-
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: move all functions here,
-	get rid of header files, use e-pilot-settings to display gui
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/gnome-cal.c (get_current_time): use icaltimetype_to_tm
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	figure out when today is and highlight if it is not selected
-
-	* gui/e-week-view.h: enum the "today" color
-
-	* gui/e-week-view.c (e_week_view_realize): init the "today" color
-
-2002-01-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/alarm-notify/save.h: add protos
-
-	* gui/alarm-notify/save.c (save_blessed_program): records a
-	program as blessed
-	(is_blessed_program): checks to see if a program is blessed
-
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	popup a dialog notifying the user that is a program and let them
-	not see the dialog about this program again
-	(procedure_notification): use above
-
-2002-01-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.c: 
-	* gui/e-itip-control.c (write_label_piece): 
-	* gui/calendar-config.c (on_timezone_set): translate timezone names
-	when displayed. Fixes bug #6544.
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_complete_cmd): new verb
-	callback
-	(sensitize_commands): set sensitivity of mark complete command
-
-	* gui/e-tasks.h: new proto
-
-	* gui/e-tasks.c (e_tasks_complete_selected): mark selected tasks
-	in the table as complete
-
-	* gui/e-calendar-table.h: new proto
-
-	* gui/e-calendar-table.c (e_calendar_table_complete_selected):
-	mark selected rows as complete
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): only need one warning
-	message now
-
-	* gui/e-tasks.c (create_sexp): change the logic to expunge all
-	completed tasks not just hidden ones
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): confirm expunging of the
-	tasks
-	(tasks_control_expunge_cmd): verb callback
-
-	* gui/calendar-config.c (config_read): read confirm expunge value
-	(calendar_config_write): write confirm expunge value
-	(calendar_config_write_on_exit): ditto
-	(calendar_config_get_confirm_expunge): get value
-	(calendar_config_set_confirm_expunge): set value
-
-	* gui/calendar-config.h: new proto
-
-	* gui/e-itip-control.c (start_calendar_server): kill warning
-
-	* gui/e-tasks.c (e_tasks_init): init query member to NULL
-	(set_status_message): util function to set status message
-	(e_tasks_open): use above
-	(cal_opened_cb): ditto
-	(create_sexp): create sexp of items to be deleted
-	(query_obj_updated_cb): remove any items found
-	(query_eval_error_cb): bail out on error
-	(query_query_done_cb): tidy when done
-	(e_tasks_delete_completed): set up query
-
-	* gui/e-tasks.h: new proto
-
-	* gui/calendar-model.c (query_query_done_cb): use g_warning
-	instead of printing to stderr
-	(query_eval_error_cb): ditto
-	(update_query): clear the status message if we can't create the
-	query
-
-	* gui/tag-calendar.c (resolve_tzid_cb): make this static
-
-2001-12-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c: remove needs send signal related
-	cruft
-	(save_comp_with_send): with send_component_dialog, indicate if the
-	meeting info is newly created or not
-	(real_edit_comp): remember if the dialog initially needs a send
-
-	* gui/dialogs/send-comp.c (send_component_dialog): take a "new"
-	parameter indicating whether the dialog should intimate if the
-	component to be sent is a new meeting or not
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c: remove no longer used needs_send
-	notification and signal
-
-	* gui/dialogs/comp-editor.h: remove proto
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): add new
-	param to send_component_dialog
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): add new
-	param to send_component_dialog
-
-2001-12-21 JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/comp-editor.h: inherit from bonobo window	
-
-	* gui/dialogs/comp-editor.c: inherit from bonobo window
-	(comp_editor_key_press_event): Look for an escape key press and
-	close the window if found
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/main.c (main): Push GdkRGB visual and colormap.
-
-2001-12-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	go slow and clear the map if the last uri and the current uri do
-	not match
-	(post_sync): save the last uri
-
-	* conduits/calendar/calendar-conduit-config.h: handle a last uri
-	config option
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-    	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-    	use the open_default_calendar method
-    
-    	* conduits/todo/todo-conduit.c (start_calendar_server): same as above
-	
-    	* cal-client/Makefile.am: link with bonobo conf
-    
-    	* cal-client/cal-client.h: new protos
-    
-    	* idl/evolution-calendar.idl: make sure open method raises
-    	appropriate exceptions
-    
-     	* gui/e-itip-control.c (start_calendar_server): use
-     	cal_client_open_default_* calls
-     
-     	* cal-client/cal-client.c (real_open_calendar): do the real work
-     	of loading
-     	(cal_client_open_calendar): use above
-     	(get_fall_back_uri): get the basic local uri
-     	(get_default_uri): get the default uri from the config db
-     	(cal_client_open_default_calendar): open the default uri or the
-     	fallback if the method is unsupported
-     	(cal_client_open_default_tasks): same for tasks
-	
-2001-12-17  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): use get_real_item
- 	(get_refresh_options): uncomment out
- 	(get_real_item): obtain the real object which has the uid of the
- 	item received
- 	(show_current_todo): use get_refresh_options for refresh method
- 	and provide the description and summary from the real component
- 	since its not in the reply
- 	(show_current_event): ditto
- 	(send_item): use get_real_item
-
-2001-12-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_limit_attendees): can't remove properties
-	in an iteration loop, so remove them outside the loop
-	(comp_minimal): don't set a recurid if there isn't one, add the x
-	properties to the clone
-	(comp_compliant): unref the clone for DECLINECOUNTER
-
-	* gui/e-itip-control.c (get_refresh_options): make function
-	available again
-	(show_current_event): use it here
-	(ok_clicked_cb): can't remove properties in an iteration loop, so
-	remove them outside the loop
-
-	* cal-util/cal-component.c (free_icalcomponent): properly free the
-	attendee list
-	(cal_component_rescan): don't destroy the alarm hash
-
-2001-12-13  Damon Chaplin  <damon@ximian.com>
-
-	* zones.h: new file to contain all timezone names for translation.
-	We won't be using the translations in 1.0.1, but it gives translators
-	time before we do use them in 1.0.2.
-
-	* Makefile.am: added zones.h to EXTRA_DIST.
-
-2001-12-12  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_release):
- 	ungrab the pointer before calling
- 	e_day_view_finish_long_event_resize
- 	(e_day_view_on_main_canvas_button_release): ditto
- 	(e_day_view_finish_long_event_resize): ask if the meeting should
- 	be sent
- 	(e_day_view_finish_resize): ditto
- 	(e_day_view_on_editing_stopped): ditto
- 	(e_day_view_on_top_canvas_drag_data_received): ditto
- 	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2001-12-11  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-model.c (process_free_busy_comp): properly convert
- 	the dtstart and dtend times if they are UTC
- 	(cursor_cb): if we don't have anybody to get f/b info for, process
- 	the callbacks immediately
- 	(e_meeting_model_refresh_busy_periods): take start/end times,
- 	calculate the timet values with object timezone
- 	(e_meeting_model_etable_model_to_view_row): proper cast
- 	(e_meeting_model_etable_view_to_model_row): ditto
-	(async_open): bail out if we couldn't open properly
-
-	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_update_free_busy): use defines for
- 	determining the number of days before and after of free busy to
- 	request
- 	(e_meeting_time_selector_update_dates_shown): use defines for the
- 	number of days shown
- 
- 	* gui/e-meeting-model.h: update proto
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/control-factory.c (control_factory_new_control): removed code
-	that connects to GnomeCalendar's "dates_shown_changed" signal.
-
-	* gui/calendar-commands.c (gcal_calendar_dates_change_cb): 
-	(calendar_control_activate): moved it here, so it gets reconnected
-	whenever the control is activated. Fixes bug #15798.
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: fixed executable
-	name. Fixes bug #16880.
-
-2001-12-08  JP Rosevear  <jpr@ximian.com>
-  
-  	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-  	if we have an alarm that can be represented on the pilot, set the
-  	appointment fields appropriately, if the duration has values for
-  	minutes and/or hours and/or days, use the lowest common
-  	denominator
-  	(comp_from_remote_record): if the appointment on the pilot has an
-  	alarm, find the first alarm an item currently had that is relative
-  	to the start and with a negative duration and update it (or create
-  	a new one if no valid ones exist)
-  
- 	* cal-util/cal-component.c (cal_component_get_alarm_uids): build
-  	list in the order they appear in the component so we get
-  	consisting order for the gui and for the pilot
- 
-2001-12-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): s/%/%s
-
-2001-11-09  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed by Damon)
-
-	Fix bug #14699.
-
-	* pcs/query.c (QueryState): Added a state QUERY_WAIT_FOR_BACKEND
-	to indicate that the query is not populated as we are waiting for
-	the backend to be opened.
-	(query_init): Start in the QUERY_WAIT_FOR_BACKEND state.
-	(query_destroy): Only disconnect from the backend if we are in a
-	state that implies that we are connected to its signals.
-	(query_construct): If the backend is already loaded, immediately
-	set the state to QUERY_START_PENDING.
-	(backend_opened_cb): Disconnect from the backend's "opened"
-	signal.  Set the state to QUERY_START_PENDING.
-	(match_component): We can now only match components if the query
-	is in progress or if it is done.  Assert to that effect, and do
-	not ensure_sexp().
-	(match_component): Do not check for a nonexistent component using
-	g_return_if_fail().  Also, there is no need to ref/unref the
-	component.
-	(backend_obj_updated_cb): Assert to the effect of our state.
-	(backend_obj_removed_cb): Likewise.
-	(parse_sexp): Renamed from ensure_sexp().  Assert that the query
-	has not started.  Do not disconnect from the backend's signals
-	here, since we have no connections.
-	(start_query_cb): Set the state to QUERY_IN_PROGRESS here instead
-	of in populate_query().
-
-2001-12-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): if the key in the config
-	database does not exist, just return the local URIs, but never
-	return NULL
-
-2001-12-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): default
-	component classification to PUBLIC
-
-2001-12-06  Jon Trowbridge  <trow@ximian.com>
-
-        * gui/dialogs/event-editor.c (event_editor_destroy): Explicitly
-	destroy the EMeetingModel.  This is a hack to work around problems
-	with the reference counting; we are still leaking the
-	EMeetingModels.
-
-        * gui/e-meeting-time-sel.c
-        (e_meeting_time_selector_construct): Ref our EMeetingModel.
-        (e_meeting_time_selector_destroy): Unref the model.
-
-        * gui/e-meeting-model.c (destroy): Properly destroy
-	corba_select_names with a call to bonobo_object_release_unref.
-        (Fixes 14002)
-
-2001-12-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.glade: added entry for the LOCATION field
-
-	* gui/dialogs/event-page.c: added support for the new LOCATION entry
-	added in the Event editor.
-
-2001-12-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/itip-utils.c (comp_subject, comp_description):
-	Marked strings for translation.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-meeting-model.c: 
-	* gui/calendar-model.c: make sure we call e_table_model_pre_change()
-	before changing the model.
-
-	* gui/calendar-config.c (calendar_config_configure_e_calendar_table): 
-	removed call to e_table_model_changed(). calendar_model_refresh()
-	results in that anyway.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.etspec: disabled 'Alarms', 'End Date' and
-	'Show Time As' fields, as these are not useful for tasks. We may want
-	to reenable them later if we add a table view of calendar events.
-
-2001-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened): connect to
-	"cal_set_mode" signal before calling cal_client_set_mode. Also,
-	s/cal_mode_set/cal_set_mode
-	(backend_go_offline): connect to "cal_opened" signal before calling
-	cal_client_open_calendar
-
-2001-11-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (remove_item): only show the dialog if we
-	created it. Hopefully fixes bug #15774.
-	Also ifdef'ed out a lot of code that isn't currently used, including
-	code to use a label which is never created. The unused code was there
-	to support handling multiple iTIP objects in a message, but was never
-	updated when we switched to use HTML for the control. Fixes bug #16232.
-
-2001-11-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): Set the category of
-	the new task to that of the search bar.  Fixes bug #15533.
-
-2001-11-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status):
-	* gui/itip-utils.c (comp_to_list): fixed typos in translatable
-	strings. Fixes Ximian #15456
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c: Substituted gnome_font_get_width_string() with
-	gnome_font_get_width_utf8() and gnome_font_get_width_string_n()
-	with gnome_font_get_width_utf8_sized(). Fixes calendar part of #15379.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (date_value_to_string): Convert the buffer
-	to UTF8.
-	(calendar_model_value_to_string): Do not convert the string fields
-	to UTF8 again; they are already in UTF8.  Fixes the UTF8-related
-	bits of bug #15304.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: 
-	* cal-util/cal-component.h: #ifdef'ed out the LOCATION field for now,
-	since it wasn't supported everywhere, or in the .etspec file.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c: don't abort when e_table_selected_count()
-	returns odd values. There seems to be a bug in ETable. This is to
-	avoid bug #13843.
-
-2001-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed to CVS by Damon)
-	Fixes bug #15137.
-	
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Do not try
-	to operate on the event if it gets deleted while stopping the
-	edition.
-	(e_day_view_on_event_double_click): Likewise.
-	(e_day_view_on_long_event_button_press): Likewise.
-	(e_day_view_on_event_button_press): Likewise.
-	(e_day_view_on_long_event_click): Likewise.
-	(e_day_view_on_event_click): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-2001-11-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): remove silly
-	debug warning
-
-2001-11-13  Damon Chaplin  <damon@ximian.com>
-
-	* gui/alarm-notify/config-data.c (ensure_inited): 
-	* gui/calendar-config.c (config_read): 
-	* conduits/todo/todo-conduit.c (get_default_timezone): 
-	* conduits/calendar/calendar-conduit.c (get_default_timezone): 
-	make the timezone default to UTC. Fixes bug #14362.
-
-2001-11-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view.c (selection_received): only change the day,
-	month and year for the start date, for not screwing up the start
-	time, which was being set to midnight always (Fixes Ximian #5287)
-	Also, deal correctly with VCALENDAR components
-	
-	* gui/e-day-view.c (selection_received): dela correctly with
-	VCALENDAR components being pasted
-
-2001-11-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): The last
-	argument to the bonobo_config_get_XXX_with_default() is a gboolean
-	*, not a CORBA_Environment *.  Fixes bug #14655.
-
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
- 	* pcs/cal-backend-file.c (free_busy_instance): recurrence
- 	expansion callback for free/busy
- 	(create_user_free_busy): expand recurrences and use date/time
- 	values for dtstart and dtend
- 
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-meeting-model.c (e_meeting_model_get_zone): accessor
-	(e_meeting_model_set_zone): ditto
-	(init): init to the calendar default zone
-	(process_free_busy_comp): take the zone to convert to as a param
-	(e_meeting_model_refresh_busy_periods): redraw properly
-
-	* gui/dialogs/schedule-page.c (update_time): set the zone of the
-	model
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): don't subtract a day
-	from DTEND. For DATE values we don't include the entire day now.
-	Fixes bug #14842.
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.c (e_week_view_layout_events): fix buffer
-	overflow. Fixes bug #10285 (the printing of lines & dates in the
-	printout of the month view).
-
-2001-11-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/meeting-page.c
-	(meeting_page_fill_widgets): Convert strings to GTK+ encoding.
-	(meeting_page_destroy): Free allocated strings before freeing the list
-	itself.
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_timeout_handler): don't let an empty
-	event occur for all days when auto scrolling
-
-2001-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c 
-	(cal_backend_file_compute_changes_foreach_key): don't leak the
-	string returned by cal_component_get_as_string nor the temporary
-	CalComponent we create
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-	
- 	* gui/e-itip-control.c (ok_clicked_cb): don't add the item, remove
- 	it if declining (in case it was added before)
- 	(remove_item): Since we can't discern between an item not found
- 	and another error, always say the removal is complete
-
-2001-11-07  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text):
-	Convert generated string to UTF-8.
-
-2001-11-07  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_start_time_changed): emit changed
- 	signal
- 	(e_meeting_time_selector_on_end_time_changed): emit changed
- 	signal, if end time is now before start time and all day event,
- 	make sure a whole day is still selected
- 	(e_meeting_time_selector_drag_meeting_time): calculate the first
- 	and last_time's in whole days for all day events
- 	(e_meeting_time_selector_timeout_handler): calculate the drag time
- 	to be whole days for all day events and scroll the canvas even if
- 	we don't update the time so the user can see where they're headed
-
-2001-11-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): make sure
-	to remove all attendees from the model when we edit a new comp,
-	append the pages if they are needed and we weren't showing them
-	before
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same as above
-
- 	* gui/dialogs/comp-editor.c (comp_editor_remove_page): check for a
- 	return value indicating the page was not found and return if so
- 
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c: #include
-	"Evolution-Addressbook-SelectNames.h", not
-	"../Evolution-Addressbook-SelectNames.h".  Grrr.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_class_init):
-	add a changed signal
-	(e_meeting_time_selector_construct): emit changed signal
-	(e_meeting_time_selector_set_meeting_time): ditto
-	(e_meeting_time_selector_set_all_day): set the all day setting
-	(e_meeting_time_selector_autopick): emit changed signal
-	(e_meeting_time_selector_find_nearest_interval): find proper
-	interval when in all day mode
-	(e_meeting_time_selector_find_nearest_interval_backward): ditto
-	(e_meeting_time_selector_drag_meeting_time): for all day events,
-	move the time when past the 12 hour mark, and and always make sure
-	1 full day is selected, emit changed signal when appropriate
-	(e_meeting_time_selector_update_start_date_edit): set date and
-	time of day together
-	(e_meeting_time_selector_update_end_date_edit): ditto, and adjust
-	display time if all day event
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): remove unused variable
-	(e_meeting_time_selector_item_button_press): for all day mode,
-	make the interval a whole day
-
-	* gui/dialogs/schedule-page.c (update_time): set the meeting time
-	selector setting instead of manual mucking with the e-date-edit
-	widgets
-	(init_widgets): listen to the changed signal of the meeting time
-	selector instead of propagating multiple events as it updates
-
-	* gui/dialogs/event-page.c (update_time): block time zone change
-	signals
-
-2001-11-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): removed ';' in the wrong
-	place. Fixes bug #14421.
-
-2001-11-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDFLAGS):
-	-export-dynamic for libglade custom widget.
-
-2001-11-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_component): use TZID from the
-	builtin timezone, instead of using the location name.
-
-2001-11-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-util.c (compute_alarm_range): Short-circuit the
-	calculation of the repeat time if there are zero repetitions.
-	(compute_alarm_range): I'm a moron.  De-reference alarm_start when
-	subtracting stuff from it!  Fixes bug #14209.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am: Added rules to generate
-	`Evolution-Addressbook-SelectNames.h'.
-
-	* gui/dialogs/comp-editor-util.h: #include
-	"Evolution-Addressbook-SelectNames.h" from this directory.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c: #include <string.h>
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): If a query is not in
-	progress, just retag the whole thing.  An event may change dates
-	and tag_calendar_by_comp() would not know how to untag the old
-	dates.  Fixes bug #10220.
-
-	* pcs/query.c (start_query_cb): Connect to the backend's
-	"obj_updated" and "obj_removed" signals here instead of in
-	query_construct().  If a query is started while another one is
-	notifying of an update, these signal connections would get appened
-	to the running signal (the one that triggered the notification
-	about an update) and the new signal handlers would also get
-	called.  We are really not interested in updates before we
-	populate the query, because we'll catch the changes anyways.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13723.
-
-	* gui/gnome-cal.h (GnomeCalendarClass): New signals
-	"calendar_focus_change", "taskpad_focus_change", and
-	"taskpad_selection_changed".  Renamed "selection_changed" to
-	"calendar_selection_changed".
-
-	* gui/gnome-cal.c (gnome_calendar_get_num_tasks_selected): New
-	function.
-	(setup_widgets): Connect to the focus event signals of the task
-	pad and the calendar view widgets.
-	(gnome_calendar_delete_selection): Renamed from
-	gnome_calendar_delete_event().
-	(gnome_calendar_cut_clipboard): Handle the current focus location.
-	(gnome_calendar_copy_clipboard): Likewise.
-	(gnome_calendar_paste_clipboard): Likewise.
-	(gnome_calendar_delete_selection): Likewise.
-	(table_selection_change_cb): New callback.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): Take in
-	whether we should unconditionally disable everything.
-	(sensitize_taskpad_commands): Analogous function to the above.
-	(gcal_calendar_focus_change_cb): New callback, used for calendar
-	views.
-	(gcal_taskpad_focus_change_cb): New callback, used for the
-	taskpad.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use a better test for
-	keys that should start editing.  Fixes bug #6447.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c: Make the pre_changes and changes match
-	here.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send as mixed rather than
-	alternative
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/save.c (KEY_CALENDARS_TO_LOAD):
-	Removed.
-	(KEY_NUM_CALENDARS_TO_LOAD): New key, containing the number of
-	calendars to load.
-	(BASE_KEY_CALENDAR_TO_LOAD): New base key name for the URIs of the
-	calendars to load.
-	(save_calendars_to_load): Rewrote to not use a sequence, to work
-	around an ORBit bug that causes bonobo-moniker-xmldb to crash.
-	(get_calendars_to_load): Likewise.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): disconnect
-	signals added in append_page(). Fixes Gtk-Critical warning about
-	GtkAccelGroup being added twice to a window.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): set a body for the message
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): call
-	GNOME_Evolution_Composer_setMultipartType to get a
-	multipart/alternative.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): don't overwrite
-	memory
-	(e_meeting_time_selector_on_end_time_changed): ditto
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): return NULL if passed
-	NULL. Should fix bug #14048.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (config_read): Do not ignore the
-	exceptions of the cases that do not have defaults.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_drag_meeting_time): if we are doing all
-	day stuff, make the drag increment 1 day at a time
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_component): Add
-	_() to a string that was missing it.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (table_canvas_focus_out_cb): Commit
-	the ETable click-to-add for if the dialog is being destroyed.
-	Should fix bug #13959.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Allocate enough space for the
-	string!  (was missing the null terminator) Possibly fixes #13924.
-	Thanks a *LOT* to Michael Zucchi for running this through Purify.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_button_press): move in whole day
-	increments if we are in all day mode
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): get rid of
-	localtime call
-	(e_meeting_time_selector_on_end_time_changed): ditto
-	(e_meeting_time_selector_update_start_date_edit): set the date
-	editor using the meeting time fields directly
-	(e_meeting_time_selector_update_end_date_edit): ditto
-
-	* gui/dialogs/schedule-page.c (update_time): do the set_show_time
-	stuff first
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): don't
-	adjust the time, set the default timezone for date values
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (INCLUDES):
-	s/BONOBO_HTML_GNOME_LIBS/BONOBO_HTML_GNOME_CFLAGS/
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (e_meeting_model_count_actual_attendees):
-	count the actual attendees (doesn't include people delegating
-
-	* gui/e-meeting-time-sel.c: use
-	e_meeting_model_count_actual_attendees (renamed)
-
-	* gui/e-meeting-time-sel-item.c: use
-	e_meeting_model_etable_view_to_model_row calls instead of calling
-	on the model directly, use e_meeting_model_count_actual_attendees
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): get the real mapping
-	(e_meeting_model_etable_view_to_model_row): ditto
-	(get_key): e-table-without callback
-	(duplicate_key): ditto
-	(free_gotten_key): ditto
-	(free_duplicated_key): ditto
-	(init): create without model
-	(e_meeting_model_etable_from_model): build etable from without
-	model
-
-	* gui/e-meeting-model.h: update protos
-
-	* gui/dialogs/meeting-page.c (right_click_cb): convert row from
-	view to model row
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): set to the default
-	timezone for DATE values, in case the user switches to a DATE-TIME.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: handle DATE values for Start and Due dates.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/schedule-page.c: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/comp-editor-util.c: updated code to handle DATE values.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): 
-	* gui/e-day-view.c (e_day_view_key_press): updated DATE code.
-
-	* gui/e-cell-date-edit-text.c: 
-	* gui/calendar-model.c: updated to support DATE values.
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): updated
-	to use DATE values in same way as Outlook - i.e. the DTEND date is
-	not included entirely. Though I did make it so that if the DTSTART
-	and DTEND used the same DATE value, it includes the entire day.
-	So 1-day events should be the same. Long All-Day events will be
-	1 day shorter.
-
-	* cal-util/cal-component.c (cal_component_get_start_plus_duration): 
-	don't subtract a day from the end date.
-
-	* gui/tasks-control.c: updated the EPixmap paths for Cut/Copy etc.
-	Removed Print & Print Preview paths, since we don't have menu commands
-	for these any more.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #10016.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Use
-	bonobo_ui_util_set_ui() instead of doing things by hand.  Hmmm, if
-	only that function had a way of telling us whether it failed so
-	that we could avoid setting the verb list...
-
-	* gui/dialogs/event-editor.c (event_editor_init): Do not pass the
-	filename with the full path so that Bonobo can find it in a smart
-	way.
-
-	* gui/dialogs/task-editor.c (task_editor_init): Likewise.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use an
-	EMessageBox instead of a gnome_dialog_question so that the label
-	gets line breaking.  Fixes bug #11260.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13649.
-
-	* gui/calendar-config.c
-	(calendar_config_get_use_default_reminder): New function.
-	(calendar_config_set_use_default_reminder): New function.
-	(calendar_config_get_default_reminder_interval): New function.
-	(calendar_config_set_default_reminder_interval): New function.
-	(calendar_config_get_default_reminder_units): New function.
-	(calendar_config_set_default_reminder_units): New function.
-	(config_read): Get the options for default reminders.
-	(calendar_config_write): Set the options for default reminders.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Set the default reminder widgets from the config values.
-	(cal_prefs_dialog_update_config): Set the config values from the
-	widgets.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): New
-	function; creates a VEVENT component with the default alarm.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	cal_comp_event_new_with_defaults ();
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	* gui/calendar-model.c (calendar_model_append_row): Likewise.
-	* gui/comp-editor-factory.c (get_default_component): Likewise.
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): Likewise.
-
-	* cal-util/cal-component.c (ensure_alarm_properties_cb): Ensure we
-	have a DESCRIPTION property.
-	(cal_component_commit_sequence): Ensure we have the mandatory
-	alarm properties.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_section): process an individual
-	section here
-	(select_names_ok_cb): call above
-	(get_select_name_dialog): listen for ok:dialog signal
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD): 
-	* gui/Makefile.am (evolution_calendar_LDADD): 
-	* cal-util/Makefile.am (test_recur_LDADD): 
-	* cal-client/Makefile.am (client_test_LDADD): use libical-evolution.la
-
-	* gui/dialogs/schedule-page.c: save the timezone passed in for the
-	start time, so if our times are changed we use this. Also, if the
-	end time was passed in in a different timezone, convert it.
-	Also hide the time fields for DATE values. Note that DATE values still
-	do not work.
-
-	* gui/dialogs/meeting-page.glade: changed "Invite Others" to
-	"Invite Others..." to be consistent with the other page.
-
-	* gui/dialogs/event-page.c (times_updated):
-	(all_day_event_toggled_cb): set is_date if appropriate.
-
-	* gui/e-itip-control.c (write_label_piece): convert all UTC times to
-	the current timezone. Outlook sends simple, non-recurring, events as
-	UTC times, which isn't very useful.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): Launch the alarm daemon as
-	soon as the calendar component is started.  Fixes bug #13867;
-	we can't really do much better than this.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control.c (pixmaps): Fix the verb names for the
-	pixmaps in the Edit menu; they were out of synch with the XML
-	UI description.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_dump_active_backends): new
-	function.
-	(dump_backend): new function.
-
-	* pcs/cal-factory.h: add prototype for
-	cal_factory_dump_active_backends.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #12163.
-
-	* cal-util/cal-util.c (compute_alarm_range): Take alarm
-	repetitions into account.
-	(add_alarm_occurrences_cb): Add alarm repetitions.
-	(generate_absolute_triggers): Likewise.
-	(generate_absolute_triggers): Oops, absolute triggers are in UTC,
-	so convert them as such.  Also, pay attention to the timezones of
-	the dtstart and dtend properties.
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* importers/Makefile.am: include the header as a source so it gets
-	dist'ed.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (INCLUDES):
-	s/BONOBO_CFLAGS/BONOBO_GNOME_CFLAGS/.
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn): fixed URI
-	construction, which was preventing importing into the root
-	calendar (~/evo/local/Calendar/)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): handle date
-	values
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/: added evolution-calendar-importer binary, starting
-	with an iCalendar file importer
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit-config.h
-	(todoconduit_load_configuration): get the management object by id
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): ditto
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.[ch] (calendar_config_get_default_uri):
-	(calendar_config_set_default_uri):
-	(calendar_config_get_default_tasks_uri):
-	(calendar_config_set_default_tasks_uri): new functions for setting
-	and retrieving the default calendar URIs
-
-	* gui/e-itip-control.c (init): don't use
-	hard-coded URI, but use the default calendar URI, as returned
-	by calendar_config_get_default_uri
-	(start_calendar_server): added a "gboolean tasks" parameter, so
-	that the local tasks.ics file is used if the calendar to be
-	started is for tasks when no default tasks URI is found in
-	the configuration
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (add_record): unref the
-	comp when finished
-
-	* conduits/todo/todo-conduit.c (add_record): ditto
-	
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): added break
-	statements after each case, when setting the classification.
-	Fixes bug #13772.
-
-2001-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): removed this
-	function, as we don't need to unref at all the WombatClient
-	object, since it is aggregated to the CalListener object, which
-	will take care of unrefing it (Fixes Ximian #12001)
-	(cal_client_open_calendar): create the WombatClient here
-
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_todo_details): get the tasks directly from the
-	CalendarModel, so we get the filtering & sorting for free. Fixes
-	bug #10280. Hmm. This seems too easy. It isn't going to work is it...
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad): new function to get
-	the TaskPad ECalendarTable, for printing.
-
-	* gui/calendar-model.c: 
-	* gui/calendar-config.c (calendar_config_get_hide_completed_tasks_sexp): 
-	split this out from calendar-model.c so we could use it for printing,
-	but ended up doing that a different way.
-
-	* gui/dialogs/task-page.c (init_widgets): removed a duplicated signal
-	connected to field_changed_cb().
-
-2001-10-27  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_week_view): 
-	(range_selector_new): when the week start day is set to Sunday, we
-	have to be careful to make sure we print the correct week, since
-	the previous Saturday is actually printed first. Fixes bug #13687.
-	(print_week_summary): always set compress_weekend to true if
-	multi_week_view is FALSE (i.e. we are printing the week view).
-	Fixes bug #13688.
-
-	* gui/e-itip-control.c (send_freebusy): use the timezones from the
-	DTSTART and DTEND.
-	(write_label_piece): output the date-time and the timezone after it.
-	Note that we may want to convert it to the current timezone and display
-	that as well. Also converted COMPLETED to the current timezone.
-	And fixed all uses of old timezone functions.
-
-	* gui/dialogs/comp-editor.c (commit_all_fields): added function to
-	set the focus in the window to NULL, so all fields lose their focus,
-	so they emit "changed" signals and update their values if needed.
-	We call this when most menu commands are used, e.g. 'Save and Close',
-	'Print' etc. Fixes bug #11434. In future we should also check fields
-	are valid and show dialogs if they are not.
-
-	* gui/calendar-model.c (get_completed): use the completed value
-	properly. Fixes bug #13694.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): don't check
-	from_zone and to_zone != NULL. A NULL zone is valid, it is for
-	floating times.
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_text_item_event): Cancel editing
-	if the user presses Escape.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-	* gui/cal-search-bar.c: #include <string.h>
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Delete
-	appointments with empty summaries.  Fixes Ximian bug #780.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Added an
-	argument to specify whether we unconditionally want single
-	components to be considered as not having a summary.
-
-	* gui/comp-util.c (cal_comp_confirm_delete_empty_comp): New
-	function.
-
-	* gui/misc.[ch]: New files with miscellaneous utility functions;
-	moved string_is_empty() over from calendar-model.c.
-
-	* gui/calendar-model.c: Use the string_is_empty()
-	function from misc.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added misc.[ch] to
-	the list of sources.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): touch on
-	lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(match): touch on lookup
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	touch the record on lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(pre_sync): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove the merges as
-	valid sync types
-
-	* conduits/todo/e-todo.conduit.in: as above
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): write out only
-	the touched records if we are doing copies
-
-	* conduits/todo/todo-conduit.c: as above
-	
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): get the sync type
-
-	* conduits/todo/todo-conduit-config.h: as above
-	
-2001-10-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (write_label_piece): convert the formatted
-	date to UTF-8.
-
-	* cal-util/cal-recur.c (CAL_OBJ_DEBUG): turn off debug functions.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): handle UTF8
-	correctly. Bug #4450. Good enough for 1.0.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): set the gc
-	color before drawing. Should fix bug #11469.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show or hide the
-	meeting page as appropriate. Note this may be called more than once,
-	if the task gets updated somewhere else and the user clicks 'Update
-	the object'. Hopefully fixes bug #12930.
-
-	* gui/print.c (print_comp_item): printed more fields and made a little
-	prettier. Fixes bug #9352.
-	(print_date_label): used the correct timezones for each date field.
-
-	* *.c: removed several debug messages.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	make debug output more accurate
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/todo/todo-conduit.c (pre_sync): remove the uid from the
-	map if was archived and is now deleted
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2001-10-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar_table.c (delete_selected_components):
-	(selection_received): added status bar messages
-
-	* gui/e-day-view.c (e_day_view_cut_clipboard):
-	(selection_received): likewise
-
-	* gui/e-week-view.c (e_week_view_cut_clipboard):
-	(selection_received): likewise
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.h: modify fields
-
-	* conduits/todo/todo-conduit.h: as above
-
-	* conduits/calendar/calendar-conduit.c (print_remote): free the
-	struct after use
-	(e_calendar_context_new): explicitly init context fields
-	(e_calendar_context_destroy): free local records and properly free
-	changed hash elements
-	(start_calendar_server_cb): tidy
-	(start_calendar_server): ditto
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer to avoid leaks
-	(local_record_from_comp): only copy over alarm stuff from the
-	original record, we sync everything else
-	(local_record_from_uid): unref the comp when we are done
-	(pre_sync): free change_id
-	(post_sync): ditto
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2001-10-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for
-	every CORBA call.  Hopefully will fix #11978, but I'm not sure
-	about what else could be happening.
-	(cal_get_password): Free the exception.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: used functions to get PUBLISH_OPTIONS etc.,
-	so we can translate them.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_obj_bysetpos_filter): subtract 1 from
-	any positive BYSETPOS value, since our array is 0-based.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): 
-	(recurrence_page_fill_widgets): Outlook (2000) will not accept monthly
-	recurrences like BYDAY=2TU. Instead it uses BYDAY=TU;BYSETPOS=2.
-	So to be compatable with it we now do the same, although we still
-	accept and convert the old format.
-
-	* cal-client/cal-client.c (cal_client_get_component_as_string): new
-	function to return a complete VCALENDAR string containing a VEVENT
-	or VTODO with all the VTIMEZONEs it uses.
-
-	* gui/dialogs/comp-editor.c (save_as_ok): use above function so we
-	save the VTIMEZONE data with the VEVENT/VTODO. Fixes bug #8626.
-	Also made sure we output "METHOD:PUBLISH" since Outlook (2000) will
-	not import it otherwise.
-
-	* gui/dialogs/comp-editor.c (page_mapped_cb): 
-	(page_unmapped_cb): install/uninstall the GtkAccelGroup for the page.
-	(comp_editor_append_page): connect to the map/unmap signals to
-	install/uninstall the accelerators. (This is all for bug #11609,
-	though of course it doesn't work too well in GTK+ 1.2 anyway.)
-
-	* gui/dialogs/task-page.c (get_widgets): 
-	* gui/dialogs/task-details-page.c (get_widgets): 
-	* gui/dialogs/schedule-page.c (get_widgets): 
-	* gui/dialogs/recurrence-page.c (get_widgets): 
-	* gui/dialogs/meeting-page.c (get_widgets): 
-	* gui/dialogs/event-page.c (get_widgets): 
-	* gui/dialogs/alarm-page.c (get_widgets): got the GtkAccelGroup from
-	the original window, ref'ed it and placed it in the CompEditorPage
-	struct.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
-	any GtkAccelGroup for the page.
-
-	* gui/dialogs/task-page.glade: changed '_Confidential' to
-	'Con_fidential' as it clashed with '_Contacts'. It now matches the
-	event editor as well.
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/task-page.glade: Set CAN_FOCUS to TRUE for the custom
-	EDateEdit widgets, and set them as the accel targets of the labels.
-
-2001-10-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): show an error message when
-	we can't update the object on the calendar server
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/control-factory.c: Ifdef-ed out the PersistFile bits.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: The tasks folder does not
-	support the PersistFile interface; removed it.  Removed it as well
-	from the calendar folder since it is aggregated but not actually
-	implemented.
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Handle tasks folders as
-	well; was always using "calendar.ics" as the filename.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: added sections for Tasks
-	factory and control. I hope someone checks these!
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Fixed to only copy the
-	`calendar.ics' and `calendar.ics~' files.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): when
-	iterating over the subcomponents, use 'subcomp' rather than 'icalcomp'.
-	That meant it wasn't working at all well when an entire VCALENDAR
-	was passed in.
-
-	* cal-util/cal-component.c: handle DURATION property used instead of
-	DTEND or DUE. In cal_component_get_dtend/due we will return DTSTART
-	+ DURATION if necessary. In set_dtend/due we remove any DURATION
-	property. Fixes bug #11262.
-
-	* gui/e-meeting-model.c (build_etable): 
-	* gui/e-calendar-table.c (e_calendar_table_init): use U_ for the
-	ECellCombo popdown strings, as it expects UTF-8 strings.
-
-2001-10-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	track the spacer vbox
-	(e_meeting_time_selector_style_set): make sure the rows are the
-	correct size for the style
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): slight adjustments
-	to where the text is drawn
-
-	* gui/e-meeting-time-sel.h: new member
-
-	* gui/e-meeting-model.c (build_etable): ensure uniform row height
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): mark
-	status as completed in appropriate places and don't overwrite
-	legitimate percentages and such
-
-2001-10-24  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5282.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): New function
-	to avoid copying the same code all over the place.
-	(icaltimetype_to_tm): Also set the tm.tm_wday.
-
-	* gui/alarm-notify/alarm-queue.c (queue_midnight_refresh): Use
-	time_day_end_with_zone().
-	(load_alarms_for_today): Likewise.  And oops, we were only
-	computing the times and not loading the alarms.
-	(obj_updated_cb): Likewise.
-	(load_alarms): Removed assertion that is no longer valid because
-	we may load the alarms for a client in two stages.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Convert absolute
-	trigger times to the local timezone.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Convert the times to the local timezone.
-	(alarm_notify_dialog): Likewise, for the window title.
-	(alarm_notify_dialog): Set the window layer to WIN_LAYER_ONTOP.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Use
-	icaltimetype_to_tm_with_zone().
-
-	* gui/alarm-notify/save.c (get_config_db): Made public.
-	(discard_config_db): Made public.
-
-	* gui/alarm-notify/config-data.[ch]: New files with functions to
-	fetch the calendar configuration data used by the alarm daemon.
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_event_dates_match): make sure
-	we free all the CalComponentDateTime's when we are finished.
-
-	* gui/gnome-cal.c (gnome_calendar_notify_dates_shown_changed): just
-	return if no time range is set.
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_table_vadjustment_changed): adjust the
-	display canvas when the table scrolls
-	(e_meeting_time_selector_construct): listen for table scrolling
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (build_etable): no longer set the
-	scrollbar policy here
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_update_main_canvas_scroll_region): add an
-	extra row to the height so the click to add row can be properly
-	seen
-	(e_meeting_time_selector_construct): set the scrollbar policy for
-	the etable scrolled
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (icaltimetype_to_tm): convert an
-	icaltimetype to a tm
-	(tm_to_icaltimetype): vice versa
-
-	* cal-util/timeutil.h: new protos
-
-	* conduits/calendar/calendar-conduit.c: replace all mktime and
-	localtime calls (except for debugging calls)
-
-	* conduits/todo/todo-conduit.c: ditto
-	(comp_from_remote_record): make sure the completed time is in UTC
-	
-2001-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_construct) set priv->corba_query
-	to CORBA_OBJECT_NIL if there was an error
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: added setDefaultTimezone() method.
-
-	* pcs/cal-backend.c (cal_backend_get_default_timezone): 
-	(cal_backend_set_default_timezone): new functions to call class
-	methods.
-
-	* pcs/cal-backend-file.c: lots of changes to handle the default
-	timezone and use it.
-
-	* pcs/query.c: use the default timezone.
-
-	* gui/dialogs/task-details-page.c (date_changed_cb): initialized
-	completed_tt.
-
-	* gui/dialogs/event-page.c: changed it to handle DATE values. The
-	'All Day Event' checkbox is only set now when the DTSTART and DTEND
-	are DATE values.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_free_dates): free the
-	CalComponentDateTime structs as well.
-
-	* gui/e-tasks.c: set the default timezone on the server.
-
-	* gui/tag-calendar.c: 
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: updates to handle DATE values.
-
-	* gui/e-calendar-table.c (date_compare_cb): updated to use the new
-	ECellDateEditValue values, so it now works.
-	(percent_compare_cb): updated to use GPOINTER_TO_INT values.
-	(e_calendar_table_init): use an ECellPercent for the percent field
-	and an ECellDateEditText for the date fields.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the DTSTART or DTEND is a DATE value. We don't want to show the
-	timezone icons for DATE values.
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): set the default
-	timezone on the server.
-
-	* gui/calendar-model.c: major changes to support sorting properly.
-	For date and percent fields we now use subclasses of ECellText, so
-	we don't use a char* as the model value. For the percent field we now
-	use a GINT_TO_POINTER. For the date fields we now use a
-	ECellDateEditValue* as the value.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	set the timezone and use_24_hour flags of the new ECellDateEditText.
-
-	* conduits/todo/todo-conduit.c (pre_sync): 
-	* conduits/calendar/calendar-conduit.c (pre_sync): set the default
-	timezone on the server.
-
-	* cal-util/timeutil.c (time_days_in_month): removed debug message.
-
-	* cal-util/test-recur.c: try to handle timezones in the iCalendar
-	file properly, and updated to pass default timezone.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp):
-	(cal_util_generate_alarms_for_list): added default timezone argument.
-
-	* cal-util/cal-recur.c: changed many of the functions to take a default
-	timezone, to use to resolve DATE and floating DATE-TIME values.
-
-	* cal-client/cal-client.c (cal_client_set_default_timezone): new
-	function to set the default timezone.
-	(cal_client_ensure_timezone_on_server): new function to ensure that
-	a given timezone is on the server.
-
-	* gui/e-cell-date-edit-text.c: new subclass of ECellText to display
-	and edit a date value.
-
-	* cal-util/cal-recur.c (cal_obj_byday_expand_monthly): changed week_num
-	to -week_num when calculating the weeks to go back from the end of the
-	month for things like BYDAY=-2WE. Fixes bug #11525.
-	(cal_recur_generate_instances_of_rule): only go up to MAX_YEAR (2037).
-	We can't really handle anything past that anyway.
-	(cal_recur_ensure_rule_end_date): initialize cb_date.end_date to 0,
-	so if the RULE doesn't generate COUNT instances we save 0 as the
-	time_t.
-
-2001-10-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control-factory.c (tasks_control_factory_fn): Put up a
-	warning dialog box if we failed to create the tasks control.
-	Fixes bug #13033.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): write out the correct
-	time in the control
-
-	* pcs/cal.c (build_fb_seq): utility function to build sequences of
-	f/b data
-	(impl_Cal_get_free_busy): use above so we never return a NULL
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_save_configuration): fix c/p error
-	(calconduit_load_configuration): ditto
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): we don't need
-	to save the state
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	ditto
-
-	* gui/e-meeting-model.c (build_etable): listen for the etable
-	being destroyed
-	(table_destroy_cb): save the state when the etable is destroyed
-
-2001-10-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (init_widgets): listen for changes
-	in the date editors
-	(schedule_page_set_dates): update the times when they change
-	elsewhere
-	(update_time): set the time in the dialog
-	(time_changed_cb): notify of changed times
-	
-	* gui/dialogs/comp-editor.c (page_dates_changed_cb): don't call
-	the set dates function on the page that noted the change
-	(page_summary_changed_cb): same for set summary function
-	
-	* gui/dialogs/event-page.c (update_time): move time setting stuff
-	to util function
-	(event_page_set_dates): use it
-	(event_page_fill_component): ditto
-
-	* gui/e-meeting-time-sel.h: fix comment
-
-2001-10-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load): Do not assert
-	if we fail to load the URI list.  This would of course have been a
-	bonobo-conf activation problem.
-	(remove_uri_to_load): Likewise.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): Likewise.
-
-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): Make the
-	time range half-open so that we do not display the last alarm
-	twice.
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_set_status_message): make
-	it a public function
-
-	* gui/e-tasks.c (e_tasks_open): display progress messages
-	(cal_opened_cb): clean up status bar messages
-
-	* gui/gnome-cal.c (gnome_calendar_open): display progress messages
-	(client_cal_opened_cb): clean up status bar messages
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* gui/calendar-model.c (set_status_message): new function
-	(update_query): call set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-	(get_location, set_location): new functions for setting and
-	retrieving the location in the calendar model
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): keep a reference to the
-	EvolutionShellClient component
-
-	* gui/e-week-view.c (e_week_view_set_status_message): new function
-	(update_query): call e_week_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/e-day-view.c (e_day_view_set_status_message): new function
-	(update_query): call e_day_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/Makefile.am: added EVOLUTION_IMAGESDIR to CFLAGS
-	
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_clicked): call
-	the invite others dialog in the model
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_atype): pick
-	attendee type based on role and cutype
-
-	* gui/e-meeting-attendee.h: remove proto
-
-	* gui/Makefile.am: compile select names idl
-
-	* gui/e-meeting-model.h: new proto
-
-	* gui/dialogs/meeting-page.c: remove invite others dialogs bits
-	from here
-
-	* gui/e-meeting-model.c (e_meeting_model_invite_others_dialog):
-	and put them here
-	
-	* gui/dialogs/Makefile.am: compile corba bits in parent dir
-
-	* gui/dialogs/comp-editor-util.h: reflect above in includes
-
-	* gui/dialogs/e-delegate-dialog.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto and clean includes
-	
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: add html widget
-	(url_requested_cb): add function to load images from file as they
-	are requested.
-	(write_html_heading): convert to using html.
-	(alarm_notify_dialog): convert to use html display.
-	(make_html_display): this is the function the custom widget in the
-	galde file uses to create the html widget.
-
-	* gui/alarm-notify/alarm-notify.glade: add placeholder for the
-	custom html widget.
-
-	* gui/alarm-notify/Makefile.am: add flags for gtkhtml and gal.
-	
-2001-10-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Adds session management for the alarm daemon.  Also makes it store
-	a list of calendars to be monitored.  Those calendars will all be
-	loaded when the alarm daemon starts up.
-
-	* idl/evolution-calendar.idl (AlarmNotify): Removed the ::die()
-	method.  The alarm daemon now handles termination via the session
-	manager's commands.
-
-	* gui/alarm-notify/notify-main.c (set_session_parameters): New
-	function, sets some parameters so that the session manager can
-	restart the daemon via the evolution-alarm-client program.  Also,
-	sets up the "die" signal so that the daemon can terminate when the
-	session ends.
-	(load_calendars): New function to load the calendars on startup.
-	(main): Set the session parameters.  Load the calendars on startup.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): New
-	function, moved over from the impl_ function.  Added a
-	load_afterwards argument to indicate whether the calendar should
-	just be loaded or if it should also be added to the list of
-	calendars to load on startup.
-	(AlarmNotify_addCalendar): Use alarm_notify_add_calendar().
-	(AlarmNotify_removeCalendar): Remove the calendar from the list of
-	calendars to load on startup.
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): New function,
-	saves a sequence of the URIs to load.
-	(get_calendars_to_load): New function, loads a sequence of
-	calendars to load.
-
-	* gui/alarm-notify/alarm.h: Removed stale prototype for alarm_init().
-
-	* gui/component-factory.c (remove_folder): Ask the alarm daemon to
-	stop monitoring alarms for the folder that is being deleted.
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): use 12 or 24 hour
-	settings
-
-	* gui/e-meeting-time-sel.c: strings for 12 hour setting
-	(e_meeting_time_selector_construct): increase width slightly
-	
-	* gui/e-meeting-time-sel.h: extern the new char array
-
-2001-10-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch] (cal_component_get_location):
-	(cal_component_set_location): new functions
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_callbacks): util routine to
-	handle calling back
-	(async_close): use above
-	(e_meeting_model_refresh_busy_periods): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): translate
-	1-5 priorites to 1-9 priorities better
-	(comp_from_remote_record): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* idl/evolution-calendar.idl: allow some decent exceptions
-
-2001-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (match_component): there may be cases when the backend
-	will return an invalid component from a valid UID (an UID returned
-	by the get_uids method), so don't abort if that's the case
-
-2001-10-15  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: removed Help button. Do we have
-	any others?
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (set_icon_from_comp): remove warnings.
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	function to break up multi day events into single events for both
-	evo and the pilot and create new CalClientChange structures
-	(pre_sync): call above function, and adjust changed list if
-	necessary
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): util function
-	to determine if event is all day
-	(local_record_from_comp): use new util function
-	(comp_from_remote_record): kill use of deprecated time functions
-
-2001-10-13  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): call
-	set_icon_from_comp.
-	(set_icon_from_comp): set the window icon from the comp.
-	(make_icon_from_comp): get the icon path based on comp type.
-	
-	* gui/dialogs/Makefile.am (iconsdir): EVOLUTION_ICONSDIR bits.
-
-2001-10-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): send
-	cancellation comp if necessary
-
-2001-10-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/alarm-page.c: return fill_component success
-
-	* gui/dialogs/task-page.c: ditto
-
-	* gui/dialogs/task-details-page.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto
-
-	* gui/dialogs/recurrence-page.c: ditto
-
-	* gui/dialogs/event-page.c: ditto
-
-	* gui/dialogs/meeting-page.c: use e_notice instead of
-	duplicate_error
-	(meeting_page_get_cancel_comp): duh, deleted_attendees is an array
-	now
-	(meeting_page_fill_component): spew gui errors if there is no
-	organizer or no attendees, return success
-
-	* gui/dialogs/event-editor.c (event_editor_send_comp): always call
-	parent method and don't send the cancellation comp if the method
-	is publish
-	(refresh_meeting_cmd): use the orginal comp to refresh
-	(forward_cmd): prompt the user for the version they want to send
-	(current, original)
-
-	* gui/dialogs/task-editor.c (forward_cmd): as above
-	(refresh_task_cmd): ditto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_fill_component): return boolean of whether the
-	component could be filled or not
-
-	* gui/dialogs/comp-editor-page.h: update proto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param
-	on whether to try and send or not
-	(comp_editor_get_current_comp): only fill component if its changed
-	(comp_editor_save_comp): prompt user as well
-
-	* gui/dialogs/comp-editor.h: change proto
-
-	* gui/itip-utils.c: replace error_dialog with e_notice
-	(comp_content_type): specify charset
-
-2001-10-11  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c: large reworking of i18n tagging and now
-	uses gtk_html_stream write and U_ where appropriate.  More to
-	come.
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c (init): set the default character set to
-	utf-8.
-
-2001-10-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): Return the original key in
-	the hash table if requested.
-	(backend_last_client_gone_cb): Use lookup_backend() so that we
-	have the URI mangling done for us.
-	(impl_CalFactory_open): The type should be GtkType *, not GtkType!
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_set_mode_cb): remove unneeded
-	assertions
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-factory.c (add_uri): fix logic checks
-
-	* gui/dialogs/event-editor.c (event_editor_init): init the
-	exisiting_org boolean
-	(set_menu_sens): base sensitivity on existing_org boolean
-	(event_editor_edit_comp): set exisiting_org boolean
-
-	* gui/dialogs/task-editor.c: same as above
-
-	* gui/calendar-offline-handler.c (add_connection): handle the
-	protocol or host being unknown
-
-	* cal-util/cal-component.c (cal_component_has_organizer):
-	implement
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #884.
-
-	* gui/alarm-notify/save.[ch]: New files with functions to
-	save/load the last notification time.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Save the last
-	notification time.
-	(alarm_queue_init): Load the last notification time when the
-	daemon is inited.
-	(alarm_queue_add_client): Load the alarms that we missed while the
-	alarm daemon was not running.
-	(cal_opened_cb): Likewise.
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Added save.[ch] to the list of sources.
-
-2001-10-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): util function to get address
-	(itip_addresses_get_default): get only the default address
-	(itip_address_free): free single address
-	(itip_addresses_free): use above
-	(comp_limit_attendees): limit the number of attendees to one, the
-	user
-	(comp_sentby): set the sentby parameter if the user is not the
-	organizer
-	(comp_minimal): remove extraneous info for send (for refresh and
-	declinecounter)
-	(comp_compliant): remove all alarms, do various things to make the
-	components comply with itip spec based on method
-	(itip_send_comp): use comp_compliant method
-
-	* gui/itip-utils.h: new protos
-
-	* gui/e-itip-control.c: rescan the component when necessary
-	(get_next): don't get stuck in infinite loop if there are no
-	viewable components
-	(e_itip_control_set_data): if there are no viewable components,
-	spit an error message
-
-	* gui/dialogs/meeting-page.h: tidy
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): use
-	organizer's cn if possible
-	(other_clicked_cb): no longer doing the sent by stuff directly,
-	hide more widgets
-
-	* pcs/query.c: use bonobo exception stuff
-
-	* cal-util/cal-component.c (cal_component_rescan): have the comp
-	rescan its libical component (for when you change things directly)
-	(free_icalcomponent): take a param on whether to free the
-	component or just clean up the mappings
-	(cal_component_has_attendees): util function
-
-	* cal-util/cal-component.h: new protos
-	
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend, add_backend): deal correctly with
-	URIs to be inserted into the hash table, so that we don't add the same
-	backend over and over because the URI strings were different (although
-	refering to the same backend)
-
-	* pcs/cal-backend-file.c (mail_account_*): moved to a common place
-	(cal_backend_file_open): check if "uristr != NULL" and not
-	"uri != NULL"
-
-	* pcs/cal-backend-util.c: moved to here
-
-	* gui/e-day-view.c: add missing header file
-
-2001-10-09  Dan Winship  <danw@ximian.com>
-
-	* gui/e-meeting-model.c (process_free_busy_comp): Fix incorrect
-	variable name check.
-
-2001-10-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): refactor functionality into
-	several function
-	(comp_string): if we are publishing, empty the attendee list
-
-	* gui/dialogs/event-editor.c (schedule_meeting_cmd): when we
-	schedule a new meeting, mark the event editor as changed
-
-	* pcs/cal.c (cal_class_init): get correct parent class
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): use the
-	generated ui component name
-
-2001-10-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c:
-	* gui/calendar-offline-handler.c:
-	* gui/comp-editor-factory.c: replace use of gnome_vfs_uri with e_uri
-
-	* gui/e-meeting-model.c (start_addressbook_server): make it return void,
-	since the return value does not mind
-
-	* pcs/cal.c:
-	* pcs/cal-factory.c:
-	* pcs/cal-backend.[ch]: don't use GnomeVFS for URI management
-	
-	* pcs/cal-backend-file.c: ditto, only use GnomeVFS for internal
-	operations
-
-	* cal-client/cal-client.c (cal_client_open_calendar): don't CORBA_exception_free
-	before checking for exceptions
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.etspec: Added priorities to a bunch of
-	these columns.  Fixes Ximian bug #7158.
-
-2001-10-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a
-	DATE-TIME value, since we know the exact time. Fixes bug #11278.
-	(Before we were setting is_date, but icaltime_from_timet_with_zone()
-	didn't convert it properly. We need to figure out how to handle DATEs
-	when using time_t's.)
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): use
-	e_time_format_date_and_time() so we show the time as well, if the
-	exception is a DATE-TIME value.
-
-	* cal-util/timeutil.c: removed time_add_month(), time_year_begin(),
-	time_month_begin() & time_week_begin() - old pre-timezone functions
-	which we no longer use.
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): set
-	ir.until.is_date to FALSE before converting to a time_t.
-	Hopefully fixes bug #5034.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c: use bonobo-exception to tidy
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/calendar/calendar-conduit.c (nth_weekday): handle -1 as
-	well
-	(comp_from_remote_record): fix monthly by day recurrences and
-	handle "last" day type
-
-2001-10-01  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): unref the page
-	objects here, instead of in close_dialog(). (This was fixed a while
-	ago, but accidentally reverted.) Fixes bug #7543.
-
-2001-10-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Set the window state to sticky.  Thanks to Peter Teichman for the
-	suggestion.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert the comp exceptions to the pilot record
-	(comp_from_remote_record): record exceptions on the desktop and
-	use time zone stuff on recurrence end date
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	strdup the uid to avoid double free, write out only after
-	everything is done
-
-2001-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't use
-	gnome_vfs_uri_is_local on URIs created with
-	gnome_vfs_uri_new_private
-
-2001-09-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_comp_item): use bound_text to print the summary,
-	so it wraps instead of being clipped to 1 line. Fixes part 3 of bug
-	#10285, I think.
-
-	* gui/dialogs/alarm-page.glade: left-aligned the Date/Time label.
-	Also set the width of the Summary & Date/Time labels to 10, and set
-	expand to TRUE, to make sure that the dialog doesn't keep getting
-	wider as the summary text on the main page gets longer. Could possibly
-	use an EClippedLabel here instead, so we get a '...' at the end if it
-	is clipped.
-
-	* gui/dialogs/recurrence-page.glade: changed Summary & Date/Time
-	widths as above.
-
-	* gui/print.c (print_calendar): use landscape mode for the month
-	preview.
-	(print_border_with_triangles): use EPSILON to account for floating
-	point errors. Hopefully fixes part 2b of bug #10285.
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Handle the fields and category we don't sync by making sure we
-	don't overwrite them
-	(local_record_to_pilot_record): use local record category
-	(pre_sync): track db info
-
-	* conduits/calendar/calendar-conduit.h: db info field
-
-	* conduits/todo/todo-conduit.[hc]: same as above
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_compute_changes_foreach_key): create a dummy
-	component of the right type and strdup the uid
-	(cal_backend_file_compute_changes): sync the db hash after each
-	change and free the uid
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_open_calendar): init the
-	execption rather than freeing it
-
-2001-09-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): use bonobo-exception
-	for exceptions
-	(cal_client_open_calendar): likewise
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Update pixmap menu paths;
-	/menu/ComponentToolsPlaceholder/Tools ->
-	/menu/Tools/ComponentPlaceholder .
-	* gui/tasks-control.c: Likewise.
-
-2001-09-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidURI and UnsupportedMethod
-	exceptions to the CalFactory interface
-
-	* pcs/cal-factory.c (impl_CalFactory_open): raise InvalidURI exception on
-	URI errors and UnsupportedMethod when we don't support the method for
-	a given URI
-	
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: added support for using multiple calendar
-	factories
-	(cal_client_uri_list): use the list of factories loaded for this
-	CalClient
-
-2001-09-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c (date_compare_cb): 
-	(percent_compare_cb): 
-	(priority_compare_cb): added comparison functions for these special
-	cell types. But the date and percent ones don't work yet due to the
-	use of static text buffers for return cell values.
-	(e_calendar_table_init): added the comparison functions to the
-	ETableExtras. NOTE: task_compare_cb() never seems to be called.
-	I'm not sure why it is there.
-
-	* gui/e-calendar-table.etspec: set the comparison function names for
-	the date/percent/priority fields.
-
-	* cal-util/cal-util.c (cal_util_priority_to_string): 
-	(cal_util_priority_from_string): new utility functions.
-
-	* gui/calendar-model.c (get_priority): 
-	(set_priority): used above utility functions, and removed the warning
-	dialog which isn't useful now that the field isn't editable.
-
-	* gui/dialogs/event-page.c (times_updated): handle timezones and for
-	all-day events make sure it stays an all-day event after adjusting.
-	Fixes bugs #5945 and #10222.
-
-	* gui/calendar-commands.c (pixmaps): fixed the E_PIXMAP paths - the
-	edit items were moved beneath 'EditPlaceholder'. This gets rid of
-	those long Bonobo warnings! (and we get the icons back)
-
-	* gui/dialogs/comp-editor.c (pixmaps): removed the PrintPreview toolbar
-	icon, since it doesn't appear in the xml file. Gets rid of warning.
-
-	* gui/dialogs/event-page.c (notify_dates_changed): new function to
-	emit the notification signal when the dates are changed. It also
-	handles timezones now.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageDates): used
-	CalComponentDateTime for start/end/due so we have the timezone as well
-	as the time.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): updated to get
-	the timezones as well as the times.
-	(comp_editor_free_dates): new function needed to free all the structs.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): added call
-	to preview_recur() to make sure the preview gets updated.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): free the
-	CompEditorPageDates struct after use.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): added 'comp_is_on_server'
-	argument. If FALSE, we try to use builtin timezones first. This is
-	needed for the recurrence page of the event editor, because the
-	timezones may not have been added to the server yet. This and the
-	changes to the notification stuff should fix bug #5034.
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): call above
-	tag_calendar_by_comp() with TRUE since the events will be on the
-	server in this case.
-
-	* gui/e-day-view-layout.c:
-	* gui/e-day-view.c: made sure an event always takes up at least one
-	row, even when the start & end times are the same. Fixes bug #5944.
-	I don't know if we should try to also handle events with the end time
-	before the start time.
-
-	* gui/e-week-view.c (e_week_view_style_set): check that the small font
-	is actually smaller than the normal font. If it isn't, don't use it.
-	Hopefully fixes bug #6876.
-	(e_week_view_on_new_appointment): if only one day is selected, then
-	we set the initial time of the event to 1/2-hour from the start of the
-	working day, to differentiate 'New Appointment' from 'New All Day
-	Event'. Fixes bug #8892.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): do the same as the
-	above.
-
-2001-09-26  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes the GUI part of bug #7892.
-
-	* gui/dialogs/alarm-page.c (get_alarm_duration_string): Return
-	NULL if the duration is zero.
-	(get_alarm_string): Handle duration of zero.  Also, hopefully
-	make the strings be more l10n-friendly.
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): I am a moron.  Fix
-	reversed test.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): disconnect
-	signals first thing
-
-2001-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDFLAGS): Add
-	-export-dynamic to make glade custom widgets work on non-Linux.
-
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added CAL_MODE_INVALID to CalMode enum
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: new proto
-
-	* pcs/cal.c (impl_Cal_set_mode): implement set mode method
-	(cal_class_init): set setMode function in epv
-	(cal_notify_mode): notify listener of mode change
-
-	* pcs/cal-factory.c (add_uri): deal with UriType renaming
-
-	* pcs/cal-backend.h: add new virtual methods and protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new virtual
-	methods to null
-	(cal_backend_set_mode): sets mode
-	(cal_backend_get_mode): gets mode
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): overide
-	get_mode and set_mode methods
-	(cal_backend_file_get_mode): return mode
-	(notify_mode): have listeners notified of the set mode call
-	(cal_backend_file_set_mode): set the mode by indicating not
-	supported
-
-	* cal-client/cal-listener.h: update proto
-
-	* cal-client/cal-listener.c (impl_notifyCalSetMode): implement set
-	mode callback
-	(cal_listener_construct): take set mode callback
-	(cal_listener_new): ditto
-
-	* cal-client/cal-client.h: update protos, add signal proto
-
-	* cal-client/cal-client.c (cal_client_class_init): add
-	cal_set_mode signal
-	(cal_set_mode_cb): handle set mode callback from listener
-	(cal_client_open_calendar): pass additional param to cal_listener_new
-	(cal_client_set_mode): wrapper to set the calendar mode
-
-	* idl/evolution-calendar.idl: make UriType into CalMode, add
-	SetModeStatus enum and notifyCalSetMode method to the listener
-
-	* gui/calendar-offline-handler.c (create_connection_list): fetch
-	the uri list ourselves
-	(impl_prepareForOffline): reflect param change of
-	create_connect_list
-	(update_offline): ditto
-	(backend_cal_set_mode): set mode call back
-	(backend_cal_opened): cal opened call back, set mode to local
-	(impl_goOffline): reflect UriType renaming
-
-	* cal-util/cal-util.h: rename UriType to CalMode
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Warning fixes courtesy of Chris Lahey <clahey@ximian.com>.
-
-	* gui/e-itip-control.c (write_html): Warning fixes.  Also, don't
-	strdup() more than necessary.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	Warning fixes.
-
-	* gui/itip-utils.c (itip_addresses_get): Warning fixes.
-
-	* gui/print.c (print_day_background): Warning fixes.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Warning
-	fixes.
-	(alarm_to_palarm_widgets): Likewise.
-
-	* gui/dialogs/delete-comp.c: #include "../calendar-config.h"
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): Check that the
-	timeout is not set up before we create a new one; the alarm_fn
-	callback may cause the alarm system to re-enter and add a new
-	alarm.  Fixes bug #10840.
-	(pop_alarm): Assert that there is at least one alarm in the queue.
-
-2001-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c: use bonobo-exception stuff to clean code
-
-	* pcs/cal-factory.c (add_uri): add uri to the list if the type
-	matches
-	(impl_CalFactory_uriList): implement uriList method
-
-	* pcs/cal-backend.h: new virtual function member
-
-	* pcs/cal-backend.c (cal_backend_is_remote): call virtual function
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): override
-	virtual function
-	(cal_backend_file_is_remote): new virtual function, always return
-	FALSE
-
-	* idl/evolution-calendar.idl: uriList factory call, with flags for
-	types to get
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): cast to remove
-	warning
-
-	* gui/e-itip-control.c (write_label_piece): kill warnings by take
-	const char *
-
-	* gui/component-factory.c (create_object): aggregate offline
-	interface
-
-	* gui/Makefile.am: compile new files
-
-	* calobj.[hc]: Remove obsolete files
-
-	* cal-util/cal-util.h: enum URI types for uriList call
-
-	* cal-client/cal-client.c (build_uri_list): build list from string
-	sequence
-	(cal_client_uri_list): factory call to get uri list
-
-	* cal-client/cal-client.h: new proto
-
-	* cal-client/cal-client.c: use bonobo exception stuff to clean
-	code
-
-	* gui/calendar-offline-handler.[hc]: Start some skeleton routines
-	for online/offline handling
-
-	* pcs/cal-factory.c (launch_backend_for_uri): use accessor and
-	remove FIXME
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): base text on component
-	type
-
-2001-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: don't use gnome_vfs_uri_new_private
-	(fixes Ximian #10544)
-
-2001-09-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c: #include a few files we were missing
-	from libgnomevfs.
-
-2001-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (load_db): gets a config db
-	(cal_backend_file_destroy): release config db
-	(cal_backend_file_init): use load_db
-	(mail_account_get): gets a mail account by number
-	(mail_account_get_default): gets the default mail account
-	(mail_account_is_valid): looks to see if any accounts have the
-	given address
-	(create_user_free_busy): modularize so we can call multiple times
-	if necessary, set organizer
-	(cal_backend_file_get_free_busy): if the list of users is null,
-	use the default account otherwise get the same info for each
-	address that is an identity in the mailer
-
-	* gui/itip-utils.c (itip_addresses_get): s/gint/glong/ for bonobo
-	conf returns
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): fix problems
-	from a merge so that we publish 6 weeks of free/busy information
-	again
-
-2001-09-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_destroy): make
-	sure to release the ref on priv->comp.
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): make sure to release
-	the ref on priv->comp.
-
-2001-09-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): Display a
-	notification message always, in addition to playing the sound.
-	(procedure_notification): Present a confirmation dialog before
-	actually running the alarm's program.
-	(procedure_notification): Use gnome_execute_shell() instead of
-	gnome_execute_async() so that we handle multiple arguments
-	properly.  Plus, it is most likely what the user expects.
-	(mail_notification): Display a message about unsupported email
-	reminders instead of blindly dropping the alarm.
-
-	* gui/dialogs/alarm-options.glade: Added an explanatory message
-	about mail alarms not being supported.
-
-	* gui/dialogs/alarm-page.glade: Removed the "Send an email"
-	option.
-
-	* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): listen for model
-	changes
-	(task_editor_edit_comp): add the attendees to the model and notify
-	of need send
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/schedule-page.c: remove model change notification
-	stuff
-	(schedule_page_fill_widgets): no need to do the needs_send here
-	because the editor handles this since it owns the model
-
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): no need
-	to do the needs_send here because the editor handles this since it
-	owns the model
-	(invite_entry_changed): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_changed): new
-	accessor
-	(comp_editor_get_changed): ditto
-	(comp_editor_set_needs_send): ditto
-	(comp_editor_get_needs_send): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_addresses_get): reflect configuration
-	path changes in the mailer
-
-	* gui/e-meeting-model.c: remove commented out code, ifdef one
-	section for later
-
-2001-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_oaf_register): add a new parameter
-	(const char *iid) to specify the OAFIID of the factory being
-	registered
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (e_meeting_model_refresh_busy_periods):
-	remove silly debug #if 0
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): g_list_free
-	rather than g_free
-
-	* gui/e-itip-control.c (write_html): eliminate code path that
-	caused double freed memory
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.*: A page that shows the meeting time
-	selector and free/busy data for attendees
-
-	* gui/dialogs/meeting-page.c: use the meeting model to track/edit
-	attendees, remove table value conversion routines and simple table
-	routines
-	(set_attendees): take a pointer array
-	(meeting_page_destroy): destroy the pointer array, save state
-	(meeting_page_init): new pointer array
-	(meeting_page_fill_widgets): don't null the deleted attendees
-	field
-	(popup_delegate_cb): array add
-	(popup_delete_cb): array add
-	(cleanup_attendees): iterate over the array to unref now
-	(meeting_page_fill_widgets): don't null out fields, no need to add
-	attendees here
-	(invite_entry_changed): use e_meeting_attendee routines
-	(popup_delegate_cb): ditto
-	(popup_delete_cb): ditto
-	(meeting_page_new): take new arg and pass it to construct
-	(meeting_page_construct): take new arg, use e-meeting-model
-	routines to construct table
-
-	* gui/dialogs/task-editor.c (task_editor_init): new meeting model
-	(task_editor_destroy): unref the model
-
-	* gui/dialogs/event-editor.c (event_editor_init): make new model
-	and pass it to meeting and schedule pages
-	(event_editor_set_cal_client): virtual function, set meeting model
-	client
-	(event_editor_edit_comp): add the attendees to the model
-	(event_editor_destroy): unref model
-	
-	* gui/dialogs/comp-editor.h: add virtual function
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): make
-	set_cal_client a virutal function
-
-	* gui/e-meeting-types.h: generally useful type defines
-
-	* gui/e-meeting-time-sel*.[hc]: Move here and use an e-table for
-	the attendee list and extract display information from the new
-	meeting model and attendees
-
-	* gui/e-meeting-time-sel.etspec: spec for the table
-
-	* gui/e-meeting-attendee.[hc]: meeting attendees for the model,
-	with to/from conversions for CalComponentAttendee structure, emits
-	changed signal and allows getting and setting of free busy
-	periods
-
-	* gui/e-meeting-model.[hc]: move the model out on its own
-
-	* gui/e-itip-control.c (write_error_html): clean up warnings
-	
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #6350.
-
-	* gui/component-factory.c (remove_folder): Use a simplified method
-	for removing our folder data; we just need to remove calendar.ics
-	or tasks.ics and the corresponding backup files.
-
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #2830.
-
-	* gui/calendar-config.c (calendar_config_get_confirm_delete): New
-	function.
-	(calendar_config_set_confirm_delete): New function.
-	(config_read): Get the default value for the ConfirmDelete option.
-	(calendar_config_write): Set the value of ConfirmDelete.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Handle the
-	configuration option for confirmation.
-
-	* gui/dialogs/cal-prefs-dialog.c (CalPrefsDialogPrivate): Added
-	the fields for the Other page.
-	(get_widgets): Handle the new widgets.
-	(cal_prefs_dialog_show_config): Likewise.
-	(cal_prefs_dialog_update_config): Likewise.
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client-multi.[ch]: new class for managing multiple
-	calendars, with an API very similar to the CalClient one,
-	for ease of transition from one to the other
-
-	* gui/component-factory.c (xfer_folder, remove_folder, create_folder):
-	reworked to be able to manage folders for any calendar backend, and
-	not only the file: one
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* idl/evolution-calendar.idl: changed signature for the getFreeBusy
-	method, to return a sequence of CalObj's, and added sequence of users
-	as a new parameter to that method
-
-	* cal-client/cal-client.c (cal_client_get_free_busy): adapted to new
-	IDL method signature, by adding a new "GList *users" parameter, for
-	callers to be able to specify a list of users
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy):
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): add the
-	"GList *users" parameter. In cal_backend_file_get_free_busy, call
-	lookup_component to get the CalComponent for each uid, instead
-	of calling cal_backend_get_object, which meant converting the
-	component to a string and then parsing it again.
-
-	* cal-client/client-test.c (cal_opened_cb):
-	* gui/e-itip-control.c (send_freebusy):
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapted to
-	new getFreeBusy method signature
-
-2001-09-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: added a timeout to refresh the list every
-	10 minutes. Not ideal, as the user may be editing a task when it gets
-	refreshed.
-	(adjust_query_sexp): use the 'completed-before?' operator to filter
-	out tasks according to the config settings.
-
-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets): 
-	added support for the 'Completed' date. This code must have got lost
-	somewhere, as it used to work.
-	(date_changed_cb): set the priv->updating flag while updating the other
-	widgets.
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): made sure
-	we freed the components.
-
-	* pcs/query.c (func_completed_before): added 'completed-before?'
-	operator.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	don't set the lower & upper hour. Use 0-24 like the EDateEdit does.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config): set
-	the 12/24-hour time format options sensitive only if we support both.
-
-	* gui/calendar-config.c (config_read): if the locale doesn't define
-	'am' and 'pm' strings then we must use 24-hour format.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): don't
-	translate the '%d' as it doesn't make much sense. Resolves bug #8027.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): Do not call
-	calendar_config_init() here.
-
-	* gui/main.c (main): Call calendar_config_init() here.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (queue_alarm): Duh, only setup the
-	timeout if the list was empty.
-	(alarm_ready_cb): Notify with the ID of the original alarm.
-	(alarm_remove): Likewise.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Switch the alarm system from using SIGALRM to normal glib timers.
-	Also, use a more robust de-queueing mechanism.
-
-	* gui/alarm-notify/alarm.c (alarm_init): Removed.
-	(alarm_done): Remove the glib timeout instead of closing the pipes
-	and the signal handler.
-	(alarm_add): Allow adding alarms that happen before right now.
-	(queue_alarm): Use a glib timer instead of a signal.
-	(alarm_remove): Adjust the timeout as appropriate.
-
-	* gui/alarm-notify/notify-main.c (main): There is no need to
-	initialize the alarm system now.
-
-	* gui/main.c (main): Likewise.
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_init): get itip addresses
-	(calendar_model_destroy): destroy same
-	(calendar_model_value_at): do more thorough checking on whether to
-	use recurring, assigned, assigned to or regular task icons
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-component.c (for_each_remove_all_alarms): for each
-	call back, removes the alarms
-	(cal_component_remove_all_alarms): remove all alarms from the
-	component
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/e-itip-control.c (write_error_html): writes error messages
-	rather than normal html
-
-	* gui/itip-utils.c (itip_send_comp): remove all alarms if the
-	method warrants it
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/dialogs/meeting-page.c (build_etable): Updated this to match
-	the new ETableSimple interface.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* cal-client/Makefile.am: Set CLEANFILES directly instead of using
-	`+='.
-	* gui/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* pcs/Makefile.am: Likewise.
-
-2001-09-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (ok_clicked_cb): added space after 'identities'
-	in the message. Fixes bug #9896.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove translation
-	marker for now	
-
-2001-09-13  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: use ical partstat, role, cutypes
-	directly 
-
-	* cal-util/cal-component.c: ditto
-
-	* gui/e-itip-control.c (find_my_address): set my addresses if the
-	addresses match
-	(find_attendee): strstr returns non-null on a match
-	(write_html): use new icon, select the name displayed (organizer
-	or attendee) based on method,
-	(ok_clicked_cb): when rsvp'ing strip off all but the attendee
-	being replied for as is specified in the spec
-	(find_attendee_partstat): new util function to extract the
-	partstat of an attendee
-	(update_attendee_status): updates the partstat of a specific
-	attendee in the reply message
-
-	* gui/dialogs/meeting-page.c: use ical partstat, role, cutypes
-	directly
-	(popup_delegate_cb): if we delegate, notify of needs send and
-	changed
-	(popup_delete_cb): notify of needs send and changed for each
-	deletion
-	
-2001-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): send 6 weeks of
-	free busy info starting with the UTC start of day
-
-	* gui/itip-utils.c (get_label): create a text representation of
-	the given icaltime
-	(itip_send_comp): if the summary is empty, set the subject based
-	on the type of component, put the right extension on free/busy
-	components and base descriptions on type of component, include
-	start/end for free/busy info
-	
-2001-09-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): Added an
-	use_description argument so that other alarms can fall back to
-	this type.
-	(audio_notification): Implemented.
-	(remove_comp): Call remove_queued_alarm() here; there is no longer
-	a destroy notification function for alarms so must we do this
-	manually.
-	(alarm_trigger_cb): Do not pass the alarm to the notification
-	functions so that we can free it ourselves before all the alarms
-	in the component get freed.
-	(display_notification): Get the alarm here instead of getting it
-	as an argument.
-	(procedure_notification): Implemented.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): free the
-	destination vector when we finish with it, if we actually add
-	anyone, notify listeners of the needs send and changed info. Fixes
-	bug #8632.
-
-2001-09-10  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/print.c
-	(format_date): Convert string generated by strftime to UTF-8.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_month_small): Use U_() instead of _().
-	(print_day_background): Ditto.
-	(print_todo_details): Ditto.
-	(print_date_label): Convert generated string to UTF-8.
-
-2001-09-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_get_attach):
-	Handle the new icalattach type instead of struct icalattachtype.
-	(cal_component_alarm_set_attach): Likewise.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Likewise.
-	(alarm_to_palarm_widgets): Likewise.
-	(aalarm_widgets_to_alarm): Likewise.
-	(palarm_widgets_to_alarm): Likewise.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the calendar.]
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Remove the
-	ShellComponentFactory.
-
-	* gui/component-factory.c (create_object): Renamed from
-	`component_fn'.  Don't get any args.
-	(component_factory_init): Create the component using
-	`create_object()' and register it into OAF.
-	(COMPONENT_FACTORY_ID): Removed.
-	(COMPONENT_ID): New.
-
-2001-09-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (sc_user_create_new_item_cb):
-	Implemented.
-
-	* gui/main.c (component_editor_factory_init): New function to
-	create the factory for the comp_editor_factory.
-
-	* gui/comp-editor-factory.c: Finished implementation.
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): Implemented the
-	Edit command.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-09-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/tasks-control.c (tasks_control_activate): don't call
-	calendar_config_check_timezone_set() now, since the startup wizard
-	handles that.
-
-	* gui/e-tasks.c (e_tasks_class_init): changed selection_changed signal
-	to GTK_RUN_LAST. It has no reason to be GTK_RUN_FIRST.
-
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added "selection_changed" signal,
-	XX_delete_event() and XX_get_num_events_selected().
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): fix the shadow
-	around the dates at the top - it was 1 pixel off.
-
-	* gui/calendar-commands.c: added sensitize_commands(), similar to in
-	tasks-control.c, so we only make Cut/Copy/Delete sensitive when an
-	event is selected. Also added delete_event_cmd().
-
-	* gui/dialogs/task-page.c (task_page_set_summary): 
-	* gui/dialogs/event-page.c (event_page_set_summary): do nothing,
-	since the summary only gets changed on the main event/task page now.
-	Fixes bug #6939.
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): 
-	(e_day_view_on_top_canvas_drag_data_received): check that we are
-	dragging an event from the same EDayView. We currently don't support
-	DnD from other widgets.
-	(e_day_view_update_top_canvas_drag): only get the summary if we
-	actually have an event. Fixes bug #5162.
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): if the text hasn't
-	changed we need to call e_day_view_update_event_label() to show the
-	times again if necessary. Fixes bug #1813.
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): destroy the
-	CompEditorPage objects here rather than in close_dialog(), after the
-	widgets have been destroyed. We do this because the widgets have lots
-	of signal handlers connected with the CompEditorPage objects as the
-	signal data, so we want to ensure that the data pointer is always
-	valid. (Alternatively we could disconnect all the handlers when the
-	CompEditorPage objects are destroyed, or use connect_while_alive()).
-	Fixes bug #7543.
-
-	Note: there is still a small bug in that if you type in a time and
-	then hit 'Save and Close', the time won't be saved. I'm not sure
-	where this should be fixed - should the actions which close the
-	dialog grab the focus to the toplevel, so any widgets currently
-	being edited finish the edit and emit 'changed'?
-	
-	* gui/dialogs/recurrence-page.c (append_exception): use
-	gtk_clist_set_row_data_full() so freeing is handled automatically by
-	the GtkClist. This helps avoid problems at destroy-time.
-	(exception_delete_cb): just call gtk_clist_remove() now. No need to
-	free the row data as GtkCList now handles it.
-	(recurrence_page_destroy): no need to free the data in the clist.
-
-	* gui/dialogs/alarm-page.c: ditto.
-
-	* gui/dialogs/meeting-page.c: ditto.
-	(etable_destroy_cb): save the ETable state in this new handler cb
-	rather than in the destroy method, since the widget will already be
-	destroyed by then.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: changed 3 occurrences of 'Replyed' to 'replied'
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-itip-control.c (write_html):
-	Marked strings for translation (with U_).
-
-	* gui/itip-utils.c (itip_send_comp):
-	Ditto.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget): 
-	(comp_editor_contacts_to_component): fix debugging messages so they
-	use "" rather than NULL. Fixes bug #8559.
-
-2001-08-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object): See if
-	the set of categories changed by using the removed_categories hash
-	table.
-	(cal_backend_file_init): Create a table of removed categories.
-	This allows us to notify if and only if the set of category
-	changes when an object is updated/removed, instead of
-	unconditionally notifying if an object is updated.
-	(cal_backend_file_update_objects): Only notify if the set of
-	categories really changed.
-	(update_categories_from_comp): Shuffle the categories between the
-	priv->categories and priv->removed_categories lists.
-
-2001-08-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #7879, a query may receive an update notification from
-	the backend before the query itself gets populated.
-
-	* pcs/query.c (ensure_sexp): New function; ensures that the esexp
-	is created and notifies of parse errors.  It is the bulk of
-	start_query_cb() but put in a separate function so that we can
-	share it elsewhere.
-	(start_query_cb): Use ensure_sexp().
-	(process_component_cb): Oops, notify of a successfully finished
-	query.
-	(match_component): Call ensure_sexp().  This function can be
-	called by the backend notification callbacks before the query is
-	populated, so we need to make sure the esexp exists here.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Set the
-	"category is" criterion as the default for the calendar and tasks.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):
-	Unset the priv->updating flag before returning in the case the
-	component has no recurrence information.  Fixes bug #6850.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (QueuedAlarm): Added a snooze
-	flag to differentiate snoozed alarms from real occurrences.
-	(add_component_alarms): Do not specify a destroy function for the
-	alarm trigger.  We handle this in the callbacks now.
-	(alarm_trigger_cb): Just remove the alarms for the unimplemented
-	notification types.
-	(create_snooze): Implemented snooze.
-	(notify_dialog_cb): Snooze as appropriate.
-
-2001-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (foreach_tzid_callback): call back to add
-	timezones to the top level
-	(itip_send_comp): call icalcomponent_foreach_tzid
-
-2001-08-22  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c: #include <libgnomevfs/gnome-vfs-types.h> so
-	this will compile against gnome-vfs 1.0.1.
-
-2001-08-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): open the tasks folder
-	associated with the calendar being opened, and not always the local
-	tasks.ics file
-
-	* pcs/cal-factory.c (open_fn): use gnome_vfs_uri_new_private when
-	parsing the URI to allow non-registered URIs
-
-2001-08-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_palarm_widgets): Handle
-	the case where there is no attachment.  Fixes bug #7257.
-
-2001-08-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): strip the mailto bit for the
-	email address if we display it
-
-2001-08-21  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/query.c (func_is_completed): added new e-sexp operator. We
-	don't currently use it though.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Changed '_Overdue' to 'O_verdue'
-	since we have an '_Other' notebook tab. Added '_Hide' accel.
-
-	* gui/dialogs/cal-prefs-dialog.c: hooked up config options to dialog.
-
-	* gui/calendar-config.c: added config options for hiding completed
-	tasks.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-day-view.c (e_day_view_reshape_long_event): added 2 pixels
-	extra space between icons and text for long events, and 1 pixel space
-	between icons in all events.
-	(e_day_view_realize): changed the background color to match the
-	EGrayBar in the shell.
-
-2001-08-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: new files to contain utility functions
-	for calendar backends
-
-	* pcs/cal-backend.c (cal_backend_add_cal): implement it here, and not in
-	the calendar backends. Add a "cal_added" signal, so that backends are
-	notified when a new Cal is added, if they need to
-	(cal_backend_get_type_by_uid): implement it here
-
-	* pcs/cal-backend-file.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_file_add_cal): removed
-	(cal_backend_file_init): connect to the "cal_added" signal in the
-	CalBackend class so that we can update categories when a new Cal is
-	added
-	(cal_backend_file_get_type_by_uid): removed
-
-	* pcs/cal-backend-db.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_db_add_cal): removed
-	(cal_backend_db_get_type_by_uid): removed
-
-	* AUTHORS: added JP and Damon to list of authors
-
-2001-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_generate_alarms_for_list):
-	(cal_util_generate_alarms_for_comp): 
-	new functions moved from the CalBackendFile, to allow its use outside
-	of it. The signature has changed a little bit, since these functions
-	need a way to get the timezones from the callers, so a callback
-	function to resolve the timezones has been added to the list of
-	parameters
-
-	* pcs/cal-backend-file.c (generate_alarms_for_list):
-	(generate_alarms_for_comp): moved to cal-util, with all their related
-	functions/structures
-
-	* pcs/cal-backend-db.c: removed functions that were moved to cal-util
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use Delete icon in menu, and
-	change to bigger Save icon in toolbar.
-
-	* gui/tasks-control.c: 
-	* gui/calendar-commands.c (pixmaps): used new_task-16.png and
-	goto-16.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): added delete icons for menu
-	and toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added Cut/Copy/Paste icons for toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: uses new delete icons in menu & toolbar.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Update the folder list to include a
-	display name and a description.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use new delete icon for toolbar.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: fixed typo, 'send' -> 'sent'. Bug #7621.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added option to hide completed
-	tasks after a given number of minutes/hours/days. Unfinished.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): initialize
-	zone to NULL to avoid a warning.
-	(contacts_clicked_cb): work around a bug in SelectNames by notifying
-	that the page has changed when you click the 'Contacts' button.
-	Otherwise it is easy to lose changes.
-
-	* gui/dialogs/task-page.c (contacts_clicked_cb): ditto.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used new Save/Save As icons.
-
-	* gui/tasks-control.c:
-	* gui/calendar-commands.c (pixmaps): added new Cut/Copy/Paste icons,
-	and changed the 'New Task' icon to use the bigger one I made.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/task-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-2001-08-18  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/calendar-config.c (locale_uses_24h_time_format): New.
-	(config_read): Use locale's setting as default for
-	/Calendar/Display/Use24HourFormat so that Europeans don't have to
-	switch to 24-hour format manually.
-
-2001-08-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (destroy): destroy the addresses
-	(clean_up): don't free the addresses, we need them
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): new function to open the
-	task editor to add a new task.
-
-	* gui/calendar-commands.c: added new_task_cb() to create a new task
-	in the calendar folder, and added menu commands for it, and a toolbar
-	button (I think that is what Ettore wanted. Maybe he just meant menu
-	commands. Anyway, it is easy to take out.) Note that we don't have a
-	decent icon for 'New Task' for the toolbar.
-	Also added the new Goto button (but we don't have a similar one for
-	the menu command).
-
-2001-08-16  Iain Holmes  <iain@ximian.com>
-
-	* gui/Makefile.am: Add the libetimezonedialog.a lib link
-
-	* gui/calendar-config.c: Change the #include for the timezone dialog
-
-	* gui/e-timezone-entry.c: Ditto.
-
-	* gui/dialogs/Makefile.am: Remove the e-timezone-dialog stuff.
-
-2001-08-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: hide the timezone fields for all-day
-	events. We will use DATE values for these eventually, and these
-	don't have timezones associated with them. Currently we just use the
-	default timezone for all-day events, as a workaround until we have
-	DATE values working.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit): added
-	make_time_insensitive flag. Though we may not use it.
-
-	* gui/dialogs/event-page.glade: made the 'All day event' toggle
-	right-aligned, so it doesn't move when the other widgets are shown
-	and hidden.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_default_timezone): new
-	function to set the default timezone of the widget. If the current
-	timezone setting matches the default then the entry field is hidden.
-	Most people won't use timezones so this makes the GUI simpler.
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): set the default timezone
-	using the above function.
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): if the start date
-	or due date is not set, we use the default timezone, so the user
-	doesn't have to set this each time they set the date.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): If the
-	component has no alarms remember to set the priv->updating flag to
-	FALSE before returning.
-
-2001-08-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c
-	(e_delegate_dialog_get_delegate_name): get the destinations
-	property, not the text property
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (clear_widgets): Set the default-to-add
-	notification to be display a message 15 minutes before the start
-	of the appointment.  Fixes bug #7175.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_strip_categories):
-	New function to strip surrounding whitespace from a string of
-	categories entered by the user.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Use
-	comp_editor_strip_categories().
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_configure_e_date_edit):
-	Do not set the time popup range.  We also want to be able to
-	create appointments that are not within nine-to-five!  Think of
-	going to the movies!  Fixes bug #7436.
-
-	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".
-	Fixes bug #7367.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Changed to reflect my renaming of some of
-	the more hideously-named functions in the ESearchBar API.
-
-2001-08-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): only fill the component
-	and save it if something has changed
-	(save_comp_with_send): only try to send if something has changed
-	and the editor needs a send
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: OK, re-added the default
-	alarm options.  Way too many people are asking for them.
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Add the user creatable
-	items.  The callback is not actually implemented yet; this is just
-	to finalize the GUI.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added an option to ask for
-	confirmation when deleting items.  Added underlined shortcuts
-	(they may not all work currently).
-
-2001-08-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added support for the Contacts field.
-	Note that I'm not sure what we should put in the iCalendar CONTACT
-	properties. Currently we put "name <email>", but it isn't recognized
-	as a contact when we reopen the dialog, so we may need more info here.
-	Also we currently use a simple parser to parse the above format, and
-	we should maybe use some camel function.
-
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: replaced the GtkEntry fields for the
-	Contacts with a GtkEventBox which we put the BonoboControl in at
-	runtime.
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): added FIXMEs
-	since it doesn't seem to be freeing the EDestination stuff. JP?
-
-	* gui/dialogs/comp-editor-util.c: added bunch of utility functions to
-	handle the Contacts field in the main Event and Task pages.
-
-	* gui/gnome-cal.c: added visible_start and visible_end fields, so we
-	only emit the 'dates-shown-changed' signal when really necessary.
-	Currently changing the folder title bar label results in a complete
-	redraw of the Evolution window (silly GtkLabel queueing a resize),
-	so we want to avoid that as much as possible.
-	(gnome_calendar_new_appointment_for): only move the event's end time
-	to the end of the day if it is not already 00:00:00.
-
-	* gui/e-week-view-event-item.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added support for double-clicking on an event to
-	open it, and for double-clicking on the background to create a new
-	event. There is still a minor problem to sort out, but it basically
-	works.
-
-	* cal-util/cal-component.c: added support for CONTACT properties,
-	mainly by copying the code for COMMENT properties which are exactly
-	the same type.
-
-	* gui/e-day-view.c (e_day_view_realize): use the same color for the
-	top canvas background as the shortcut bar, to make it look a little
-	nicer (I think). Although we still have the theme problem with
-	hard-coded colors.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.etspec: Made the click-to-add message
-	shorter.  Fixes bug #7177.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Added Tigert's new icons for
-	Prev and Next.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Make the "Any Category"
-	item consistent with the one in the addressbook.  Also, free the
-	items correctly.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (get_current_category): Handle an array of
-	categories in the CalSearchBar instead of our own menu items.
-	(notify_query_contains): Fetch the text from the search bar here
-	instead of in regen_query().
-	(regen_query): Handle category searches.
-	(notify_category_is): New function.
-	(cal_search_bar_construct): Do not create an option menu.
-	(make_suboptions): New function to create the suboption items from
-	the list of categories.
-	(notify_query_contains): Do not include a category sexp here.
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_item): add dialog for feedback
-	(remove_item): ditto
-	(send_item): ditto
-	(send_freebusy): ditto
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c: rewrite the gui to use gtkhtml
-
-	* gui/Makefile.am: define the icon dir
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.h: Remove #include <config.h> from here.
-	* gui/itip-utilss.h: Same here.
-	
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c: Update the paths of the Tools menu
-	according to the changes in the XML [i.e. things are moved to the
-	ComponentToolsPlaceholder].
-
-	* gui/calendar-commands.c: Likewise.
-
-2001-08-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): turn on word-wrap for the
-	description fields. Fixes bug #6821.
-
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Where we have ESearchBarItems, set their
-	subitems to NULL.
-
-2001-08-09  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object_component): added new
-	backend method to get the component given a UID.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component): 
-	added implementation of above virtual method.
-	
-	* pcs/query.c (match_component): use the new backend function to get
-	the CalComponent rather than the string. This avoids converting all
-	the calendar components to strings and parsing them back into
-	components for every query! (That wasn't a good idea, was it ;)
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: use a timeout handler to layout the events,
-	to avoid doing a layout for each event we get from a query.
-
-	* gui/print.c (print_day_add_event): 
-	* gui/e-day-view.c (e_day_view_add_event): set start_row_or_col and
-	num_columns to 0. They are guint8's.
-
-	* gui/e-week-view.c (e_week_view_free_events): hide all the jump
-	buttons. Fixes bug #5946.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): added the
-	day numbers for the month view.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Delete" to "_Remove",
-	since it clashed with "_Add". Also added underlined accelerators for
-	the recurrence radio buttons. Note that none of these accelerators
-	actually work at present, due to the way we are using .glade files
-	for each notebook page. I need to add a bug about this.
-	Also, the "_Action" menu doesn't popup when I press Alt+A, even though
-	the "_File" menu does popup when I press Alt+F. Strange.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object):
-	removed debug msgs.
-
-2001-08-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* 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-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	unref the GdkPixmap and GdkBitmap returned by the function
-	e_categories_config_get_icon_for ()
-
-2001-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.*: Remove progress frame
-
-	* gui/dialogs/task-details-page.*: Put in progress frame, remove
-	basics frame
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): util function to set
-	menu sensitivity based on state
-	(task_editor_init): add meeting page
-	(task_editor_edit_comp): show page if necessary
-	(task_editor_destroy): unref meeting page
-	(assign_task_cmd): bring up meeting page
-	(refresh_task_cmd): save before sending
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (save_cmd): implement new save command
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-itip-control.c (destroy): Chain to the destroy handler in
-	the parent class!
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy):
-	Likewise.  Sigh.
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): Whoops, added a
-	destroy handler.
-
-2001-08-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/goto-dialog.glade: removed underlined accelerator key from
-	"_Go To Today" button. GnomeDialog doesn't actually support underlined
-	accelerator keys for buttons. We could hack it, like Glade does, if
-	we really need to. Fixes bug #6418.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): Stop editing any event.  Fixes
-	bug #5949.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): Duuuh, set
-	the alarm_copy on the component, not the original alarm.  Fixes
-	bug #5214.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (set_attendees): set the attendees of
-	a component
-	(meeting_page_fill_component): use above
-	(meeting_page_get_cancel_comp): return a comp with the attendees
-	to be cancelled
-
-	* gui/dialogs/meeting-page.h: get a component that will be sent as
-	a cancellation
-
-	* gui/dialogs/event-editor.c (event_editor_class_init): override
-	send_comp class method
-	(event_editor_send_comp): send cancellation notices to deleted
-	attendees
-	(refresh_meeting_cmd): save before send
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_class_init): set default
-	send_comp method
-	(real_send_comp): do the real work
-	(comp_editor_send_comp): call class method
-	(save_comp): don't do any sending
-	(save_comp_with_send): save and send here
-	(prompt_to_save_changes): use above
-	(save_close_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: add virtual function
-
-2001-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): don't use a NULL mask in the
-	call to gdk_gc_set_clip_mask
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): ditto
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit-config.h: fix pre-processor
-	macros
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit-config.h: fix pre-processor macros
-
-	* conduits/todo/todo-conduit.h: ditto
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-listener.c (cal_listener_stop_notification): New
-	function to stop further notification from happening.
-	(impl_notifyCalOpened): Do not notify if requested.
-	(impl_notifyObjUpdated): Likewise.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyCategoriesChanged): Likewise.
-	(CalListenerPrivate): Do not keep a reference to the server-side
-	Cal.  This would create a circular reference since the server
-	keeps a reference to the listener.
-	(cal_listener_destroy): Likewise.
-	(impl_notifyCalOpened): Likewise.
-
-	* pcs/cal.c (cal_destroy): bonobo_object_release_unref() the listener.
-
-	* cal-client/cal-client.c (cal_client_destroy): Ask the listener
-	to stop notifications.  Also, do not unref it as the server does
-	that itself when we unref the Cal.
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_free_value): Only unref the
-	FIELD_COMPONENT if it is non-NULL.  We return a NULL for that
-	field from ::initialize_value(), after all.  Fixes bug #6098.
-
-2001-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Make calendar.ics the
-	suggested name when attaching the ical object
-
-2001-08-06  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.h: 
-	* gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent
-	and EWeekViewEvent, to note that the event is in a different timezone.
-	We now compute this once when we add the event to the array, rather
-	than each time we draw the event. If it is set, we will draw the
-	timezone icon next to the event.
-
-	* gui/e-day-view-main-item.c: take transparency into account when
-	drawing the blue vertical bars to represent busy time.
-
-	* gui/tag-calendar.c: take transparency into account when tagging
-	the mini calendar.
-
-	* gui/e-calendar-table.c (e_calendar_table_init): removed the "None"
-	options for transparency and classification, since these properties
-	have defaults anyway, so we may as well use those to keep it simple.
-	Also use "Free" and "Busy" for transparency, rather than "Transparent"
-	and "Opaque".
-
-	* gui/calendar-model.c: updated classification & transparency code
-	as above.
-
-	* gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As"
-	since people have a chance of understanding that.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: 
-	* gui/gnome-cal.c: added functions to get the visible time range.
-
-	* gui/calendar-commands.c: finished stuff to set the folder bar
-	label to the dates currently displayed.
-
-	* gui/control-factory.c (control_factory_new_control): connected
-	signal to update the folder title bar label when the dates shown
-	are changed. I had to connect it here since we need the BonoboControl
-	in the callback, and I don't know how to get the control from the
-	widget.
-
-	* gui/tasks-control.c (tasks_control_activate): clear the folder bar
-	label. We could display something here at some point.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since
-	we have an "_Actions" menu. (These also use Alt+key, right?)
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/event-page.c: added 'Show Time As' field, which is
-	really the TRANSP property but with a better name!
-	Also changed one of the "_Confidential" to "Con_fidential" since we
-	already have "_Contacts" using the same 'C' key.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip
-	events that are TRANSPARENT. Also added comment as this code looks
-	inefficient.
-
-	* cal-util/cal-component.c: removed stuff for comparing timezones.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the
-	above function here, and updated it to compare the UTC offsets of the
-	times as well as the TZIDs.
-
-2001-08-06  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In process of fixing bug
-	#6005.  The "Calendar" page is now "Display", and it has no
-	frames.  The "Task list" page has colons between the labels and
-	the color pickers, and it has no frame.
-
-2001-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): added check for
-	NULL pointers. Maybe fixes #5203 (I can't reproduce it, so I'm not
-	sure)
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/query-listener.c (query_listener_stop_notification):
-	New function; stops further notification from happening.  This is
-	needed since the listener is destroyed asynchronously from the
-	Wombat and the corresponding CalQuery may already have died.
-	(impl_notifyObjUpdated): Do not notify if requested.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyQueryDone): Likewise.
-	(impl_notifyEvalError): Likewise.
-
-	* cal-client/cal-query.c (cal_query_destroy): Use
-	query_listener_stop_notification().
-
-	* cal-client/cal-listener.c (cal_listener_destroy): Nullify the
-	pointers to the callback functions.
-
-	* gui/e-day-view.c (update_query): Commit our state of no longer
-	having a query before unrefing it.  We may reenter from the ORBit
-	main loop and we *really* want this information to be committed.
-
-	* gui/e-week-view.c (update_query): Likewise.
-
-	* gui/calendar-model.c (update_query): Likewise.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): Added a "clear_first"
-	argument that indicates whether the ECalendar should be cleared of
-	any marks first.
-
-	* gui/calendar-commands.c (calendar_control_activate): Removed
-	ifdefed-out view buttons code from the Gnomecal days.
-
-	* gui/gnome-cal.c (client_categories_changed_cb): Merge the
-	categories of the calendar and tasks clients so that we can
-	display the categories in both sets.
-	(gnome_calendar_construct): Connect to "categories_changed" on
-	both clients.
-	(gnome_calendar_on_date_navigator_selection_changed): Removed call
-	to gnome_calendar_update_view_buttons().
-	(gnome_calendar_update_view_buttons): Removed.  We cannot have
-	this until Bonobo supports radio toolbar items.
-	(gnome_calendar_set_view_buttons): Removed.
-	(gnome_calendar_dayjump): Do not use priv->day_button.
-	(GnomeCalendarPrivate): Removed the {day,work_week,week,month}_button 
-	fields.
-	(gnome_calendar_set_query): Start a retagging process of the date
-	navigator so that it reflects the current query.
-	(update_query): New function to restart a query for the date navigator.
-	(initial_load): Use update_query() instead of tagging the date
-	navigator directly.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(client_cal_opened_cb): Use update_query() instead of initial_load().
-	(initial_load): Removed.
-	(client_obj_updated_cb): Removed.
-	(client_obj_removed_cb): Removed.
-	(gnome_calendar_new_appointment_for): Set the default category of
-	the new component.
-	(search_bar_category_changed_cb): Set the default category for the
-	calendar views.
-
-	* gui/cal-search-bar.c (cal_search_bar_set_categories): Sort the
-	categories before creating the menu.
-
-	* gui/e-day-view.c (adjust_query_sexp): Return NULL instead of
-	"#f" if the time range is not set yet.
-	(update_query): Do not start a query if the time range is not set.
-	(e_day_view_set_default_category): New function.
-	(e_day_view_key_press): Set the default category on the new
-	component.
-
-	* gui/e-week-view.c (adjust_query_sexp): Analogous to the above.
-	(update_query): Analogous to the above.
-	(e_week_view_set_default_category): Analogous to the above.
-	(e_week_view_key_press): Analogous to the above.
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1407.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Removed the alarm
-	preferences page, since we decided it was unnecessary.
-
-2001-08-03  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes.
-
-	* gui/dialogs/event-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-	* gui/itip-utils.c:
-	Added missing #include <config.h>
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/Makefile.am: Added camel dependency (now needed by ebook).
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_is_empty): If the
-	default category is the same as the value passed in to this
-	function, return TRUE.  This could be a hack or not, but it
-	prevents two items from being added to the table if a category is
-	selected.
-
-	* gui/e-tasks.c (setup_widgets): Allow the search bar to shrink
-	horizontally.
-
-	* gui/dialogs/task-page.c (clear_widgets): Pass valid values to
-	e_dialog_option_menu_set(); these need to come from the status map.
-
-2001-08-01  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.c: removed debugging messages.
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	The calendar search bar widget now includes a drop-down menu of
-	available categories.
-
-	* pcs/query.c (func_has_categories): Handle one and only one #f
-	value as meaning "unfiled", for components that have no categories
-	at all.
-
-	* pcs/cal-backend-file.c (open_cal): Duh, do not notify here about
-	changed categories since at this point we don't have any clients
-	bound to us yet.
-	(create_cal): Likewise.
-	(cal_backend_file_add_cal): Notify here.
-
-	* gui/cal-search-bar.h (CalSearchBarClass): New signal
-	"category_changed".
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Add a drop-down
-	menu for the list of categories.
-	(search_option_items): Removed the "Has category" option, since we
-	now have the drop-down menu instad and it would be confusing to
-	have both options.
-	(regen_query): Likewise.  Also, this function is now the old
-	cal_search_bar_query_changed() and is shared by that very function
-	and by the callback from the drop-down menu.
-	(notify_query_contains): Include the sub-sexp for the categories.
-	(cal_search_bar_set_categories): New function.
-	(cal_search_bar_get_category): New function.
-	(categories_selection_done_cb): Emit the "category_changed" signal.
-
-	* gui/e-tasks.c (obj_updated_cb): Removed function since it did
-	not do anything; all updates are handled by the CalendarModel.
-	(obj_removed_cb): Likewise.
-	(ETasksPrivate): Removed the fields for the categories option
-	menu, since now it is in the ESearchBar.
-	(search_bar_sexp_changed_cb): Use calendar_model_set_query()
-	directly here, as we do not need to frob the sexp anymore.
-	(update_query): Removed.
-	(client_categories_changed_cb): New callback.
-	(search_bar_category_changed_cb): New callback.
-	(e_tasks_new_task): Set the default category on the component to
-	the one that is selected in the search bar.
-	(e_tasks_on_filter_selected): Removed.
-	(e_tasks_on_categories_changed): Removed.
-	(e_tasks_rebuild_categories_menu): Removed.
-	(e_tasks_add_menu_item): Removed.
-	(e_tasks_setup_view_menus): Sanitized not to sink objects wildly.
-	(e_tasks_discard_view_menus): New function.
-
-	* gui/calendar-model.h (CalendarModelClass): Removed the
-	"categories_changed" signal since this is handled in the Wombat
-	now.
-
-	* gui/calendar-model.c (calendar_model_get_categories): Removed.
-	(calendar_model_set_value_at): Do not collect the categories.
-	(query_obj_updated_cb): Likewise.
-	(calendar_model_collect_categories): Removed.
-	(calendar_model_set_default_category): Constify.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Call
-	e_tasks_discard_view_menus().
-
-	* gui/gnome-cal.c (search_bar_category_changed_cb): Set the
-	default category for the task pad's model.
-
-2001-07-31  Federico Mena Quintero  <federico@ximian.com>
-
-	The Wombat now keeps track of which categories are present in the
-	objects of a calendar.  It will notify the clients of changes in
-	this set.  This is to make the category drop-down menus in the
-	calendar/tasks views be always up to date.
-
-	* idl/evolution-calendar.idl (Listener): Added a
-	notifyCategoriesChanged() method.  The Wombat now keeps track of
-	the categories within a calendar.
-
-	* cal-client/cal-listener.[ch]: Switched it to use BonoboXObject.
-	Also added the notifyCategoriesChanged implementation.
-
-	* cal-client/cal-client.[ch]: Added a "categories_changed" signal.
-
-	* pcs/cal-backend-file.c: Maintain a list of the live categories.
-	(update_categories_from_comp): New function to maintain the set of
-	live categories.
-	(add_component): Update the set of categories.
-	(remove_component): Likewise.
-	(open_cal): Notify about changes in the set of categories.
-	(create_cal): Likewise.
-	(cal_backend_file_update_objects): Likewise.
-	(cal_backend_file_remove_object): Likewise.
-	(notify_categories_changed): New function to notify the clients
-	about the current set of categories.
-
-	* pcs/cal.c (cal_notify_categories_changed): New function.
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/e-day-view.c (selection_received):
-        * gui/e-week-view.c (selection_received): yes, set the end date, but
-	correctly calculated, not by using the component's duration, which
-	may not exist. Now really fixes #5836
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received):
-	* gui/e-week-view.c (selection_received): don't set the end date
-	for the pasted components, since it will be recalculated when the start
-	date is set, thus keeping the same duration than the original
-	cut/copied component. Fixes #5836
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c: 
-	* gui/calendar-commands.c (clear_folder_bar_label): started some code
-	to show the currently displayed dates in the folder title bar.
-	Unfinished.
-
-	* gui/e-itip-control.c (set_date_label):
-	* conduits/todo/todo-conduit.c (local_record_from_comp): 
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free
-	the CalComponentDateTimes. (Note the iTIP control needs updating for
-	timezone support.)
-
-	* cal-util/cal-component.c: Changed CalComponentDateTime so that the
-	TZID is malloc'ed and freed rather than being a pointer to a static
-	string. This was causing problems as sometimes we were freeing the
-	string that was being pointed to, so we got corrupted TZIDs.
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.
-	DATE values do not have timezones.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,
-	since I think they are more commonly-used. Also added underlined
-	accelerator keys.
-
-	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the
-	popup menu to be consistent with other folders, and separated from the
-	clipboard commands. Also changed to use EPopupMenu so the accelerators
-	work, and the masks may be useful at some point.
-
-	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since
-	that makes it simpler. Fixes bug #5034.
-
-	* gui/calendar-config.c (calendar_config_set_timezone): strdup the
-	location string. Fixes bug #4990.
-
-	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times
-	don't include the end time.
-
-	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed
-	days_shown. Fixes bug #5709.
-
-	* cal-client/cal-client.c (cal_client_get_timezone): took out some
-	debugging messages.
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added Help button. Though of
-	course it doesn't do anything yet.
-
-2001-07-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Mark strings for translation
-
-2001-07-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): call
-	cal_client_get_free_busy for testing the new method
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): implemented
-
-2001-07-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5352.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show): Added a
-	`page' argument so that we can select which page to show when
-	popping up the dialog.
-	(cal_prefs_dialog_construct): Added the `page' argument as well.
-	(cal_prefs_dialog_new): Likewise.
-
-	* gui/calendar-commands.c (settings_cmd): Set the page to the main
-	calendar settings one.
-
-	* gui/tasks-control.c (tasks_control_settings_cmd): Implemented
-	callback for the "Task Settings" command.
-	(verbs): Added the "TasksSettings" verb.
-	(pixmaps): Added an icon for the tasks settings command.
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	recur is always in UTC
-	
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/calendar/calendar-conduit.h: time zone field for the
-	context
-
-	* conduits/calendar/Makefile.am: link to bonobo conf
-
-	* conduits/todo/todo-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/todo/todo-conduit.h: time zone field for the
-	context
-
-	* conduits/todo/Makefile.am: link to bonobo conf
-	
-2001-07-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): 
-	initialize to NULL some pointers
-
-	* e-calendar-table.c (selection_received): deal correctly with
-	VCALENDAR objects
-	(e_calendar_table_copy_clipboard): g_strdup the value returned by
-	icalcomponent_get_as_ical_string
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): Constify and set the
-	query sexp on the task pad's model as well.
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.[ch]: New files with a derivative of
-	ESearchBar that generates sexps for calendar queries directly.
-
-	* gui/gnome-cal.c (setup_widgets): Use CalSearchBar instead of
-	ESearchBar.
-
-	* gui/e-calendar-table.h (ECalendarTable): Removed the ->colors
-	array since it is handled by ETableExtras now.
-
-	* gui/e-calendar-table.[ch]: Removed the subset_model.  Now we use
-	the live query facility to filter tasks.  Removed the filter
-	function stuff as well.
-
-	* gui/e-tasks.c (e_tasks_construct): Use
-	calendar_model_set_cal_client() directly instead of
-	e_calendar_table_set_model().
-	(setup_widgets): Create a calendar search bar for the tasks
-	component.
-	(search_bar_sexp_changed_cb): Set the query sexp on the table model.
-	(e_tasks_on_filter_selected): Regenerate the query from the
-	selected category and the current sexp.
-	(update_query): New convenience function to recompute the real
-	query sexp.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Likewise.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_cal_client):
-	Removed function; people are now supposed to get the model from
-	the calendar table and operate on it.
-
-	* gui/calendar-commands.c (verbs): Consistency fixes with the XML
-	file.
-	(pixmaps): Likewise.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	cal-search-bar.[ch] to the list of sources.
-
-2001-07-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CompEditorFactory): New interface to
-	a centralized factory for calendar component editors.  Has
-	editExisting() and editNew() methods to edit an existing component
-	from a URI/UID pair, and to create a new component in a calendar
-	that is in a particular URI, respectively.
-
-	* gui/comp-editor-factory.[ch]: Implementation files for the
-	component editor factory.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added the CompEditorFactory
-	stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): when an entry
-	has changed, iterate over the elements of the entry and add them
-	to the list if need be
-	(get_select_name_dialog): add a Chair Persons section
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-	
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-
-	* gui/dialogs/meeting-page.c (cleanup_attendees): free a list of
-	attendees
-	(meeting_page_fill_widgets): clean up attendee lists and fix typo
-	(find_match): add ability to return pos of match
-	(popup_delete_cb): if deletion happens, make sure to tidy up
-	delegation chain
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	use the destination rather than text property
-	(e_delegate_dialog_get_delegate): ditto
-	(e_delegate_dialog_new): take name/address pair for dialog default
-
-	* gui/dialogs/e-delegate-dialog.h: update protos
-
-	* gui/e-itip-control.c (clean_up): only unref the object if we
-	have one
-	
-	* gui/itip-control-factory.c (stream_read): make sure we null
-	terminate the final buffer
-
-	* gui/itip-utils.c (itip_send_comp): strip the mailto: from the
-	organizer address if necessary
-
-2001-07-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (exception_select_row_cb): check that
-	the row passed in is valid. Sometimes we get the "row-selected"
-	signal for row 0 when there are no rows in the list. Fixes bug #4266.
-
-	* cal-client/cal-client.c (cal_client_get_object): prefetch all the
-	timezone data needed by the object, to try to avoid making Corba
-	calls all over the place. They can cause problems because they call
-	the GTK+ main loop recursively. This currently leads to an assertion
-	failure in the GnomeCanvas occasionally.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): gracefully
-	handle the lack of a method
-
-2001-07-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received_cb): check type of component
-	before actually pasting.
-	Deal with VCALENDAR components also (fixes bug #5140)
-
-	* gui/e-week-view.c (selection_received_cb): ditto
-
-	* cal-client/cal-client.c (cal_client_update_object): check the return
-	value from cal_component_get_as_string and don't call
-	GNOME_Evolution_Calendar_Cal_updateObjects if NULL
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.
-
-	* gui/print.c (range_selector_new): changed the 'Current day/week...'
-	strings to 'Selected day/week...' to make a little less confusing.
-	Fixes bug #5451.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (is_duplicate): see if the address is
-	already in the list of attendees
-	(duplicate_error): throw up an error dialog
-	(popup_delegate_cb): if the attendee has already delegated, delete
-	the old delegatee
-	(value_at): cast to kill warnings
-	(append_row): don't add the new attendee if they are already in
-	the list
-
-2001-07-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): calculate
-	tmp_tm.tm_wday ourselves. strftime has a habit of crashing if you
-	have weird values here. I think this fixes bug #4574.
-
-2001-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (value_at): stip the delto and
-	delfrom
-	(popup_delegate_cb): show a delegate dialog and add the new
-	delegatee and update the delegator
-	(add_section): listen for changes in a more direct manner
-	(get_select_name_dialog): add_section now takes a limit argument
-
-	* gui/dialogs/e-delegate-dialog.[hc]: New dialog to query the user
-	for a person to delegate to
-
-	* gui/dialogs/Makefile.am: build/install new files
-
-	* gui/Makefile.am: add ldadd line for ebook
-
-2001-07-21  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed
-	the test to see whether we should draw the icons.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (get_local_file_name_for_folder_type):
-	New helper function.
-	(remove_folder): Add a @type arg and handle it, by deleting
-	"tasks.ics" instead of "calendar.ics" if the type is "tasks".  If
-	the type is not "tasks" or "calendar", report an
-	`UNSUPPORTED_TYPE' error.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Make folders of type "calendar" and
-	"tasks" user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/event-editor.h (event_editor_update_widgets):
-	Removed unused prototype.
-
-	* gui/dialogs/task-editor.h (task_editor_update_widgets):
-	Likewise.
-
-2001-07-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free various data related
-	settings
-	(destroy): use cleanup and unref the clients
-	(e_itip_control_set_data): clean up before setting the data and
-	store the timezones in a top level component
-	(update_item): use cal_client_update_objects and our top level
-	(including the timezones)
-
-2001-07-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): 
-	* gui/calendar-commands.c (pixmaps): updated to use new print icon.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (init_widgets): don't show the time
-	in the EDateEdit widget for adding EXDATEs.
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): don't
-	set t.time.is_date to -1. It is a boolean flag, 0 or 1. We probably
-	don't want a date value, so we leave it at 0.
-
-2001-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	do not discard drawing icon if mask is NULL
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-2001-07-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_next): find the next displayable
-	component
-	(get_prev): find the previous displayable component
-	(e_itip_control_set_data): use above
-	(prev_clicked_cb): ditto
-	(next_clicked_cb): ditto
-
-2001-07-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Really fixes #4380.  The previous fix was necessary but not
-	sufficient; it worked for me because my system timezone happens to
-	match the Evolution timezone --- if they don't match, the bug
-	would persist.  Not matching is *not* an error; it is just a
-	matter of Unix sucking a lot and XST not being finished :)
-
-	* cal-util/timeutil.c (time_to_gdate_with_zone): New function.  We
-	cannot use g_date_set_time() anymore because it does not take
-	timezones into account.
-
-	* gui/gnome-cal.c (get_days_shown): Use the function above.
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range): Likewise.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): Print
-	a g_message when the list of invited people changes
-	in the SelectNames control.
-	(add_section): #if 0/#endif out some (broken?) code.
-	(get_select_name_dialog): Listen for changes in the
-	SelectNames control.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_destroy): destroy
-	the dialog widget here. Fixes bug #4198.
-
-2001-07-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): 
-	* gui/dialogs/event-page.c (event_page_fill_widgets): try to use
-	builtin timezones before getting them from the server. When creating
-	new events/tasks the timezones may not be on the server.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): for all-day
-	events we subtract a day from the end date rather than add it.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): ignore the event
-	if it isn't a GDK_CROSSING_NORMAL event. For some reason we are getting
-	leave events when the button is pressed, which meant that selecting
-	timezones in the map didn't work.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): 
-	* gui/print.c (print_date_label): only free icaltimetype if not NULL.
-
-2001-07-12  Taylor Hayward  <taylorhayward@yahoo.com>
-
-	* gui/goto-dialog.glade:
-	* gui/meeting-mockup.glade:
-	* gui/alarm-notify�larm-notify.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade: Added missing underlined
-	shortcuts.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_new_top_level): standard place to
-	get your top level calendar component
-
-	* pcs/cal-backend-file.c (create_cal): use it
-
-	* gui/itip-utils.c (itip_send_comp): ditto
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): ditto
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix
-	typo breaking compilation
-
-	* gui/dialogs/meeting-page.c: fix include
-
-	* gui/dialogs/Makefile.am: build select names idl here
-
-	* gui/Makefile.am: remove select names compilation from here
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	guard against infinite loops with the updating boolean, fixes 4270
-
-2001-07-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c: added support for multiple selections in
-	cut/copy/paste. Also, it's now ready for the
-	s/update_object/update_objects change (I think)
-
-2001-07-11  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: renamed updateObject to updateObjects
-	and removed the UID argument, since it can add/update multiple objects
-	at once. (It can't yet, but it will!)
-
-	* pcs/cal.c: 
-	* pcs/cal-backend.[hc]: 
-	* pcs/cal-backend-file.c: renamed update_object to update_objects and
-	got rid of the UID arg.
-
-	* cal-client/cal-client.c (cal_client_update_objects): new function to
-	add/update multiple objects in one go, i.e for iTIP and for importing
-	calendars.
-
-	* gui/print.c (print_date_label): fixed type bug.
-
-	* gui/e-week-view.[hc]: 
-	* gui/e-week-view-event-item.c: draw the timezone icons if the event's
-	DTSTART or DTEND is in a different timezone to the current one.
-	Note that we may want to change this so it compares the UTC offsets
-	rather than the TZIDs, since currently it will draw the icons for all
-	events coming from iTIP requests from other clients.
-
-2001-07-11  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4380 as well as some leftovers from the days of struct
-	tm and some uninitialized values.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Initialize
-	the icaltimetype structures completely.
-	(gnome_calendar_init): Do not reset priv->zone to NULL here, since
-	it was set by gnome_calendar_update_config_settings() from
-	setup_widgets().
-
-	* gui/calendar-model.c (set_completed): Do not set is_daylight.
-
-	* gui/e-day-view.c (e_day_view_convert_grid_position_to_time):
-	Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_timezone): Likewise.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Likewise,
-	and initialize start_tt and end_tt completely.
-
-	* cal-util/timeutil.c (time_year_begin_with_zone): Likewise.
-	(time_month_begin_with_zone): Likewise.
-	(time_week_begin_with_zone): Likewise.
-	(time_day_begin_with_zone): Likewise.
-	(time_day_end_with_zone): Likewise.
-	(time_from_isodate): Likewise.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Initialize
-	icaltime before using it.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an
-	unused icaltimetype.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_component): Initialize icaltime before
-	using it.
-
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component-factory.c: fix the calendar not exiting with a
-	gross hack because i don't have time to fix the ref counting right
-	now
-	
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: be careful about adding and
-	stripping MAILTO:'s properly
-
-	* gui/dialogs/meeting-page.etspec: add missing columns
-
-	* gui/itip-utils.c (itip_strip_mailto): point to the real start of
-	the email address
-
-	* gui/itip-utils.h: add proto
-
-	* gui/itip-control-factory.c: get rid of the my address property
-
-	* gui/e-itip-control.c: use the users real identity to figure out
-	which attendee they are
-	(find_my_address): figure out who the user is among the attendees
-
-	* gui/e-itip-control.h: remove protos
-
-	* gui/dialogs/Makefile.am: extra dist etspecs
-
-	* gui/Makefile.am: ditto
-
-2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Added a hack to get the last
-	string translated since xml-i18n-tools doesn't recognize
-	_click-to-add-message="Click here to add a task".
-	
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (BUILT_SOURCES): Move this higher so that
-	Makefile properly depends on us. Fixes distcheck.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4389: ETableSpecification still in e-calendar-table.c
-	file]
-	
-	* gui/e-calendar-table.etspec: New file containing the spec that
-	was in e-calendar-table.c as a big string.
-	
-	* gui/e-calendar-table.c (e_calendar_table_init): Use the spec
-	file instead of a string.
-	(e_calendar_table_get_spec): Removed this function, we don't need
-	it anymore.
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Don't load from string,
-	from file instead.
-	
-	* gui/Makefile.am: Necessary changes to get the new .etspec file
-	installed.
-
-2001-07-10  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4388: ETableSpecification still in meeting-page.c file]
-
-	* gui/dialogs/meeting-page.etspec: New file containing the spec
-	that was previously in meeting-page.c as a string.
-	
-	* gui/dialogs/meeting-page.c: One line change to get it to use
-	this spec file instead of a string.
-
-	* gui/dialogs/Makefile.am: Necessary changes to get the new
-	meeting-page.etspec installed.
-
-2001-07-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.[hc]:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/print.c:
-	* gui/dialogs/cal-prefs-dialog.c:
-	* gui/dialogs/comp-editor-util.c:
-	* gui/dialogs/event-page.c:
-	* pcs/cal-backend-file.c:
-	* pcs/query.c:
-	* cal-util/cal-component.[hc]: 
-	* cal-util/cal-recur.c: 
-	* cal-util/timeutil.[hc]: 
-	* cal-client/cal-client.[hc]: more timezone updates. I'm pretty much
-	done with the calendar code now, except for alarms and conduits,
-	which Federico and JP know more about. And there are a couple of
-	other minor things to fix. But it is still pretty buggy.
-
-2001-07-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add popup support so you can delete
-	users from the list
-
-	* gui/dialogs/comp-editor.c (setup_widgets): fix typo
-
-2001-07-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Handle the
-	different alarm actions.
-	(display_notification): Do the alarm notification dialog here.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (make_heading): Take in a
-	CalComponentVType, not a whole component.
-	(alarm_notify_dialog): Take in a CalComponentVType and the final
-	message instead of generating it ourselves.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
-	parent vCalendar component as the timezone closure of
-	cal_recur_generate_instances().
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
-	consistent with the option menu text.
-	(get_alarm_string): Removed extra spaces from the last part of the
-	alarm string.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_day_view_cut_clipboard): Constify.
-	(e_day_view_on_cut): Constify.
-	(e_day_view_reshape_long_event): Remove unused variable.
-
-	* gui/e-week-view.c (e_week_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_week_view_cut_clipboard): Constify.
-	(e_week_view_on_cut): Constify.
-
-	* cal-client/cal-client.c (cal_client_resolve_tzid_cb): Fix the
-	prototype so that this matches CalRecurResolveTimezoneFn.  Also
-	renamed it so that it is clear that it is supposed to be a
-	callback.
-
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (init_widgets): connect to the entry
-	not the combo
-
-	* gui/dialogs/event-editor.c (set_menu_sens): set menu
-	sensitivities based on whether or not the meeting page is shown
-	(event_editor_init): call above
-	(event_editor_edit_comp): ditto
-	(schedule_meeting_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_ui_prop): new
-	function to allow for set of ui props (esp. "sensitive")
-	
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (clear_widgets): actually clear some
-	widgets and hide/show widgets in the default setup
-	(meeting_page_destroy): destroy the address lists
-	(meeting_page_fill_widgets): allow the user to select among their
-	identities as a new organizer, or show the existing organizer as
-	label
-	(meeting_page_fill_component): set the "MAILTO:" bit of the
-	organizer to match spec, set CN properly if we know it
-	(get_widgets): load new widgets
-	(other_clicked_cb): handle "Other Organizer" click
-	(change_clicked_cb): handle "Change Organizer" click
-	(init_widgets): listen for clicks on new buttons
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove the
-	page from our internal list and unref it
-
-	* gui/itip-utils.c (itip_addresses_get): get the configure mail
-	identities
-	(itip_addresses_free): free a list of identities returned by
-	itip_addresses_get
-
-	* gui/itip-utils.h: remove obsolete protos, and new protos
-
-	* gui/gnome-cal.html: Remove ancient file
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4018 and what would be the analogous bugs for the other
-	component editors.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageClass): New
-	virtual method "::focus_main_widget()".
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_focus_main_widget): New function.
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): If we are
-	inserting the main page, ask it to focus its main widget.
-
-	* gui/dialogs/alarm-page.c (alarm_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/event-page.c (event_page_focus_main_widget):
-	Implemented.
-	#include "e-util/e-categories-config.h".
-
-	* gui/dialogs/meeting-page.c (meeting_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/recurrence-page.c
-	(recurrence_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-page.c (task_page_focus_main_widget):
-	Implemented.
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (clear_folder_bar_label): New function.
-	(calendar_control_activate): Clear the folder bar label; we really
-	don't have anything interesting to display.
-
-2001-07-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add new columns for information
-	specification
-	(meeting_page_destroy): save the table state
-	(build_etable): load new table state
-
-	* gui/dialogs/task-editor.c (task_editor_destroy): unref pages
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): unref pages
-
-	* gui/dialogs/comp-editor.c (setup_widgets): kill warning
-	(comp_editor_append_page): ref page passed in
-	(close_dialog): unref pages
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-day-view.c (query_obj_updated_cb): fix warning, and added
-	some debug messages.
-
-	* gui/dialogs/comp-editor-util.c (write_label_piece): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): call mktime()
-	to set the weekday, though this is a temporary fix.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.[hc]: added virtual method to get a VTIMEZONE
-	component given a TZID. We need this to resolve TZIDs when expanding
-	an event using cal_recur_generate_instances() in query.c.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone): implemented
-	virtual method.
-	(cal_backend_file_update_object): fixed bug, kind -> child_kind.
-
-	* pcs/query.c (func_occur_in_time_range): use the virtual method for
-	resolving TZIDs. The other way didn't work anyway, as we didn't have
-	the entire VCALENDAR with VTIMEZONEs in it.
-
-	* gui/dialogs/recurrence-page.c (init_widgets): 
-	(make_ending_until_special): moved the call to
-	e_date_edit_set_get_time_callback() from init_widgets to
-	make_ending_until_special(), since that is where the widget gets
-	created.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_timezone): handle zone
-	being NULL.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.[ch]: New files with the alarm options
-	dialog; this configures the repeat/duration properties and the
-	options specific to each alarm action type.
-
-	* gui/dialogs/alarm-page.c (AlarmPagePrivate): Added the alarm
-	options button.  Also, keep an alarm structure which we are
-	editing and an alarm options dialog.
-	(init_widgets): Connect to the options button.
-	(add_clicked_cb): Clone the component we are editing instead of
-	creating a new one so that we preserve the data from the alarm
-	options dialog.
-	(button_options_clicked_cb): Pop up the alarm options dialog.
-
-	* cal-util/cal-component.c (cal_component_alarm_new): Doh,
-	initialize the other fields in the new alarm.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.[hc]
-	* cal-util/cal-component.c
-	* cal-util/cal-recur.[hc]
-	* cal-util/test-recur.c
-	* cal-util/timeutil.c
-	* gui/calendar-config.c
-	* gui/calendar-model.[hc]
-	* gui/comp-util.[hc]
-	* gui/e-calendar-table.c
-	* gui/e-day-view-main-item.c
-	* gui/e-day-view-top-item.c
-	* gui/e-day-view.[hc]
-	* gui/e-itip-control.c
-	* gui/e-timezone-entry.[hc]
-	* gui/e-week-view.[hc]
-	* gui/gnome-cal.[hc]
-	* gui/goto.c
-	* gui/tag-calendar.[hc]
-	* gui/dialogs/cal-prefs-dialog.c
-	* gui/dialogs/comp-editor-page.[hc]
-	* gui/dialogs/comp-editor-util.[hc]
-	* gui/dialogs/comp-editor.c
-	* gui/dialogs/e-timezone-dialog.[hc]
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-details-page.glade
-	* gui/dialogs/task-page.c
-	* idl/evolution-calendar.idl
-	* pcs/cal-backend-file.c
-	* pcs/cal-backend.c
-	* pcs/cal-backend.h
-	* pcs/cal.c
-	* pcs/query.c: timezone changes everywhere. There's still quite a
-	few things to update, and its not working well at present.
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): publish
-	free/busy information for the currently viewed time range
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-	(evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS).
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for ATTACH, DESCRIPTION properties in alarm components.
-
-	* cal-util/cal-component.c (scan_alarm_property):  Deal with
-	ATTACH, DESCRIPTION properties.
-	(cal_component_alarm_get_attach): New function.  Libical is
-	actually bogus; supposedly icalattachtype structures are
-	refcounted but the property functions return them by value.
-	(cal_copmonent_alarm_set_attach): New function.
-	(cal_component_alarm_get_description): New function.
-	(cal_component_alarm_set_description): New function.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for repeat/duration properties in alarm components.
-
-	* cal-util/cal-component.h (CalAlarmRepeat): New structure that
-	pairs the repeat/duration values of an alarm component, which must
-	be set both together or not set at all.
-
-	* cal-util/cal-component.c (CalComponentAlarm): Added fields for
-	the repeat and duration properties.
-	(scan_alarm_property): Scan the DURATION and REPEAT properties.
-	(make_alarm): Nullify/initialize all the fields in the alarm.
-	(cal_component_alarm_get_repeat): New function.
-	(cal_component_alarm_set_repeat): New function.
-
-	* gui/dialogs/alarm-page.glade: Changed the label of display
-	alarms from "Show a dialog" to "Display a message".
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): fill in delegated from field
-	
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (categories_clicked_cb): 
-	* gui/dialogs/event-page.c (categories_clicked_cb): use the new
-	self-contained e_categories_config_open_dialog_for_entry() function
-
-	* gui/e-week-view-event-item.c (e_week_view_item_draw_icons): 
-	* gui/e-day-view-top-item.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): ditto
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	use e_categories_config_get_icon_for() to retrieve the icon
-	associated with each category
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (send_freebusy): implement
-
-	* cal-util/cal-component.c (set_attendee_list): add the delto
-	property rather than the delfrom property twice
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show
-	delegation info if appropriate
-	(delegate_task_cmd): delegate command
-	(cancel_task_cmd): cancel command
-	(refresh_task_cmd): refresh command
-
-	* gui/dialogs/task-details-page.c: Load new widgets
-	(task_details_page_show_delegation): show/hide delegation info widgets
-
-	* gui/dialogs/task-details-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): free
-	attendee list when finished
-
-	* gui/dialogs/comp-editor.c (setup_widgets): explicitly show the
-	widgets, update pixmaps after the verbs have been added
-	(comp_editor_focus): don't do a show all
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1406.
-
-	* gui/calendar-config.c (config_read): Handle the options for the
-	task list colors.
-	(calendar_config_write): Ditto.
-	(calendar_config_get_tasks_due_today_color): New function.
-	(calendar_config_set_tasks_due_today_color): New function.
-	(calendar_config_get_tasks_overdue_color): New function.
-	(calendar_config_set_tasks_overdue_color): New function.
-	(calendar_config_configure_e_calendar_table): Use
-	e_table_model_changed() for the colors.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Updated the options for the
-	task list and alarms.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Update the task list settings.
-	(cal_prefs_dialog_update_config): Ditto.
-
-	* gui/calendar-model.c (get_color): Deal with tasks for today as
-	well as overdue tasks.  Make it cleaner, even though we have to
-	duplicate a chunk of is_overdue().
-
-	* gui/calendar-commands.c (preferences_cmd): Renamed from
-	properties_cmd().
-
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw icons per category
-
-	* gui/e-day-view-top-item.c
-	(e_day_view_top_item_draw_long_event): draw icons per category
-
-	* gui/e-day-view.c
-	(e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): calculate space for category icons
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): draw icons per category
-
-	* gui/e-week-view.c
-	(e_week_view_reshape_event_span): calculate space for category icons
-	
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_*_clipboard): fixed clibpoard
-	command activation from the menu entries. CTRL-C and CTRL-X don't
-	work though, since it seems the key presses are being captured by
-	the text item
-
-	gui/e-week-view.c (e_week_view_*_clipboard): ditto
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): Only set the
-	pressed_event_num and pressed_span_num if button 1 was pressed.
-	Fix up return values a bit.  This fixes bug #3780.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Doh, the
-	call for the day view was supposed to be
-	gnome_calendar_set_view(), not set_view().  Fixes bug #3779.
-
-2001-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_cut_cmd): call
-	e_calendar_table_cut_clipboard with the correct object
-
-	(tasks_control_copy_cmd): ditto
-
-	(sensitize_commands): sensitize clipboard commands based on the
-	number of selected tasks
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch] (e_calendar_table_cut_clipboard),
-	(e_calendar_table_copy_clipboard),
-	(e_calendar_table_paste_clipboard): new functions for allowing the
-	execution of clipboard-related commands
-
-	* gui/tasks-control.c (tasks_control_cut_cmd),
-	(tasks_control_copy_cmd), (tasks_control_paste_cmd): added
-	callbacks for the new clipboard-related menu entries
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: removed not-uses-anymore parameter in
-	call to evolution_shell_component_new
-
-	* gui/gnome-cal.[ch] (gnome_calendar_cut_clipboard),
-	(gnome_calendar_copy_clipboard), (gnome_calendar_paste_clipboard):
-	new functions for allowing execution of clipboard-related commands
-
-	* gui/e-day-view.[ch] (e_day_view_cut_clipboard),
-	(e_day_view_copy_clipboard), (e_day_view_paste_clipboard): ditto
-
-	* gui/e-week-view.[ch] (e_week_view_cut_clipboard),
-	(e_week_view_copy_clipboard), (e_week_view_paste_clipboard): ditto
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (cut_event_cmd),
-	(copy_event_cmd), (paste_event_cmd): added callbacks for the new
-	clipboard-related menu entries
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* conduits/*/Makefile.am (INCLUDES): More srcdir != builddir
-	fixes.
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (selection_received): fixed
-	(e_calendar_table_on_copy): fixed
-
-2001-06-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur
-	field to occur_start; added an occur_end field.  This way we can
-	present the complete times for the occurrence from the server.
-
-	* cal-util/cal-component.h (CalAlarmInstance): Likewise.
-
-	* pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new
-	fields appropriately.
-	(generate_absolute_triggers): Likewise; we use -1 in case the
-	component has no DTSTART or DTEND because there are no meaningful
-	occurrence dates here.
-	(fill_alarm_instances_seq): Fill in the new fields.
-
-	* cal-client/cal-client.c (build_alarm_instance_list): Likewise.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Take in both the occur_start and occur_end times.
-
-	* gui/goto.c (goto_dialog): Free the dlg structure on the bail-out
-	cases.
-
-	* gui/dialogs/event-page.c (get_widgets): Do not assert if we
-	cannot find the main widget; just return FALSE.
-
-	* gui/dialogs/alarm-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-details-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Likewise.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Fixes for
-	srcdir != builddir. Link to the static libwombat.
-
-	* conduits/todo/Makefile.am (INCLUDES): Here too.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize libglade.
-
-	* pcs/cal-backend-file.c (compute_alarm_range):
-	icaldurationtype_as_int() will now return a negative value if
-	dur->is_neg is true, so we need to flip the sign of some
-	operations here.
-	(add_alarm_occurrences_cb): Likewise.
-
-	* pcs/cal-backend-db.c (compute_alarm_range): Likewise.
-	(add_alarm_occurrences_cb): Likewise.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c: Converted to use BonoboXObject.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Ask the alarm
-	notification service to add the calendar and tasks URIs.
-	(add_alarms): New function.
-
-	* gui/alarm-notify/notify-main.c (main): Doh, fixed typo in the
-	OAFIID.
-	(main): Initialize and shut down gnome-vfs.
-
-	* gui/Makefile.am (IDLS): Added evolution-calendar.idl, sigh.
-	(evolution_calendar_SOURCES): Added the files generated from the IDL.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): New function
-	used when an alarm is triggered.
-
-	* gui/dialogs/Makefile.am: Removed the alarm-notify-dialog files;
-	they are now in gui/alarm-notify.
-
-	* gui/alarm-notify/Makefile.am: Added the alarm-notify-dialog
-	files.
-
-	* pcs/cal.c (cal_forget_password): This was incorrectly named
-	cal_client_forget_password(); renamed it.
-
-	* gui/main.c (main): Initialize and shut down gnome-vfs.
-
-2001-06-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (task_compare_cb): New function to
-	compare tasks like the Pilot task list.
-
-	* cal-util/cal-component.h (CalComponentField): Added a
-	semi-hackish CAL_COMPONENT_FIELD_COMPONENT.  In the ETable model,
-	it is intended to return a pointer to the component itself.
-
-	* gui/calendar-model.c (calendar_model_value_at): Return the
-	component itself for CAL_COMPONENT_FIELD_COMPONENT.  Be more
-	paranoid about invalid columns.
-	(calendar_model_set_value_at): Be more paranoid about invalid
-	columns.
-	(calendar_model_duplicate_value): Ref the component field.
-	(calendar_model_initialize_value): Deal with the component field.
-	(calendar_model_value_is_empty): Likewise.
-	(calendar_model_value_to_string): Likewise.
-
-2001-06-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Added itip-control-factory.* to the build.
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch] (cal_get_password): new function for the backends to
-	be able to call the getPassword method on the associated
-	WombatClient
-	(cal_forget_password): ditto for the forgetPassword method
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: changed getFreeBusy method to return
-	a CalObj instead of a sequence
-
-	* cal-client/cal-client.[ch] (cal_client_get_free_busy): changed it to
-	work like the cal_client_get_object function, that is, it does not
-	return anymore a list of UIDs, but a CalClientGetStatus code, and
-	added a new parameter for the caller to get the component back when
-	this function returns
-	(cal_client_open): aggregate WombatClient interface to the CalListener
-	being used
-
-	* pcs/cal-backend-db.c, pcs/cal-backend-file.c (..get_free_busy): set
-	return value to "char *" as it will be returning a FreeBusy object,
-	and not a list of UIDs
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy): ditto
-
-	* pcs/cal.c (cal_construct): queryInterface on the listener to obtain
-	the WombatClient interface
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c (main): update to new call
-
-	* gui/e-itip-control.[hc]: break the widget bits out on their own
-	into a proper object, basic stuff seems to be working again
-	
-	* gui/itip-control-factory.c: put the control specific bits here
-	from e-itip-control.c
-
-	* gui/itip-control-factory.h: new header
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am (gladedir): add include path
-
-	* gui/dialogs/comp-editor.c (setup_widgets): remove buttons and
-	use evolution's standard ui config
-
-	* gui/print.c (print_comp_item): print description text
-
-2001-06-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]:
-	(cal_client_init): create a WombatClient when creating a CalClient
-	object, so that we can receive authentication notifications from
-	the wombat
-	(cal_client_destroy): destroy the WombatClient object when dying
-	(cal_client_set_auth_func): new function to set the authentication
-	function to be called when a password is required by the calendar
-	server (through the WombatClient object)
-	(cal_client_get_free_busy): new function for calling the new IDL
-	method Cal::getFreeBusy
-
-	* gui/alarm-notify/Makefile.am: add libwombat to LDADD
-
-	* gui/Makefile.am: add libwombat to LDADD
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (print_cmd): print menu command
-	(print_preview_cmd): ditto for print preview
-	(print_setup_cmd): ditto for print setup
-	(comp_editor_set_cal_client): listen for updated and removed
-	signals
-	(obj_updated_cb): if the item changes else where, query the user
-	for the course of action
-	(obj_removed_cb): ditto for removal
-
-	* gui/print.c (print_setup): rudimentary page setup support
-	(print_comp): rudimentary individual event/task printing support
-
-	* gui/print.h: new protos
-
-	* gui/dialogs/changed-comp.[hc]: dialog to query the user about
-	what to do when a item is changed elsewhere
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/send-comp.c (send_component_dialog): remove useless
-	assignment
-	
-2001-06-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added getFreeBusy method
-
-	* pcs/cal.c (impl_Cal_get_free_busy): implementation of the new
-	getFreeBusy added method
-	
-	* pcs/cal-backend.[ch]: added new virtual method to the CalBackend
-	class (get_free_busy)
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_free_busy): new function,
-	not implemented yet
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): new funtion,
-	not implemented yet
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-config.[hc]:
-	* gui/gnome-cal.[hc]: 
-	* gui/tasks-control.c (tasks_control_activate): 
-	* gui/calendar-commands.c (calendar_control_activate): moved the
-	function to check for a default timezone to calendar-config.c, and
-	also used it in the tasks control.
-
-	* gui/dialogs/e-timezone-dialog.h: #include <gtk/gtkwidget.h> fix.
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/gnome-cal.[hc]: added code to show the timezone dialog if the
-	user hasn't set a default timezone yet.
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_add_timezones): 
-	set the "None" item string before adding it to the combo, to stop the
-	combo putting "None" in the entry initially.
-
-2001-06-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch]: added cut/copy/paste support. It works
-	with single selections (a single component selected) and with
-	multiple ones (several components selected)
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: if the timezones of the start and end of
-	the event are the same, then if the start timezone is changed we
-	change the end timezone as well, since that is what most users will
-	want.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal.c: 
-	* idl/evolution-calendar.idl: 
-	* cal-client/cal-client.[hc]: removed stuff to get builtin timezone
-	info from the server.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: added a 'Time zone' setting. Also
-	rearranged a little, adding a new 'General' page, since we had too
-	many settings on the 'Calendar' page.
-
-	* gui/e-timezone-entry.[hc]: 
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/comp-editor.c: 
-	* gui/dialogs/comp-editor-page.[hc]: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: removed CalClient stuff. The timezone dialog
-	now uses the timezone data directly from the client's libical library.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_init): add ui
-	(forward_cmd): implement forward command
-
-	* gui/dialogs/comp-editor.c (save_as_ok): bug fix, seems to work
-	now
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/control-factory.c (control_factory_init): add auto exit unref
-
-	* gui/component-factory.c (destroy_cb): destroy our selves if we
-	have no more shells
-	(component_factory_init): add auto exit unref
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: don't compile or install the old meeting edit
-	stuff
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: Remove scheduling menu option
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c: add some needed commas
-	(itip_send_comp): if publishing, don't set the to list and show
-	the message.  unless publishing, just send the email
-
-	* gui/Makefile.am: remove typo
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/send-comp.c: itip/imip send dialog
-
-	* gui/dialogs/send-comp.h: new proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): only
-	use the weekday picker if visible
-
-	* gui/dialogs/meeting-page.c: just show the meeting list
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): remove the
-	meeting page if no attendees
-	(schedule_meeting_cmd): schedule a meeting menu item
-	(refresh_meeting_cmd): refresh meeting request menu item
-	(cancel_meeting_cmd): ditto for cancel
-	(forward_cmd): send as attachment
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove page
-	from dialog
-	(comp_editor_show_page): show a given page
-	(comp_editor_get_current_comp): return a cal component
-	representing the current widget state
-	(comp_editor_save_comp): save the cal component
-	(comp_editor_delete_comp): delete the cal component
-	(comp_editor_send_comp): send the cal component
-	(comp_editor_merge_ui): merge xml in to the bonobo gui
-	(setup_widgets): use a bonobo window instead of a gtk window, add menus again
-	(save_as_cmd): save to file on disk - still broken
-	(save_close_cmd): close menu command
-	(save_close_cmd): save and close menu command
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): itip/imip
-	cancellation dialog
-
-	* gui/dialogs/cancel-comp.h: new proto
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): emit needs_send signal
-
-	* gui/dialogs/comp-editor-page.h: new signal protos
-
-	* gui/itip-utils.c (itip_send_comp): new function to send cal
-	components
-
-	* gui/itip-utils.h: new proto
-
-	* gui/e-itip-control.c (pstream_load): trim using cal-component
-	wrapper stuff
-	(accept_button_clicked_cb): use itip_send_comp
-	(tentative_button_clicked_cb): ditto
-	(decline_button_clicked_cb): ditto
-
-	* gui/Makefile.am: compile select name idl stuff
-
-	* cal-util/cal-component.c (cal_component_get_organizer): get the organizer
-	(cal_component_set_organizer): set the organizer
-	(cal_component_get_recurid): get the recurrence id
-	(cal_component_set_recurid): set the recurrence id
-	(set_attendee_list): actually set the attendee list
-	(get_attendee_list): build the attendee list
-
-	* cal-util/cal-component.h: new protos
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: 
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: added timezone fields. Also moved the
-	'All Day' flag into an alignment so it doesn't mess up the height of
-	the other widgets.
-
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added code to handle the timezone fields.
-	This still needs to be hooked up when the libical code is finished.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): new function to
-	clear the preview label and turn off the highlighted point on the
-	map when you move the mouse outside it.
-	(find_selected_point): new function to try to find the point
-	corresponding to the text in the combo.
-	(on_combo_changed): call the above function to update the selected
-	point.
-	(on_map_leave): turn off the preview point & label when the mouse
-	leaves the map.
-	(e_timezone_dialog_set_cal_client): changed it so that selecting "None"
-	clears the entry.
-	
-	* gui/dialogs/comp-editor-page.[hc]: added set_cal_client() virtual
-	method since some pages need to access the CalClient to get timezone
-	information. Also added comp_editor_page_set_cal_client() to call
-	the virtual method.
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): called
-	comp_editor_page_set_cal_client() on each page.
-
-	* gui/calendar-config.c: added functions to get & set the timezone.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record),
-	(check_for_slow_setting), (conduit_get_gpilot_conduit):
-	* conduits/todo/todo-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-view.[ch]: New files with the generic calendar view
-	object.  It sucks that we have to implement at least two classes
-	to define a GalView and its factory.
-
-	* gui/calendar-view-factory.[ch]: New files; factory for calendar
-	views.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Moved from gnome-cal.c
-	and renamed from ViewType.  We no longer use strings to identify
-	the view types.
-
-	* gui/gnome-cal.c (gnome_calendar_get_view_type): New function.
-	(set_view): Renamed from gnome_calendar_set_view_internal().
-	(gnome_calendar_set_query): Made public; renamed from set_query().
-	(gnome_calendar_setup_view_menus): New function to set up the view
-	collection and the GalViewMenus.
-	(gnome_calendar_discard_view_menus): New function to discard them.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set up the
-	GalView menus.
-	(calendar_control_deactivate): Discard the GalView menus.
-
-	* gui/e-day-view.c: #include <gtk/gtkinvisible.h>
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_type): The type info
-	structure should be static.
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): generate a new UID
-	when pasting
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): finished implementation
-	of Paste stuff
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added popup menu items for cut/copy/paste
-
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.[hc]: new widget to enter a timezone.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added the above.
-	* gui/Makefile.am (evolution_calendar_LDADD): had to move
-	libcal-dialogs.a above libmiscwidgets.a to get it to compile.
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/e-timezone-dialog.glade: new dialog for setting the
-	time zone.
-
-	* gui/dialogs/Makefile.am: added timezone dialog files.
-
-	* idl/evolution-calendar.idl: added CalTimezoneInfo struct and seq,
-	and getBuiltinTimezoneInfo method.
-
-	* pcs/cal.c (impl_Cal_get_builtin_timezone_info): implemented method.
-	(cal_class_init): added method to epv.
-	
-	* cal-client/cal-client.c (struct CalClientPrivate): added
-	timezone_info array to contain cached info on builtin timezone city
-	names and coordinates.
-	(cal_client_get_builtin_timezone_info): new function to get the info
-	about builtin timezones.
-
-	* cal-client/cal-client.h: added CalTimezoneInfo struct, to contain
-	the city names and coords of the builtin timezones.
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_date_label): remove
-	unnecessary space
-
-	* gui/dialogs/task-page.c (task_page_set_summary): indicate we are
-	updating, Fixes #3307
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	set the completed time in the date editor if appropriate
-
-	* gui/dialogs/task-page.c (task_page_set_dates): if we are
-	updating, return
-	(complete_date_changed): don't returns if we are updating - the
-	guards are done in the calling function
-	(status_changed): indicate when we are updating and when we are
-	finished, round the completion time to the nearest minute
-	(percent_complete_changed): indicate when are updating and when we
-	are finished
-	(percent_complete_changed): notify of the date change after the
-	option menu is updated
-	
-2001-06-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added cut&paste support, by using a GtkInvisible
-	widget to manage the clipboard selections.
-	
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component-factory.c: Removed the executive-summary includes.
-	(component_factory_init): Don't init the summary factory.
-
-	* gui/calendar-summary.[ch]: Removed.
-
-	* gui/Makefile.am: Remove executive-summary stuff, move some libs 
-	around a bit.
-
-2001-06-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates):
-	update the blocked/selected days if the starting day of the
-	appointment changes, fixes #2188
-
-	* gui/dialogs/task-details-page.h: tidy proto
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c: #include <bonobo/bonobo-context.h> instead
-	of <bonobo/bonobo-running-context.h>.
-	* gui/tasks-control-factory.c: Likewise.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)'
-	before libeutil.
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: no longer build widget-util.*, the code has
-	been moved
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-page.c (make_date_edit): use new func
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_create_date_edit): ditto
-
-	* gui/dialogs/recurrence-page.c (make_ending_until_special): ditto
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit):
-	rename date_edit_new function
-
-	* gui/dialogs/comp-editor-util.h: new proto
-
-	* gui/dialogs/task-page.c (task_page_set_summary): no longer any
-	need to block/unblock the handler
-	(task_page_create_date_edit): use new func
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/.cvsignore: Update
-
-	* gui/evolution-calendar-control.c: Remove dead file
-
-	* gui/*.vcf: Remove dead files
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.[hc]: renamed from editor-page for
-	consistency, more complete implementation
-
-	* gui/dialogs/comp-editor.[hc]: More complete implementation
-
-	* gui/dialogs/*-page.*: The various pages needed to construct the
-	event and task dialogs
-	
-	* gui/dialogs/comp-editor-util.[hc]: useful utility functions for the
-	component editor pages to use
-
-	* gui/dialogs/Makefile.am: Build and install new files
-
-	* gui/event-editor*: Remove, obsoleted by the new comp-editor
-	stuff
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-	* gui/e-calendar-table.c (open_task): update to use comp editor
-	stuff
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): ditto
-
-	* gui/Makefile.am: don't build non-existent files nor try to
-	install them
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory_init): ditto
-
-	* gui/tasks-control-factory.c (tasks_control_factory_init):
-	auto_exit_unref the factory
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Add `$(DB3_LDADD)'.
-
-2001-05-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_get_calendar_table): New function.
-
-	* gui/tasks-control.c (tasks_control_activate): Connect to the
-	"selection_changed" signal of the tasks widget here, not in
-	tasks_control_new().  Also, update the sensitivity of the commands
-	here for the first time.
-	(tasks_control_deactivate): Disconnect from the signal here since
-	it only makes sense to monitor selection changes while the control
-	is active.
-	(selection_changed_cb): Removed hack that tested the presence of
-	the remote UI container.
-	(sensitize_commands): New function.
-
-2001-05-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.[hc]: 
-	* gui/e-day-view-layout.[hc]: new files to contain layout code split
-	off from EDayView an EWeekView, so we can use it for printing.
-
-	* gui/print.c: rewritten to use the same layout code as the EDayView
-	and EWeekView widgets.
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad_cal_client): added
-	function so we can get the CalClient used for the TaskPad for printing.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added
-	e-day-view-layout.[hc] amd e-week-view-layout.[hc].
-
-	* cal-util/timeutil.c (time_week_begin): 
-	(time_week_end): added week_start_day argument.
-
-	* cal-util/cal-recur.c: added comments describing problems in it.
-
-2001-05-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (remove_folder): implemented the
-	'remove_folder' function for the calendar shell component
-	(xfer_folder): ditto for 'xfer_folder'
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-	* gui/tasks-control.c: Likewise.
- 
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.
-
-2001-05-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c: Finished porting from the old
-	event-editor.c.  Made it store a clone of the component for when
-	we need to expand the recurrence set.
-
-	* gui/dialogs/event-page.c (event_page_get_dates): New function.
-
-	* gui/dialogs/editor-page.c (editor_page_set_dates): Renamed from
-	editor_page_set_dtstart(); now sets both DTSTART and DTEND.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_dates): Ahem, it is a
-	label, not an entry.
-
-2001-05-21  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2831; the tasks toolbar and menu now have a button to
-	delete the selected tasks.
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): New
-	function.
-	(delete_cb): Use e_calendar_table_delete_selected().
-	(e_calendar_table_get_table): New function.
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): Handle the
-	delete command.
-	(selection_changed_cb): Change the sensitivity of the TasksDelete
-	command when the selection in the table changes.
-
-	* gui/e-tasks.c (table_selection_change_cb): Notify upstream when
-	the ETable selection changes.
-
-2001-05-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2829.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Allow the
-	caller to specify whether just one or many components are to be
-	deleted.
-
-	* gui/e-calendar-table.c (tasks_popup_one): Popup menu definition
-	for when one and only one task is selected.
-	(tasks_popup_many): Likewise, for more than one task.
-	(e_calendar_table_on_right_click): Do not create a structure for
-	the closure data; we can simply pass the cal_table.  Use a
-	different menu depending on the number of selected tasks.
-	(mark_as_complete_cb): Renamed; now iterates over the selected
-	rows.
-	(delete_selected_components): New function to delete all the
-	selected components.
-	(delete_cb): Adjusted for delete_component_dialog().
-	(open_task): New function, simply open a CalComponent in the task
-	editor.
-	(open_task_by_row): Renamed; use open_task().
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Updated
-	for delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-2001-05-16  Duncan Mak  <duncan@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): removed
-	editor-page.[ch] because they've now moved dialogs.
-
-2001-05-16  Federico Mena Quintero  <federico@ximian.com>
-
-	Split the event and task editors into different objects for the
-	separate pages; this way they can be shared by both editors.
-
-	* gui/dialogs/editor-page.[ch]: New abstract class for a page in a
-	calendar component editor.
-
-	* gui/dialogs/event-page.[ch]: Main page of an event editor.
-
-	* gui/dialogs/alarm-page.[ch]: Alarm page of a calendar component
-	editor.
-
-	* gui/dialogs/recurrence-page.[ch]: Recurrence page of a calendar
-	component editor.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): Eeek, this
-	was missing a bunch of break statements.
-	(event_page_fill_component): Use a temporary variable rather than
-	allocating a struct icaltimetype.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Do not use
-	fixed-size buffers.
-	(alarm_page_fill_widgets): Use cal_obj_uid_list_free().
-	(append_reminder): Now the list stores the plain CalComponentAlarm
-	structures in the row data.  We do *NOT* want to be frobbing the
-	component's data directly.  Rather, we clone the alarms from the
-	component and maintain them on our own.
-	(alarm_page_fill_component): Clone the alarms before adding them
-	to the component so that we maintain the invariant that the alarm
-	structures in the list did *not* come from the component.
-
-	* cal-util/cal-component.c (cal_component_add_alarm): Added
-	documentation.
-	(cal_component_remove_alarm): Added documentation.
-	(cal_component_remove_alarm): Do a lookup in our hash table of
-	alarms instead of scanning the whole component.
-	(CalComponentAlarm): Removed the `parent' field, since it was
-	unused.
-	(cal_component_free_alarm_uids): Removed function, since
-	cal_component_get_alarm_uids() is documented so that the user will
-	know that he must use cal_obj_uid_list_free().
-	(cal_component_alarm_clone): New function.
-
-2001-05-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	editor-page.[ch] to the list of sources.
-
-2001-05-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (reminder_add_cb): switch on the correct
-	widget and map
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory): unref the
-	property bag when we finish with it
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): ditto
-
-	* gui/control-factory.c (calendar_properties_init): ditto
-
-	* gui/calendar-summary.c (create_summary_view): ditto
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free):
-	(cal_component_alarm_free): free the alarm component if it doesn't
-	have a parent, rather than if it does
-
-	* gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool
-	lines are shorter (fixes problem on solaries due to sed)
-
-2001-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-factory.[hc]: Convert to bonobo xobject
-
-	* pcs/cal.[hc]: Convert to bonobo xobject
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/event-editor.c (make_title_from_comp): conversion summary
-	from utf8 here, use translated strings as is.
-	(set_title_from_comp): reflect this, simplify.
-
-	* gui/dialogs/task-editor.c: updated copies of above functions here.
-
-	* gui/gnome-cal.c: use defines from widgets/misc/e-filter-bar.h for
-	consistency in "Show all".
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): unref the
-	calcomponent when we're done with it
-
-	* cal-util/cal-component.c (cal_component_gen_uid): free the iso
-	date string when we finish with it
-
-2001-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (put_property_in_list): remove hardcoded
-	values
-	(edit_attendee): ditto, and there are only 4 roles now
-
-	* gui/e-meeting-dialog.glade: tweak
-
-	* gui/itip-utils.c: There shouldn't be an "other" role
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	 * gui/e-meeting-edit.c (edit_attendee): use enums not hard code
-	 values
-	
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (add_button_clicked_cb):
-	icalparameter_new_rsvp now takes an enum
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): the
-	value type should be inited with ICAL_VALUE_* rather than
-	ICAL_*_VALUE because it is a param argument.
-
-2001-04-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (get_is_overdue): Replace "<" by "<=" in
-	the comparison for due dates against the current time.  This makes
-	tasks appear immediately as red when you click Now in the due date
-	popup field.
-
-	This is not a complete solution to the more general problem of
-	tasks staying the same color even if they become overdue while the
-	task list remains the same on the screen.  This has been logged as
-	bug #2399.
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Remove
-	UNICODE_LIBS
-
-	* cal-client/Makefile.am (client_test_LDADD): Remove -lunicode
-
-2001-04-24  Duncan Mak  <duncan@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (funny_trigger_cb): Fixed
-	Strftime so it uses the locale prefered way to display date/time. 
-	("%x %X" instead of "%Y/%m/%d %H:%M:%S")
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-summary.c: translate "Things to do" etc. and convert them
-	to utf8. Changed some link from helixcode to ximian.
-
-2001-04-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/calendar/cal-client',
-	`-I$(top_builddir)/calendar/cal-client'.
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-	* cal-client/cal-query.h: #include "evolution-calendar.h".
-
-2001-04-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the "changed"
-	signal of the categories entry so that they will be applied
-	correctly.
-	(EventEditorPrivate): Added fields for the contacts button and
-	entry.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-	(get_widgets): Get the contacts widgets.
-
-	* gui/dialogs/task-editor.c (get_widgets): Get the contacts
-	button, which was missing.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-
-	* pcs/query.c (matches_text_list): Use e_utf8_strstrcasedecomp()
-	instead of plain e_utf8_strstrcase().
-	(matches_summary): Likewise.
-
-2001-04-17  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_action): the
-	libical action stuff uses enums rather than strings to enumerate
-	the various actions now
-	(cal_component_alarm_get_action): ditto
-
-2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Add `$(CORBA_GENERATED)'.
-
-2001-04-16  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am (INCLUDES): Add EXTRA_GNOME_CFLAGS, for gal.
-
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): Create the ESearchBar thingy.
-	(search_bar_query_changed_cb): Build the different queries based
-	on the type and string.
-
-	* pcs/query.c (backend_obj_updated_cb): Ref the query while we are
-	notifying the listener so that it will not disappear from under us.
-	(backend_obj_removed_cb): Likewise.
-	(process_component_cb): Likewise.
-	(func_contains): New function to match text fields.
-	(matches_comment): New function to match comment lists.
-	(matches_description): New function to match description lists.
-	(matches_summary): New function to match summaries.
-	(matches_any): New function to match any text field.
-	(func_has_categories): New function to match categories.
-
-2001-04-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize the trigger
-	and queue systems.
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the syntactic bogon
-	here, and attempt to fix the logical bogon too. (tm_gmtoff and
-	timezone have opposite signs... I'm assuming Federico tested the
-	Linux case, so I'm flipping the sign of the BSD case. But maybe he
-	didn't and it's supposed to be the other way...)
-
-2001-04-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): New function to restart a query
-	for the day view.
-	(query_obj_updated_cb): Renamed from obj_updated_cb(); updated for
-	queries instead of calendar clients.
-	(query_obj_removed_cb): Likewise.
-	(cal_opened_cb): Just update_query() instead of queueing reloading
-	all the events.
-	(e_day_view_set_cal_client): Likewise.
-	(e_day_view_set_query): Likewise.
-	(e_day_view_set_selected_time_range): Likewise.
-	(e_day_view_set_days_shown): Likewise.
-	(e_day_view_recalc_work_week): Likewise.
-	(e_day_view_queue_reload_events): Removed function now that events
-	are updated entirely by the query.
-	(e_day_view_reload_events_idle_cb): Likewise.
-	(e_day_view_reload_events): Likewise.
-	(e_day_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* gui/e-week-view.c: Analogous changes to the ones in e-day-view.c.
-	(e_week_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* cal-util/timeutil.c (isodate_from_time_t): Return a g_strdup()ed
-	version of the string instead of a pointer to a static buffer.
-	(time_from_isodate): Resurrected function.  Polished up to our
-	current standards of paranoia.
-
-	* pcs/query.c (func_time_now): New function (time-now).
-	(func_make_time): New function (make-time ISODATE).
-	(func_time_add_day): New function (time-add-day TIME N).
-	(func_time_day_begin): New function (time-day-begin TIME).
-	(func_time_day_end): New function (time-day-end TIME).
-	(func_occur_in_time_range): Use time_t values instead of ints.
-	(match_component): Free the stringized component.  Free the ESexp
-	result value.
-
-	* gui/e-day-view.h: Removed a couple of unused prototypes.
-
-	* pcs/query.c (query_destroy): Oops, disconnect from the backend.
-
-	* pcs/cal.c (Cal_get_query): Duplicate the query reference before
-	we return it.
-
-	* gui/calendar-commands.c (pixmaps): Fixed paths to image files.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	prepend to both changes and change_ids when different and mark as
-	modified, not added
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): Fix this to
-	just send the data to the wombat instead of inserting it
-	ourselves.
-
-2001-04-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Display fixes, thanks to Kjartan for finding these.
-
-	* gui/event-editor.c: use simple (not e_utf8_) gtk_clist_append for
-	strings which are never in utf-8.
-	* dialogs/delete-comp.c (delete_component_dialog): convert only
-	summary from utf-8 to gtk charset. Translated values are in correct
-	craset already.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/calendar-commands.c: Fix headers.
-	* gui/calendar-config.c: Same here.
-	* gui/calendar-model.c: Same here.
-	* gui/e-day-view-time-item.c: Same here.
-	* gui/e-day-view-top-item.c: Same here.
-	* gui/e-day-view.c: Same here.
-	* gui/e-meeting-edit.c: Same here.
-	* gui/e-week-view-main-item.c: Same here.
-	* gui/e-week-view.c: Same here.
-	* gui/event-editor.c: Same here.
-	* gui/gnome-cal.c: Same here.
-	* gui/goto.c: Same here.
-	* gui/main.c: Same her.
-	* gui/print.c: Same here.
-
-2001-04-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Plug leak.
-
-	* gui/event-editor.c (obj_updated_cb): Do nothing for now until we
-	think of something sensible to do.
-	(obj_removed_cb): Likewise.
-
-	* gui/dialogs/task-editor.c (obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-
-	* gui/event-editor.c (dialog_to_comp_object): Plug leak.
-
-2001-04-01  Federico Mena Quintero  <federico@ximian.com>
-
-	Client-side glue for the live query engine.
-
-	* cal-client/query-listener.[ch]: New files with the
-	implementation fo the QueryListener interface.
-
-	* cal-client/cal-query.[ch]: New files with the client-side
-	convenience object for live queries.
-
-	* cal-client/cal-listener.h (CalListenerClass): Removed unused
-	slots for signal handlers.
-
-	* cal-client/Makefile.am (libcal_clientinclude_HEADERS): Now we
-	install the evolution-calendar.h header.  This sucks a bit.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-commands.c: use new pixmap cache. Added some menu icons
-	and changed filenames of renamed icons.
-	* gui/tasks-control.c: added icons for new task and print in menu.
-
-2001-03-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Engine for live queries to calendars.  A query object watches a
-	CalBackend in the PCS and is otherwise completely separate from
-	it; backends need to do nothing to support live queries.  Right
-	now we have the following functions:
-
-		(get-vtype)
-
-			Returns a string indicating the type of component
-			(VEVENT, VTODO, VJOURNAL, VFREEBUSY, VTIMEZONE,
-			UNKNOWN).
-
-		(occur-in-time-range? START END)
-
-			START - int, time_t start of the time range
-			END - int, time_t end of the time range
-
-			Returns a boolean indicating whether the component
-			has any occurrences in the specified time range.
-
-	* idl/evolution-calendar.idl (Cal::getQuery): New method that
-	initiates a live query.
-	(Query): New interface for a handle to a live query.
-	(QueryListener): New interface for a listener to changes in a live
-	query.
-
-	* pcs/query.[ch]: New files with the live query engine.
-
-	* pcs/cal-backend.h (CalBackendClass): Added notification signals
-	so that the query system can catch them.
-	(CalBackendClass): New virtual method ::get_load_state().
-
-	* pcs/cal-backend.c (cal_backend_opened):
-	(cal_backend_obj_updated):
-	(cal_backend_obj_updated): New functions to emit the notification
-	signals; to be used only by backend implementations.
-	(cal_backend_get_load_state): New function.
-
-	* pcs/cal-backend-file.c (notify_update): Call
-	cal_backend_obj_updated().
-	(notify_remove): Call call_backend_obj_removed().
-	(open_cal): Free the icalcomp if it is not of the correct type.
-	(cal_backend_file_get_load_state): Implemented new method.
-
-	* pcs/cal-backend-db.c (cal_backend_db_update_object): Call
-	cal_backend_obj_updated().
-	(cal_backend_db_remove_object): Call cal_backend_obj_removed().
-	(cal_backend_db_get_load_state): Implemented new method.
-
-	* pcs/cal.c (Cal_get_query): Implementation of the ::getQuery()
-	method.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.c: fixed button placement to comply
-	with gnome standards.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.glade: fixed spacing and label alignment to
-	comply with gnome standards. Also removed shadows from extraneous
-	scrolled windows to avoid bevelitous. There are many more changes
-	that need to happen to this viewer, but they all require a hacker
-	to do some c-coding, so I will avoid committing them until after the
-	.10 release.
-
-2001-03-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* cal-client/client-test.c: Replace includes of <gnome.h>, <bonobo.h>
-	and <gtk/gtk.h> with the needed headers to speed up compile.
-	* cal-util/test-recur.c: Same here for <gtk/gtk.h>
-	* gui/calendar-commands.c: Replace <bonobo.h> and remove
-	<libgnorba/gnorba.h>
-	* gui/calendar-summary.c: Replace <gnome.h> and <bonobo.h>
-	* gui/calendar-summary.h: Added <bonobo/bonobo-generic-factory.h>
-	* gui/component-factory.c: Remove <bonobo.h>
-	* gui/control-factory.c: Replace <bonobo.h>
-	* gui/e-calendar-table.c: Remove <gnome.h>
-	* gui/e-itip-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/e-meeting-edit.c: Replace <bonobo.h>
-	* gui/e-tasks.c: Replace <gnome.h>
-	* gui/e-tasks.h: Replace <bonobo.h>
-	* gui/gnome-cal.h: Remove <bonobo.h>
-	* gui/main.c: Replace <bonobo.h> and <glade/glade.h>
-	* gui/tasks-control-factory.c: Replace <bonobo.h>
-	* gui/tasks-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/weekday-picker.c: Add <string.h> and <libgnome/gnome-defs.h>
-	* gui/alarm-notify/client-main.c: Remove <gnome.h> and <bonobo.h>
-	* gui/alarm-notify/notify-main.c: Replace <gnome.h> and <bonobo.h>
-	* gui/dialogs/alarm-notify-dialog.c: Replace <gnome.h>
-	* pcs/cal-backend.c: Replace <gtk/gtk.h>
-
-2001-03-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): The
-	model_rows_{inserted,deleted} signals changed names; deal with it.
-	(e_calendar_table_on_rows_inserted): Updated for new ETable API.
-	(e_calendar_table_on_rows_deleted): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed unused enum.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Constify.
-
-	* gui/calendar-commands.c (calendar_set_uri): Removed function,
-	since it was just calling gnome_calendar_open().
-
-	* gui/control-factory.c (set_prop): Replace usage of
-	calendar_set_uri() with gnome_calendar_open().
-	(load_calendar): Likewise.
-	(calendar_persist_init): Made static.
-
-	* gui/e-tasks.c: #include "calendar-config.h"
-	(e_tasks_update_all_config_settings): We are configuring a table,
-	not a calendar!  Use the appropriate function.
-
-2001-03-17  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_event,
-	e_day_view_on_new_appointment): Simplifed this function to use the
-	shared code.
-
-	* gui/e-week-view.c (e_week_view_on_new_event,
-	e_week_view_on_new_appointment): ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): New
-	function used to launch editor components with a time range.   A
-	bunch of functions use this code now instead of duplicating code
-	all over the place
-
-	* gui/e-week-view.c (e_week_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_week_view_on_new_full_day): New function for making a full day
-	event.
-	(e_week_view_on_goto_date): Go To support.
-	(e_week_view_on_goto_today): Goto today support.
-
-	* gui/e-day-view.c (e_day_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_day_view_on_new_full_day): New function for making a full day
-	event.
-	(e_day_view_on_goto_date): Go To support.
-	(e_day_view_on_goto_today): Goto today support.
-
-	* main_items: Add New All Day Event;  Go to Today; Go to Date.
-
-2001-03-07  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/control-factory.c (calendar_persist_init): New function:
-	inits the BonoboPersistFile server.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added BonoboPropertyBag to
-	the list of supported interfaces that were supported but not
-	reported.  Add the new PersistFile.
-
-	Add text/calendar mime type attribute.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_start_editing_event):
-	* gui/e-day-view.c (e_day_view_start_editing_event): Update
-	arguments to e_canvas_item_grab_focus.
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/*.xpm: moved to ../art.
-	* gui/Makefile.am: removed *.xpm and oaf_DATA from EXTRA_DIST.
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c:
-	#include "art/*.xpm".
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Specify a NULL
-	`EvolutionShellComponentGetDndSelectionFn'.
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-tasks.c: keep list of all Tasks folders so we can update the
-	preference settings when necessary.
-
-	* gui/gnome-cal.c: configure the TaskPad according to the settings.
-
-	* gui/e-calendar-table.c: use ECellCombo and ECellDateEdit for fields,
-	so the tasks folders is almost usable now.
-
-	* gui/calendar-model.c: added support for the Status property.
-
-	* gui/calendar-config.[hc]: added convenience functions to setup
-	ECalendarTable and ECellDateEdit objects.
-
-	* gui/calendar-commands.c: connected to "destroy" signal of calendars
-	so we can remove them from all_calendars list.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	call e_tasks_update_all_config_settings() to update all the settings
-	in the Tasks folders as well.
-
-	* cal-util/cal-component.h: added CAL_COMPONENT_FIELD_STATUS.
-
-	* cal-util/cal-component.c (cal_component_get_transparency): fixed
-	calls to strcasecmp so they check for '== 0'.
-
-	Applied patch from Miguel...
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/e-todo.conduit.in: update for new pilot foo
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-	* conduits/todo/Makefile.am: update sed script
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (recurrence_exception_select_row_cb): New
-	function to set the EDateEdit's value when a row is selected in
-	the exception date list.  Fixes bug #1638.
-	(append_exception): Set the value as well. Block/unblock signals
-	from the clist as appropriate.  Gotta love non-model/view widgets.
-	(recurrence_exception_delete_cb): Be more paranoid about the
-	contents of the list row's data.
-	(recur_to_comp_object): Likewise.
-	(fill_exception_widgets): Select the first row after we are done
-	appending the exception dates.
-
-2001-02-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (libalarm_a_SOURCES): Create a
-	little stand-alone library for the low-level alarm trigger
-	mechanism.  This is so that the GUI parts of the calendar can use
-	it in addition to the alarm daemon.
-
-	* gui/main.c: #include "alarm-notify/alarm.h".
-
-	* gui/calendar-summary.c: Likewise.
-	(alarm_fn): Do not remove the previous alarm; it is removed
-	automatically when it is triggered.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed alarm.[ch]
-	from the sources.
-
-	* gui/alarm.[ch]: Removed obsolete files.
-
-2001-02-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar):
-	Switched to using our own refcounted structure for loaded clients.
-	(AlarmNotify_removeCalendar): Ditto.  Also, do the full
-	destruction of the client.
-	(alarm_notify_destroy): Destroy each element in the hash table.
-
-	* cal-client/cal-client.c (cal_client_construct): Test for
-	exceptions from OAF when activating the Wombat calendar factory.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in:
-	New .oaf.in file.
-
-	* gui/alarm-notify/Makefile.am (oaf_in_files): Updated.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here
-	instead of in a million files.
-
-	* gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file.
-
-	* gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY*
-	obsolete file.
-
-	* gui/Makefile.am (oaf_in_files): Updated.
-
-2001-02-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (add_history): fixed generation of history records
-
-2001-02-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (CalFactoryPrivate): Added a `registered'
-	field.
-	(cal_factory_oaf_register): New function; now the factory performs
-	its own registration with OAF.
-	(cal_factory_destroy): Unregister from OAF if appropriate.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: Remove PISOCK_LIBDIR
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/calbackend-db.c (cal_backend_db_destroy): close DB environment.
-	Some compilation warnings removed
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Added libmenus.la.
-
-	* gui/e-calendar-table.c, gui/e-calendar-table.h
-	(e_calendar_table_get_spec): Added this function.
-
-	* gui/e-tasks.c, gui/e-tasks.h (e_tasks_setup_menus): Added this
-	function.
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	e_tasks_setup_menus.
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_new_task): call task_editor_focus
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new
-	appointment icon
-	(set_pixmap): load files rather than create from xpm file
-
-	* gui/*view.xpm: move to the art directory
-
-2001-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_alarms_for_object):
-	implemented
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new command
-
-	* gui/e-calendar-table.c: Add titles to pixbuf column for grouping
-
-	* gui/calendar-model.c (calendar_model_class_init): override value
-	to string virtual method
-	(calendar_model_value_to_string): implement value to string for
-	etable (necessary for group by)
-
-2001-02-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c:
-	cal_backend_db_update_object(): manage both updates and additions/add notification
-	cal_backend_db_get_object(): don't use DB cursors
-	cal_backend_db_get_type_by_uid(): don't use DB cursors
-	cal_backend_db_remove_object(): don't use DB cursors/add notification
-	cal_backend_db_get_alarms_in_range(): implemented
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.
-	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.
-
-2001-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: added DB3 transactions support
-	* pcs/cal-backend-db.[ch]: added the new DB3-based backend. This is just
-	the beginning, there are some missing things still.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop,
-	conduits/todo/e-todo-conduit-control-applet.desktop: removed.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop.in,
-	conduits/todo/e-todo-conduit-control-applet.desktop.in: added empty.
-
-	* conduits/calendar/Makefile.am, conduits/todo/Makefile.am:
-	reflect above changes, merge translations.
-
-	* gui/*.glade.h, gui/dialogs/*.glade.h: removed, xml-i18n-extract
-	takes care of strings itself.
-
-	* gui/*.glade, gui/dialogs/*.glade: do not output_translatable_strings
-
-	* gui/Makefile.am, gui/dialogs/Makefile.am: do not include removed
-	files in EXTRA_DIST.
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor-dialog.glade: Oops, remove old widget
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (fill_widgets): fill in new
-	classification stuff properly
-	(get_widgets): load new class. widgets
-	(init_widgets): if the class. widgets change, mark the dialog
-	dirty
-	(dialog_to_comp_object): set the comp class. from the new widgets
-
-	* gui/dialogs/task-editor-dialog.glade: Make more consistent,
-	fixing bugs 1247 and 1249
-
-	* gui/dialogs/task-editor.c (fill_widgets):
-
-	* gui/event-editor-dialog.glade: Gui tidying
-
-	* gui/event-editor.c: Remove old alarm cruft
-
-	* cal-util/cal-component.c (cal_component_set_url): Don't try and
-	write an empty string as a property
-
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c: Move the get_change code here
-
-	* pcs/cal-backend.c: Remove get_changes related stuff and
-	implement by calling the virtual method instead
-
-	* pcs/cal-backend.h: New virtual method.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-	* gui/e-week-view.c (e_week_view_on_schedule_meet): new routine to
-	throw up the meeting schedule dialog
-	(e_week_view_show_popup_menu): add schedule meeting to the
-	contextual menu where appropriate
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c: Remove assorted menu/bonobo stuff
-
-	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff
-	(task_editor_construct): no longer suck out the glade contents
-	into a bonobo win, listen for apply and close signals
-	(tedit_apply_event_cb): listen for apply signal and save object
-	(tedit_close_event_cb): listen for close signal and prompt to save
-	if need be
-	(task_editor_focus): new function to bring the dialog to the front
-
-	* gui/dialogs/task-editor.h: new prototype
-
-	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to
-	update widgets in the event editor since the event editor won't be
-	open
-	(e_meeting_editor_new): don't need the event editor reference any
-	more
-
-	* gui/e-meeting-edit.h: Change prototype
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Make
-	schedule meeting a new contextual menu item
-	(e_day_view_on_schedule_meet): new routine to schedule a meeting
-	from the contextual menu
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): Call
-	task_editor_focus
-
-	* gui/event-editor-dialog.glade: Update to be a property box
-
-	* gui/dialogs/task-editor-dialog.glade: Update to be a property
-	box
-
-2001-02-07  Iain Holmes  <iain@ximian.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a setter to the
-	property bag.
-	(set_property): The setter.
-	(generate_html_summary): Sort the UIDs accodring to time.
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (fill_reminder_widgets): Match new
-	append_alarm signature
-	(reminder_to_comp_object): only add alarms tagged as new, no
-	longer delete all alarms first
-	(append_reminder): the row data is now of type ReminderData,
-	rename from append_alarm
-	(reminder_add_cb): math new append_alarm signature
-	(reminder_delete_cb): if the alarm existed before the dialog was
-	loaded, delete it immediately from the cal component
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix spacing
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
-	consistent
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-calendar-table.c: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_set_categories): If the
-	categories string is empty, remove the property
-	(get_period_list): Fixes from clahey to handle the new rdate
-	format in libical
-	(set_period_list): ditto
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): Set
-	the time and duration values in the trigger to null by default
-	(cal_component_free_alarm_uids): properly free the list of alarm
-	uids
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (get_widgets): get the new reminder widgets
-	(sync_entries): different callback data
-	(summary_changed_cb): take different data and handle various cases
-	(init_widgets): connect signals for the new widgets
-	(get_alarm_duration_string): give a text string of the alarm
-	duration
-	(get_alarm_string): give a string representing the alarm
-	(fill_widgets): make sure we don't loop infinitely and remove old
-	alarm cruft
-	(reminder_to_comp_object): dump alarm info in the gui into the cal
-	component
-	(append_alarm): add alarm to the clist
-	(reminder_add_cb): create new alarm
-	(reminder_delete_cb): remove the alarm from the list
-
-	* gui/event-editor-dialog.glade: Update gui
-
-	* gui/e-calendar-table.c: include gnome.h for all the menu stuff
-
-	* gui/calendar-summary.c: for internationalization
-
-	* gui/tasks-control.c: include gnome.h
-
-	* gui/e-tasks.c: ditto
-
-	* gui/e-itip-control.c: ditto
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Update for
-	libical changes
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Fixed up these #includes.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog):
-	gnome_dialog_grab_focus() on the Yes button.  Fixes bug #1242.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Mark a string for translation.
-	* gui/e-itip-control.c: Mark a bunch of strings for translation.
-
-2001-01-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/print.c: #include <sys/time.h>.
-
-2001-01-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c: <gnome.h> trimming to reduce compilation
-	time.
-	* gui/calendar-summary.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-edit.c: Likewise.
-	* gui/e-meeting-edit.h: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/event-editor.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.h: Likewise.
-	* gui/main.c: Likewise.
-	* gui/popup-menu.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control-factory.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-2001-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/timeutil.c: <gnome.h> trimming to reduce compilation time.
-	* gui/dialogs/task-editor.c: Ditto.
-	* gui/dialogs/cal-prefs-dialog.c: Ditto.
-	* gui/dialogs/save-comp.c: Ditto.
-	* gui/dialogs/delete-comp.c: Ditto.
-	* gui/calendar-commands.c: Ditto.
-	* gui/calendar-model.c: Ditto.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (itip_control_destroy_cb): Don't attempt to
-	call `icalcomponent_remove_component()' on a NULL component or a
-	NULL subcomponent.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tag-calendar.c: don't tag the calendar if no dates are shown.
-	(e_calendar_item_get_date_range() now returns FALSE in this case.)
-
-2001-01-23  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (ensure_task_complete): make sure the status
-	is set to "Completed". Fixes bug #1253.
-
-	* gui/e-tasks.c (e_tasks_open): load the ETable state after opening
-	the tasks folder, since it relies on the folder uri, which isn't set
-	now until you open the folder.
-
-	* gui/calendar-model.c (obj_updated_cb): add the categories from the
-	updated object to our tree, and emit the "categories-changed" signal
-	if they have changed. Fixes bug #1255.
-
-	* gui/e-tasks.c: removed debug messages.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	*  libical import cleanup
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): properly ref
-	the cal component when we use it, prevents double free
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): ditto
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am: compile new stuff
-
-	* gui/dialogs/task-editor.c (prompt_to_save_changes): use new
-	standard dialog
-
-	* gui/event-editor.c (prompt_to_save_changes): ditto
-
-	* gui/dialogs/save-comp.h: new header
-
-	* gui/dialogs/save-comp.c (save_component_dialog): shows the save
-	dialog
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate
-	message
-
-	* conduits/calendar/Makefile.am: Remove vfs lib dependency
-
-	* conduits/todo/Makefile.am: ditto
-
-	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now
-	(for_each_modified): remove duplicate message
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_record): Remove
-	deleted records from the pilot map so we don't have dupes in the future
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-2001-01-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now
-	we present a confirmation dialog before deleting the component.
-
-2001-01-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix bug #1243.  Turn on the Y
-	expand/fill options for the date widgets in the General page.
-	This makes them be vertically aligned with the "All day event"
-	toggle so that they will get the focus in the proper order; the
-	toggle would get the focus before them because it was a pixel or
-	two above them.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/weekday-picker.c (weekday_picker_init): Unset the
-	GTK_CAN_FOCUS flag on the weekday picker.  This will do until it
-	supports being used with the keyboard.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_new): create a new
-	cal component alarm
-	(cal_component_add_alarm): add alarm to the cal component
-	(cal_component_remove_alarm): remove alarm from the cal component
-	(remove_alarm): remove alarm from hash
-
-	* cal-util/cal-component.h: new protos
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	add alarm information, still needs to be hacked to replace an already
-	existing alarm.  questions abound about the heuristic for doing this.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Properly set categories
-	to NULL if there are none
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-migrate.[ch]: New files with a simple sequence to
-	migrate the task components from the old calendar folder into the
-	new tasks folder.
-
-	* gui/component-factory.c (owner_set_cb): Call tasks_migrate()
-	once evolution_dir is set.  It sucks to have to do this here.
-
-	* cal-client/cal-client.c (cal_client_get_uids): In the inline
-	docs, indicate how to free the return value.
-	(cal_opened_cb): Ahem, moved assertion to the right place.  Also,
-	ref() and unref() around our own signal emission because we are
-	not inside a signal handler, rather a simple callback from the
-	listener object; we want to have a chance to clean up even if the
-	client is unrefed during the emission.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tasks-migrate.[ch] to the list of sources.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Use
-	e_calendar_item_set_max_days_sel() instead of setting GTK+ object
-	arguments.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Oops, we had a
-	reversed test for the client being loaded.
-
-	* gui/tag-calendar.c (tag_calendar_by_client): Fixed similarly
-	reversed test.
-
-2001-01-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view*.c
-	* gui/e-day-view*.c: don't use the theme colors at all within
-	the graphical parts of the widgets, since they may clash with
-	our colors. May make them configurable in future so people can tweak
-	them to go with their theme. At least the calendars are usable in any
-	theme now, even though the colors may not go well with the theme.
-	Also set the font of all the EText items in style_set.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the icons if we are editing the event.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: reinstated the optimizations so we don't do a
-	complete relayout if the event's dates haven't been changed.
-	(Though we still do a re-layout when recurring events change, since
-	comparing all the RDATES/RRULES/EXDATES/EXRULES is too much hassle.)
-	A side-effect of this change is that the EWeekView won't crash so
-	often - only recurring events will be a problem.
-
-	* cal-util/cal-component.[hc]: added function to check if the start
-	and end dates of a component match. Used for optimizing the updating
-	of the EDayView & EWeekView.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): Fix transposition
-	of sync db location
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* */*: Ximianified email addresses and copyrights.
-
-	* idl/evolution-calendar.idl (CalFactory::open): Renamed from
-	::load(), and added an only_if_exists argument.
-	(CalFactory::create): Removed method.
-	(Listener::OpenStatus): Removed the IN_USE error and replaced it
-	with a NOT_FOUND one; renamed the enum from LoadStatus.
-	(Listener::notifyCalOpened): Renamed from notifyCalLoaded().
-
-	* pcs/cal-backend.h (CalBackend): Removed the uri field.
-	(CalBackendOpenStatus): Renamed from CalBackendLoadStatus and
-	added a NOT_FOUND value.
-	(CalBackendClass::open): Put in a slot for the open method.
-
-	* pcs/cal-backend.c (cal_backend_create): Removed function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): Return the
-	appropriate value when only_if_exists is TRUE.
-	(create_cal): We are Ximian now, so set the PRODID property to
-	the appropriate foo.
-
-	* pcs/cal-factory.c (CalFactory_open): implemented, replacing
-	CalFactory_load() and CalFactory_create().
-	(CalFactory_open): Moved the queue_load_create_job() stuff to
-	here, since we now only need to contemplate the open case instead
-	of load/create ones.
-	(open_backend): Do everything here; replaces load_backend() and
-	create_backend().
-
-	* cal-client/cal-listener.h (CalListenerClass::cal_opened):
-	Renamed from cal_loaded.
-	(CalListenerClass): Replaced the silly signals, which are
-	gratuitous abstraction, by a set of function pointers in the
-	instance structure.
-
-	* cal-client/cal-listener.c (cal_listener_get_calendar): Removed
-	unused function.
-	(cal_listener_construct): Added the listener notification functions.
-	(cal_listener_new): Ditto.
-	(Listener_notifyCalOpened): Renamed to our new naming convention
-	for servant implementations.
-	(Listener_notifyObjUpdated): Ditto.
-	(Listener_notifyObjRemoved): Ditto.
-
-	* cal-client/cal-client.h (CalClientOpenStatus): Renamed from
-	CalClientLoadStatus.
-	(CalClientClass::cal_opened): Renamed from ::cal_loaded().
-	(CalClientLoadState): New enum; basically make LoadState public so
-	that users of this code do not have to maintain their own states.
-
-	* cal-client/cal-client.c (cal_client_create_calendar): Removed
-	function.
-	(cal_client_open_calendar): Moved the functionality over from
-	load_or_create(); now we do everything here.
-	(*): Use the CalClientLoadState enum values instead of the old
-	LoadState values.
-	(cal_client_get_load_state): Renamed from cal_client_is_loaded(),
-	and return the appropriate value.
-	(CalClientPrivate): Added an uri field.
-	(cal_client_init): Initialize priv->uri.
-	(cal_client_destroy): Free the priv->uri.
-	(cal_opened_cb): Maintain the priv->uri.
-	(cal_client_open_calendar): Fill in the priv->uri.
-	(cal_client_get_uri): New function.
-
-	* gui/calendar-model.c (calendar_model_set_new_comp_vtype): New
-	function to configure the type of calendar components to create
-	when doing click-to-add.  This makes the model usable for
-	something other than task lists.
-	(calendar_model_get_new_comp_vtype): New function.
-
-	* gui/e-calendar-table.c (e_calendar_table_get_model): New function.
-	(e_calendar_table_destroy): Unref the subset_model.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed enum.
-
-	* gui/gnome-cal.c (LoadState): Removed enum; we now use the
-	CalClientLoadState from the client objects.
-	(GnomeCalendarPrivate): Removed the loading_uri and
-	task_pad_loading_uri fields as well as the load_state and
-	task_pad_load_state fields, as we can now query them directly from
-	the CalClient.
-	(open_error): Renamed from load_error().
-	(create_error): Removed function.
-	(gnome_calendar_open): Do not take in the mode parameter.
-	(cal_opened_cb): Get rid of our beautifully-crafted state machine
-	and replace it with simple code; all the loading smarts are in the
-	Wombat now.
-	(setup_widgets): Set the new component vtype of the table model to
-	CAL_COMPONENT_TODO.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	gnome-month-item.[ch] from the list of sources.
-
-	* gui/calendar-summary.c (CalSummary): Removed unused cal_loaded
-	field.
-	(create_summary_view): Do not check if the file exists; this is
-	the job of the Wombat.
-	(generate_html_summary): Fixed prototype.
-	(alarm_fn): Fixed prototype.
-	(property_dialog): Fixed prototype.  Wonder if/how this ever
-	worked.
-	(create_summary_view): Cast the component and view as
-	appropriate.  Removed unused html variable.
-
-	[Iain dude, are you compiling with -Wall?]
-
-	* gui/e-itip-control.c (cal_opened_cb): Sigh, this function
-	signature was *very* wrong.  It was using CalClientGetStatus
-	instead of CalClientOpenStatus.
-
-	* gui/e-tasks.h (ETasksOpenMode): Removed enum.
-
-	* gui/e-tasks.c (setup_widgets): Set the new component vtype of
-	the table model to CAL_COMPONENT_TODO.
-	(LoadState): Removed the state machine foo.
-	(e_tasks_open): Removed the mode parameter.
-	(initial_load): Removed function.
-	(create_error): Removed function.
-	(ETasksPrivate): Removed folder_uri field.
-	(cal_opened_cb): Remove the state machine.
-
-	* gui/component-factory.c: #include "tasks-control.h"
-
-	* conduits/calendar/calendar-conduit.h (ECalConduitContext):
-	Removed calendar_load_tried field.
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server_cb):
-	Sigh, fixed function prototype.
-
-	* conduits/todo/todo-conduit.h (EToDoConduitContext): Removed
-	calendar_load_tried field.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server_cb): Fixed
-	function prototype.
-
-2001-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): fix debug output
-	(print_remote): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): accomadate tasks
-	in their new dir
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and
-	buffer overflows.
-	(print_remote): ditto
-
-	* conduits/calendar/calendar-conduit.c: as above
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): changed the expansion
-	values so that small text fields are 1.0, all the date fields and the
-	URL field are 2.0, and the Summary is 3.0. Hopefully the user will
-	resize the fields as desired, but at least this is a better start.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: pass -module and -avoid-version to
-	conduit linker
-
-	* conduits/todo/Makefile.am: ditto
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.[hc]: moved #include
-	<cal-client/cal-client.h> to the .h file.
-
-	* gui/e-tasks.c: load & save the Tasks folders' ETable layout.
-	Added an option menu to filter tasks by category.
-
-	* gui/gnome-cal.c: use the "Tasks" folder for the TaskPad.
-	(We may make the actual tasks folder shown a per-calendar option.)
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): added support for
-	the New Task icon on the toolbar.
-
-	* gui/e-calendar-table.[hc]: we now use an ETableSubsetVariable model
-	to filter the tasks by a category. And tidied up a little.
-
-	* gui/calendar-model.[hc]: added way to get all the categories used by
-	the tasks, so we can show an option menu of them. Also a signal which
-	is emitted when they are changed.
-	Also allows a default category to be set, which is used to initialize
-	the 'click-to-add' row.
-	Also made sure the initialize_value()/get_value() functions don't
-	return NULL since that can cause a SEGV.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: set the "fill_color_rgba" arg of the EText items
-	to black since it doesn't seem to set up a default color properly.
-	Hopefully this fixes the bug on Solaris where the items appear with
-	strange colors.
-
-	* gui/widget-util.c (date_edit_new): use the calendar_config function
-	to set most of the options. It wasn't setting the 12/24 hour option
-	before.
-
-	* gui/dialogs/task-editor-dialog.glade: added "Undefined" priority.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-calendar-table.c: Add translation strings.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a PropertyControl
-	interface to set whether or not to show tasks and appointments. Add
-	a PersistStream to remember this.
-
-2001-01-09  Dave Camp  <dave@helixcode.com>
-
-	* gui/Makefile.am: Replaced e-meet-dialog.glade.h with
-	e-meeting-dialog.glade in glade_messages.
-
-	* gui/e-meeting-dialog.glade: Enabled the translatable string option.
-
-	* gui/e-itip-control.glade: Likewise.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (AlarmNotify): New interface for the
-	alarm notification system.
-
-	* gui/alarm-notify: New directory for the alarm notification
-	daemon and its auxiliary stuff.
-
-	* gui/alarm-notify/alarm.[ch]: Moved over from gui/alarm.[ch].
-
-	* gui/alarm-notify/alarm-queue.[ch]: Moved over from
-	gui/alarm-notify.[ch].  Renamed functions from alarm_notify_*() to
-	alarm_queue_*().
-
-	* gui/alarm-notify/alarm-notify.[ch]: Implementation of the
-	GNOME::Evolution::Calendar::AlarmNotify interface.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Removed the
-	LINK_FLAGS variable and reordered the libraries to remove some
-	duplicated ones.
-	(SUBDIRS): Added the alarm-notify directory.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Get the tasks
-	correctly.
-	(generate_html_summary): Mark the tasks as completed if so.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files for the Tasks folders.
-
-	* gui/e-tasks.[hc]: new widget to encapsulate the Tasks view.
-
-	* gui/tasks-control.[hc]: new files to implement the Tasks control.
-
-	* gui/tasks-control-factory.[hc]: new files to implement the factory
-	for the Tasks controls. (I think the way I've split the code up is a
-	lot cleaner than the GnomeCal implementation - the factory file just
-	contains the factory functions and the control file contains all the
-	control functions. Maybe we should make GnomeCal like this.)
-
-	* gui/main.c: initialize the Tasks control factory.
-
-	* gui/component-factory.c: added support for the Tasks control.
-	Also added a "create_folder" function so we can now create new Tasks
-	and Calendar folders within Evolution.
-	I'm not a Bonobo expert so someone might want to check these over.
-
-	* gui/calendar-config.[hc]: added convenience functions to configure
-	the common settings of ECalendar and EDateEdit widgets.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit):
-	* gui/gnome-cal.c (gnome_calendar_update_config_settings):
-	* gui/event-editor.c: used function to configure the ECalendars
-	and EDateEdits.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	fixed minor bug in format strings.
-
-2001-01-06  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Neaten the HTML,
-	and fix the time printing stuff. Add stuff the get Tasks.
-	(alarm_fn): Set up an alarm for midnight everynight and regenerate
-	the HTML for the new day.
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/event-editor-dialog.glade: Add categories and contacts buttons
-	and fields
-
-	* gui/dialogs/task-editor-dialog.glade: Rename button
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/dialogs/task-editor-dialog.glade: Tweak to name the categories
-	button and make it active
-
-	* gui/calendar-model.c (get_categories): We can get the string list of
-	categories directly now
-
-	* cal-util/cal-component.c (cal_component_get_categories): new function
-	to get the categories list as a string
-	(cal_component_set_categories): same but for setting
-	(free_icalcomponent): init the categories var
-	(scan_categories): kill
-	(scan_property): assign the prop to the categories var
-	(cal_component_get_categories_list): deal with renaming var to categories
-	(cal_component_set_categories_list): fix brokeness
-
-2001-01-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Handle the case where
-	the calendar view cannot be created; present a warning dialog box.
-	(new_calendar): Do not show the widget here, since we already show
-	it in control-factory.c.
-
-	* gui/control-factory.c (control_factory_new_control): Handle the
-	case where the calendar view cannot be created.
-
-	* gui/component-factory.c (create_view): Ditto.
-
-	* gui/calendar-summary.h: Added prototype for
-	calendar_summary_factory_init().
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm-notify.c (add_component_alarms): If the component has
-	no alarms, do not try to queue them.
-	(remove_client_alarms): New function to remove all the queued
-	alarms for a calendar client.
-	(alarm_notify_remove_client): Remove the client's alarms.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Do not
-	compose strings so that they can be localized correctly.  Also,
-	convert from UTF8 into the font's encoding.  Fixes bug #1030.
-
-	* gui/e-calendar-table.c (delete_component): Pass the widget
-	argument to delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/event-editor.c (file_delete_cb): Likewise.
-
-	* gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of
-	BONOBO_UI_UNSAFE_VERB().  Guess what, all of our handler
-	signatures were wrong.
-
-	* gui/event-editor.c: Likewise.
-
-	* gui/dialogs/task-editor.c: Likewise.
-
-	* gui/goto-dialog.glade: Added some spacing between the month/year
-	widgets and the calendar widget.
-
-2001-01-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): Unconditionally remove
-	the client from the alarm notification system.
-	Removed all the obsolete alarm code.
-
-	* gui/event-editor.c: Removed some crufty externs left over from
-	Gnomecal.
-
-	* gui/calendar-commands.c: #include "goto.h"
-	Removed crufty variables left over from Gnomecal.
-	(new_calendar): Do not take a full_name parameter.
-	(init_username): Removed function.
-	(init_calendar): Wheeeeeeee!  Removed crufty function.
-	(quit_cmd): Removed function.
-
-	* gui/print.c (WEEK_STARTS_ON_MONDAY): Made it unconditionally
-	FALSE because we do not use the configuration setting anyways.
-	Sigh, all the printing code needs to be revamped.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Create a shared
-	BonoboEventSource object.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_init): Set draw background to FALSE.
-	(e_day_view_reshape_long_event): ditto.
-	(e_day_view_reshape_day_event): ditto.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Clean up
-	translatable strings for translators, fixes bug 993
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (create_ecal): Make sure the current month is shown
-	when the dialog pops up.
-
-	* gui/goto-dialog.glade: Remove flicker
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	account for the case where there are no alarms, fixes crash
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (ecal_date_range_changed): New function to keep the
-	ecal marked properly
-	(create_ecal): move more creation code here, update marks
-	(goto_dialog_init_widgets): listen for date_range_changed signal
-	in the ecal
-
-	* gui/calendar-commands.c (init_calendar): Remove ancient gnomecal
-	cruft
-
-	* gui/mark.[hc], gui/prop.c: Remove ancient gnomecal code that is
-	no longer needed, last bit of bug 904
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto-dialog.glade.h: translations
-
-	* gui/goto-dialog.glade: new glade file for goto dialog
-
-	* gui/gnome-cal.c (setup_widgets): Set date navigator attributes
-
-	* gui/calendar-commands.h: remove prototype
-
-	* gui/goto.h: Add prototype
-
-	* gui/Makefile.am: Add glade file stuff
-
-	* gui/gnome-cal.c (setup_widgets): Use accessors to configure the
-	calendar item properly
-
-2000-12-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm trigger queueing for the GUI part.
-
-	* gui/alarm-notify.[ch]: New files with the high-level alarm
-	notification system; mostly moved over from gnome-cal.c.  The
-	low-level timer stuff is still in alarm.[ch].
-
-	* gui/alarm-notify.c (alarm_notify_init): New function to
-	initialize the alarm notification system.
-	(alarm_notify_done): New function to shut down the alarm
-	notification system.
-	(alarm_notify_add_client): New function to start monitoring a
-	calendar client for alarm notification.
-	(alarm_notify_remove_client): New function to stop monitoring a
-	client.
-
-	* gui/alarm.h (AlarmDestroyNotify): Also pass in the alarm ID so
-	the callback may know which ID is being destroyed.
-
-	* gui/alarm.c (clear_itimer): New function.
-	(pop_alarm): Use clear_itimer().
-	(alarm_done): New function to shut down the timer system.
-	(alarm_add): Add some preconditions.  Do not call the destroy
-	notification function if we could not create the alarm.
-	(alarm_ready): Pass the alarm ID to the destroy notify function.
-	(alarm_remove): Likewise.  Also, add some preconditions.
-
-	* gui/gnome-cal.c: Removed the alarm notification functions from
-	here since they are now in alarm-notify.c.
-	(gnome_calendar_construct): Register the client with
-	alarm_notify_add_client().
-	(gnome_calendar_destroy): Use alarm_notify_remove_client() to
-	unregister the client.
-	(obj_updated_cb): Do not do any alarm-related stuff.
-	(obj_removed_cb): Likewise.
-
-	* gui/main.c (main): Shut down the alarm timer system.
-	(main): Initialize and shut down the alarm notification system.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	alarm-notify.[ch] to the list of sources.
-
-	* gui/calendar-model.c (calendar_model_set_cal_client): Only
-	connect to the "cal_loaded" signal if the client is not already
-	loaded.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): Likewise.
-
-	* gui/e-itip-control.c (update_calendar): Connect to "cal_loaded"
-	before issuing the load request.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c: Updated for new executive summary.
-
-	* gui/component-factory.c: Reenabled the summary.
-
-	* gui/GNOME_Evolution_Calendar.oafinfo: Added the summary.
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Fix erroneous documentation
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): if
-	!is_empty_time rather than is_empty_time
-	(e_todo_context_new): Return a pointer rather than fill in
-	a parameter
-	(e_todo_context_foreach_change): Free just the key
-	(e_todo_context_destroy): Plug this enormous leakage.  I had assumed
-	i had done this earlier, which isn't too bright when anything beyond
-	2 minutes ago is fuzzy.
-	(comp_from_remote_record): Kill warnings
-	(post_sync): Destroy the map later
-	(conduit_get_gpilot_conduit): Fix e_todo_context_new params
-
-	* conduits/calendar/calendar-conduit.[hc]: Similar to above
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Remove pointless comment
-
-	* conduits/todo/todo-conduit.c (is_empty_time): add utility function
-	(comp_from_remote_record): use it
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert cal component strings to pilot character set
-	(comp_from_remote_record): vice versa
-
-	* conduits/todo/todo-conduit.c: Same as above
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in
-	the way the range is expanded.
-
-	* cal-util/cal-component.c (cal_component_alarms_free): Doh,
-	alarms->alarms is a list, not a generic pointer.  Free it properly.
-	(cal_component_free_pilot_id): Removed unused function.
-	(cal_component_free_pilot_status): Likewise.
-
-	* gui/main.c (init_bonobo): Use VERSION instead of a hardcoded
-	string.  Pass argc by value, not by reference.  Test the return
-	value of gnome_init_with_popt_table().
-
-	* cal-client/cal-client.c (cal_client_free_alarms): Oops, missed
-	implementing this function.
-
-	* cal-util/timeutil.c (print_time_t): Better printing format.
-	(isodiff_to_secs): Removed unused function.
-	(isodiff_from_secs): Removed unused function.
-	(time_day_end): Removed crufty part.
-	(time_day_begin): Removed crufty part.
-	(time_day_hour): Removed unused function.
-	(format_simple_hour): Removed unused function.
-	(get_time_t_hour): Removed unused function.
-	(time_from_start_duration): Removed unused function.
-
-	* cal-util/timeutil.h (parse_date): Removed unimplemented, unused
-	function prototype.
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/gnome-cal.c: Removed prototype for setup_alarm to fix a
-	warning.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm instance generation support for the Wombat.
-
-	* idl/evolution-calendar.idl (Cal::CalAlarmInstance): Changed to
-	have an alarm UID, the trigger time, and the actual occurrence
-	time.
-	(Cal::CalComponentAlarms): New structure to hold a pair of a
-	component and its alarms that trigger in a particular range of
-	time.
-	(Cal::getAlarmsInRange): Changed to return a CalComponentAlarmsSeq.
-
-	* cal-util/cal-component.h (CalAlarmInstance): New C-side
-	structure to match the one on the IDL.
-	(CalComponentAlarms): Ditto.
-	(CalAlarmAction): Renamed from CalComponentAlarmAction.
-	(CalAlarmTriggerType): Renamed from CalComponentAlarmTriggerType.
-	Encoded the START and END parameters for the RELATED parameter in
-	this enum, too.  Added a NONE value for invalid or missing trigger
-	specifications.
-	(CalComponentAlarmTriggerRelated): Removed.
-	(CalAlarmTrigger): Renamed from CalComponentAlarmTrigger.  Renamed
-	the duration/time fields to rel_duration/abs_time, respectively.
-
-	* cal-util/cal-component.c (cal_component_alarm_get_trigger):
-	Changed to use the new trigger structure.
-	(cal_component_alarm_set_trigger): Likewise.
-	(cal_component_alarm_free_trigger): Removed function.
-	(cal_component_has_alarms): Count the elements in the
-	alarm_uid_hash instead of trying to fetch the first alarm subcomponent.
-	(cal_component_alarms_free): New function to free a
-	CalComponentAlarms structure.
-	(CalComponentAlarmPrivate): Added an uid property pointer.
-	(scan_alarm_property): Scan for the our extension UID property.
-	(cal_component_alarm_get_uid): New function.
-
-	* pcs/cal-backend.h (CalBackendClass): Changed the signatures of
-	the ::get_alarms_in_range() and ::get_alarms_for_object() methods.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): Changed
-	signature; use the new method.
-	(cal_backend_get_alarms_for_object): Likewise.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): New spiffy
-	function to compute a range of time for alarm occurrences.
-	(add_alarm_occurrences_cb): New function to add alarms for a
-	particular occurrence of the component.
-	(generate_absolute_triggers): New function to add the absolute
-	alarm triggers.
-	(generate_alarms_for_comp): New function to generate all the alarm
-	instances for a component.
-	(cal_backend_file_get_alarms_in_range): Implemented.
-
-	* pcs/cal.c (Cal_get_alarms_in_range): Use the new CalBackend API.
-	(Cal_get_alarms_for_object): Likewise.
-	(build_alarm_instance_seq): Removed old function.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): Removed
-	function.
-
-	* cal-client/cal-client.c (build_component_alarms_list): New
-	function to demarshal the component alarms sequence.
-	(build_alarm_instance_list): New function to demarshal the alarm
-	instances sequence.
-	(cal_client_get_alarms_in_range): Updated for the new API.
-	(cal_client_get_alarms_for_object): Updated for the new API.
-
-	* gui/gnome-cal.c: Temporary #ifdef-ing out of alarm-related stuff
-	to make it build.
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.[ch] (time_from_isodate): Removed unused
-	function, a relic from Gnomecal.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the sign in the
-	HAVE_TM_GMTOFF case
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed getdate.y.
-	We no longer use it; it is a relic from Gnomecal.
-
-	* gui/getdate.y: Removed file.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #955.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for
-	the week_start_day, to be used in the same way as
-	calendar-config.h defines it.  Removed the week_starts_on_monday
-	flag.
-	(day_event_cb): Use the week_start_day.
-	(colorize_items): Likewise.
-	(configure_items): Likewise.
-	(weekday_picker_set_week_start_day): New function.
-	(weekday_picker_get_week_start_day): New function.
-	(weekday_picker_set_week_starts_on_monday): Removed function.
-	(weekday_picker_get_week_starts_on_monday): Removed function.
-
-	* gui/widget-util.[ch]: New files with utilities for creating or
-	configuring widgets.
-
-	* gui/widget-util.c (date_edit_new): New function to create an
-	EDateEdit configured with the calendar's preferences; moved over
-	from event-editor.c.
-
-	* gui/event-editor.c (make_recur_weekly_special): Use
-	weekday_picker_set_week_start_day() and the corresponding function
-	from calendar-config.h.
-	(init_widgets): Likewise.
-	(make_date_edit_with_time): Removed function.
-	(make_recur_ending_until_special): Use date_edit_new().
-	(make_date_edit): Likewise.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): Likewise.
-
-	* gui/event-editor-dialog.glade: Removed references to
-	make_date_edit_with_time(); replace them with make_date_edit().
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	widget-util.[ch] to the list of sources.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reset the widths
-	of the columns with pixbufs to the actual pixbufs' sizes; now
-	ETable properly computes its column widths so we do not need to
-	add extra padding here.
-
-2000-12-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-model.c (_XOPEN_SOURCE): #define this to 500, not
-	nothing. Also, move this bit after the other #includes to
-	prevent potential messiness.
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Even
-	though icaltime_from_timet() now properly ignores the is_utc
-	argument since time_t values *are* in UTC by definition, we were
-	passing FALSE for that argument's value in a bunch of places.  So
-	although it is ignored, changed them to TRUE for consistency.
-	Hopefully newer versions of libical will remove that argument
-	entirely since it does not make sense to speak of non-absolute
-	time_t values.
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise.
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_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_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	(e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (simple_recur_to_comp_object): Likewise.
-	(recur_to_comp_object): Likewise.
-	(dialog_to_comp_object): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c: #if 0ed cal_obj_date_only_compare_func.
-	(cal_object_get_rdate_end): Changed this function to get rid of a
-	possible uninitialized error on the rdate function.
-
-	* gui/calendar-model.c: Fixed some warnings involving the #define
-	_XOPEN_SOURCE lines here.
-
-	* gui/component-factory.c: #ifdef WANT_THE_EXECUTIVE_SUMMARYed out
-	the summary_factory object since it's unused if
-	WANT_THE_EXCUTIVE_SUMMARY is not defined.
-
-	* gui/e-day-view.c: #if 0ed out e_day_view_remove_event_cb.
-	(obj_updated_cb): #ifndef NO_WARNINGSed out a #warning.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): Made
-	it so that
-
-	* gui/e-week-view.c (obj_updated_cb): #ifndef NO_WARNINGSed out a
-	#warning.
-
-2000-12-13  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Revert federico's change for now
-	because of libtool limitations with ldadding shared libtool
-	libs
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-12  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (task_editor_set_todo_object): Use
-	set_title_from_comp
-	(save_todo_object): ditto
-	(set_title_from_comp): Make sure the title is encoded properly (as in
-	event-editor)
-
-2000-12-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (get_text_list): Constify for new
-	libical API.
-	(set_text_list): Likewise.
-
-	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.
-	(cal_recur_set_rule_end_date): Likewise.
-
-	* gui/e-itip-control.c (find_attendee): Likewise.
-	(pstream_load): Likewise.
-
-	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.
-
-	* gui/dialogs/task-editor.c (status_string_map): Removed unused
-	variable.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
-	shared library.
-
-	* cal-client/Makefile.am (client_test_LDADD): Likewise.
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	Likewise.
-
-	* gui/Makefile.am (LINK_FLAGS): Likewise.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	This is to make things work with libical 0.21helix1 and later.
-	Warnings remain because at last libical was constified; will take
-	care of those tomorrow.
-
-	* cal-util/timeutil.h: #include <ical.h> instead of <icaltypes.h>
-
-	* gui/e-itip-control.c: Likewise.
-
-	* gui/e-meeting-edit.c: Likewise.
-
-	* gui/itip-utils.h: Likewise.
-
-	* cal-util/cal-component.c (alarm_uid_from_prop): constify.
-	(cal_component_get_status): Updated for new libical API.
-	(cal_component_set_status): Likewise.
-
-	* gui/calendar-model.c (ensure_task_complete): Removed unused
-	status code.
-	(ensure_task_not_complete): Update for new status API.
-
-	* gui/dialogs/task-editor.c (status_string_to_value): Removed
-	function.
-	(status_value_to_string): Removed function.
-	(status_string_map): Removed variable.
-	(fill_widgets): Update for new status API.
-	(dialog_to_comp_object): Likewise.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): updated the
-	tests on the start & end time just before calling the callback. It
-	was skipping occurrences that started before the required interval's
-	start time, which was wrong. We want all occurrences that intersect
-	the interval.
-	(cal_obj_time_weekday): removed the CalRecurrence* argument, since it
-	isn't needed.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: added changed flags and added calls to a new
-	function event_editor_set_changed() to set & reset this flag.
-	Added prompt_to_save_changed() which is called when the user
-	selects File/Close or the window's close button.
-	Fixed the 'All day event' toggle button.
-	Made the 'Alarm' page sensitive as appropriate when filling widgets.
-	(Though note that the alarm widgets are not being set yet.)
-
-	* gui/dialogs/task-editor.c: added changed flag as above.
-
-	* gui/event-editor-dialog.glade: used good names for all the
-	classification radio buttons so we can access them in the code.
-
-	* gui/event-editor.c (init_widgets): use the "show week numbers" config
-	option in the recurrence preview calendar.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): use 9:00 instead
-	of 09:00 in the main view, as we do everywhere else now. It means the
-	times won't line up, but they are easier to read which I think is
-	better.
-	Added support for Page Up/Down, though I think it should move the
-	selection rather than just scroll the canvas.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): removed the
-	end parameter since we should be using the chunk end time now.
-	Added single_rule parameter for when we are generating the
-	occurrences of a single RRULE, in which case the event's start date is
-	not included in the occurrences output (unless it results from the
-	RRULE expansion). Both of these fix problems when using COUNT.
-
-	* gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed):
-	fixed bug when checking if the new start day starts on the week start
-	day. If you select a complete week it should now show the Week view.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Free the strings we
-	get from the editables.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-	This sucks; this code should be shared between the two dialogs.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (fill_widgets): Free the dates we get from
-	the component.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Attach signal
-	handlers to the e_scrolled_table's etable rather than to the
-	e_scrolled_table directly
-	(e_calendar_table_on_double_click): This signal provides more
-	params now
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Got rid of code referencing the
-	ETableScrolled proxy functions.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Ugly hack for syncing
-	until pcs can be altered (longer term)
-
-	* conduits/todo/todo-conduit.c (post_sync): ditto
-
-2000-12-07  Chris Toshok  <toshok@helixcode.com>
-
-	* cal-client/Makefile.am (client_test_LDADD): add
-	EXTRA_GNOME_LIBS.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Create
-	an empty cal component if the object has been deleted.
-
-	* idl/evolution-calendar.idl: Bit shift the change type constants
-	properly
-
-2000-12-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): Unref
-	the component from the objects list; it got referenced as many
-	times as appropriate for the instances list.
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Confirm before deleting the
-	event.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_init): unref the pixbuf when
-	finished with it
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #920.
-
-	* gui/e-calendar-table.c (delete_component): New function.
-	(e_calendar_table_on_delete_task): Use delete_component().
-	(e_calendar_table_on_key_press): Likewise.  Also, mark the event
-	as handled.
-
-	* gui/calendar-model.c (calendar_model_get_component): Renamed
-	function from calendar_model_get_cal_object().
-	(calendar_model_delete_task): Removed function.
-
-	* gui/dialogs/delete-comp.[ch]: New files with the dialog for
-	deleting a calendar component.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Confirm
-	before actually deleting the appointment.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_a_SOURCES): Added
-	delete-comp.[ch] to the list of sources.
-
-	* cal-util/cal-component.c (cal_component_destroy): Free the alarm
-	UID hash.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal.c (build_change_seq): kill
-	(Cal_get_changes): return the corba sequence directly
-
-	* pcs/cal-backend.h: update prototype
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Build
-	the corba struct rather than the old calobjchange thing
-	(cal_backend_compute_changes): ditto.  build and return the actual
-	corba sequence rather than the list of calobjchanges
-	(cal_backend_get_changes): return the corba sequence
-
-	* cal-util/cal-util.h: Remove CalObjChange cruft
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): Kill
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-util.c:
-
-	* conduits/calendar/calendar-conduit.c (map_name): Update so as not to conflict
-	with calendar
-	(next_changed_item): update to use CalClientChange instead of CalObjChange
-	(compute_status): ditto
-	(pre_sync): ditto
-	(for_each_modified): since we now have the cal component we can call
-	local_record_from_comp directly
-
-	* conduits/todo/todo-conduit.c: same as above
-
-	* pcs/cal-backend.c: Remove much logging cruft
-	(cal_backend_compute_changes): Calculate the changes based on the
-	hashed database
-	(cal_backend_get_changes): call cal_backend_compute_changes
-	(cal_backend_compute_changes_foreach_key): hash callback for
-	calculating deletions
-
-	* pcs/cal-backend.h: update protype, remove logging cruft from
-	object
-
-	* pcs/cal.c (build_change_seq): dup the calobj rather than the uid
-	now
-	(Cal_get_changes): rename from Cal_get_changed_uids
-	(cal_get_epv): reflect name change in epv
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): update assertion
-
-	* cal-util/cal-util.h: CalObjChange now returns the entire ical
-	component, update the change types.  This should all go away shortly
-
-	* idl/evolution-calendar.idl: getChangedUIds -> getChanges.
-	CalObjChange now contains the calobj rather than the uid, update
-	the change types
-
-	* cal-client/cal-client.c (cal_client_get_changes): rename from
-	cal_client_get_changed_uids to make idl and addressbook
-
-	* cal-client/cal-client.h: Update prototype
-
-	* cal-client/cal-client.c (build_change_list): Build a list of
-	CalClientChange instead of CalObjChange
-
-	* cal-client/cal-client-types.c (cal_client_change_list_free): Free
-	a glist of CalClientChanges
-
-	* cal-client/cal-client-types.h: New file. Declarations for
-	CalClientChange.
-
-	* cal-client/Makefile.am: Build new files
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix my build stupidty READ THE MACRO
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-04  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Initialize max_large_digit_width to 0 to prevent crazy sizing issues.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* gui/e-itip-control.c: Remove mysterious #include inserted by
-	mmeeks to break the build.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #918.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for a
-	set of blocked days.
-	(weekday_picker_set_blocked_days): New function to configure a set
-	of days that cannot be modified by the user.
-	(weekday_picker_get_blocked_days): Query function for the above.
-	(day_event_cb): Block the appropriate days from being modified.
-
-	* gui/event-editor.c (get_start_weekday_mask): New function to
-	compute a day mask for the start day of a calendar component.
-	(set_recur_special_defaults): New function to set sane defaults
-	for the recurrence special widgets.
-	(fill_recurrence_widgets): Use set_recur_special_defaults().
-	(make_recur_weekly_special): Block the appropriate days.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/control-factory.c (set_prop): Removed debugging message.
-	(control_factory_init): Ditto.
-
-	* gui/calendar-commands.c (calendar_set_uri): Ditto.
-
-	* gui/main.c (main): Ditto.
-
-	* gui/event-editor.c (set_title_from_comp): New function to
-	generate a title and convert it from UTF8 before setting it on the
-	window.
-	(save_event_object): Uset set_title_from_comp().
-	(event_editor_set_event_object): Likewise.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c:  Debug message cleanups
-	(comp_from_remote_record): Properly set the ical description field
-
-	* conduits/calendar/calendar-conduit.c (is_empty_time): New utility
-	functions that look for all 0's in a struct tm
-	(comp_from_remote_record): use above
-	(local_record_from_comp): Correctly set the repeatForever value so
-	that we repeat forever instead of a really long time
-	(comp_from_remote_record): Only set the cal component recurrence
-	until field when repeatForever is 0
-
-2000-11-30  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed a bug that caused the calendar to
-	segfault when the iTip control was destroyed.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Empty
-	by_day entries are no longer indicated by ICAL_RECURRENCE_ARRAY_MAX not
-	SHRT_MAX. Calculate weekly and monthly by date recurrences properly
-	(get_pilot_day): Convert ical day to corresponding integer for pilot day
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Debug message cleanups
-	(get_ical_day): Fix off-by-one error which affected weekly occurences.
-	(comp_from_remote_record): Monthly by day and by date were reversed
-	(nth_weekday): function taken from event-editor.c that encodes BYDAY
-	values - this needs to be in libical really.
-	(comp_from_remote_record): Don't set the description if the pilot note
-	is null.  Rejig so that we don't have to free objects.
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	Upgrade of the alarm framework.  We now access alarms by a unique
-	identifier.  This UID is added as an extension property to alarm
-	subcomponents when their parent components are scanned by
-	CalComponent.
-
-	* cal-util/cal-component.c (CalComponentPrivate): Added a hash
-	table of alarm UIDs -> alarm properties.
-	(cal_component_init): Initialize priv->alarm_uid_hash.
-	(free_icalcomponent): Free the elements in the
-	priv->alarm_uid_hash.
-	(scan_alarm): New function to add scan an alarm subcomponent and
-	ensure that it has an alarm UID extension property so that we can
-	add it to our mapping table.
-	(cal_component_get_first_alarm): Removed function.
-	(cal_component_get_next_alarm): Removed function.
-	(cal_component_get_alarm_uids): New function.
-	(cal_component_get_alarm): New function.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reformatted the
-	table spec to make it easier to read.
-
-	* gui/tag-calendar.c: Oops, Damon wrote this, not me.  Fixed the
-	Authors line.
-
-2000-11-28  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]:
-	* gui/e-week-view*.[hc]: finished 12-hour support and tried to tidy
-	up & comment the drawing code in places. Also fixed a couple of bugs I
-	spotted. All the options on the 'Calendar' page should now work.
-
-2000-11-28  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: removed some debugging code that I had,
-	which might have caused problems.
-
-2000-11-27  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/calendar-model.c: added a preliminary change to have
-	Assigned To-Do items have a corresponding icon.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (free_prepare): Ditto
-
-	* conduits/calendar/calendar-conduit.c (free_prepare): Adjust
-	free_prepare to the correct signal parameters.  Don't actually
-	do anything - there is a semantic discrepancy that needs to be
-	resolved.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_set_days_shown): == instead of =.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c: added more support for config settings.
-
-	* gui/e-week-view.[hc]:
-	* gui/e-day-view.[hc]: added support for setting - show event end
-	times, week start day and 12-hour format (unfinished).
-
-	* gui/e-day-view-time-item.c: started 12-hour support.
-
-	* gui/tag-calendar.c (prepare_tag): use end_day + 1 since we want to
-	include the last day.
-
-	* gui/event-editor.c (set_all_day): minor change when turning all_day
-	off - set the event end to one hour after the event start if it is on
-	or before the start time. Also added more comments to make it a bit
-	clearer.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_days): use a gint for day
-	rather than a guint since we now support -ve days.
-	Also fixed bug with weekly recurrences.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): use
-	config settings.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	updated EDateEdit calls.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Unref the ETable
-	extras.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (free_icalcomponent): DOH, fixed
-	reversed test for the presence of the icalcomp's parent.  This was
-	causing memory leaks in the Wombat and elsewhere.
-
-	* pcs/cal-backend.c (cal_backend_set_node_timet): Plug leak.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (scan_vcalendar): Use the new libical
-	external iterators (icalcomponent_begin_component() and friends);
-	the internal iterators are deprecated.
-
-	* cal-util/test-recur.c (generate_occurrences): Likewise.
-
-	* gui/e-itip-control.c (pstream_load): Likewise.
-
-	* gui/e-meeting-edit.c (e_meeting_edit): Likewise.
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Plug leak.
-	(cal_backend_log_sync): Free the entry->uid.
-
-	* util/icalendar-save.[ch]:
-	* util/icalendar-test.c:
-	* util/icalendar.[ch]: Removed obsolete files.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/task.xpm: Remove the check because it makes it look like the
-	task is already completed.  This fixes bug #819.
-
-	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.
-
-	* gui/task-*.xpm: Made the things look like little spiral-bound
-	notebooks.
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default
-	column order be icon/completed/summary.  You may need to erase
-	your ~/evolution/config/TaskPad for this to appear.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_is_cell_editable): The icon
-	column is not editable!
-
-	* gui/calendar-commands.c (todo_properties_changed): Removed.
-	(time_format_changed): Removed.
-	(colors_changed): Removed.
-
-	* gui/calendar-commands.h:
-	* gui/prop.c (prop_apply):
-	* gui/calendar-commands.c (init_calendar): Removed the old to-do
-	list crap.
-
-	* gui/gncal-todo.[ch]: Removed obsolete files.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed gncal-todo.[ch].
-
-	* gui/gnome-cal.c (gnome_calendar_todo_properties_changed): Removed.
-	(gnome_calendar_time_format_changed): Removed.
-	(gnome_calendar_colors_changed): Removed.
-
-2000-11-21   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed the stupid Bonobo widget size
-	allocation bug that had been vexing me.
-
-	* gui/e-itip-control.glade: I removed some hacks that were
-	necessary for said size bug.
-
-2000-11-16   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-meeting-edit.c: added cancellation
-	code to our program; people can cancel meetings, which is the best
-	thing to do for most meetings.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: made the REPLY code actually work.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/itip-utils.[ch]: I created this file to store some commonly used enumeration to
-	string mappings and functions.
-
-	* gui/Makefile.am: this was changed to reflect the addition of the above file.
-
-	* gui/e-itip-control.c: added code to take action on a REPLY message.
-
-	* gui/e-meeting-edit.c: bug fixes.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, bugzilla bug #829 is fixed and that does not redeem me from
-	extreme procrastination.  Wheeeeeeeeeeeeeeee!
-
-	* gui/event-editor-dialog.c: Changed the "Rule view" label to
-	"Preview"
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (make_recur_ending_count_special): Misspelled
-	"occurrences".
-	(fill_recurrence_widgets): Sensitize the "Custom recurrence" radio
-	button as appropriate.
-	(sensitize_recur_widgets): Resurrected the recurrence custom
-	warning label.
-	(get_widgets): Load the recurrence custom warning bin.
-
-	* gui/event-editor-dialog.glade: Add an empty alignment for the
-	recurrence custom warning label.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_preview_date_range_changed_cb): New
-	function; re-tag the calendar when its date range changes.
-	(init_widgets): Connect to "date_range_changed" on the recurrence
-	preview calendar.
-	(make_recur_weekly_special): Connect to "changed" on the weekday
-	picker.
-	(recur_weekday_picker_changed_cb): New function; re-tag the calendar.
-	(month_day_menu_selection_done_cb): Re-tag the calendar.
-	(recur_month_index_value_changed_cb): Likewise.
-	(recur_ending_until_changed_cb): Likewise.
-	(recur_ending_count_value_changed_cb): Likewise.
-	(make_recur_monthly_special): Connect to "value_changed" on the
-	adjustment of the month index.
-	(make_recur_ending_until_special): Connect to "changed" on the
-	ending-until date picker.
-	(make_recur_ending_count_special): Connect to "value_changed" on
-	the ending-count adjustment.
-	(init_widgets): Set to zero the maximum number of selectable days
-	in the recurrence preview calendar.  Set the week_start_day from
-	the calendar's configuration.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (clear_widgets): Block the signals as appropriate.
-	(fill_ending_date): Ditto.
-	(fill_recurrence_widgets): Ditto.
-	(recurrence_type_toggled_cb): Only sensitize the widgets and
-	preview the recurrence if the toggle button is active.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_to_comp_object): Clear the rdate and
-	exrule lists from the component if we are setting a simple
-	recurrence.
-	(recur_to_comp_object): Set the exdate list here instead of in
-	dialog_to_comp_object().
-	(preview_recur): New function to tag the recurrence preview
-	calendar based on the information from the dialog box.
-	(fill_exception_widgets): Fill the exception widgets here; moved
-	over from fill_widgets().
-	(fill_recurrence_widgets): Call preview_recur().  Also, call
-	fill_exception_widgets() first of all.
-	(recurrence_type_toggled_cb): Call preview_recur().
-	(recur_interval_selection_done_cb): Likewise.
-	(recur_ending_selection_done_cb): Likewise.
-	(recurrence_exception_add_cb): Likewise.
-	(recurrence_exception_modify_cb): Likewise.
-	(recurrence_exception_delete_cb): Likewise.
-	(date_changed_cb): Likewise.
-	(recur_interval_value_changed_cb): Likewise, new function.
-
-	* gui/tag-calendar.[ch]: New files with utilities for tagging
-	calendars.  mark.[ch] should go away some day.
-
-	* gui/tag-calendar.c (tag_calendar): Moved over from
-	gnome_calendar_tag_calendar().  Take in a CalClient instead of a
-	GnomeCalendar.  Added API docs.
-	(tag_calendar_by_comp): New function to tag a calendar based on a
-	single calendar component instead of a whole client.
-
-	* gui/gnome-cal.c (initial_load): Use tag_calendar_by_client().
-	(obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(editor_closed_cb): Free the closure.
-	(destroy_editor_cb): Renamed from free_uid().  Do not free the
-	UID; just unref the event editor.  Our destroy handler to it will
-	free things properly.  This will also cause the corresponding
-	calendar client to be unrefed.
-	(editor_closed_cb): Use a flag on the GnomeCalendar to decide
-	whether to remove the editor from the hash table.  This is sort of
-	icky.
-
-	* gui/calendar-model.c (obj_updated_cb): If the object is new, we
-	have to use e_table_model_row_inserted(), not row_changed().
-	Thanks to JP Rosevear for reporting this.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tag-calendar.[ch] to the list of sources.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/evolution-calendar.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.
-
-	* pcs/Makefile.am (idl_flags): ditto.
-
-2000-11-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
-	iterator before finding the next changed item.
-
-	* conduits/todo/todo-conduit.c (for_each_modified): ditto
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: I wrote the code so that recipients of meeting requests
-	can reply appropriately.
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c:  fixed a bug that would make the calendar segfault
-	if the meeting editor were called up twice without first saving the
-	component.
-
-2000-11-08   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: updated the GUI
-	to allow the user to add PUBLISHed events to his calendar, and created
-	unworking buttons for meeting requests.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	These changes fix bugzilla bugs #874 and #875.
-
-	* cal-util/cal-component.c (cal_component_get_exdate_list): Return
-	a list of CalComponentDateTime instead of simple struct
-	icaltimetype objects.  Exception date properties *can* contain a
-	timezone parameter, so we need to include those if they are
-	present.
-	(cal_component_set_exdate_list): On the input, handle a list of
-	CalComponentDateTime structures.  On the internals, handle a list
-	of struct datetime instead of plain properties.
-	(cal_component_free_exdate_list): Handle a list of
-	CalComponentDateTime structures.
-	(scan_exdate): Create a list of struct datetime structures.
-	(free_icalcomponent): Free the exdate_list properly.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Use the
-	proper types for exception dates.
-
-	* gui/comp-util.h:
-	* gui/comp-util.c: New files with utilities for manipulating
-	calendar component objects.
-	(cal_comp_util_add_exdate): New function.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-util.[ch] to the list of sources.
-
-	* gui/e-day-view.c (add_exdate): New convenience function to add
-	an exception date to a calendar component.
-	(e_day_view_on_unrecur_appointment): Use cal_comp_util_add_exdate().
-	(e_day_view_on_delete_occurrence): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (nth_weekday): Be paranoid about valid
-	position values.
-	(fill_widgets): Use the proper types for exdates.
-	(dialog_to_comp_object): Likewise.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (adjust_day_index_spin): Adjust the valid
-	range of the month index spin button depending on the selection of
-	the day/weekday menu.
-
-2000-11-07   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed the GUI,
-	and added some extra feedback for the user.
-
-2000-11-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.h (WeekdayPickerClass): Added a "changed"
-	signal to notify of changes to the set of selected days.
-
-	* gui/weekday-picker.c (weekday_picker_class_init): Create the
-	"changed" signal.
-	(weekday_picker_set_days): Emit the "changed" signal.
-
-2000-11-06   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed to GUI to
-	accomodate dynamically generated buttons, which will be tailored to
-	the type of iTip message that is incoming.
-
-	* gui/e-meeting-dialog.glade gui/e-meeting-edit.c: added a new button
-	to publish events, in addition to requesting meetings.
-
-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 89cea775bd..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl cal-util pcs cal-client gui importers $(CONDUIT_DIR)
-
-EXTRA_DIST = zones.h
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 1537e6e01d..0000000000
--- a/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,15 +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
-*.lo
-*.la
-client-test
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
deleted file mode 100644
index de4b85e51f..0000000000
--- a/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# libcal-client
-#
-
-CORBA_GENERATED =				\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-CORBA_HEADERS_GENERATED =			\
-	evolution-calendar.h
-
-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		\
-	-I$(top_builddir)/libwombat			\
-	-I$(top_srcdir)/libwombat			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-lib_LTLIBRARIES = libcal-client.la
-
-libcal_clientincludedir = $(includedir)/evolution/cal-client
-
-libcal_client_la_SOURCES =	\
-	$(CORBA_GENERATED)	\
-	cal-client-multi.c	\
-	cal-client-types.c	\
-	cal-client.c		\
-	cal-listener.c		\
-	cal-listener.h		\
-	cal-query.c		\
-	query-listener.c	\
-	query-listener.h
-
-libcal_clientinclude_HEADERS =		\
-	$(CORBA_HEADERS_GENERATED)	\
-	cal-client-multi.h		\
-	cal-client-types.h 		\
-	cal-client.h			\
-	cal-query.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 =							\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(top_builddir)/calendar/cal-util/libcal-util.la		\
-	$(top_builddir)/libversit/libversit.a				\
-	$(top_builddir)/libical/src/libical/libical-evolution.la	\
-	$(top_builddir)/libwombat/libwombat.la				\
-	libcal-client.la
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/cal-client/cal-client-multi.c b/calendar/cal-client/cal-client-multi.c
deleted file mode 100644
index aeebc72fda..0000000000
--- a/calendar/cal-client/cal-client-multi.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "cal-client-multi.h"
-
-/* Private part of the CalClientMulti structure */
-struct _CalClientMultiPrivate {
-	GHashTable *calendars;
-	GList *uris;
-};
-
-static void cal_client_multi_class_init (CalClientMultiClass *klass);
-static void cal_client_multi_init       (CalClientMulti *multi);
-static void cal_client_multi_destroy    (GtkObject *object);
-
-/* signal IDs */
-enum {
-	CAL_OPENED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	CATEGORIES_CHANGED,
-	FORGET_PASSWORD,
-	LAST_SIGNAL
-};
-
-static guint cal_multi_signals[LAST_SIGNAL];
-static GtkObjectClass *parent_class = NULL;
-
-/*
- * Private functions
- */
-
-/**
- * cal_client_multi_get_type
- *
- * Registers the #CalClientMulti class if necessary, and returns the type ID
- * assigned to it.
- *
- * Returns: The type ID of the #CalClientMulti class
- */
-GtkType
-cal_client_multi_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info = {
-			"CalClientMulti",
-			sizeof (CalClientMulti),
-			sizeof (CalClientMultiClass),
-			(GtkClassInitFunc) cal_client_multi_class_init,
-			(GtkObjectInitFunc) cal_client_multi_init,
-			NULL,
-			NULL,
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (GTK_TYPE_OBJECT, &info);
-	}
-
-	return type;
-}
-
-/* class initialization function for the multi calendar client */
-static void
-cal_client_multi_class_init (CalClientMultiClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-	
-	cal_multi_signals[CAL_OPENED] =
-		gtk_signal_new ("cal_opened",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientMultiClass, cal_opened),
-				gtk_marshal_NONE__POINTER_INT,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_ENUM);
-	cal_multi_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientMultiClass, obj_updated),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_STRING);
-	cal_multi_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientMultiClass, obj_removed),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_STRING);
-	cal_multi_signals[CATEGORIES_CHANGED] =
-		gtk_signal_new ("categories_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientMultiClass, categories_changed),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-	cal_multi_signals[FORGET_PASSWORD] =
-		gtk_signal_new ("forget_password",
-				GTK_RUN_FIRST,
-                                object_class->type,
-                                GTK_SIGNAL_OFFSET (CalClientMultiClass, forget_password),
-                                gtk_marshal_NONE__POINTER_POINTER,
-                                GTK_TYPE_NONE, 2,
-                                GTK_TYPE_STRING, GTK_TYPE_STRING);
-
-	object_class->destroy = cal_client_multi_destroy;
-}
-
-/* object initialization function for the multi calendar client */
-static void
-cal_client_multi_init (CalClientMulti *multi)
-{
-	multi->priv = g_new0 (CalClientMultiPrivate, 1);
-	multi->priv->calendars = g_hash_table_new (g_str_hash, g_str_equal);
-	multi->priv->uris = NULL;
-}
-
-static void
-free_calendar (gpointer key, gpointer value, gpointer data)
-{
-	CalClientMulti *multi = (CalClientMulti *) data;
-
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	multi->priv->uris = g_list_remove (multi->priv->uris, key);
-
-	g_free (key);
-	gtk_object_unref (GTK_OBJECT (value));
-}
-
-/* destroy handler for the multi calendar client */
-static void
-cal_client_multi_destroy (GtkObject *object)
-{
-	CalClientMulti *multi = (CalClientMulti *) object;
-
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	/* free memory */
-	g_hash_table_foreach (multi->priv->calendars, free_calendar, multi);
-	g_hash_table_destroy (multi->priv->calendars);
-	g_list_free (multi->priv->uris);
-
-	g_free (multi->priv);
-	multi->priv = NULL;
-
-	/* chain to parent class' destroy handler */
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/**
- * cal_client_multi_new
- *
- * Creates a new multi-calendar client. This allows you to merge several
- * #CalClient objects into one entity, making it easier to manage
- * multiple calendars.
- *
- * Returns: A newly-created multi-calendar client.
- */
-CalClientMulti *
-cal_client_multi_new (void)
-{
-	CalClientMulti *multi;
-
-	multi = gtk_type_new (CAL_CLIENT_MULTI_TYPE);
-	return multi;
-}
-
-/* CalClient's signal handlers */
-static void
-client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer user_data)
-{
-	CalClientMulti *multi = (CalClientMulti *) user_data;
-
-	g_return_if_fail (IS_CAL_CLIENT (client));
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	gtk_signal_emit (GTK_OBJECT (multi),
-			 cal_multi_signals[CAL_OPENED],
-			 client, status);
-}
-
-static void
-client_obj_updated_cb (CalClient *client, const char *uid, gpointer user_data)
-{
-	CalClientMulti *multi = (CalClientMulti *) user_data;
-
-	g_return_if_fail (IS_CAL_CLIENT (client));
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	gtk_signal_emit (GTK_OBJECT (multi),
-			 cal_multi_signals[OBJ_UPDATED],
-			 client, uid);
-}
-
-static void
-client_obj_removed_cb (CalClient *client, const char *uid, gpointer user_data)
-{
-	CalClientMulti *multi = (CalClientMulti *) user_data;
-
-	g_return_if_fail (IS_CAL_CLIENT (client));
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	gtk_signal_emit (GTK_OBJECT (multi),
-			 cal_multi_signals[OBJ_REMOVED],
-			 client, uid);
-}
-
-static void
-client_categories_changed_cb (CalClient *client, GPtrArray *categories, gpointer user_data)
-{
-	CalClientMulti *multi = (CalClientMulti *) user_data;
-
-	g_return_if_fail (IS_CAL_CLIENT (client));
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	gtk_signal_emit (GTK_OBJECT (multi),
-			 cal_multi_signals[CATEGORIES_CHANGED],
-			 client, categories);
-}
-
-static void
-client_forget_password_cb (CalClient *client, const char *key, gpointer user_data)
-{
-	CalClientMulti *multi = (CalClientMulti *) user_data;
-
-	g_return_if_fail (IS_CAL_CLIENT (client));
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	gtk_signal_emit (GTK_OBJECT (multi),
-			 cal_multi_signals[FORGET_PASSWORD],
-			 client, key);
-}
-/**
- * cal_client_multi_add_client
- * @multi: A #CalClientMulti object.
- * @client: The #CalClient object to be added.
- *
- * Aggregates the given #CalClient to a #CalClientMulti object,
- * thus adding it to the list of managed calendars.
- */
-void
-cal_client_multi_add_client (CalClientMulti *multi, CalClient *client)
-{
-	char *uri;
-	CalClient *old_client;
-
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	uri = g_strdup (cal_client_get_uri (client));
-	old_client = g_hash_table_lookup (multi->priv->calendars, uri);
-	if (old_client) {
-		g_free (uri);
-		return;
-	}
-
-	gtk_object_ref (GTK_OBJECT (client));
-	multi->priv->uris = g_list_append (multi->priv->uris, uri);
-	g_hash_table_insert (multi->priv->calendars, uri, client);
-
-	/* set up CalClient's signal handlers */
-	gtk_signal_disconnect_by_data (GTK_OBJECT (client), multi);
-	gtk_signal_connect (GTK_OBJECT (client),
-			    "cal_opened",
-			    GTK_SIGNAL_FUNC (client_cal_opened_cb),
-			    multi);
-	gtk_signal_connect (GTK_OBJECT (client),
-			    "obj_updated",
-			    GTK_SIGNAL_FUNC (client_obj_updated_cb),
-			    multi);
-	gtk_signal_connect (GTK_OBJECT (client),
-			    "obj_removed",
-			    GTK_SIGNAL_FUNC (client_obj_removed_cb),
-			    multi);
-	gtk_signal_connect (GTK_OBJECT (client),
-			    "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb),
-			    multi);
-	gtk_signal_connect (GTK_OBJECT (client),
-			    "forget_password",
-			    GTK_SIGNAL_FUNC (client_forget_password_cb),
-			    multi);
-}
-
-typedef struct {
-	CalClientAuthFunc func;
-	gpointer user_data;
-} AuthFuncData;
-
-static void
-set_auth_func (gpointer key, gpointer value, gpointer user_data)
-{
-	AuthFuncData *cb_data = (AuthFuncData *) user_data;
-	CalClient *client = (CalClient *) value;
-
-	g_return_if_fail (IS_CAL_CLIENT (client));
-	g_return_if_fail (cb_data != NULL);
-
-	cal_client_set_auth_func (client, cb_data->func, cb_data->user_data);
-}
-
-/**
- * cal_client_multi_set_auth_func
- * @multi: A #CalClientMulti object.
- * @func: The authentication function.
- * @user_data: Data to be passed to the authentication function.
- *
- * Sets the authentication function for all the clients in the
- * given #CalClientMulti.
- */
-void
-cal_client_multi_set_auth_func (CalClientMulti *multi,
-				CalClientAuthFunc func,
-				gpointer user_data)
-{
-	AuthFuncData *cb_data;
-
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	cb_data = g_new0 (AuthFuncData, 1);
-	cb_data->func = func;
-	cb_data->user_data = user_data;
-	g_hash_table_foreach (multi->priv->calendars, set_auth_func, cb_data);
-
-	g_free (cb_data);
-}
-
-/**
- * cal_client_multi_open_calendar
- * @multi: A #CalClientMulti object.
- * @str_uri: The URI of the calendar to be open
- * @only_if_exists:
- *
- * Open a new calendar in the given #CalClientMulti object.
- *
- * Returns: a pointer to the new #CalClient
- */
-CalClient *
-cal_client_multi_open_calendar (CalClientMulti *multi,
-				const char *str_uri,
-				gboolean only_if_exists)
-{
-	CalClient *client;
-	gboolean result;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), FALSE);
-
-	client = cal_client_new ();
-
-	result = cal_client_open_calendar (client, str_uri, only_if_exists);
-	if (result) {
-		cal_client_multi_add_client (multi, client);
-		gtk_object_unref (GTK_OBJECT (client));
-		return client;
-	}
-
-	gtk_object_unref (GTK_OBJECT (client));
-
-	return NULL;
-}
-
-/**
- * cal_client_multi_get_client_for_uri
- * @multi: A #CalClientMulti object.
- * @uri: The URI for the client.
- *
- * Returns the #CalClient object associated with the given
- * @uri for the given #CalClientMulti object.
- *
- * Returns: a pointer to the client or NULL if no client is
- * associated with that URI.
- */
-CalClient *
-cal_client_multi_get_client_for_uri (CalClientMulti *multi, const char *uri)
-{
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	return g_hash_table_lookup (multi->priv->calendars, uri);
-}
-
-/**
- * cal_client_multi_get_n_objects
- * @multi: A #CalClientMulti object.
- * @type: Type for objects
- *
- * Get the count of objects of the given type(s) for a #CalClientMulti
- * object.
- *
- * Returns: The count of objects of the given type(s).
- */
-int
-cal_client_multi_get_n_objects (CalClientMulti *multi,
-				CalObjType type)
-{
-	CalClient *client;
-	GList *l;
-	int count = 0;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), -1);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client))
-			count += cal_client_get_n_objects (client, type);
-	}
-
-	return count;
-}
-
-/**
- * cal_client_multi_get_object
- */
-CalClientGetStatus
-cal_client_multi_get_object (CalClientMulti *multi,
-			     const char *uid,
-			     CalComponent **comp)
-{
-	CalClient *client;
-	GList *l;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (uid != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			CalClientGetStatus status;
-
-			status = cal_client_get_object (client, uid, comp);
-			if (status == CAL_CLIENT_GET_SUCCESS)
-				return status;
-		}
-	}
-
-	return CAL_CLIENT_GET_NOT_FOUND;
-}
-
-/**
- * cal_client_multi_get_timezone
- * @multi: A #CalClientMulti object.
- * @tzid: ID for the timezone to be retrieved.
- * @zone: A pointer to where the icaltimezone object will be copied.
- */
-CalClientGetStatus
-cal_client_multi_get_timezone (CalClientMulti *multi,
-			       const char *tzid,
-			       icaltimezone **zone)
-{
-	CalClient *client;
-	GList *l;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (tzid != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			CalClientGetStatus status;
-
-			status = cal_client_get_timezone (client, tzid, zone);
-			if (status == CAL_CLIENT_GET_SUCCESS)
-				return status;
-		}
-	}
-
-	return CAL_CLIENT_GET_NOT_FOUND;
-}
-
-/**
- * cal_client_multi_get_uids
- * @multi: A #CalClientMulti object.
- * @type: Type of objects whose IDs will be returned.
- *
- * Returns a list of UIDs for all the objects of the given
- * type(s) that are in the calendars managed by a
- * #CalClientMulti object
- *
- * Returns: a GList of UIDs.
- */
-GList *
-cal_client_multi_get_uids (CalClientMulti *multi, CalObjType type)
-{
-	CalClient *client;
-	GList *l;
-	GList *result = NULL;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			GList *tmp;
-
-			tmp = cal_client_get_uids (client, type);
-			if (tmp)
-				result = g_list_concat (result, tmp);
-		}
-	}
-
-	return result;
-}
-
-/**
- * cal_client_multi_get_changes
- * @multi: A #CalClientMulti object.
- * @type: Object type.
- * @change_id: Change ID.
- *
- * Returns a list of changes for the given #CalClientMulti
- * object.
- */
-GList *
-cal_client_multi_get_changes (CalClientMulti *multi,
-			      CalObjType type,
-			      const char *change_id)
-{
-	CalClient *client;
-	GList *l;
-	GList *result = NULL;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			GList *tmp;
-
-			tmp = cal_client_get_changes (client, type, change_id);
-			if (tmp)
-				result = g_list_concat (result, tmp);
-		}
-	}
-
-	return result;
-}
-
-/**
- * cal_client_multi_get_objects_in_range
- * @multi: A #CalClientMulti object.
- * @type: Type for objects.
- * @start: Start time.
- * @end: End time.
- *
- * Retrieves a list of all calendar components that are
- * scheduled within the given time range. The information is
- * retrieved from all the calendars being managed by the
- * given #CalClientMulti object.
- *
- * Returns: A list of UID strings. This should be freed using the
- * #cal_obj_uid_list_free() function.
- **/
-GList *
-cal_client_multi_get_objects_in_range (CalClientMulti *multi,
-				       CalObjType type,
-				       time_t start,
-				       time_t end)
-{
-	CalClient *client;
-	GList *l;
-	GList *result = NULL;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			GList *tmp;
-
-			tmp = cal_client_get_objects_in_range (client, type, start, end);
-			if (tmp)
-				result = g_list_concat (result, tmp);
-		}
-	}
-
-	return result;
-}
-
-/**
- * cal_client_multi_get_free_busy
- * @multi: A #CalClientMulti object.
- * @users: List of users to retrieve F/B information for.
- * @start: Start time.
- * @end: End time.
- *
- * Retrieves Free/Busy information for the given users in all
- * the calendars being managed by the given #CalClient multi
- * object.
- *
- * Returns: A GList of VFREEBUSY CalComponents
- */
-GList *
-cal_client_multi_get_free_busy (CalClientMulti *multi,
-				GList *users,
-				time_t start,
-				time_t end)
-{
-	CalClient *client;
-	GList *l;
-	GList *result = NULL;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			GList *tmp;
-
-			tmp = cal_client_get_free_busy (client, users, start, end);
-			if (tmp)
-				result = g_list_concat (result, tmp);
-		}
-	}
-
-	return result;
-}
-
-/**
- * cal_client_multi_generate_instances
- */
-void
-cal_client_multi_generate_instances (CalClientMulti *multi,
-				     CalObjType type,
-				     time_t start,
-				     time_t end,
-				     CalRecurInstanceFn cb,
-				     gpointer cb_data)
-{
-	CalClient *client;
-	GList *l;
-
-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			cal_client_generate_instances (
-				client, type, start, end, cb, cb_data);
-		}
-	}
-}
-
-/**
- * cal_client_multi_get_alarms_in_range
- */
-GSList *
-cal_client_multi_get_alarms_in_range (CalClientMulti *multi, time_t start, time_t end)
-{
-	CalClient *client;
-	GList *l;
-	GSList *result = NULL;
-
-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);
-
-	for (l = multi->priv->uris; l; l = l->next) {
-		client = cal_client_multi_get_client_for_uri (multi,
-							      (const char *) l->data);
-		if (IS_CAL_CLIENT (client)) {
-			GSList *tmp;
-
-			tmp = cal_client_get_alarms_in_range (client, start, end);
-			if (tmp)
-				result = g_slist_concat (result, tmp);
-		}
-	}
-
-	return result;
-}
diff --git a/calendar/cal-client/cal-client-multi.h b/calendar/cal-client/cal-client-multi.h
deleted file mode 100644
index cded02e194..0000000000
--- a/calendar/cal-client/cal-client-multi.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_MULTI_H
-#define CAL_CLIENT_MULTI_H
-
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-#define CAL_CLIENT_MULTI_TYPE            (cal_client_multi_get_type ())
-#define CAL_CLIENT_MULTI(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti))
-#define CAL_CLIENT_MULTI_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass))
-#define IS_CAL_CLIENT_MULTI(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_MULTI_TYPE))
-#define IS_CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE))
-
-typedef struct _CalClientMulti        CalClientMulti;
-typedef struct _CalClientMultiClass   CalClientMultiClass;
-typedef struct _CalClientMultiPrivate CalClientMultiPrivate;
-
-struct _CalClientMulti {
-	GtkObject object;
-
-	/* Private data */
-	CalClientMultiPrivate *priv;
-};
-
-struct _CalClientMultiClass {
-	GtkObjectClass parent_class;
-
-	/* notification signals */
-	void (* cal_opened) (CalClientMulti *multi, CalClient *client, CalClientOpenStatus status);
-
-	void (* obj_updated) (CalClientMulti *multi, CalClient *client, const char *uid);
-	void (* obj_removed) (CalClientMulti *multi, CalClient *client, const char *uid);
-
-	void (* categories_changed) (CalClientMulti *multi, CalClient *client, GPtrArray *categories);
-
-	void (* forget_password) (CalClientMulti *multi, CalClient *client, const char *key);
-};
-
-GtkType            cal_client_multi_get_type (void);
-
-CalClientMulti    *cal_client_multi_new (void);
-
-void               cal_client_multi_add_client (CalClientMulti *multi, CalClient *client);
-void               cal_client_multi_set_auth_func (CalClientMulti *multi,
-						   CalClientAuthFunc func,
-						   gpointer user_data);
-
-CalClient         *cal_client_multi_open_calendar (CalClientMulti *multi,
-						   const char *str_uri,
-						   gboolean only_if_exists);
-CalClient         *cal_client_multi_get_client_for_uri (CalClientMulti *multi,
-							const char *uri);
-
-int                cal_client_multi_get_n_objects (CalClientMulti *multi, CalObjType type);
-CalClientGetStatus cal_client_multi_get_object (CalClientMulti *multi,
-						const char *uid,
-						CalComponent **comp);
-CalClientGetStatus cal_client_multi_get_timezone (CalClientMulti *multi,
-						  const char *tzid,
-						  icaltimezone **zone);
-GList             *cal_client_multi_get_uids (CalClientMulti *multi, CalObjType type);
-GList             *cal_client_multi_get_changes (CalClientMulti *multi,
-						 CalObjType type,
-						 const char *change_id);
-GList             *cal_client_multi_get_objects_in_range (CalClientMulti *multi,
-							  CalObjType type,
-							  time_t start,
-							  time_t end);
-GList             *cal_client_multi_get_free_busy (CalClientMulti *multi,
-						   GList *users,
-						   time_t start,
-						   time_t end);
-void               cal_client_multi_generate_instances (CalClientMulti *multi,
-							CalObjType type,
-							time_t start,
-							time_t end,
-							CalRecurInstanceFn cb,
-							gpointer cb_data);
-GSList            *cal_client_multi_get_alarms_in_range (CalClientMulti *multi,
-							 time_t start, time_t end);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/cal-client-types.c b/calendar/cal-client/cal-client-types.c
deleted file mode 100644
index 6ce98c02c2..0000000000
--- a/calendar/cal-client/cal-client-types.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-client-types.h"
-
-
-
-/**
- * cal_client_change_list_free:
- * @list: List of #CalClientChange structures.
- * 
- * Frees a list of #CalClientChange structures.
- **/
-void
-cal_client_change_list_free (GList *list)
-{
-	CalClientChange *c;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		c = l->data;
-
-		g_assert (c != NULL);
-		g_assert (c->comp != NULL);
-
-		gtk_object_unref (GTK_OBJECT (c->comp));
-		g_free (c);
-	}
-
-	g_list_free (list);
-}
diff --git a/calendar/cal-client/cal-client-types.h b/calendar/cal-client/cal-client-types.h
deleted file mode 100644
index 9727fc9b3d..0000000000
--- a/calendar/cal-client/cal-client-types.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_TYPES_H
-#define CAL_CLIENT_TYPES_H
-
-#include <libgnome/gnome-defs.h>
-#include <cal-util/cal-component.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-typedef enum {
-	CAL_CLIENT_CHANGE_ADDED = 1 << 0,
-	CAL_CLIENT_CHANGE_MODIFIED = 1 << 1,
-	CAL_CLIENT_CHANGE_DELETED = 1 << 2
-} CalClientChangeType;
-
-typedef struct 
-{
-	CalComponent *comp;
-	CalClientChangeType type;
-} CalClientChange;
-
-void cal_client_change_list_free (GList *list);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
deleted file mode 100644
index 30402bf126..0000000000
--- a/calendar/cal-client/cal-client.c
+++ /dev/null
@@ -1,2552 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <liboaf/liboaf.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <libgnome/gnome-util.h>
-
-#include "cal-client-types.h"
-#include "cal-client.h"
-#include "cal-listener.h"
-#include "wombat-client.h"
-
-
-
-/* Private part of the CalClient structure */
-struct _CalClientPrivate {
-	/* Load state to avoid multiple loads */
-	CalClientLoadState load_state;
-
-	/* URI of the calendar that is being loaded or is already loaded, or
-	 * NULL if we are not loaded.
-	 */
-	char *uri;
-
-	/* The calendar factories we are contacting */
-	GList *factories;
-
-	/* Our calendar listener implementation */
-	CalListener *listener;
-
-	/* The calendar client interface object we are contacting */
-	GNOME_Evolution_Calendar_Cal cal;
-
-	/* The authentication function */
-	CalClientAuthFunc auth_func;
-	gpointer auth_user_data;
-
-	/* The WombatClient */
-	WombatClient *w_client;
-
-	/* A cache of timezones retrieved from the server, to avoid getting
-	   them repeatedly for each get_object() call. */
-	GHashTable *timezones;
-
-	/* The default timezone to use to resolve DATE and floating DATE-TIME
-	   values. */
-	icaltimezone *default_zone;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_OPENED,
-	CAL_SET_MODE,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	CATEGORIES_CHANGED,
-	FORGET_PASSWORD,
-	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 char *client_get_password_cb (WombatClient *w_client,
-				     const gchar *prompt,
-				     const gchar *key,
-				     gpointer user_data);
-static void  client_forget_password_cb (WombatClient *w_client,
-					const gchar *key,
-					gpointer user_data);
-static void cal_client_get_object_timezones_cb (icalparameter *param,
-						void *data);
-
-static guint cal_client_signals[LAST_SIGNAL];
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_client_get_type:
- *
- * 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;
-}
-
-#define marshal_NONE__ENUM_ENUM gtk_marshal_NONE__INT_INT
-
-/* 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_OPENED] =
-		gtk_signal_new ("cal_opened",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, cal_opened),
-				gtk_marshal_NONE__ENUM,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_ENUM);
-	cal_client_signals[CAL_SET_MODE] =
-		gtk_signal_new ("cal_set_mode",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, cal_set_mode),
-				marshal_NONE__ENUM_ENUM,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_ENUM,
-				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);
-	cal_client_signals[CATEGORIES_CHANGED] =
-		gtk_signal_new ("categories_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, categories_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-	cal_client_signals[FORGET_PASSWORD] =
-		gtk_signal_new ("forget_password",
-				GTK_RUN_FIRST,
-                                object_class->type,
-                                GTK_SIGNAL_OFFSET (CalClientClass, forget_password),
-                                gtk_marshal_NONE__STRING,
-                                GTK_TYPE_NONE, 1,
-                                GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL);
-
-	class->cal_opened = NULL;
-	class->obj_updated = NULL;
-	class->obj_removed = NULL;
-	class->categories_changed = NULL;
-	class->forget_password = NULL;
-
-	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->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-	priv->uri = NULL;
-	priv->factories = NULL;
-	priv->timezones = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->w_client = NULL;
-	priv->default_zone = icaltimezone_get_utc_timezone ();
-}
-
-/* Gets rid of the factories that a client knows about */
-static void
-destroy_factories (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Object factory;
-	CORBA_Environment ev;
-	int result;
-	GList *f;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-
-	for (f = priv->factories; f; f = f->next) {
-		factory = f->data;
-
-		result = CORBA_Object_is_nil (factory, &ev);
-		if (BONOBO_EX (&ev)) {
-			g_message ("destroy_factories(): could not see if a factory was nil");
-			CORBA_exception_free (&ev);
-
-			continue;
-		}
-
-		if (result)
-			continue;
-
-		CORBA_Object_release (factory, &ev);
-		if (BONOBO_EX (&ev)) {
-			g_message ("destroy_factories(): could not release a factory");
-			CORBA_exception_free (&ev);
-		}
-	}
-
-	g_list_free (priv->factories);
-	priv->factories = 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 (BONOBO_EX (&ev)) {
-		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);
-	GNOME_Evolution_Calendar_Cal_unref (priv->cal, &ev);
-	if (BONOBO_EX (&ev))
-		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 (BONOBO_EX (&ev))
-		g_message ("destroy_cal(): could not release the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-	priv->cal = CORBA_OBJECT_NIL;
-
-}
-
-static void
-free_timezone (gpointer key, gpointer value, gpointer data)
-{
-	/* Note that the key comes from within the icaltimezone value, so we
-	   don't free that. */
-	icaltimezone_free (value, TRUE);
-}
-
-/* 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;
-
-	/* The server unrefs the query listener, so we just NULL it out here */
-	if (priv->listener) {
-		cal_listener_stop_notification (priv->listener);
-		priv->listener = NULL;
-	}
-
-	priv->w_client = NULL;
-	destroy_factories (client);
-	destroy_cal (client);
-
-	priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-
-	if (priv->uri) {
-		g_free (priv->uri);
-		priv->uri = NULL;
-	}
-
-	g_hash_table_foreach (priv->timezones, free_timezone, NULL);
-	g_hash_table_destroy (priv->timezones);
-	priv->timezones = NULL;
-
-	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_opened notification from the listener */
-static void
-cal_opened_cb (CalListener *listener,
-	       GNOME_Evolution_Calendar_Listener_OpenStatus status,
-	       GNOME_Evolution_Calendar_Cal cal,
-	       gpointer data)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_Cal cal_copy;
-	CalClientOpenStatus client_status;
-
-	client = CAL_CLIENT (data);
-	priv = client->priv;
-
-	g_assert (priv->load_state == CAL_CLIENT_LOAD_LOADING);
-	g_assert (priv->uri != NULL);
-
-	client_status = CAL_CLIENT_OPEN_ERROR;
-
-	switch (status) {
-	case GNOME_Evolution_Calendar_Listener_SUCCESS:
-		CORBA_exception_init (&ev);
-		cal_copy = CORBA_Object_duplicate (cal, &ev);
-		if (BONOBO_EX (&ev)) {
-			g_message ("cal_opened_cb(): could not duplicate the "
-				   "calendar client interface");
-			CORBA_exception_free (&ev);
-			goto error;
-		}
-		CORBA_exception_free (&ev);
-
-		priv->cal = cal_copy;
-		priv->load_state = CAL_CLIENT_LOAD_LOADED;
-
-		client_status = CAL_CLIENT_OPEN_SUCCESS;
-		goto out;
-
-	case GNOME_Evolution_Calendar_Listener_ERROR:
-		client_status = CAL_CLIENT_OPEN_ERROR;
-		goto error;
-
-	case GNOME_Evolution_Calendar_Listener_NOT_FOUND:
-		client_status = CAL_CLIENT_OPEN_NOT_FOUND;
-		goto error;
-
-	case GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
-		client_status = CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED;
-		goto error;
-
-	default:
-		g_assert_not_reached ();
-	}
-
- error:
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-
-	/* We free the priv->uri and set the priv->load_state until after the
-	 * "cal_opened" signal has been emitted so that handlers will be able to
-	 * access this information.
-	 */
-
- out:
-
-	/* We are *not* inside a signal handler (this is just a simple callback
-	 * called from the listener), so there is not a temporary reference to
-	 * the client object.  We ref() so that we can safely emit our own
-	 * signal and clean up.
-	 */
-
-	gtk_object_ref (GTK_OBJECT (client));
-
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_OPENED],
-			 client_status);
-
-	if (client_status != CAL_CLIENT_OPEN_SUCCESS) {
-		priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-		g_free (priv->uri);
-		priv->uri = NULL;
-	}
-
-	g_assert (priv->load_state != CAL_CLIENT_LOAD_LOADING);
-
-	gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Handle the cal_set_mode notification from the listener */
-static void
-cal_set_mode_cb (CalListener *listener,
-		 GNOME_Evolution_Calendar_Listener_SetModeStatus status,
-		 GNOME_Evolution_Calendar_CalMode mode,
-		 gpointer data)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-	CalClientSetModeStatus client_status;
-
-	client = CAL_CLIENT (data);
-	priv = client->priv;
-
-	client_status = CAL_CLIENT_OPEN_ERROR;
-
-	switch (status) {
-	case GNOME_Evolution_Calendar_Listener_MODE_SET:
-		client_status = CAL_CLIENT_SET_MODE_SUCCESS;
-		break;		
-	case GNOME_Evolution_Calendar_Listener_MODE_NOT_SET:
-		client_status = CAL_CLIENT_SET_MODE_ERROR;
-		break;
-	case GNOME_Evolution_Calendar_Listener_MODE_NOT_SUPPORTED:
-		client_status = CAL_CLIENT_SET_MODE_NOT_SUPPORTED;
-		break;		
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* We are *not* inside a signal handler (this is just a simple callback
-	 * called from the listener), so there is not a temporary reference to
-	 * the client object.  We ref() so that we can safely emit our own
-	 * signal and clean up.
-	 */
-
-	gtk_object_ref (GTK_OBJECT (client));
-
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_SET_MODE],
-			 client_status, mode);
-
-	gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Handle the obj_updated signal from the listener */
-static void
-obj_updated_cb (CalListener *listener, const GNOME_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 GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_REMOVED], uid);
-}
-
-/* Handle the categories_changed signal from the listener */
-static void
-categories_changed_cb (CalListener *listener, const GNOME_Evolution_Calendar_StringSeq *categories,
-		       gpointer data)
-{
-	CalClient *client;
-	GPtrArray *cats;
-	int i;
-
-	client = CAL_CLIENT (data);
-
-	cats = g_ptr_array_new ();
-	g_ptr_array_set_size (cats, categories->_length);
-
-	for (i = 0; i < categories->_length; i++)
-		cats->pdata[i] = categories->_buffer[i];
-
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CATEGORIES_CHANGED], cats);
-
-	g_ptr_array_free (cats, TRUE);
-}
-
-
-/* Handle the get_password signal from the Wombatclient */
-static gchar *
-client_get_password_cb (WombatClient *w_client,
-                        const gchar *prompt,
-                        const gchar *key,
-                        gpointer user_data)
-{
-        CalClient *client;
-
-        client = CAL_CLIENT (user_data);
-        g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-        if (client->priv->auth_func)
-                return client->priv->auth_func (client, prompt, key, client->priv->auth_user_data);
-
-        return NULL;
-}
-
-/* Handle the forget_password signal from the WombatClient */
-static void
-client_forget_password_cb (WombatClient *w_client,
-                           const gchar *key,
-                           gpointer user_data)
-{
-        CalClient *client;
-
-        client = CAL_CLIENT (user_data);
-        g_return_if_fail (IS_CAL_CLIENT (client));
-
-        gtk_signal_emit (GTK_OBJECT (client),
-                         cal_client_signals [FORGET_PASSWORD],
-                         key);
-}
-
-
-
-/**
- * cal_client_construct:
- * @client: A calendar client.
- *
- * Constructs a calendar client object by contacting all available
- * calendar factories.
- *
- * 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;
-	GNOME_Evolution_Calendar_CalFactory factory;
-	OAF_ServerInfoList *servers;
-	CORBA_Environment ev;
-	int i;
-
-	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;
-
-	CORBA_exception_init (&ev);
-
-	servers = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/Calendar/CalFactory:1.0')", NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("Cannot perform OAF query for Calendar servers.");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	if (servers->_length == 0)
-		g_warning ("No Calendar servers installed.");
-
-	for (i = 0; i < servers->_length; i++) {
-		const OAF_ServerInfo *info;
-
-		info = servers->_buffer + i;
-
-		g_print ("Factory: %s\n", info->iid);
-		factory = (GNOME_Evolution_Calendar_CalFactory)
-			oaf_activate_from_id (info->iid, 0, NULL, &ev);
-		if (BONOBO_EX (&ev)) {
-			g_warning ("cal_client_construct: Could not activate calendar server %s", info->iid);
-			CORBA_free (servers);
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		priv->factories = g_list_prepend (priv->factories, factory);
-	}
-
-	CORBA_free (servers);
-
-	CORBA_exception_free (&ev);
-	return client;
-}
-
-/**
- * cal_client_new:
- *
- * Creates a new calendar client.  It should be initialized by calling
- * cal_client_open_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;
-}
-
-/**
- * cal_client_set_auth_func
- * @client: A calendar client.
- * @func: The authentication function
- * @data: User data to be used when calling the authentication function
- *
- * Associates the given authentication function with a calendar client. This
- * function will be called any time the calendar server needs a password
- * from the client. So, calendar clients should provide such authentication
- * function, which, when called, should act accordingly (by showing a dialog
- * box, for example, to ask the user for the password).
- *
- * The authentication function must have the following form:
- *	char * auth_func (CalClient *client,
- *			  const gchar *prompt,
- *			  const gchar *key,
- *			  gpointer user_data)
- */
-void
-cal_client_set_auth_func (CalClient *client, CalClientAuthFunc func, gpointer data)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	client->priv->auth_func = func;
-	client->priv->auth_user_data = data;
-}
-
-static gboolean
-real_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists, gboolean *supported)
-{
-	CalClientPrivate *priv;
-	GNOME_Evolution_Calendar_Listener corba_listener;
-	int unsupported;
-	GList *f;
-	CORBA_Environment ev;
-	
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_NOT_LOADED, FALSE);
-	g_assert (priv->uri == NULL);
-
-	g_return_val_if_fail (str_uri != NULL, FALSE);
-
-	priv->listener = cal_listener_new (cal_opened_cb,
-					   cal_set_mode_cb,
-					   obj_updated_cb,
-					   obj_removed_cb,
-					   categories_changed_cb,
-					   client);
-	if (!priv->listener) {
-		g_message ("cal_client_open_calendar(): could not create the listener");
-		return FALSE;
-	}
-
-	/* create the WombatClient */
-	priv->w_client = wombat_client_new (
-		(WombatClientGetPasswordFn) client_get_password_cb,
-                (WombatClientForgetPasswordFn) client_forget_password_cb,
-                (gpointer) client);
-	bonobo_object_add_interface (BONOBO_OBJECT (priv->listener),
-				     BONOBO_OBJECT (priv->w_client));
-
-	corba_listener = (GNOME_Evolution_Calendar_Listener) (BONOBO_OBJREF (priv->listener));
-
-	priv->load_state = CAL_CLIENT_LOAD_LOADING;
-	priv->uri = g_strdup (str_uri);
-
-	unsupported = 0;
-	for (f = priv->factories; f; f = f->next) {
-		CORBA_exception_init (&ev);
-
-		GNOME_Evolution_Calendar_CalFactory_open (f->data, str_uri,
-							  only_if_exists,
-							  corba_listener, &ev);
-		if (!BONOBO_EX (&ev))
-			break;
-		else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod))
-			unsupported++;
-	}
-
-	if (supported != NULL) {
-		if (unsupported == g_list_length (priv->factories))
-			*supported = FALSE;
-		else
-			*supported = TRUE;
-	}
-	
-	if (BONOBO_EX (&ev)) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-		priv->listener = NULL;
-		priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-		g_free (priv->uri);
-		priv->uri = NULL;
-
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * cal_client_open_calendar:
- * @client: A calendar client.
- * @str_uri: URI of calendar to open.
- * @only_if_exists: FALSE if the calendar should be opened even if there
- * was no storage for it, i.e. to create a new calendar or load an existing
- * one if it already exists.  TRUE if it should only try to load calendars
- * that already exist.
- *
- * Makes a calendar client initiate a request to open a calendar.  The calendar
- * client will emit the "cal_opened" signal when the response from the server is
- * received.
- *
- * Return value: TRUE on success, FALSE on failure to issue the open request.
- **/
-gboolean
-cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists)
-{
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	return real_open_calendar (client, str_uri, only_if_exists, NULL);
-}
-
-static char *
-get_fall_back_uri (gboolean tasks)
-{
-	if (tasks)
-		return g_concat_dir_and_file (g_get_home_dir (),
-					      "evolution/local/"
-					      "Tasks/tasks.ics");
-	else
-		return g_concat_dir_and_file (g_get_home_dir (),
-					      "evolution/local/"
-					      "Calendar/calendar.ics");
-}
-
-static char *
-get_default_uri (gboolean tasks)
-{
-	Bonobo_ConfigDatabase db;
-	char *uri;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return NULL;
- 	}
-
-	if (tasks)
-		uri = bonobo_config_get_string (db, "/DefaultFolders/tasks_uri", &ev);
-	else
-		uri = bonobo_config_get_string (db, "/DefaultFolders/calendar_uri", &ev);
-	bonobo_object_release_unref (db, NULL);
-
-	if (BONOBO_EX (&ev)) {
-		CORBA_exception_free (&ev);
-		uri = get_fall_back_uri (tasks);
-	} else {
-		uri = cal_util_expand_uri (uri, tasks);
-	}
-	
-	return uri;
-}
-
-gboolean
-cal_client_open_default_calendar (CalClient *client, gboolean only_if_exists)
-{
-	char *default_uri, *fall_back;
-	gboolean result, supported;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	default_uri = get_default_uri (FALSE);
-	fall_back = get_fall_back_uri (FALSE);
-	
-	result = real_open_calendar (client, default_uri, only_if_exists, &supported);
-	if (!supported && strcmp (fall_back, default_uri))
-		result = real_open_calendar (client, fall_back, only_if_exists, NULL);
-
-	g_free (default_uri);
-	g_free (fall_back);
-	
-	return result;
-}
-
-gboolean
-cal_client_open_default_tasks (CalClient *client, gboolean only_if_exists)
-{
-	char *default_uri, *fall_back;
-	gboolean result, supported;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	default_uri = get_default_uri (TRUE);
-	fall_back = get_fall_back_uri (TRUE);
-
-	result = real_open_calendar (client, default_uri, only_if_exists, &supported);
-	if (!supported && strcmp (fall_back, default_uri))
-		result = real_open_calendar (client, fall_back, only_if_exists, NULL);
-
-	g_free (default_uri);
-	g_free (fall_back);
-
-	return result;
-}
-
-/* Builds an URI list out of a CORBA string sequence */
-static GList *
-build_uri_list (GNOME_Evolution_Calendar_StringSeq *seq)
-{
-	GList *uris = NULL;
-	int i;
-
-	for (i = 0; i < seq->_length; i++)
-		uris = g_list_prepend (uris, g_strdup (seq->_buffer[i]));
-
-	return uris;
-}
-
-/**
- * cal_client_uri_list:
- * @client: A calendar client
- * @type: type of uri's to get
- * 
- * 
- * Return value: A list of URI's open on the wombat
- **/
-GList *
-cal_client_uri_list (CalClient *client, CalMode mode)
-{
-	CalClientPrivate *priv;
-	GNOME_Evolution_Calendar_StringSeq *uri_seq;
-	GList *uris = NULL;	
-	CORBA_Environment ev;
-	GList *f;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-
-	for (f = priv->factories; f; f = f->next) {
-		CORBA_exception_init (&ev);
-		uri_seq = GNOME_Evolution_Calendar_CalFactory_uriList (f->data, mode, &ev);
-
-		if (BONOBO_EX (&ev)) {
-			g_message ("cal_client_uri_list(): request failed");
-
-			/* free memory and return */
-			g_list_foreach (uris, (GFunc) g_free, NULL);
-			g_list_free (uris);
-			uris = NULL;
-			break;
-		}
-		else
-			uris = g_list_concat (uris, build_uri_list (uri_seq));
-	
-		CORBA_exception_free (&ev);
-	}
-	
-	return uris;	
-}
-
-/**
- * cal_client_get_load_state:
- * @client: A calendar client.
- * 
- * Queries the state of loading of a calendar client.
- * 
- * Return value: A #CalClientLoadState value indicating whether the client has
- * not been loaded with cal_client_open_calendar() yet, whether it is being
- * loaded, or whether it is already loaded.
- **/
-CalClientLoadState
-cal_client_get_load_state (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;
-}
-
-/**
- * cal_client_get_uri:
- * @client: A calendar client.
- * 
- * Queries the URI that is open in a calendar client.
- * 
- * Return value: The URI of the calendar that is already loaded or is being
- * loaded, or NULL if the client has not started a load request yet.
- **/
-const char *
-cal_client_get_uri (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	return priv->uri;
-}
-
-/* Converts our representation of a calendar component type into its CORBA representation */
-static GNOME_Evolution_Calendar_CalObjType
-corba_obj_type (CalObjType type)
-{
-	return (((type & CALOBJ_TYPE_EVENT) ? GNOME_Evolution_Calendar_TYPE_EVENT : 0)
-		| ((type & CALOBJ_TYPE_TODO) ? GNOME_Evolution_Calendar_TYPE_TODO : 0)
-		| ((type & CALOBJ_TYPE_JOURNAL) ? GNOME_Evolution_Calendar_TYPE_JOURNAL : 0));
-}
-
-gboolean
-cal_client_set_mode (CalClient *client, CalMode mode)
-{
-	CalClientPrivate *priv;
-	gboolean retval = TRUE;	
-	CORBA_Environment ev;
-
-	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 == CAL_CLIENT_LOAD_LOADED, -1);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_setMode (priv->cal, mode, &ev);
-
-	if (BONOBO_EX (&ev))
-		retval = FALSE;
-		
-	CORBA_exception_free (&ev);
-
-	return retval;
-}
-
-/**
- * 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 == CAL_CLIENT_LOAD_LOADED, -1);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-	n = GNOME_Evolution_Calendar_Cal_countObjects (priv->cal, t, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		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;
-}
-
-
-/* This is used in the callback which fetches all the timezones needed for an
-   object. */
-typedef struct _CalClientGetTimezonesData CalClientGetTimezonesData;
-struct _CalClientGetTimezonesData {
-	CalClient *client;
-
-	/* This starts out at CAL_CLIENT_GET_SUCCESS. If an error occurs this
-	   contains the last error. */
-	CalClientGetStatus status;
-};
-
-
-/**
- * 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;
-	GNOME_Evolution_Calendar_CalObj comp_str;
-	CalClientGetStatus retval;
-	icalcomponent *icalcomp;
-	CalClientGetTimezonesData cb_data;
-
-	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 == CAL_CLIENT_LOAD_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);
-	comp_str = GNOME_Evolution_Calendar_Cal_getObject (priv->cal, (char *) uid, &ev);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))
-		goto out;
-	else if (BONOBO_EX (&ev)) {		
-		g_message ("cal_client_get_object(): could not get the object");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (comp_str);
-	CORBA_free (comp_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;
-	}
-
-	/* Now make sure we have all timezones needed for this object.
-	   We do this to try to avoid any problems caused by getting a timezone
-	   in the middle of other code. Any calls to ORBit result in a 
-	   recursive call of the GTK+ main loop, which can cause problems for
-	   code that doesn't expect it. Currently GnomeCanvas has problems if
-	   we try to get a timezone in the middle of a redraw, and there is a
-	   resize pending, which leads to an assert failure and an abort. */
-	cb_data.client = client;
-	cb_data.status = CAL_CLIENT_GET_SUCCESS;
-	icalcomponent_foreach_tzid (icalcomp,
-				    cal_client_get_object_timezones_cb,
-				    &cb_data);
-
-	retval = cb_data.status;
-
- out:
-
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-
-static void
-cal_client_get_object_timezones_cb (icalparameter *param,
-				    void *data)
-{
-	CalClientGetTimezonesData *cb_data = data;
-	const char *tzid;
-	icaltimezone *zone;
-	CalClientGetStatus status;
-
-	tzid = icalparameter_get_tzid (param);
-	if (!tzid) {
-		cb_data->status = CAL_CLIENT_GET_SYNTAX_ERROR;
-		return;
-	}
-
-	status = cal_client_get_timezone (cb_data->client, tzid, &zone);
-	if (status != CAL_CLIENT_GET_SUCCESS)
-		cb_data->status = status;
-}
-
-
-CalClientGetStatus
-cal_client_get_timezone (CalClient *client,
-			 const char *tzid,
-			 icaltimezone **zone)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalObj comp_str;
-	CalClientGetStatus retval;
-	icalcomponent *icalcomp;
-	icaltimezone *tmp_zone;
-
-	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 == CAL_CLIENT_LOAD_LOADED,
-			      CAL_CLIENT_GET_NOT_FOUND);
-
-	g_return_val_if_fail (zone != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	/* If tzid is NULL or "" we return NULL, since it is a 'local time'. */
-	if (!tzid || !tzid[0]) {
-		*zone = NULL;
-		return CAL_CLIENT_GET_SUCCESS;
-	}
-
-	/* If it is UTC, we return the special UTC timezone. */
-	if (!strcmp (tzid, "UTC")) {
-		*zone = icaltimezone_get_utc_timezone ();
-		return CAL_CLIENT_GET_SUCCESS;
-	}
-
-	/* See if we already have it in the cache. */
-	tmp_zone = g_hash_table_lookup (priv->timezones, tzid);
-	if (tmp_zone) {
-		*zone = tmp_zone;
-		return CAL_CLIENT_GET_SUCCESS;
-	}
-
-	retval = CAL_CLIENT_GET_NOT_FOUND;
-	*zone = NULL;
-
-	/* We don't already have it, so we try to get it from the server. */
-	CORBA_exception_init (&ev);
-	comp_str = GNOME_Evolution_Calendar_Cal_getTimezoneObject (priv->cal, (char *) tzid, &ev);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))
-		goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_get_timezone(): could not get the object");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (comp_str);
-	CORBA_free (comp_str);
-
-	if (!icalcomp) {
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	tmp_zone = icaltimezone_new ();
-	if (!tmp_zone) {
-		/* FIXME: Needs better error code - out of memory. Or just
-		   abort like GTK+ does? */
-		retval = CAL_CLIENT_GET_NOT_FOUND;
-		goto out;
-	}
-
-	if (!icaltimezone_set_component (tmp_zone, icalcomp)) {
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	/* Now add it to the cache, to avoid the server call in future. */
-	g_hash_table_insert (priv->timezones, icaltimezone_get_tzid (tmp_zone),
-			     tmp_zone);
-
-	*zone = tmp_zone;
-	retval = CAL_CLIENT_GET_SUCCESS;
-
- out:
-
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/* Resolves TZIDs for the recurrence generator. */
-icaltimezone*
-cal_client_resolve_tzid_cb (const char *tzid, gpointer data)
-{
-	CalClient *client;
-	icaltimezone *zone = NULL;
-	CalClientGetStatus status;
-
-	g_return_val_if_fail (data != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (data), NULL);
-	
-	client = CAL_CLIENT (data);
-
-	/* FIXME: Handle errors. */
-	status = cal_client_get_timezone (client, tzid, &zone);
-
-	return zone;
-}
-
-
-/* Builds an UID list out of a CORBA UID sequence */
-static GList *
-build_uid_list (GNOME_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.  This should be
- * freed using the cal_obj_uid_list_free() function.
- **/
-GList *
-cal_client_get_uids (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_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 == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-
-	seq = GNOME_Evolution_Calendar_Cal_getUIDs (priv->cal, t, &ev);
-	if (BONOBO_EX (&ev)) {
-		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 CalClientChange structures from the CORBA sequence */
-static GList *
-build_change_list (GNOME_Evolution_Calendar_CalObjChangeSeq *seq)
-{
-	GList *list = NULL;
-	icalcomponent *icalcomp;
-	int i;
-
-	/* Create the list in reverse order */
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalObjChange *corba_coc;
-		CalClientChange *ccc;
-
-		corba_coc = &seq->_buffer[i];
-		ccc = g_new (CalClientChange, 1);
-
-		icalcomp = icalparser_parse_string (corba_coc->calobj);
-		if (!icalcomp)
-			continue;
-
-		ccc->comp = cal_component_new ();
-		if (!cal_component_set_icalcomponent (ccc->comp, icalcomp)) {
-			icalcomponent_free (icalcomp);
-			gtk_object_unref (GTK_OBJECT (ccc->comp));
-			continue;
-		}
-		ccc->type = corba_coc->type;
-
-		list = g_list_prepend (list, ccc);
-	}
-
-	list = g_list_reverse (list);
-
-	return list;
-}
-
-GList *
-cal_client_get_changes (CalClient *client, CalObjType type, const char *change_id)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_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 == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	t = corba_obj_type (type);
-	CORBA_exception_init (&ev);
-
-	seq = GNOME_Evolution_Calendar_Cal_getChanges (priv->cal, t, change_id, &ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_get_changes(): 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 (GNOME_Evolution_Calendar_CalObjInstanceSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_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;
-	GNOME_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 == CAL_CLIENT_LOAD_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 = GNOME_Evolution_Calendar_Cal_getObjectsInRange (priv->cal, t, start, end, &ev);
-	if (BONOBO_EX (&ev)) {
-		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;
-}
-
-/**
- * cal_client_get_free_busy
- * @client:: A calendar client.
- * @users: List of users to retrieve free/busy information for.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Gets free/busy information from the calendar server.
- *
- * Returns: a GList of VFREEBUSY CalComponents
- */
-GList *
-cal_client_get_free_busy (CalClient *client, GList *users,
-			  time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_UserList *corba_list;
-	GNOME_Evolution_Calendar_CalObjSeq *calobj_list;
-	GList *l;
-	GList *comp_list = NULL;
-	int len, i;
-
-	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 == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	/* create the CORBA user list to be passed to the backend */
-	len = g_list_length (users);
-
-	corba_list = GNOME_Evolution_Calendar_UserList__alloc ();
-	CORBA_sequence_set_release (corba_list, TRUE);
-	corba_list->_length = len;
-	corba_list->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_User_allocbuf (len);
-
-	for (l = g_list_first (users), i = 0; l; l = l->next, i++)
-		corba_list->_buffer[i] = CORBA_string_dup ((CORBA_char *) l->data);
-
-	/* call the method on the backend */
-	CORBA_exception_init (&ev);
-
-	calobj_list = GNOME_Evolution_Calendar_Cal_getFreeBusy (priv->cal, corba_list,
-								start, end, &ev);
-	CORBA_free (corba_list);
-	if (BONOBO_EX (&ev) || !calobj_list) {
-		g_message ("cal_client_get_free_busy(): could not get the objects");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	for (i = 0; i < calobj_list->_length; i++) {
-		CalComponent *comp;
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-
-		icalcomp = icalparser_parse_string (calobj_list->_buffer[i]);
-		if (!icalcomp)
-			continue;
-
-		kind = icalcomponent_isa (icalcomp);
-		if (kind == ICAL_VFREEBUSY_COMPONENT) {
-			comp = cal_component_new ();
-			if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-				icalcomponent_free (icalcomp);
-				gtk_object_unref (GTK_OBJECT (comp));
-				continue;
-			}
-
-			comp_list = g_list_append (comp_list, comp);
-		}
-		else
-			icalcomponent_free (icalcomp);
-	}
-
-	CORBA_exception_free (&ev);
-	CORBA_free (calobj_list);
-
-	return comp_list;
-}
-
-/* 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 == CAL_CLIENT_LOAD_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,
-					      cal_client_resolve_tzid_cb, client,
-					      priv->default_zone);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	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);
-}
-
-/* Builds a list of CalAlarmInstance structures */
-static GSList *
-build_alarm_instance_list (CalComponent *comp, GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq)
-{
-	GSList *alarms;
-	int i;
-
-	alarms = NULL;
-
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;
-		CalComponentAlarm *alarm;
-		const char *auid;
-		CalAlarmInstance *instance;
-
-		corba_instance = seq->_buffer + i;
-
-		/* Since we want the in-commponent auid, we look for the alarm
-		 * in the component and fetch its "real" auid.
-		 */
-
-		alarm = cal_component_get_alarm (comp, corba_instance->auid);
-		if (!alarm)
-			continue;
-
-		auid = cal_component_alarm_get_uid (alarm);
-		cal_component_alarm_free (alarm);
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = corba_instance->trigger;
-		instance->occur_start = corba_instance->occur_start;
-		instance->occur_end = corba_instance->occur_end;
-
-		alarms = g_slist_prepend (alarms, instance);
-	}
-
-	return g_slist_reverse (alarms);
-}
-
-/* Builds a list of CalComponentAlarms structures */
-static GSList *
-build_component_alarms_list (GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq)
-{
-	GSList *comp_alarms;
-	int i;
-
-	comp_alarms = NULL;
-
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;
-		CalComponent *comp;
-		CalComponentAlarms *alarms;
-		icalcomponent *icalcomp;
-
-		corba_alarms = seq->_buffer + i;
-
-		icalcomp = icalparser_parse_string (corba_alarms->calobj);
-		if (!icalcomp)
-			continue;
-
-		comp = cal_component_new ();
-		if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-			icalcomponent_free (icalcomp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			continue;
-		}
-
-		alarms = g_new (CalComponentAlarms, 1);
-		alarms->comp = comp;
-		alarms->alarms = build_alarm_instance_list (comp, &corba_alarms->alarms);
-
-		comp_alarms = g_slist_prepend (comp_alarms, alarms);
-	}
-
-	return comp_alarms;
-}
-
-/**
- * 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 #CalComponentAlarms structures.  This should be freed
- * using the cal_client_free_alarms() function, or by freeing each element
- * separately with cal_component_alarms_free() and then freeing the list with
- * g_slist_free().
- **/
-GSList *
-cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;
-	GSList *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 == CAL_CLIENT_LOAD_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 = GNOME_Evolution_Calendar_Cal_getAlarmsInRange (priv->cal, start, end, &ev);
-	if (BONOBO_EX (&ev)) {
-		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_component_alarms_list (seq);
-	CORBA_free (seq);
-
-	return alarms;
-}
-
-/**
- * cal_client_free_alarms:
- * @comp_alarms: A list of #CalComponentAlarms structures.
- * 
- * Frees a list of #CalComponentAlarms structures as returned by
- * cal_client_get_alarms_in_range().
- **/
-void
-cal_client_free_alarms (GSList *comp_alarms)
-{
-	GSList *l;
-
-	for (l = comp_alarms; l; l = l->next) {
-		CalComponentAlarms *alarms;
-
-		alarms = l->data;
-		g_assert (alarms != NULL);
-
-		cal_component_alarms_free (alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/**
- * cal_client_get_alarms_for_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar component.
- * @start: Start time for query.
- * @end: End time for query.
- * @alarms: Return value for the component's alarm instances.  Will return NULL
- * if no instances occur within the specified time range.  This should be freed
- * using the cal_component_alarms_free() function.
- *
- * 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,
-				  CalComponentAlarms **alarms)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;
-	gboolean retval;
-	icalcomponent *icalcomp;
-	CalComponent *comp;
-
-	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 == CAL_CLIENT_LOAD_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);
-
-	corba_alarms = GNOME_Evolution_Calendar_Cal_getAlarmsForObject (priv->cal, (char *) uid,
-									start, end, &ev);
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))
-		goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (corba_alarms->calobj);
-	if (!icalcomp)
-		goto out;
-
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		icalcomponent_free (icalcomp);
-		gtk_object_unref (GTK_OBJECT (comp));
-		goto out;
-	}
-
-	retval = TRUE;
-
-	*alarms = g_new (CalComponentAlarms, 1);
-	(*alarms)->comp = comp;
-	(*alarms)->alarms = build_alarm_instance_list (comp, &corba_alarms->alarms);
-	CORBA_free (corba_alarms);
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-typedef struct _ForeachTZIDCallbackData ForeachTZIDCallbackData;
-struct _ForeachTZIDCallbackData {
-	CalClient *client;
-	GHashTable *timezone_hash;
-	gboolean include_all_timezones;
-	gboolean success;
-};
-
-/* This adds the VTIMEZONE given by the TZID parameter to the GHashTable in
-   data. */
-static void
-foreach_tzid_callback (icalparameter *param, void *cbdata)
-{
-	ForeachTZIDCallbackData *data = cbdata;
-	CalClientPrivate *priv;
-	const char *tzid;
-	icaltimezone *zone;
-	icalcomponent *vtimezone_comp;
-	char *vtimezone_as_string;
-
-	priv = data->client->priv;
-
-	/* Get the TZID string from the parameter. */
-	tzid = icalparameter_get_tzid (param);
-	if (!tzid)
-		return;
-
-	/* Check if we've already added it to the GHashTable. */
-	if (g_hash_table_lookup (data->timezone_hash, tzid))
-		return;
-
-	if (data->include_all_timezones) {
-		CalClientGetStatus status;
-
-		status = cal_client_get_timezone (data->client, tzid, &zone);
-		if (status != CAL_CLIENT_GET_SUCCESS) {
-			data->success = FALSE;
-			return;
-		}
-	} else {
-		/* Check if it is in our cache. If it is, it must already be
-		   on the server so return. */
-		if (g_hash_table_lookup (priv->timezones, tzid))
-			return;
-
-		/* Check if it is a builtin timezone. If it isn't, return. */
-		zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-		if (!zone)
-			return;
-	}
-
-	/* Convert it to a string and add it to the hash. */
-	vtimezone_comp = icaltimezone_get_component (zone);
-	if (!vtimezone_comp)
-		return;
-
-	vtimezone_as_string = icalcomponent_as_ical_string (vtimezone_comp);
-
-	g_hash_table_insert (data->timezone_hash, (char*) tzid,
-			     g_strdup (vtimezone_as_string));
-}
-
-/* This appends the value string to the GString given in data. */
-static void
-append_timezone_string (gpointer key, gpointer value, gpointer data)
-{
-	GString *vcal_string = data;
-
-	g_string_append (vcal_string, value);
-	g_free (value);
-}
-
-
-/* This simply frees the hash values. */
-static void
-free_timezone_string (gpointer key, gpointer value, gpointer data)
-{
-	g_free (value);
-}
-
-
-/* This converts the VEVENT/VTODO to a string. If include_all_timezones is
-   TRUE, it includes all the VTIMEZONE components needed for the VEVENT/VTODO.
-   If not, it only includes builtin timezones that may not be on the server.
-
-   To do that we check every TZID in the component to see if it is a builtin
-   timezone. If it is, we see if it it in our cache. If it is in our cache,
-   then we know the server already has it and we don't need to send it.
-   If it isn't in our cache, then we need to send it to the server.
-   If we need to send any timezones to the server, then we have to create a
-   complete VCALENDAR object, otherwise we can just send a single VEVENT/VTODO
-   as before. */
-static char*
-cal_client_get_component_as_string_internal (CalClient *client,
-					     CalComponent *comp,
-					     gboolean include_all_timezones)
-{
-	GHashTable *timezone_hash;
-	GString *vcal_string;
-	int initial_vcal_string_len;
-	ForeachTZIDCallbackData cbdata;
-	char *obj_string;
-
-	CalClientPrivate *priv;
-
-	priv = client->priv;
-
-	timezone_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* Add any timezones needed to the hash. We use a hash since we only
-	   want to add each timezone once at most. */
-	cbdata.client = client;
-	cbdata.timezone_hash = timezone_hash;
-	cbdata.include_all_timezones = include_all_timezones;
-	cbdata.success = TRUE;
-	icalcomponent_foreach_tzid (cal_component_get_icalcomponent (comp),
-				    foreach_tzid_callback, &cbdata);
-	if (!cbdata.success) {
-		g_hash_table_foreach (timezone_hash, free_timezone_string,
-				      NULL);
-		return NULL;
-	}
-
-	/* Create the start of a VCALENDAR, to add the VTIMEZONES to,
-	   and remember its length so we know if any VTIMEZONEs get added. */
-	vcal_string = g_string_new (NULL);
-	g_string_append (vcal_string,
-			 "BEGIN:VCALENDAR\n"
-			 "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
-			 "VERSION:2.0\n"
-			 "METHOD:PUBLISH\n");
-	initial_vcal_string_len = vcal_string->len;
-
-	/* Now concatenate all the timezone strings. This also frees the
-	   timezone strings as it goes. */
-	g_hash_table_foreach (timezone_hash, append_timezone_string,
-			      vcal_string);
-
-	/* Get the string for the VEVENT/VTODO. */
-	obj_string = cal_component_get_as_string (comp);
-
-	/* If there were any timezones to send, create a complete VCALENDAR,
-	   else just send the VEVENT/VTODO string. */
-	if (!include_all_timezones
-	    && vcal_string->len == initial_vcal_string_len) {
-		g_string_free (vcal_string, TRUE);
-	} else {
-		g_string_append (vcal_string, obj_string);
-		g_string_append (vcal_string, "END:VCALENDAR\n");
-		g_free (obj_string);
-		obj_string = vcal_string->str;
-		g_string_free (vcal_string, FALSE);
-	}
-
-	g_hash_table_destroy (timezone_hash);
-
-	return obj_string;
-}
-
-/**
- * cal_client_get_component_as_string:
- * @client: A calendar client.
- * @comp: A calendar component object.
- *
- * Gets a calendar component as an iCalendar string, with a toplevel
- * VCALENDAR component and all VTIMEZONEs needed for the component.
- *
- * Return value: the component as a complete iCalendar string, or NULL on
- * failure. The string should be freed after use.
- **/
-char*
-cal_client_get_component_as_string (CalClient *client,
-				    CalComponent *comp)
-{
-	return cal_client_get_component_as_string_internal (client, comp,
-							    TRUE);
-}
-
-
-/**
- * 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;
-
-	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 == CAL_CLIENT_LOAD_LOADED, FALSE);
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-
-	retval = FALSE;
-
-	cal_component_commit_sequence (comp);
-
-	obj_string = cal_client_get_component_as_string_internal (client,
-								  comp, FALSE);
-	if (obj_string == NULL)
-		return FALSE;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_updateObjects (priv->cal, obj_string, &ev);
-	g_free (obj_string);
-	
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject))
-	    goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_update_object(): could not update the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/**
- * cal_client_update_objects:
- * @client: A calendar client.
- * @icalcomp: A toplevel VCALENDAR libical component.
- *
- * Asks a calendar to add or update one or more components, possibly including
- * VTIMEZONE data.  Any existing components with the same UIDs will be
- * replaced. The VTIMEZONE data will be compared to existing VTIMEZONEs in
- * the calendar, and the VTIMEZONEs may possibly be renamed, as well as all
- * references to them throughout the VCALENDAR.
- *
- * The client program should not assume that the objects are 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_objects (CalClient *client, icalcomponent *icalcomp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-	char *obj_string;
-
-	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 == CAL_CLIENT_LOAD_LOADED,
-			      FALSE);
-
-	g_return_val_if_fail (icalcomp != NULL, FALSE);
-
-	retval = FALSE;
-
-	/* Libical owns this memory, using one of its temporary buffers. */
-	obj_string = icalcomponent_as_ical_string (icalcomp);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_updateObjects (priv->cal, obj_string, &ev);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject))
-		goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_update_objects(): could not update the objects");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-
-}
-
-
-/**
- * cal_client_remove_object:
- * @client: A calendar client.
- * @uid: Unique identifier of the calendar component to remove.
- * 
- * Asks a calendar to remove a component.  If the server is able to remove the
- * component, all clients will be notified and they will emit the "obj_removed"
- * signal.
- * 
- * Return value: TRUE on success, FALSE on specifying a UID for a component that
- * is not in the server.  Returning FALSE is normal; the object may have
- * disappeared from the server before the client has had a chance to receive the
- * corresponding notification.
- **/
-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 == CAL_CLIENT_LOAD_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_removeObject (priv->cal, (char *) uid, &ev);
-
-	if (BONOBO_USER_EX (&ev,  ex_GNOME_Evolution_Calendar_Cal_NotFound))
-		goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_remove_object(): could not remove the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/**
- * cal_client_get_query:
- * @client: A calendar client.
- * @sexp: S-expression representing the query.
- * 
- * Creates a live query object from a loaded calendar.
- * 
- * Return value: A query object that will emit notification signals as calendar
- * components are added and removed from the query in the server.
- **/
-CalQuery *
-cal_client_get_query (CalClient *client, const char *sexp)
-{
-	CalClientPrivate *priv;
-
-	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 == CAL_CLIENT_LOAD_LOADED, FALSE);
-
-	g_return_val_if_fail (sexp != NULL, NULL);
-
-	return cal_query_new (priv->cal, sexp);
-}
-
-
-/* This ensures that the given timezone is on the server. We use this to pass
-   the default timezone to the server, so it can resolve DATE and floating
-   DATE-TIME values into specific times. (Most of our IDL interface uses
-   time_t values to pass specific times from the server to the client.) */
-static gboolean
-cal_client_ensure_timezone_on_server (CalClient *client, icaltimezone *zone)
-{
-	CalClientPrivate *priv;
-	char *tzid, *obj_string;
-	icaltimezone *tmp_zone;
-	GString *vcal_string;
-	gboolean retval = FALSE;
-	icalcomponent *vtimezone_comp;
-	char *vtimezone_as_string;
-	CORBA_Environment ev;
-
-	priv = client->priv;
-
-	/* If the zone is NULL or UTC we don't need to do anything. */
-	if (!zone)
-		return TRUE;
-	
-	tzid = icaltimezone_get_tzid (zone);
-
-	if (!strcmp (tzid, "UTC"))
-		return TRUE;
-
-	/* See if we already have it in the cache. If we do, it must be on
-	   the server already. */
-	tmp_zone = g_hash_table_lookup (priv->timezones, tzid);
-	if (tmp_zone)
-		return TRUE;
-
-	/* Now we have to send it to the server, in case it doesn't already
-	   have it. */
-
-	vcal_string = g_string_new (NULL);
-	g_string_append (vcal_string,
-			 "BEGIN:VCALENDAR\n"
-			 "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
-			 "VERSION:2.0\n");
-
-	/* Convert the timezone to a string and add it. */
-	vtimezone_comp = icaltimezone_get_component (zone);
-	if (!vtimezone_comp) {
-		g_string_free (vcal_string, TRUE);
-		return FALSE;
-	}
-
-	/* We don't need to free this string as libical owns it. */
-	vtimezone_as_string = icalcomponent_as_ical_string (vtimezone_comp);
-	g_string_append (vcal_string, vtimezone_as_string);
-
-	g_string_append (vcal_string, "END:VCALENDAR\n");
-
-	obj_string = vcal_string->str;
-	g_string_free (vcal_string, FALSE);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_updateObjects (priv->cal, obj_string, &ev);
-	g_free (obj_string);
-	
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject))
-	    goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_ensure_timezone_on_server(): could not add the timezone to the server");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-
-gboolean
-cal_client_set_default_timezone (CalClient *client, icaltimezone *zone)
-{
-	CalClientPrivate *priv;
-	gboolean retval = FALSE;
-	CORBA_Environment ev;
-	const char *tzid;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-	g_return_val_if_fail (zone != NULL, FALSE);
-
-	priv = client->priv;
-
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED,
-			      FALSE);
-
-	/* Make sure the server has the VTIMEZONE data. */
-	if (!cal_client_ensure_timezone_on_server (client, zone))
-		return FALSE;
-
-	/* Now set the default timezone on the server. */
-	CORBA_exception_init (&ev);
-	tzid = icaltimezone_get_tzid (zone);
-	GNOME_Evolution_Calendar_Cal_setDefaultTimezone (priv->cal,
-							 (char *) tzid, &ev);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))
-		goto out;
-	else if (BONOBO_EX (&ev)) {
-		g_message ("cal_client_set_default_timezone(): could not set the default timezone");
-		goto out;
-	}
-
-	retval = TRUE;
-
-	priv->default_zone = zone;
-
- 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 a362059f3a..0000000000
--- a/calendar/cal-client/cal-client.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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>
-#include <cal-client/cal-query.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;
-
-/* Open status for the cal_opened signal */
-typedef enum {
-	CAL_CLIENT_OPEN_SUCCESS,
-	CAL_CLIENT_OPEN_ERROR,
-	CAL_CLIENT_OPEN_NOT_FOUND,
-	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED
-} CalClientOpenStatus;
-
-/* Set mode status for the cal_client_set_mode function */
-typedef enum {
-	CAL_CLIENT_SET_MODE_SUCCESS,
-	CAL_CLIENT_SET_MODE_ERROR,
-	CAL_CLIENT_SET_MODE_NOT_SUPPORTED
-} CalClientSetModeStatus;
-
-/* Get status for the cal_client_get_object() function */
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-
-/* Whether the client is not loaded, is being loaded, or is already loaded */
-typedef enum {
-	CAL_CLIENT_LOAD_NOT_LOADED,
-	CAL_CLIENT_LOAD_LOADING,
-	CAL_CLIENT_LOAD_LOADED
-} CalClientLoadState;
-
-struct _CalClient {
-	GtkObject object;
-
-	/* Private data */
-	CalClientPrivate *priv;
-};
-
-struct _CalClientClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_opened) (CalClient *client, CalClientOpenStatus status);
-	void (* cal_set_mode) (CalClient *client, CalClientSetModeStatus status, CalMode mode);
-	
-	void (* obj_updated) (CalClient *client, const char *uid);
-	void (* obj_removed) (CalClient *client, const char *uid);
-
-	void (* categories_changed) (CalClient *client, GPtrArray *categories);
-
-	void (* forget_password) (CalClient *client, const char *key);
-};
-
-typedef gchar * (* CalClientAuthFunc) (CalClient *client,
-                                      const gchar *prompt,
-                                      const gchar *key,
-                                      gpointer user_data);
-
-GtkType cal_client_get_type (void);
-
-CalClient *cal_client_construct (CalClient *client);
-
-CalClient *cal_client_new (void);
-
-void cal_client_set_auth_func (CalClient *client, CalClientAuthFunc func, gpointer data);
-
-/* Sets the default timezone to use to resolve DATE and floating DATE-TIME
-   values. This will typically be from the user's timezone setting. Call this
-   before using any other functions. It will pass the default timezone on to
-   the server. Returns TRUE on success. */
-gboolean cal_client_set_default_timezone (CalClient *client, icaltimezone *zone);
-
-gboolean cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists);
-gboolean cal_client_open_default_calendar (CalClient *client, gboolean only_if_exists);
-gboolean cal_client_open_default_tasks (CalClient *client, gboolean only_if_exists);
-
-GList *cal_client_uri_list (CalClient *client, CalMode mode);
-
-CalClientLoadState cal_client_get_load_state (CalClient *client);
-
-const char *cal_client_get_uri (CalClient *client);
-
-gboolean cal_client_set_mode (CalClient *client, CalMode mode);
-
-int cal_client_get_n_objects (CalClient *client, CalObjType type);
-
-CalClientGetStatus cal_client_get_object (CalClient *client,
-					  const char *uid,
-					  CalComponent **comp);
-
-CalClientGetStatus cal_client_get_timezone (CalClient *client,
-					    const char *tzid,
-					    icaltimezone **zone);
-
-GList *cal_client_get_uids (CalClient *client, CalObjType type);
-GList *cal_client_get_changes (CalClient *client, CalObjType type, const char *change_id);
-
-GList *cal_client_get_objects_in_range (CalClient *client, CalObjType type,
-					time_t start, time_t end);
-
-GList *cal_client_get_free_busy (CalClient *client, GList *users,
-				 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);
-
-GSList *cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end);
-
-void cal_client_free_alarms (GSList *comp_alarms);
-
-gboolean cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-					   time_t start, time_t end,
-					   CalComponentAlarms **alarms);
-
-/* Add or update a single object. When adding an object only builtin timezones
-   are allowed. To use external VTIMEZONE data call update_objects() instead.*/
-gboolean cal_client_update_object (CalClient *client, CalComponent *comp);
-
-/* Add or update multiple objects, possibly including VTIMEZONE data. */
-gboolean cal_client_update_objects (CalClient *client, icalcomponent *icalcomp);
-
-gboolean cal_client_remove_object (CalClient *client, const char *uid);
-
-CalQuery *cal_client_get_query (CalClient *client, const char *sexp);
-
-/* Resolves TZIDs for the recurrence generator. */
-icaltimezone *cal_client_resolve_tzid_cb (const char *tzid, gpointer data);
-
-/* Returns a complete VCALENDAR for a VEVENT/VTODO including all VTIMEZONEs
-   used by the component. It also includes a 'METHOD:PUBLISH' property. */
-char* cal_client_get_component_as_string (CalClient *client,
-					  CalComponent *comp);
-
-
-
-
-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 c3fe31e60d..0000000000
--- a/calendar/cal-client/cal-listener.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-listener.h"
-
-
-
-/* Private part of the CalListener structure */
-struct CalListenerPrivate {
-	/* Notification functions and their closure data */
-	CalListenerCalOpenedFn cal_opened_fn;
-	CalListenerCalSetModeFn cal_set_mode_fn;
-	CalListenerObjUpdatedFn obj_updated_fn;
-	CalListenerObjRemovedFn obj_removed_fn;
-	CalListenerCategoriesChangedFn categories_changed_fn;
-	gpointer fn_data;
-
-	/* Whether notification is desired */
-	gboolean notify : 1;
-};
-
-
-
-static void cal_listener_class_init (CalListenerClass *class);
-static void cal_listener_init (CalListener *listener);
-static void cal_listener_destroy (GtkObject *object);
-
-static void impl_notifyCalOpened (PortableServer_Servant servant,
-				  GNOME_Evolution_Calendar_Listener_OpenStatus status,
-				  GNOME_Evolution_Calendar_Cal cal,
-				  CORBA_Environment *ev);
-static void impl_notifyCalSetMode (PortableServer_Servant servant,
-				   GNOME_Evolution_Calendar_Listener_SetModeStatus status,
-				   GNOME_Evolution_Calendar_CalMode mode,
-				   CORBA_Environment *ev);
-static void impl_notifyObjUpdated (PortableServer_Servant servant,
-				   GNOME_Evolution_Calendar_CalObjUID uid,
-				   CORBA_Environment *ev);
-static void impl_notifyObjRemoved (PortableServer_Servant servant,
-				   GNOME_Evolution_Calendar_CalObjUID uid,
-				   CORBA_Environment *ev);
-static void impl_notifyCategoriesChanged (PortableServer_Servant servant,
-					  const GNOME_Evolution_Calendar_StringSeq *categories,
-					  CORBA_Environment *ev);
-
-static BonoboXObjectClass *parent_class;
-
-
-
-BONOBO_X_TYPE_FUNC_FULL (CalListener,
-			 GNOME_Evolution_Calendar_Listener,
-			 BONOBO_X_OBJECT_TYPE,
-			 cal_listener);
-
-/* 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_X_OBJECT_TYPE);
-
-	class->epv.notifyCalOpened = impl_notifyCalOpened;
-	class->epv.notifyCalSetMode = impl_notifyCalSetMode;
-	class->epv.notifyObjUpdated = impl_notifyObjUpdated;
-	class->epv.notifyObjRemoved = impl_notifyObjRemoved;
-	class->epv.notifyCategoriesChanged = impl_notifyCategoriesChanged;
-
-	object_class->destroy = cal_listener_destroy;
-}
-
-/* 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_opened_fn = NULL;
-	priv->obj_updated_fn = NULL;
-	priv->obj_removed_fn = NULL;
-	priv->categories_changed_fn = NULL;
-
-	priv->notify = TRUE;
-}
-
-/* Destroy handler for the calendar listener */
-static void
-cal_listener_destroy (GtkObject *object)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_LISTENER (object));
-
-	listener = CAL_LISTENER (object);
-	priv = listener->priv;
-
-	priv->cal_opened_fn = NULL;
-	priv->obj_updated_fn = NULL;
-	priv->obj_removed_fn = NULL;
-	priv->categories_changed_fn = NULL;
-	priv->fn_data = NULL;
-
-	priv->notify = FALSE;
-
-	g_free (priv);
-	listener->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* ::notifyCalOpened method */
-static void
-impl_notifyCalOpened (PortableServer_Servant servant,
-		      GNOME_Evolution_Calendar_Listener_OpenStatus status,
-		      GNOME_Evolution_Calendar_Cal cal,
-		      CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment aev;
-	GNOME_Evolution_Calendar_Cal cal_copy;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (!priv->notify)
-		return;
-
-	CORBA_exception_init (&aev);
-	cal_copy = CORBA_Object_duplicate (cal, &aev);
-
-	if (aev._major != CORBA_NO_EXCEPTION) {
-		g_message ("Listener_notifyCalOpened(): could not duplicate the calendar");
-		CORBA_exception_free (&aev);
-		return;
-	}
-	CORBA_exception_free (&aev);
-
-	g_assert (priv->cal_opened_fn != NULL);
-	(* priv->cal_opened_fn) (listener, status, cal, priv->fn_data);
-}
-
-/* ::notifyCalSetMode method */
-static void
-impl_notifyCalSetMode (PortableServer_Servant servant,
-		       GNOME_Evolution_Calendar_Listener_SetModeStatus status,
-		       GNOME_Evolution_Calendar_CalMode mode,
-		       CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->cal_set_mode_fn != NULL);
-	(* priv->cal_set_mode_fn) (listener, status, mode, priv->fn_data);
-}
-
-/* ::notifyObjUpdated method */
-static void
-impl_notifyObjUpdated (PortableServer_Servant servant,
-		       GNOME_Evolution_Calendar_CalObjUID uid,
-		       CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->obj_updated_fn != NULL);
-	(* priv->obj_updated_fn) (listener, uid, priv->fn_data);
-}
-
-/* ::notifyObjRemoved method */
-static void
-impl_notifyObjRemoved (PortableServer_Servant servant,
-		       GNOME_Evolution_Calendar_CalObjUID uid,
-		       CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->obj_removed_fn != NULL);
-	(* priv->obj_removed_fn) (listener, uid, priv->fn_data);
-}
-
-/* ::notifyCategoriesChanged method */
-static void
-impl_notifyCategoriesChanged (PortableServer_Servant servant,
-			      const GNOME_Evolution_Calendar_StringSeq *categories,
-			      CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->categories_changed_fn != NULL);
-	(* priv->categories_changed_fn) (listener, categories, priv->fn_data);
-}
-
-
-
-/**
- * cal_listener_construct:
- * @listener: A calendar listener.
- * @cal_opened_fn: Function that will be called to notify that a calendar was
- * opened.
- * @obj_updated_fn: Function that will be called to notify that an object in the
- * calendar was updated.
- * @obj_removed_fn: Function that will be called to notify that an object in the
- * calendar was removed.
- * @categories_changed_fn: Function that will be called to notify that the list
- * of categories that are present in the calendar's objects has changed.
- * @fn_data: Closure data pointer that will be passed to the notification
- * functions.
- *
- * Constructs a calendar listener by setting the callbacks that it will use for
- * notification from the calendar server.
- *
- * Return value: the same object as the @listener argument.
- **/
-CalListener *
-cal_listener_construct (CalListener *listener,
-			CalListenerCalOpenedFn cal_opened_fn,
-			CalListenerCalSetModeFn cal_set_mode_fn,
-			CalListenerObjUpdatedFn obj_updated_fn,
-			CalListenerObjRemovedFn obj_removed_fn,
-			CalListenerCategoriesChangedFn categories_changed_fn,
-			gpointer fn_data)
-{
-	CalListenerPrivate *priv;
-
-	g_return_val_if_fail (listener != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
-	g_return_val_if_fail (cal_opened_fn != NULL, NULL);
- 	g_return_val_if_fail (cal_set_mode_fn != NULL, NULL);
-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);
-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);
-	g_return_val_if_fail (categories_changed_fn != NULL, NULL);
-
-	priv = listener->priv;
-
-	priv->cal_opened_fn = cal_opened_fn;
-	priv->cal_set_mode_fn = cal_set_mode_fn;
-	priv->obj_updated_fn = obj_updated_fn;
-	priv->obj_removed_fn = obj_removed_fn;
-	priv->categories_changed_fn = categories_changed_fn;
-	priv->fn_data = fn_data;
-
-	return listener;
-}
-
-/**
- * cal_listener_new:
- * @cal_opened_fn: Function that will be called to notify that a calendar was
- * opened.
- * @obj_updated_fn: Function that will be called to notify that an object in the
- * calendar was updated.
- * @obj_removed_fn: Function that will be called to notify that an object in the
- * calendar was removed.
- * @categories_changed_fn: Function that will be called to notify that the list
- * of categories that are present in the calendar's objects has changed.
- * @fn_data: Closure data pointer that will be passed to the notification
- * functions.
- *
- * Creates a new #CalListener object.
- *
- * Return value: A newly-created #CalListener object.
- **/
-CalListener *
-cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,
-		  CalListenerCalSetModeFn cal_set_mode_fn,
-		  CalListenerObjUpdatedFn obj_updated_fn,
-		  CalListenerObjRemovedFn obj_removed_fn,
-		  CalListenerCategoriesChangedFn categories_changed_fn,
-		  gpointer fn_data)
-{
-	CalListener *listener;
-
-	g_return_val_if_fail (cal_opened_fn != NULL, NULL);
-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);
-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);
-	g_return_val_if_fail (categories_changed_fn != NULL, NULL);
-
-	listener = gtk_type_new (CAL_LISTENER_TYPE);
-	return cal_listener_construct (listener,
-				       cal_opened_fn,
-				       cal_set_mode_fn,
-				       obj_updated_fn,
-				       obj_removed_fn,
-				       categories_changed_fn,
-				       fn_data);
-}
-
-/**
- * cal_listener_stop_notification:
- * @listener: A calendar listener.
- * 
- * Informs a calendar listener that no further notification is desired.  The
- * callbacks specified when the listener was created will no longer be invoked
- * after this function is called.
- **/
-void
-cal_listener_stop_notification (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	g_return_if_fail (listener != NULL);
-	g_return_if_fail (IS_CAL_LISTENER (listener));
-
-	priv = listener->priv;
-	g_return_if_fail (priv->notify != FALSE);
-
-	priv->notify = FALSE;
-}
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
deleted file mode 100644
index c7488e6e97..0000000000
--- a/calendar/cal-client/cal-listener.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-xobject.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 CalListenerPrivate CalListenerPrivate;
-
-typedef struct {
-	BonoboXObject xobject;
-
-	/* Private data */
-	CalListenerPrivate *priv;
-} CalListener;
-
-typedef struct {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_Listener__epv epv;
-} CalListenerClass;
-
-/* Notification functions */
-typedef void (* CalListenerCalOpenedFn) (CalListener *listener,
-					 GNOME_Evolution_Calendar_Listener_OpenStatus status,
-					 GNOME_Evolution_Calendar_Cal cal,
-					 gpointer data);
-
-typedef void (* CalListenerCalSetModeFn) (CalListener *listener,
-					  GNOME_Evolution_Calendar_Listener_SetModeStatus status,
-					  GNOME_Evolution_Calendar_CalMode mode,
-					  gpointer data);
-
-typedef void (* CalListenerObjUpdatedFn) (CalListener *listener,
-					  const GNOME_Evolution_Calendar_CalObjUID uid,
-					  gpointer data);
-typedef void (* CalListenerObjRemovedFn) (CalListener *listener,
-					  const GNOME_Evolution_Calendar_CalObjUID uid,
-					  gpointer data);
-
-typedef void (* CalListenerCategoriesChangedFn) (CalListener *listener,
-						 const GNOME_Evolution_Calendar_StringSeq *categories,
-						 gpointer data);
-
-
-GtkType cal_listener_get_type (void);
-
-CalListener *cal_listener_construct (CalListener *listener,
-				     CalListenerCalOpenedFn cal_opened_fn,
-				     CalListenerCalSetModeFn cal_set_mode_fn,
-				     CalListenerObjUpdatedFn obj_updated_fn,
-				     CalListenerObjRemovedFn obj_removed_fn,
-				     CalListenerCategoriesChangedFn categories_changed_fn,
-				     gpointer fn_data);
-
-CalListener *cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,
-			       CalListenerCalSetModeFn cal_set_mode_fn,
-			       CalListenerObjUpdatedFn obj_updated_fn,
-			       CalListenerObjRemovedFn obj_removed_fn,
-			       CalListenerCategoriesChangedFn categories_changed_fn,
-			       gpointer fn_data);
-
-void cal_listener_stop_notification (CalListener *listener);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/cal-query.c b/calendar/cal-client/cal-query.c
deleted file mode 100644
index 97e7b81240..0000000000
--- a/calendar/cal-client/cal-query.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* Evolution calendar - Live query client object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <bonobo/bonobo-exception.h>
-#include "cal-query.h"
-#include "query-listener.h"
-
-
-
-/* Private part of the CalQuery structure */
-struct _CalQueryPrivate {
-	/* Our query listener implementation */
-	QueryListener *ql;
-
-	/* Handle to the query in the server */
-	GNOME_Evolution_Calendar_Query corba_query;
-};
-
-
-
-static void cal_query_class_init (CalQueryClass *class);
-static void cal_query_init (CalQuery *query);
-static void cal_query_destroy (GtkObject *object);
-
-/* Signal IDs */
-enum {
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	QUERY_DONE,
-	EVAL_ERROR,
-	LAST_SIGNAL
-};
-
-static void marshal_obj_updated (GtkObject *object,
-				 GtkSignalFunc func, gpointer func_data,
-				 GtkArg *args);
-static void marshal_query_done (GtkObject *object,
-				GtkSignalFunc func, gpointer func_data,
-				GtkArg *args);
-
-static guint query_signals[LAST_SIGNAL];
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_query_get_type:
- * 
- * Registers the #CalQuery class if necessary, and returns the type ID assigned
- * to it.
- * 
- * Return value: The type ID of the #CalQuery class.
- **/
-GtkType
-cal_query_get_type (void)
-{
-	static GtkType cal_query_type = 0;
-
-	if (!cal_query_type) {
-		static const GtkTypeInfo cal_query_info = {
-			"CalQuery",
-			sizeof (CalQuery),
-			sizeof (CalQueryClass),
-			(GtkClassInitFunc) cal_query_class_init,
-			(GtkObjectInitFunc) cal_query_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_query_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_query_info);
-	}
-
-	return cal_query_type;
-}
-
-/* Class initialization function for the calendar query */
-static void
-cal_query_class_init (CalQueryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	query_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalQueryClass, obj_updated),
-				marshal_obj_updated,
-				GTK_TYPE_NONE, 4,
-				GTK_TYPE_STRING,
-				GTK_TYPE_BOOL,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT);
-	query_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalQueryClass, obj_removed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	query_signals[QUERY_DONE] =
-		gtk_signal_new ("query_done",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalQueryClass, query_done),
-				marshal_query_done,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_ENUM,
-				GTK_TYPE_STRING);
-	query_signals[EVAL_ERROR] =
-		gtk_signal_new ("eval_error",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalQueryClass, eval_error),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, query_signals, LAST_SIGNAL);
-
-	class->obj_updated = NULL;
-	class->obj_removed = NULL;
-	class->query_done = NULL;
-	class->eval_error = NULL;
-
-	object_class->destroy = cal_query_destroy;
-}
-
-/* Object initialization function for the calendar query */
-static void
-cal_query_init (CalQuery *query)
-{
-	CalQueryPrivate *priv;
-
-	priv = g_new0 (CalQueryPrivate, 1);
-	query->priv = priv;
-
-	priv->ql = NULL;
-	priv->corba_query = CORBA_OBJECT_NIL;
-}
-
-/* Destroy handler for the calendar query */
-static void
-cal_query_destroy (GtkObject *object)
-{
-	CalQuery *query;
-	CalQueryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_QUERY (object));
-
-	query = CAL_QUERY (object);
-	priv = query->priv;
-
-	/* The server unrefs the query listener, so we just NULL it out here */
-	query_listener_stop_notification (priv->ql);
-	priv->ql = NULL;
-
-	if (priv->corba_query != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		bonobo_object_release_unref (priv->corba_query, &ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("cal_query_destroy(): Could not release/unref the query");
-
-		CORBA_exception_free (&ev);
-		priv->corba_query = CORBA_OBJECT_NIL;
-	}
-
-	g_free (priv);
-	query->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Marshalers */
-
-typedef void (* ObjUpdatedFunc) (CalQuery *query, const char *uid,
-				 gboolean query_in_progress, int n_scanned, int total,
-				 gpointer data);
-
-static void
-marshal_obj_updated (GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
-{
-	ObjUpdatedFunc f;
-
-	f = (ObjUpdatedFunc) func;
-
-	(* f) (CAL_QUERY (object), GTK_VALUE_STRING (args[0]),
-	       GTK_VALUE_BOOL (args[1]), GTK_VALUE_INT (args[2]), GTK_VALUE_INT (args[3]),
-	       func_data);
-}
-
-typedef void (* QueryDoneFunc) (CalQuery *query, CalQueryDoneStatus status, const char *error_str,
-				gpointer data);
-
-static void
-marshal_query_done (GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
-{
-	QueryDoneFunc f;
-
-	f = (QueryDoneFunc) func;
-
-	(* f) (CAL_QUERY (object), GTK_VALUE_ENUM (args[0]), GTK_VALUE_STRING (args[1]),
-	       func_data);
-}
-
-
-
-/* Callback used when an object is updated in the query */
-static void
-obj_updated_cb (QueryListener *ql,
-		const GNOME_Evolution_Calendar_CalObjUID uid,
-		CORBA_boolean query_in_progress,
-		CORBA_long n_scanned,
-		CORBA_long total,
-		gpointer data)
-{
-	CalQuery *query;
-
-	query = CAL_QUERY (data);
-
-	gtk_signal_emit (GTK_OBJECT (query), query_signals[OBJ_UPDATED],
-			 uid, query_in_progress, (int) n_scanned, (int) total);
-}
-
-/* Callback used when an object is removed from the query */
-static void
-obj_removed_cb (QueryListener *ql,
-		const GNOME_Evolution_Calendar_CalObjUID uid,
-		gpointer data)
-{
-	CalQuery *query;
-
-	query = CAL_QUERY (data);
-
-	gtk_signal_emit (GTK_OBJECT (query), query_signals[OBJ_REMOVED],
-			 uid);
-}
-
-/* Callback used when the query terminates */
-static void
-query_done_cb (QueryListener *ql,
-	       GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus corba_status,
-	       const CORBA_char *error_str,
-	       gpointer data)
-{
-	CalQuery *query;
-	CalQueryDoneStatus status;
-
-	query = CAL_QUERY (data);
-
-	switch (corba_status) {
-	case GNOME_Evolution_Calendar_QueryListener_SUCCESS:
-		status = CAL_QUERY_DONE_SUCCESS;
-		break;
-
-	case GNOME_Evolution_Calendar_QueryListener_PARSE_ERROR:
-		status = CAL_QUERY_DONE_PARSE_ERROR;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	gtk_signal_emit (GTK_OBJECT (query), query_signals[QUERY_DONE],
-			 status, error_str);
-}
-
-/* Callback used when an error occurs when evaluating the query */
-static void
-eval_error_cb (QueryListener *ql,
-	       const CORBA_char *error_str,
-	       gpointer data)
-{
-	CalQuery *query;
-
-	query = CAL_QUERY (data);
-
-	gtk_signal_emit (GTK_OBJECT (query), query_signals[EVAL_ERROR],
-			 error_str);
-}
-
-/**
- * cal_query_construct:
- * @query: A calendar query.
- * @cal: Handle to an open calendar.
- * @sexp: S-expression that defines the query.
- * 
- * Constructs a query object by issuing the query creation request to the
- * calendar server.
- * 
- * Return value: The same value as @query on success, or NULL if the request
- * failed.
- **/
-CalQuery *
-cal_query_construct (CalQuery *query,
-		     GNOME_Evolution_Calendar_Cal cal,
-		     const char *sexp)
-{
-	CalQueryPrivate *priv;
-	GNOME_Evolution_Calendar_QueryListener corba_ql;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (query != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_QUERY (query), NULL);
-	g_return_val_if_fail (sexp != NULL, NULL);
-
-	priv = query->priv;
-
-	priv->ql = query_listener_new (obj_updated_cb,
-				       obj_removed_cb,
-				       query_done_cb,
-				       eval_error_cb,
-				       query);
-	if (!priv->ql) {
-		g_message ("cal_query_construct(): Could not create the query listener");
-		return NULL;
-	}
-
-	corba_ql = BONOBO_OBJREF (priv->ql);
-				 
-	CORBA_exception_init (&ev);
-	priv->corba_query = GNOME_Evolution_Calendar_Cal_getQuery (cal, sexp, corba_ql, &ev);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate)) {		
-		g_message ("cal_query_construct(): The server could not create the query");
-		goto error;
-	} else if (BONOBO_EX (&ev)) {
-		g_message ("cal_query_construct(): Could not issue the getQuery() request");
-		goto error;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return query;
-
- error:
-
-	CORBA_exception_free (&ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->ql));
-	priv->ql = NULL;
-	priv->corba_query = CORBA_OBJECT_NIL;
-	return NULL;
-}
-
-/**
- * cal_query_new:
- * @cal: Handle to an open calendar.
- * @sexp: S-expression that defines the query.
- * 
- * Creates a new query object by issuing the query creation request to the
- * calendar server.
- * 
- * Return value: A newly-created query object, or NULL if the request failed.
- **/
-CalQuery *
-cal_query_new (GNOME_Evolution_Calendar_Cal cal,
-	       const char *sexp)
-{
-	CalQuery *query;
-
-	query = gtk_type_new (CAL_QUERY_TYPE);
-
-	if (!cal_query_construct (query, cal, sexp)) {
-		gtk_object_unref (GTK_OBJECT (query));
-		return NULL;
-	}
-
-	return query;
-}
diff --git a/calendar/cal-client/cal-query.h b/calendar/cal-client/cal-query.h
deleted file mode 100644
index 5af5f3864d..0000000000
--- a/calendar/cal-client/cal-query.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Evolution calendar - Live query client object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_QUERY_H
-#define CAL_QUERY_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_QUERY_TYPE            (cal_query_get_type ())
-#define CAL_QUERY(obj)            (GTK_CHECK_CAST ((obj), CAL_QUERY_TYPE, CalQuery))
-#define CAL_QUERY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_QUERY_TYPE, CalQueryClass))
-#define IS_CAL_QUERY(obj)         (GTK_CHECK_TYPE ((obj), CAL_QUERY_TYPE))
-#define IS_CAL_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_QUERY_TYPE))
-
-/* Status values when a query terminates */
-typedef enum {
-	CAL_QUERY_DONE_SUCCESS,
-	CAL_QUERY_DONE_PARSE_ERROR
-} CalQueryDoneStatus;
-
-typedef struct _CalQueryPrivate CalQueryPrivate;
-
-typedef struct {
-	GtkObject object;
-
-	/* Private data */
-	CalQueryPrivate *priv;
-} CalQuery;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* obj_updated) (CalQuery *query, const char *uid,
-			      gboolean query_in_progress, int n_scanned, int total);
-	void (* obj_removed) (CalQuery *query, const char *uid);
-
-	void (* query_done) (CalQuery *query, CalQueryDoneStatus status, const char *error_str);
-
-	void (* eval_error) (CalQuery *query, const char *error_str);
-} CalQueryClass;
-
-GtkType cal_query_get_type (void);
-
-CalQuery *cal_query_construct (CalQuery *query,
-			       GNOME_Evolution_Calendar_Cal cal,
-			       const char *sexp);
-
-CalQuery *cal_query_new (GNOME_Evolution_Calendar_Cal cal,
-			 const char *sexp);
-
-
-
-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 56651566eb..0000000000
--- a/calendar/cal-client/client-test.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Evolution calendar client - test program
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-main.h>
-#include "cal-client.h"
-#include "cal-util/cal-component.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 opened */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	cl_printf (client, "Load/create %s\n",
-		   ((status == CAL_CLIENT_OPEN_SUCCESS) ? "success" :
-		    (status == CAL_CLIENT_OPEN_ERROR) ? "error" :
-		    (status == CAL_CLIENT_OPEN_NOT_FOUND) ? "not found" :
-		    (status == CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED) ? "method not supported" :
-		    "unknown status value"));
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		GList *comp_list;
-
-		/* get free/busy information */
-		comp_list = cal_client_get_free_busy (client, NULL, 0, time (NULL));
-		if (comp_list) {
-			GList *l;
-
-			for (l = comp_list; l; l = l->next) {
-				char *comp_str;
-
-				comp_str = cal_component_get_as_string (CAL_COMPONENT (l->data));
-				gtk_object_unref (GTK_OBJECT (l->data));
-				cl_printf (client, "Free/Busy -> %s\n", comp_str);
-				g_free (comp_str);
-			}
-			g_list_free (comp_list);
-		}
-
-		g_idle_add (list_uids, client);
-	}
-	else
-		gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Callback used when an object is updated */
-static void
-obj_updated_cb (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 only_if_exists)
-{
-	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_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb),
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT (*client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb),
-			    NULL);
-
-	printf ("Calendar loading `%s'...\n", uri);
-
-	result = cal_client_open_calendar (*client, uri, only_if_exists);
-
-	if (!result) {
-		g_message ("create_client(): failure when issuing calendar open request `%s'",
-			   uri);
-		exit (1);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	char *dir;
-
-	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);
-	}
-
-	dir = g_strdup_printf ("%s/evolution/local/Calendar/calendar.ics", g_get_home_dir ());
-	create_client (&client1, dir, FALSE);
-	g_free (dir);
-	create_client (&client2, "/cvs/evolution/calendar/cal-client/test.ics", TRUE);
-
-	bonobo_main ();
-	return 0;
-}
diff --git a/calendar/cal-client/query-listener.c b/calendar/cal-client/query-listener.c
deleted file mode 100644
index 1b21c1e667..0000000000
--- a/calendar/cal-client/query-listener.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Evolution calendar - Live search query listener convenience object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "query-listener.h"
-
-
-
-/* Private part of the QueryListener structure */
-
-struct _QueryListenerPrivate {
-	/* Callbacks for notification and their closure data */
-	QueryListenerObjUpdatedFn obj_updated_fn;
-	QueryListenerObjRemovedFn obj_removed_fn;
-	QueryListenerQueryDoneFn query_done_fn;
-	QueryListenerEvalErrorFn eval_error_fn;
-	gpointer fn_data;
-
-	/* Whether notification is desired */
-	gboolean notify : 1;
-};
-
-
-
-static void query_listener_class_init (QueryListenerClass *class);
-static void query_listener_init (QueryListener *ql);
-static void query_listener_destroy (GtkObject *object);
-
-static void impl_notifyObjUpdated (PortableServer_Servant servant,
-				   GNOME_Evolution_Calendar_CalObjUID uid,
-				   CORBA_boolean query_in_progress,
-				   CORBA_long n_scanned,
-				   CORBA_long total,
-				   CORBA_Environment *ev);
-
-static void impl_notifyObjRemoved (PortableServer_Servant servant,
-				   GNOME_Evolution_Calendar_CalObjUID uid,
-				   CORBA_Environment *ev);
-
-static void impl_notifyQueryDone (PortableServer_Servant servant,
-				  GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus corba_status,
-				  const CORBA_char *error_str,
-				  CORBA_Environment *ev);
-
-static void impl_notifyEvalError (PortableServer_Servant servant,
-				  const CORBA_char *error_str,
-				  CORBA_Environment *ev);
-
-static BonoboXObjectClass *parent_class;
-
-
-
-BONOBO_X_TYPE_FUNC_FULL (QueryListener,
-			 GNOME_Evolution_Calendar_QueryListener,
-			 BONOBO_X_OBJECT_TYPE,
-			 query_listener);
-
-/* Class initialization function for the live search query listener */
-static void
-query_listener_class_init (QueryListenerClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);
-
-	object_class->destroy = query_listener_destroy;
-
-	class->epv.notifyObjUpdated = impl_notifyObjUpdated;
-	class->epv.notifyObjRemoved = impl_notifyObjRemoved;
-	class->epv.notifyQueryDone = impl_notifyQueryDone;
-	class->epv.notifyEvalError = impl_notifyEvalError;
-}
-
-/* Object initialization function for the live search query listener */
-static void
-query_listener_init (QueryListener *ql)
-{
-	QueryListenerPrivate *priv;
-
-	priv = g_new0 (QueryListenerPrivate, 1);
-	ql->priv = priv;
-
-	priv->obj_updated_fn = NULL;
-	priv->obj_removed_fn = NULL;
-	priv->query_done_fn = NULL;
-	priv->eval_error_fn = NULL;
-	priv->fn_data = NULL;
-
-	priv->notify = TRUE;
-}
-
-/* Destroy handler for the live search query listener */
-static void
-query_listener_destroy (GtkObject *object)
-{
-	QueryListener *ql;
-	QueryListenerPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_QUERY_LISTENER (object));
-
-	ql = QUERY_LISTENER (object);
-	priv = ql->priv;
-
-	priv->obj_updated_fn = NULL;
-	priv->obj_removed_fn = NULL;
-	priv->query_done_fn = NULL;
-	priv->eval_error_fn = NULL;
-	priv->fn_data = NULL;
-
-	priv->notify = FALSE;
-
-	g_free (priv);
-	ql->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA method implementations */
-
-/* ::notifyObjUpdated() method */
-static void
-impl_notifyObjUpdated (PortableServer_Servant servant,
-		       GNOME_Evolution_Calendar_CalObjUID uid,
-		       CORBA_boolean query_in_progress,
-		       CORBA_long n_scanned,
-		       CORBA_long total,
-		       CORBA_Environment *ev)
-{
-	QueryListener *ql;
-	QueryListenerPrivate *priv;
-
-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
-	priv = ql->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->obj_updated_fn != NULL);
-	(* priv->obj_updated_fn) (ql, uid, query_in_progress, n_scanned, total, priv->fn_data);
-}
-
-/* ::notifyObjRemoved() method */
-static void
-impl_notifyObjRemoved (PortableServer_Servant servant,
-		       GNOME_Evolution_Calendar_CalObjUID uid,
-		       CORBA_Environment *ev)
-{
-	QueryListener *ql;
-	QueryListenerPrivate *priv;
-
-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
-	priv = ql->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->obj_removed_fn != NULL);
-	(* priv->obj_removed_fn) (ql, uid, priv->fn_data);
-}
-
-/* ::notifyQueryDone() method */
-static void
-impl_notifyQueryDone (PortableServer_Servant servant,
-		      GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus corba_status,
-		      const CORBA_char *error_str,
-		      CORBA_Environment *ev)
-{
-	QueryListener *ql;
-	QueryListenerPrivate *priv;
-
-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
-	priv = ql->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->query_done_fn != NULL);
-	(* priv->query_done_fn) (ql, corba_status, error_str, priv->fn_data);
-}
-
-/* ::notifyEvalError() method */
-static void
-impl_notifyEvalError (PortableServer_Servant servant,
-		      const CORBA_char *error_str,
-		      CORBA_Environment *ev)
-{
-	QueryListener *ql;
-	QueryListenerPrivate *priv;
-
-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
-	priv = ql->priv;
-
-	if (!priv->notify)
-		return;
-
-	g_assert (priv->eval_error_fn != NULL);
-	(* priv->eval_error_fn) (ql, error_str, priv->fn_data);
-}
-
-
-
-/**
- * query_listener_construct:
- * @ql: A query listener.
- * @obj_updated_fn: Callback to use when a component is updated in the query.
- * @obj_removed_fn: Callback to use when a component is removed from the query.
- * @query_done_fn: Callback to use when a query is done.
- * @eval_error_fn: Callback to use when an evaluation error happens during a query.
- * @fn_data: Closure data to pass to the callbacks.
- * 
- * Constructs a query listener by setting the callbacks it will use for
- * notification from the calendar server.
- * 
- * Return value: The same value as @ql.
- **/
-QueryListener *
-query_listener_construct (QueryListener *ql,
-			  QueryListenerObjUpdatedFn obj_updated_fn,
-			  QueryListenerObjRemovedFn obj_removed_fn,
-			  QueryListenerQueryDoneFn query_done_fn,
-			  QueryListenerEvalErrorFn eval_error_fn,
-			  gpointer fn_data)
-{
-	QueryListenerPrivate *priv;
-
-	g_return_val_if_fail (ql != NULL, NULL);
-	g_return_val_if_fail (IS_QUERY_LISTENER (ql), NULL);
-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);
-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);
-	g_return_val_if_fail (query_done_fn != NULL, NULL);
-	g_return_val_if_fail (eval_error_fn != NULL, NULL);
-
-	priv = ql->priv;
-
-	priv->obj_updated_fn = obj_updated_fn;
-	priv->obj_removed_fn = obj_removed_fn;
-	priv->query_done_fn = query_done_fn;
-	priv->eval_error_fn = eval_error_fn;
-	priv->fn_data = fn_data;
-
-	return ql;
-}
-
-/**
- * query_listener_new:
- * @obj_updated_fn: Callback to use when a component is updated in the query.
- * @obj_removed_fn: Callback to use when a component is removed from the query.
- * @query_done_fn: Callback to use when a query is done.
- * @eval_error_fn: Callback to use when an evaluation error happens during a query.
- * @fn_data: Closure data to pass to the callbacks.
- * 
- * Creates a new query listener object.
- * 
- * Return value: A newly-created query listener object.
- **/
-QueryListener *
-query_listener_new (QueryListenerObjUpdatedFn obj_updated_fn,
-		    QueryListenerObjRemovedFn obj_removed_fn,
-		    QueryListenerQueryDoneFn query_done_fn,
-		    QueryListenerEvalErrorFn eval_error_fn,
-		    gpointer fn_data)
-{
-	QueryListener *ql;
-
-	ql = gtk_type_new (QUERY_LISTENER_TYPE);
-
-	return query_listener_construct (ql,
-					 obj_updated_fn,
-					 obj_removed_fn,
-					 query_done_fn,
-					 eval_error_fn,
-					 fn_data);
-}
-
-/**
- * query_listener_stop_notification:
- * @ql: A query listener.
- * 
- * Informs a query listener that no further notification is desired.  The
- * callbacks specified when the listener was created will no longer be invoked
- * after this function is called.
- **/
-void
-query_listener_stop_notification (QueryListener *ql)
-{
-	QueryListenerPrivate *priv;
-
-	g_return_if_fail (ql != NULL);
-	g_return_if_fail (IS_QUERY_LISTENER (ql));
-
-	priv = ql->priv;
-	g_return_if_fail (priv->notify != FALSE);
-
-	priv->notify = FALSE;
-}
diff --git a/calendar/cal-client/query-listener.h b/calendar/cal-client/query-listener.h
deleted file mode 100644
index e553d37a49..0000000000
--- a/calendar/cal-client/query-listener.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Evolution calendar - Live search query listener implementation
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 QUERY_LISTENER_H
-#define QUERY_LISTENER_H
-
-#include <bonobo/bonobo-xobject.h>
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define QUERY_LISTENER_TYPE            (query_listener_get_type ())
-#define QUERY_LISTENER(obj)            (GTK_CHECK_CAST ((obj), QUERY_LISTENER_TYPE, QueryListener))
-#define QUERY_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), QUERY_LISTENER_TYPE,	\
-					QueryListenerClass))
-#define IS_QUERY_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), QUERY_LISTENER_TYPE))
-#define IS_QUERY_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), QUERY_LISTENER_TYPE))
-
-typedef struct _QueryListenerPrivate QueryListenerPrivate;
-
-typedef struct {
-	BonoboXObject xobject;
-
-	/* Private data */
-	QueryListenerPrivate *priv;
-} QueryListener;
-
-typedef struct {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_QueryListener__epv epv;
-} QueryListenerClass;
-
-/* Notification functions */
-
-typedef void (* QueryListenerObjUpdatedFn) (QueryListener *ql,
-					    const GNOME_Evolution_Calendar_CalObjUID uid,
-					    CORBA_boolean query_in_progress,
-					    CORBA_long n_scanned,
-					    CORBA_long total,
-					    gpointer data);
-
-typedef void (* QueryListenerObjRemovedFn) (QueryListener *ql,
-					    const GNOME_Evolution_Calendar_CalObjUID uid,
-					    gpointer data);
-
-typedef void (* QueryListenerQueryDoneFn) (
-	QueryListener *ql,
-	GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus status,
-	const CORBA_char *error_str,
-	gpointer data);
-
-typedef void (* QueryListenerEvalErrorFn) (QueryListener *ql,
-					   const CORBA_char *error_str,
-					   gpointer data);
-
-GtkType query_listener_get_type (void);
-
-QueryListener *query_listener_construct (QueryListener *ql,
-					 QueryListenerObjUpdatedFn obj_updated_fn,
-					 QueryListenerObjRemovedFn obj_removed_fn,
-					 QueryListenerQueryDoneFn query_done_fn,
-					 QueryListenerEvalErrorFn eval_error_fn,
-					 gpointer fn_data);
-
-QueryListener *query_listener_new (QueryListenerObjUpdatedFn obj_updated_fn,
-				   QueryListenerObjRemovedFn obj_removed_fn,
-				   QueryListenerQueryDoneFn query_done_fn,
-				   QueryListenerEvalErrorFn eval_error_fn,
-				   gpointer fn_data);
-
-void query_listener_stop_notification (QueryListener *ql);
-
-
-
-END_GNOME_DECLS
-
-#endif
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 bb94577c16..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		\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-#
-# 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.a				\
-	 $(top_builddir)/libical/src/libical/libical-evolution.la	\
-	 $(EVOLUTION_CALENDAR_LIBS)
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
deleted file mode 100644
index a618e0ef4b..0000000000
--- a/calendar/cal-util/cal-component.c
+++ /dev/null
@@ -1,5214 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "cal-component.h"
-#include "timeutil.h"
-
-
-
-/* Extension property for alarm components so that we can reference them by UID */
-#define EVOLUTION_ALARM_UID_PROPERTY "X-EVOLUTION-ALARM-UID"
-
-/* Private part of the CalComponent structure */
-struct _CalComponentPrivate {
-	/* The icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Properties */
-
-	icalproperty *uid;
-
-	icalproperty *status;
-
-	struct attendee {
-		icalproperty *prop;
-		icalparameter *cutype_param;
-		icalparameter *member_param;
-		icalparameter *role_param;
-		icalparameter *partstat_param;
-		icalparameter *rsvp_param;
-		icalparameter *delto_param;
-		icalparameter *delfrom_param;
-		icalparameter *sentby_param;
-		icalparameter *cn_param;
-		icalparameter *language_param;
-	};
-	
-	GSList *attendee_list;
-	
-	icalproperty *categories;
-
-	icalproperty *classification;
-
-	struct text {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	};
-
-	GSList *comment_list; /* list of struct text */
-
-	icalproperty *completed;
-
-	GSList *contact_list; /* list of struct text */
-
-	icalproperty *created;
-
-	GSList *description_list; /* list of struct text */
-
-	struct datetime {
-		icalproperty *prop;
-		icalparameter *tzid_param;
-	};
-
-	struct datetime dtstart;
-	struct datetime dtend;
-
-	icalproperty *dtstamp;
-
-	/* The DURATION property can be used instead of the VEVENT DTEND or
-	   the VTODO DUE dates. We do not use it directly ourselves, but we
-	   must be able to handle it from incoming data. If a DTEND or DUE
-	   is requested, we convert the DURATION if necessary. If DTEND or
-	   DUE is set, we remove any DURATION. */
-	icalproperty *duration;
-
-	struct datetime due;
-
-	GSList *exdate_list; /* list of struct datetime */
-	GSList *exrule_list; /* list of icalproperty objects */
-
-	struct organizer {
-		icalproperty *prop;
-		icalparameter *sentby_param;
-		icalparameter *cn_param;
-		icalparameter *language_param;
-	};
-
-	struct organizer organizer;
-	
-	icalproperty *geo;
-	icalproperty *last_modified;
-	icalproperty *percent;
-	icalproperty *priority;
-
-	struct period {
-		icalproperty *prop;
-		icalparameter *value_param;
-	};
-
-	struct recur_id {
-		struct datetime recur_time;
-		
-		icalparameter *range_param;
-	};
-
-	struct recur_id recur_id;
-	
-	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;
-	icalproperty *location;
-
-	/* Subcomponents */
-
-	GHashTable *alarm_uid_hash;
-
-	/* 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 {
-	/* Alarm icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Our extension UID property */
-	icalproperty *uid;
-
-	/* Properties */
-
-	icalproperty *action;
-	icalproperty *attach; /* FIXME: see scan_alarm_property() below */
-
-	struct {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	} description;
-
-	icalproperty *duration;
-	icalproperty *repeat;
-	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;
-
-	priv->alarm_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-/* 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;
-}
-
-/* Used from g_hash_table_foreach_remove() to free the alarm UIDs hash table.
- * We do not need to do anything to individual elements since we were storing
- * the UID pointers inside the icalproperties themselves.
- */
-static gboolean
-free_alarm_cb (gpointer key, gpointer value, gpointer data)
-{
-	return TRUE;
-}
-
-/* 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, gboolean free)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-	
-	priv = comp->priv;
-
-	if (!priv->icalcomp)
-		return;
-
-	/* Free the icalcomponent */
-
-	if (free && icalcomponent_get_parent (priv->icalcomp) == NULL) {
-		icalcomponent_free (priv->icalcomp);
-		priv->icalcomp = NULL;
-	}
-	
-	/* Free the mappings */
-
-	priv->uid = NULL;
-
-	priv->status = NULL;
-
-	for (l = priv->attendee_list; l != NULL; l = l->next)
-		g_free (l->data);
-	g_slist_free (priv->attendee_list);
-	priv->attendee_list = NULL;
-	
-	priv->categories = NULL;
-
-	priv->classification = NULL;
-	priv->comment_list = NULL;
-	priv->completed = NULL;
-	priv->contact_list = 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;
-
-	priv->duration = NULL;
-
-	priv->exdate_list = free_slist (priv->exdate_list);
-
-	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;
-	priv->location = NULL;
-
-	/* Free the subcomponents */
-
-	g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, 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, TRUE);
-	g_hash_table_destroy (priv->alarm_uid_hash);
-	priv->alarm_uid_hash = NULL;
-
-	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)
-{
-        char *iso, *ret;
-	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";
-	}
-
-	iso = isodate_from_time_t (t);
-	ret = g_strdup_printf ("%s-%d-%d-%d-%d@%s",
-			       iso,
-			       getpid (),
-			       getgid (),
-			       getppid (),
-			       serial++,
-			       hostname);
-	g_free (iso);
-
-	return ret;
-}
-
-/**
- * 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 an attendee property */
-static void
-scan_attendee (CalComponent *comp, GSList **attendee_list, icalproperty *prop) 
-{
-	struct attendee *attendee;
-	
-	attendee = g_new (struct attendee, 1);
-	attendee->prop = prop;
-
-	attendee->cutype_param = icalproperty_get_first_parameter (prop, ICAL_CUTYPE_PARAMETER);
-	attendee->member_param = icalproperty_get_first_parameter (prop, ICAL_MEMBER_PARAMETER);
-	attendee->role_param = icalproperty_get_first_parameter (prop, ICAL_ROLE_PARAMETER);
-	attendee->partstat_param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-	attendee->rsvp_param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);
-	attendee->delto_param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDTO_PARAMETER);
-	attendee->delfrom_param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);
-	attendee->sentby_param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
-	attendee->cn_param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);
-	attendee->language_param = icalproperty_get_first_parameter (prop, ICAL_LANGUAGE_PARAMETER);
-	
-	*attendee_list = g_slist_append (*attendee_list, attendee);
-}
-
-/* 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;
-	struct datetime *dt;
-
-	priv = comp->priv;
-
-	dt = g_new (struct datetime, 1);
-	dt->prop = prop;
-	dt->tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-
-	priv->exdate_list = g_slist_append (priv->exdate_list, dt);
-}
-
-/* Scans and attendee property */
-static void
-scan_organizer (CalComponent *comp, struct organizer *organizer, icalproperty *prop) 
-{
-	organizer->prop = prop;
-
-	organizer->sentby_param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
-	organizer->cn_param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);
-	organizer->language_param = icalproperty_get_first_parameter (prop, ICAL_LANGUAGE_PARAMETER);
-}
-
-/* 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_id (CalComponent *comp, struct recur_id *recur_id, icalproperty *prop)
-{
-	scan_datetime (comp, &recur_id->recur_time, prop);
-
-	recur_id->range_param = icalproperty_get_first_parameter (prop, ICAL_RANGE_PARAMETER);
-}
-
-/* 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_ATTENDEE_PROPERTY:
-		scan_attendee (comp, &priv->attendee_list, prop);
-		break;
-
-	case ICAL_CATEGORIES_PROPERTY:
-		priv->categories = 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_CONTACT_PROPERTY:
-		scan_text (comp, &priv->contact_list, 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_DURATION_PROPERTY:
-		priv->duration = 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_ORGANIZER_PROPERTY:
-		scan_organizer (comp, &priv->organizer, prop);
-		break;
-
-	case ICAL_PERCENTCOMPLETE_PROPERTY:
-		priv->percent = prop;
-		break;
-
-	case ICAL_PRIORITY_PROPERTY:
-		priv->priority = prop;
-		break;
-
-	case ICAL_RECURRENCEID_PROPERTY:
-		scan_recur_id (comp, &priv->recur_id, 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;
-
-	case ICAL_LOCATION_PROPERTY :
-		priv->location = prop;
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Gets our alarm UID string from a property that is known to contain it */
-static const char *
-alarm_uid_from_prop (icalproperty *prop)
-{
-	const char *xstr;
-
-	g_assert (icalproperty_isa (prop) == ICAL_X_PROPERTY);
-
-	xstr = icalproperty_get_x (prop);
-	g_assert (xstr != NULL);
-
-	return xstr;
-}
-
-/* Sets our alarm UID extension property on an alarm component.  Returns a
- * pointer to the UID string inside the property itself.
- */
-static const char *
-set_alarm_uid (icalcomponent *alarm, const char *auid)
-{
-	icalproperty *prop;
-	const char *inprop_auid;
-
-	/* Create the new property */
-
-	prop = icalproperty_new_x ((char *) auid);
-	icalproperty_set_x_name (prop, EVOLUTION_ALARM_UID_PROPERTY);
-
-	icalcomponent_add_property (alarm, prop);
-
-	inprop_auid = alarm_uid_from_prop (prop);
-	return inprop_auid;
-}
-
-/* Removes any alarm UID extension properties from an alarm subcomponent */
-static void
-remove_alarm_uid (icalcomponent *alarm)
-{
-	icalproperty *prop;
-	GSList *list, *l;
-
-	list = NULL;
-
-	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {
-		const char *xname;
-
-		xname = icalproperty_get_x_name (prop);
-		g_assert (xname != NULL);
-
-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0)
-			list = g_slist_prepend (list, prop);
-	}
-
-	for (l = list; l; l = l->next) {
-		prop = l->data;
-		icalcomponent_remove_property (alarm, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (list);
-}
-
-/* Adds an alarm subcomponent to the calendar component's mapping table.  The
- * actual UID with which it gets added may not be the same as the specified one;
- * this function will change it if the table already had an alarm subcomponent
- * with the specified UID.  Returns the actual UID used.
- */
-static const char *
-add_alarm (CalComponent *comp, icalcomponent *alarm, const char *auid)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *old_alarm;
-
-	priv = comp->priv;
-
-	/* First we see if we already have an alarm with the requested UID.  In
-	 * that case, we need to change the new UID to something else.  This
-	 * should never happen, but who knows.
-	 */
-
-	old_alarm = g_hash_table_lookup (priv->alarm_uid_hash, auid);
-	if (old_alarm != NULL) {
-		char *new_auid;
-
-		g_message ("add_alarm(): Got alarm with duplicated UID `%s', changing it...", auid);
-
-		remove_alarm_uid (alarm);
-
-		new_auid = cal_component_gen_uid ();
-		auid = set_alarm_uid (alarm, new_auid);
-		g_free (new_auid);
-	}
-
-	g_hash_table_insert (priv->alarm_uid_hash, (char *) auid, alarm);
-	return auid;
-}
-
-/* Scans an alarm subcomponent, adds an UID extension property to it (so that we
- * can reference alarms by unique IDs), and adds its mapping to the component.  */
-static void
-scan_alarm (CalComponent *comp, icalcomponent *alarm)
-{
-	CalComponentPrivate *priv;
-	icalproperty *prop;
-	const char *auid;
-	char *new_auid;
-
-	priv = comp->priv;
-
-	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {
-		const char *xname;
-
-		xname = icalproperty_get_x_name (prop);
-		g_assert (xname != NULL);
-
-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0) {
-			auid = alarm_uid_from_prop (prop);
-			add_alarm (comp, alarm, auid);
-			return;
-		}
-	}
-
-	/* The component has no alarm UID property, so we create one. */
-
-	new_auid = cal_component_gen_uid ();
-	auid = set_alarm_uid (alarm, new_auid);
-	g_free (new_auid);
-
-	add_alarm (comp, alarm, auid);
-}
-
-/* Scans an icalcomponent for its properties so that we can provide
- * random-access to them.  It also builds a hash table of the component's alarm
- * subcomponents.
- */
-static void
-scan_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalproperty *prop;
-	icalcompiter iter;
-
-	priv = comp->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	/* Scan properties */
-
-	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);
-
-	/* Scan subcomponents */
-
-	for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *subcomp;
-
-		subcomp = icalcompiter_deref (&iter);
-		scan_alarm (comp, subcomp);
-	}
-}
-
-/* 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_with_zone (tim, FALSE, icaltimezone_get_utc_timezone ());
-
-		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, TRUE);
-
-	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, TRUE);
-
-	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;
-}
-
-void
-cal_component_rescan (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-
-	/* Clear everything out */
-	free_icalcomponent (comp, FALSE);
-
-	/* Rescan */
-	scan_icalcomponent (comp);
-	ensure_mandatory_properties (comp);
-}
-
-/**
- * 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;
-}
-
-/* Used from g_hash_table_foreach(); ensures that an alarm subcomponent
- * has the mandatory properties it needs.
- */
-static void
-ensure_alarm_properties_cb (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-	CalComponentPrivate *priv;
-	icalcomponent *alarm;
-	icalproperty *prop;
-	enum icalproperty_action action;
-	const char *str;
-
-	alarm = value;
-
-	comp = CAL_COMPONENT (data);
-	priv = comp->priv;
-
-	prop = icalcomponent_get_first_property (alarm, ICAL_ACTION_PROPERTY);
-	if (!prop)
-		return;
-
-	action = icalproperty_get_action (prop);
-
-	switch (action) {
-	case ICAL_ACTION_DISPLAY:
-		/* Ensure we have a DESCRIPTION property */
-		prop = icalcomponent_get_first_property (alarm, ICAL_DESCRIPTION_PROPERTY);
-		if (prop)
-			break;
-
-		if (!priv->summary.prop)
-			str = _("Untitled appointment");
-		else
-			str = icalproperty_get_summary (priv->summary.prop);
-
-		prop = icalproperty_new_description (str);
-		icalcomponent_add_property (alarm, prop);
-
-		break;
-
-	default:
-		break;
-		/* FIXME: add other action types here */
-	}
-}
-
-/* Ensures that alarm subcomponents have the mandatory properties they need,
- * even when clients may not have set them properly.
- */
-static void
-ensure_alarm_properties (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	g_hash_table_foreach (priv->alarm_uid_hash, ensure_alarm_properties_cb, comp);
-}
-
-/**
- * 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);
-
-	ensure_alarm_properties (comp);
-
-	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_categories:
- * @comp: A calendar component object.
- * @categories:
- *
- *
- **/
-void
-cal_component_get_categories (CalComponent *comp, const char **categories)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (categories != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->categories)
-		*categories = icalproperty_get_categories (priv->categories);
-	else
-		*categories = NULL;
-}
-
-/**
- * cal_component_set_categories:
- * @comp: A calendar component object.
- * @categories:
- *
- *
- **/
-void
-cal_component_set_categories (CalComponent *comp, const char *categories)
-{
-	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 (!categories || !(*categories)) {
-		if (priv->categories) {
-			icalcomponent_remove_property (priv->icalcomp, priv->categories);
-			icalproperty_free (priv->categories);
-			priv->url = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->categories)
-		icalproperty_set_categories (priv->categories, (char *) categories);
-	else {
-		priv->categories = icalproperty_new_categories ((char *) categories);
-		icalcomponent_add_property (priv->icalcomp, priv->categories);
-	}
-}
-
-
-/**
- * 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) {
-		*categ_list = NULL;
-		return;
-	}
-
-	categories = icalproperty_get_categories (priv->categories);
-	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;
-	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);
-
-	if (!categ_list) {
-		if (priv->categories) {
-			icalcomponent_remove_property (priv->icalcomp, priv->categories);
-			icalproperty_free (priv->categories);
-		}
-
-		return;
-	}
-
-	/* Create a single string of categories */
-	categories_str = stringify_categories (categ_list);
-
-	/* Set the categories */
-	priv->categories = icalproperty_new_categories (categories_str);
-	g_free (categories_str);
-
-	icalcomponent_add_property (priv->icalcomp, priv->categories);
-}
-
-/**
- * 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,
-	       const 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) (const 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);
-}
-
-/**
- * cal_component_get_contact_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the contact properties and their parameters, as
- * a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the contact of a calendar component object.  The contact property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText is returned.
- **/
-void
-cal_component_get_contact_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->contact_list, icalproperty_get_contact, text_list);
-}
-
-/**
- * cal_component_set_contact_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentText structures.
- *
- * Sets the contact of a calendar component object.  The contact property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText structures is used.
- **/
-void
-cal_component_set_contact_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_contact, &priv->contact_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 the icaltimetype has is_utc set, we set "UTC" as the TZID.
-	   This makes the timezone code simpler. */
-	if (datetime->tzid_param)
-		dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
-	else if (dt->value && dt->value->is_utc)
-		dt->tzid = g_strdup ("UTC");
-	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 we are setting the property to NULL (i.e. removing it), then
-	   we remove it if it exists. */
-	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 the TZID is set to "UTC", we set the is_utc flag. */
-	if (dt->tzid && !strcmp (dt->tzid, "UTC"))
-		dt->value->is_utc = 1;
-	else
-		dt->value->is_utc = 0;
-
-	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 the TZID is set to "UTC", we don't want to save the TZID. */
-	if (dt->tzid && strcmp (dt->tzid, "UTC")) {
-		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;
-	}
-}
-
-
-/* This tries to get the DTSTART + DURATION for a VEVENT or VTODO. In a
-   VEVENT this is used for the DTEND if no DTEND exists, In a VTOTO it is
-   used for the DUE date if DUE doesn't exist. */
-static void
-cal_component_get_start_plus_duration (CalComponent *comp,
-				       CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-	struct icaldurationtype duration;
-
-	priv = comp->priv;
-
-	if (!priv->duration)
-		return;
-
-	/* Get the DTSTART time. */
-	get_datetime (&priv->dtstart, icalproperty_get_dtstart, dt);
-	if (!dt->value)
-		return;
-
-	duration = icalproperty_get_duration (priv->duration);
-
-	/* The DURATION shouldn't be negative, but just return DTSTART if it
-	   is, i.e. assume it is 0. */
-	if (duration.is_neg)
-		return;
-
-	/* If DTSTART is a DATE value, then we need to check if the DURATION
-	   includes any hours, minutes or seconds. If it does, we need to
-	   make the DTEND/DUE a DATE-TIME value. */
-	duration.days += duration.weeks * 7;
-	if (dt->value->is_date) {
-		if (duration.hours != 0 || duration.minutes != 0
-		    || duration.seconds != 0) {
-			dt->value->is_date = 0;
-		}
-	}
-
-	/* Add on the DURATION. */
-	icaltime_adjust (dt->value, duration.days, duration.hours,
-			 duration.minutes, duration.seconds);
-}
-
-
-/**
- * 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);
-
-	/* If we don't have a DTEND property, then we try to get DTSTART
-	   + DURATION. */
-	if (!dt->value)
-		cal_component_get_start_plus_duration (comp, 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);
-
-	/* Make sure we remove any existing DURATION property, as it can't be
-	   used with a DTEND. If DTEND is set to NULL, i.e. removed, we also
-	   want to remove any DURATION. */
-	if (priv->duration) {
-		icalcomponent_remove_property (priv->icalcomp, priv->duration);
-		icalproperty_free (priv->duration);
-		priv->duration = NULL;
-	}
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_dtstamp:
- * @comp: A calendar component object.
- * @t: A 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);
-
-	/* If we don't have a DTEND property, then we try to get DTSTART
-	   + DURATION. */
-	if (!dt->value)
-		cal_component_get_start_plus_duration (comp, 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);
-
-	/* Make sure we remove any existing DURATION property, as it can't be
-	   used with a DTEND. If DTEND is set to NULL, i.e. removed, we also
-	   want to remove any DURATION. */
-	if (priv->duration) {
-		icalcomponent_remove_property (priv->icalcomp, priv->duration);
-		icalproperty_free (priv->duration);
-		priv->duration = NULL;
-	}
-
-	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 icaldatetimeperiodtype (* 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 icaldatetimeperiodtype 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.period.start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME)
-			p->u.end = ip.period.end;
-		else if (p->type == CAL_COMPONENT_PERIOD_DURATION)
-			p->u.duration = ip.period.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 icaldatetimeperiodtype 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 icaldatetimeperiodtype ip;
-		icalparameter_value value_type;
-
-		g_assert (l->data != NULL);
-		p = l->data;
-
-		/* Create libical value */
-
-		ip.period.start = p->start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-			value_type = ICAL_VALUE_DATETIME;
-			ip.period.end = p->u.end;
-		} else if (p->type == CAL_COMPONENT_PERIOD_DURATION) {
-			value_type = ICAL_VALUE_DURATION;
-			ip.period.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
- * #CalComponentDateTime 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) {
-		struct datetime *dt;
-		CalComponentDateTime *cdt;
-
-		dt = l->data;
-
-		cdt = g_new (CalComponentDateTime, 1);
-		cdt->value = g_new (struct icaltimetype, 1);
-
-		*cdt->value = icalproperty_get_exdate (dt->prop);
-
-		if (dt->tzid_param)
-			cdt->tzid = g_strdup (icalparameter_get_tzid (dt->tzid_param));
-		else
-			cdt->tzid = NULL;
-
-		*exdate_list = g_slist_prepend (*exdate_list, cdt);
-	}
-
-	*exdate_list = g_slist_reverse (*exdate_list);
-}
-
-/**
- * cal_component_set_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: List of #CalComponentDateTime 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) {
-		struct datetime *dt;
-
-		dt = l->data;
-
-		/* Removing the DATE or DATE-TIME property will also remove
-		   any TZID parameter. */
-		icalcomponent_remove_property (priv->icalcomp, dt->prop);
-		icalproperty_free (dt->prop);
-		g_free (dt);
-	}
-
-	g_slist_free (priv->exdate_list);
-	priv->exdate_list = NULL;
-
-	/* Add in new exception dates */
-
-	for (l = exdate_list; l; l = l->next) {
-		CalComponentDateTime *cdt;
-		struct datetime *dt;
-
-		g_assert (l->data != NULL);
-		cdt = l->data;
-
-		g_assert (cdt->value != NULL);
-
-		dt = g_new (struct datetime, 1);
-		dt->prop = icalproperty_new_exdate (*cdt->value);
-
-		if (cdt->tzid) {
-			dt->tzid_param = icalparameter_new_tzid ((char *) cdt->tzid);
-			icalproperty_add_parameter (dt->prop, dt->tzid_param);
-		} else
-			dt->tzid_param = NULL;
-
-		icalcomponent_add_property (priv->icalcomp, dt->prop);
-		priv->exdate_list = g_slist_prepend (priv->exdate_list, dt);
-	}
-
-	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.
- *
- * Queries the 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_organizer:
- * @comp:  A calendar component object
- * @organizer: A value for the organizer
- * 
- * Queries the organizer property of a calendar component object
- **/
-void
-cal_component_get_organizer (CalComponent *comp, CalComponentOrganizer *organizer)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (organizer != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->organizer.prop)
-		organizer->value = icalproperty_get_organizer (priv->organizer.prop);
-	else
-		organizer->value = NULL;
-
-	if (priv->organizer.sentby_param)
-		organizer->sentby = icalparameter_get_sentby (priv->organizer.sentby_param);
-	else
-		organizer->sentby = NULL;
-
-	if (priv->organizer.cn_param)
-		organizer->cn = icalparameter_get_sentby (priv->organizer.cn_param);
-	else
-		organizer->cn = NULL;
-
-	if (priv->organizer.language_param)
-		organizer->language = icalparameter_get_sentby (priv->organizer.language_param);
-	else
-		organizer->language = NULL;
-
-}
-
-/**
- * cal_component_set_organizer:
- * @comp:  A calendar component object.
- * @organizer: Value for the organizer property
- * 
- * Sets the organizer of a calendar component object
- **/
-void
-cal_component_set_organizer (CalComponent *comp, CalComponentOrganizer *organizer)
-{
-	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 (!organizer) {
-		if (priv->organizer.prop) {
-			icalcomponent_remove_property (priv->icalcomp, priv->organizer.prop);
-			icalproperty_free (priv->organizer.prop);
-
-			priv->organizer.prop = NULL;
-			priv->organizer.sentby_param = NULL;
-			priv->organizer.cn_param = NULL;
-			priv->organizer.language_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (organizer->value != NULL);
-
-	if (priv->organizer.prop)
-		icalproperty_set_organizer (priv->organizer.prop, (char *) organizer->value);
-	else {
-		priv->organizer.prop = icalproperty_new_organizer ((char *) organizer->value);
-		icalcomponent_add_property (priv->icalcomp, priv->organizer.prop);
-	}
-
-	if (organizer->sentby) {
-		g_assert (priv->organizer.prop != NULL);
-
-		if (priv->organizer.sentby_param)
-			icalparameter_set_sentby (priv->organizer.sentby_param,
-						  (char *) organizer->sentby);
-		else {
-			priv->organizer.sentby_param = icalparameter_new_sentby (
-				(char *) organizer->sentby);
-			icalproperty_add_parameter (priv->organizer.prop,
-						    priv->organizer.sentby_param);
-		}
-	} else if (priv->organizer.sentby_param) {
-		icalproperty_remove_parameter (priv->organizer.prop, ICAL_SENTBY_PARAMETER);
-		icalparameter_free (priv->organizer.sentby_param);
-		priv->organizer.sentby_param = NULL;
-	}
-
-	if (organizer->cn) {
-		g_assert (priv->organizer.prop != NULL);
-
-		if (priv->organizer.cn_param)
-			icalparameter_set_cn (priv->organizer.cn_param,
-						  (char *) organizer->cn);
-		else {
-			priv->organizer.cn_param = icalparameter_new_cn (
-				(char *) organizer->cn);
-			icalproperty_add_parameter (priv->organizer.prop,
-						    priv->organizer.cn_param);
-		}
-	} else if (priv->organizer.cn_param) {
-		icalproperty_remove_parameter (priv->organizer.prop, ICAL_CN_PARAMETER);
-		icalparameter_free (priv->organizer.cn_param);
-		priv->organizer.cn_param = NULL;
-	}
-
-	if (organizer->language) {
-		g_assert (priv->organizer.prop != NULL);
-
-		if (priv->organizer.language_param)
-			icalparameter_set_language (priv->organizer.language_param,
-						  (char *) organizer->language);
-		else {
-			priv->organizer.language_param = icalparameter_new_language (
-				(char *) organizer->language);
-			icalproperty_add_parameter (priv->organizer.prop,
-						    priv->organizer.language_param);
-		}
-	} else if (priv->organizer.language_param) {
-		icalproperty_remove_parameter (priv->organizer.prop, ICAL_LANGUAGE_PARAMETER);
-		icalparameter_free (priv->organizer.language_param);
-		priv->organizer.language_param = NULL;
-	}
-
-
-}
-
-
-/**
- * cal_component_has_organizer:
- * @comp: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-cal_component_has_organizer (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;
-
-	return priv->organizer.prop != NULL;
-}
-		
-/**
- * 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_recurid:
- * @comp: A calendar component object.
- * @recur_id: Return value for the recurrence id property
- * 
- * Queries the recurrence id property of a calendar component object
- **/
-void 
-cal_component_get_recurid (CalComponent *comp, CalComponentRange *recur_id)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_id != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->recur_id.recur_time, 
-		      icalproperty_get_recurrenceid, 
-		      &recur_id->datetime);
-}
-
-/**
- * cal_component_set_recurid:
- * @comp: A calendar component object.
- * @recur_id: Value for the recurrence id property.
- * 
- * Sets the recurrence id property of a calendar component object.
- **/
-void
-cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id)
-{
-	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->recur_id.recur_time,
-		      icalproperty_new_recurrenceid,
-		      icalproperty_set_recurrenceid,
-		      &recur_id->datetime);
-}
-
-/**
- * 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.
- *
- * Queries 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_status:
- * @comp: A calendar component object.
- * @status: Return value for the status value.  It is set to #ICAL_STATUS_NONE
- * if the component has no status property.
- *
- * Queries the status property of a calendar component object.
- **/
-void
-cal_component_get_status (CalComponent *comp, icalproperty_status *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 = ICAL_STATUS_NONE;
-		return;
-	}
-
-	*status = icalproperty_get_status (priv->status);
-}
-
-/**
- * cal_component_set_status:
- * @comp: A calendar component object.
- * @status: Status value.  You should use #ICAL_STATUS_NONE if you want to unset
- * this property.
- *
- * Sets the status property of a calendar component object.
- **/
-void
-cal_component_set_status (CalComponent *comp, icalproperty_status status)
-{
-	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 = TRUE;
-
-	if (status == ICAL_STATUS_NONE) {
-		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, status);
-	} else {
-		priv->status = icalproperty_new_status (status);
-		icalcomponent_add_property (priv->icalcomp, priv->status);
-	}
-}
-
-/**
- * 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") == 0)
-		*transp = CAL_COMPONENT_TRANSP_TRANSPARENT;
-	else if (strcasecmp (val, "OPAQUE") == 0)
-		*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 || !(*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);
-	}
-}
-
-/* Gets a text list value */
-static void
-get_attendee_list (GSList *attendee_list, GSList **al)
-{
-	GSList *l;
-
-	*al = NULL;
-
-	if (!attendee_list)
-		return;
-
-	for (l = attendee_list; l; l = l->next) {
-		struct attendee *attendee;
-		CalComponentAttendee *a;
-
-		attendee = l->data;
-		g_assert (attendee->prop != NULL);
-
-		a = g_new0 (CalComponentAttendee, 1);
-		a->value = icalproperty_get_attendee (attendee->prop);
-
-		if (attendee->member_param)
-			a->member = icalparameter_get_member (attendee->member_param);		
-		if (attendee->cutype_param)
-			a->cutype = icalparameter_get_cutype (attendee->cutype_param);			
-		if (attendee->role_param)
-			a->role = icalparameter_get_role (attendee->role_param);
-		if (attendee->partstat_param)
-			a->status = icalparameter_get_role (attendee->partstat_param);
-		if (attendee->rsvp_param && icalparameter_get_rsvp (attendee->rsvp_param) == ICAL_RSVP_TRUE)
-			a->rsvp = TRUE;
-		else
-			a->rsvp = FALSE;
-		if (attendee->delfrom_param)
-			a->delfrom = icalparameter_get_sentby (attendee->delfrom_param);
-		if (attendee->delto_param)
-			a->delto = icalparameter_get_sentby (attendee->delto_param);
-		if (attendee->sentby_param)
-			a->sentby = icalparameter_get_sentby (attendee->sentby_param);
-		if (attendee->cn_param)
-			a->cn = icalparameter_get_sentby (attendee->cn_param);
-		if (attendee->language_param)
-			a->language = icalparameter_get_sentby (attendee->language_param);
-
-		*al = g_slist_prepend (*al, a);
-	}
-
-	*al = g_slist_reverse (*al);
-}
-
-
-/* Sets a text list value */
-static void
-set_attendee_list (CalComponent *comp,
-		   GSList **attendee_list,
-		   GSList *al)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old attendees */
-
-	for (l = *attendee_list; l; l = l->next) {
-		struct attendee *attendee;
-
-		attendee = l->data;
-		g_assert (attendee->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, attendee->prop);
-		icalproperty_free (attendee->prop);
-		g_free (attendee);
-	}
-
-	g_slist_free (*attendee_list);
-	*attendee_list = NULL;
-
-	/* Add in new attendees */
-
-	for (l = al; l; l = l->next) {
-		CalComponentAttendee *a;
-		struct attendee *attendee;
-
-		a = l->data;
-		g_return_if_fail (a->value != NULL);
-
-		attendee = g_new0 (struct attendee, 1);
-
-		attendee->prop = icalproperty_new_attendee (a->value);
-		icalcomponent_add_property (priv->icalcomp, attendee->prop);
-
-		if (a->member) {
-			attendee->member_param = icalparameter_new_member (a->member);
-			icalproperty_add_parameter (attendee->prop, attendee->member_param);
-		}
-
-		attendee->cutype_param = icalparameter_new_cutype (a->cutype);
-		icalproperty_add_parameter (attendee->prop, attendee->cutype_param);
-
-		attendee->role_param = icalparameter_new_role (a->role);
-		icalproperty_add_parameter (attendee->prop, attendee->role_param);
-
-		attendee->partstat_param = icalparameter_new_partstat (a->status);
-		icalproperty_add_parameter (attendee->prop, attendee->partstat_param);
-
-		if (a->rsvp)
-			attendee->rsvp_param = icalparameter_new_rsvp (ICAL_RSVP_TRUE);
-		else
-			attendee->rsvp_param = icalparameter_new_rsvp (ICAL_RSVP_FALSE);
-		icalproperty_add_parameter (attendee->prop, attendee->rsvp_param);
-	
-		if (a->delfrom) {
-			attendee->delfrom_param = icalparameter_new_delegatedfrom (a->delfrom);
-			icalproperty_add_parameter (attendee->prop, attendee->delfrom_param);
-		}
-		if (a->delto) {
-			attendee->delto_param = icalparameter_new_delegatedto (a->delto);
-			icalproperty_add_parameter (attendee->prop, attendee->delto_param);
-		}
-		if (a->sentby) {
-			attendee->sentby_param = icalparameter_new_sentby (a->sentby);
-			icalproperty_add_parameter (attendee->prop, attendee->sentby_param);
-		}
-		if (a->cn) {
-			attendee->cn_param = icalparameter_new_cn (a->cn);
-			icalproperty_add_parameter (attendee->prop, attendee->cn_param);
-		}
-		if (a->language) {
-			attendee->language_param = icalparameter_new_language (a->language);
-			icalproperty_add_parameter (attendee->prop, attendee->language_param);
-		}
-
-		*attendee_list = g_slist_prepend (*attendee_list, attendee);
-	}
-
-	*attendee_list = g_slist_reverse (*attendee_list);
-}
-
-/**
- * cal_component_get_attendee_list: 
- * @comp: A calendar component object. 
- * @attendee_list: Return value for the attendee property.
- * This should be freed using the cal_component_free_attendee_list ()
- * function.
- * 
- * Queries the attendee properties of the calendar component object
- **/
-void
-cal_component_get_attendee_list (CalComponent *comp, GSList **attendee_list)
-{
-	CalComponentPrivate *priv;
-	
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (attendee_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_attendee_list (priv->attendee_list, attendee_list);
-}
-
-/**
- * cal_component_set_attendee_list:
- * @comp: A calendar component object. 
- * @attendee_list: Values for attendee properties
- * 
- * Sets the attendees of a calendar component object
- **/
-void
-cal_component_set_attendee_list (CalComponent *comp, GSList *attendee_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_attendee_list (comp, &priv->attendee_list, attendee_list);
-}
-
-gboolean
-cal_component_has_attendees (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;
-
-	if (g_slist_length (priv->attendee_list) > 0)
-		return TRUE;
-	
-	return FALSE;
-}
-
-/**
- * cal_component_get_location:
- * @comp: A calendar component object.
- * @url: Return value for the location.
- *
- * Queries the location property of a calendar component object.
- **/
-void
-cal_component_get_location (CalComponent *comp, const char **location)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (location != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->location)
-		*location = icalproperty_get_location (priv->location);
-	else
-		*location = NULL;
-}
-
-/**
- * cal_component_set_location:
- * @comp: A calendar component object.
- * @url: Location value.
- *
- * Sets the location property of a calendar component object.
- **/
-void
-cal_component_set_location (CalComponent *comp, const char *location)
-{
-	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 (!location || !(*location)) {
-		if (priv->location) {
-			icalcomponent_remove_property (priv->icalcomp, priv->location);
-			icalproperty_free (priv->location);
-			priv->location = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->location)
-		icalproperty_set_location (priv->location, (char *) location);
-	else {
-		priv->location = icalproperty_new_location ((char *) location);
-		icalcomponent_add_property (priv->icalcomp, priv->location);
-	}
-}
-
-
-
-/**
- * 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);
-
-	g_free (dt->value);
-	g_free ((char*)dt->tzid);
-}
-
-/**
- * cal_component_free_exdate_list:
- * @exdate_list: List of #CalComponentDateTime structures.
- *
- * Frees a list of #CalComponentDateTime structures as returned by the
- * cal_component_get_exdate_list() function.
- **/
-void
-cal_component_free_exdate_list (GSList *exdate_list)
-{
-	GSList *l;
-
-	for (l = exdate_list; l; l = l->next) {
-		CalComponentDateTime *cdt;
-
-		g_assert (l->data != NULL);
-		cdt = l->data;
-
-		g_assert (cdt->value != NULL);
-		g_free (cdt->value);
-		g_free ((char*)cdt->tzid);
-
-		g_free (cdt);
-	}
-
-	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_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_free_attendee_list:
- * @attendee_list: 
- * 
- * 
- **/
-void
-cal_component_free_attendee_list (GSList *attendee_list)
-{
-	GSList *l;
-
-	for (l = attendee_list; l; l = l->next) {
-		CalComponentAttendee *attendee;
-
-		g_assert (l->data != NULL);
-
-		attendee = l->data;
-		g_return_if_fail (attendee != NULL);
-		g_free (attendee);
-	}
-
-	g_slist_free (attendee_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;
-
-	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 g_hash_table_size (priv->alarm_uid_hash) != 0;
-}
-
-/**
- * cal_component_add_alarm:
- * @comp: A calendar component.
- * @alarm: An alarm.
- * 
- * Adds an alarm subcomponent to a calendar component.  You should have created
- * the @alarm by using cal_component_alarm_new(); it is invalid to use a
- * #CalComponentAlarm structure that came from cal_component_get_alarm().  After
- * adding the alarm, the @alarm structure is no longer valid because the
- * internal structures may change and you should get rid of it by using
- * cal_component_alarm_free().
- **/
-void
-cal_component_add_alarm (CalComponent *comp, CalComponentAlarm *alarm)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (alarm != NULL);
-
-	priv = comp->priv;
-
-	add_alarm (comp, alarm->icalcomp, icalproperty_get_x (alarm->uid));
-	icalcomponent_add_component (priv->icalcomp, alarm->icalcomp);
-}
-
-/**
- * cal_component_remove_alarm:
- * @comp: A calendar component.
- * @auid: UID of the alarm to remove.
- * 
- * Removes an alarm subcomponent from a calendar component.  If the alarm that
- * corresponds to the specified @auid had been fetched with
- * cal_component_get_alarm(), then those alarm structures will be invalid; you
- * should get rid of them with cal_component_alarm_free() before using this
- * function.
- **/
-void
-cal_component_remove_alarm (CalComponent *comp, const char *auid)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *alarm;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (auid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	alarm = g_hash_table_lookup (priv->alarm_uid_hash, auid);
-	if (!alarm)
-		return;
-
-	g_hash_table_remove (priv->alarm_uid_hash, auid);
-	icalcomponent_remove_component (priv->icalcomp, alarm);
-	icalcomponent_free (alarm);
-}
-
-static gboolean
-for_each_remove_all_alarms (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp = CAL_COMPONENT (data);
-	CalComponentPrivate *priv;
-	icalcomponent *alarm = value;
-	
-	priv = comp->priv;
-	
-	icalcomponent_remove_component (priv->icalcomp, alarm);
-	icalcomponent_free (alarm);
-
-	return TRUE;	
-}
-
-/**
- * cal_component_remove_all_alarms:
- * @comp: A calendar component
- * 
- * Remove all alarms from the calendar component
- **/
-void
-cal_component_remove_all_alarms (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);
-
-	g_hash_table_foreach_remove (priv->alarm_uid_hash, for_each_remove_all_alarms, comp);
-}
-
-
-/* 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;
-	const char *xname;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_ACTION_PROPERTY:
-		alarm->action = prop;
-		break;
-
-	case ICAL_ATTACH_PROPERTY:
-		/* FIXME: mail alarms may have any number of these, not just one */
-		alarm->attach = prop;
-		break;
-
-	case ICAL_DESCRIPTION_PROPERTY:
-		alarm->description.prop = prop;
-		alarm->description.altrep_param = icalproperty_get_first_parameter (
-			prop, ICAL_ALTREP_PARAMETER);
-		break;
-
-	case ICAL_DURATION_PROPERTY:
-		alarm->duration = prop;
-		break;
-
-	case ICAL_REPEAT_PROPERTY:
-		alarm->repeat = prop;
-		break;
-
-	case ICAL_TRIGGER_PROPERTY:
-		alarm->trigger = prop;
-		break;
-
-	case ICAL_X_PROPERTY:
-		xname = icalproperty_get_x_name (prop);
-		g_assert (xname != NULL);
-
-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0)
-			alarm->uid = prop;
-
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Creates a CalComponentAlarm from a libical alarm subcomponent */
-static CalComponentAlarm *
-make_alarm (icalcomponent *subcomp)
-{
-	CalComponentAlarm *alarm;
-	icalproperty *prop;
-
-	alarm = g_new (CalComponentAlarm, 1);
-
-	alarm->icalcomp = subcomp;
-	alarm->uid = NULL;
-
-	alarm->action = NULL;
-	alarm->attach = NULL;
-	alarm->description.prop = NULL;
-	alarm->description.altrep_param = NULL;
-	alarm->duration = NULL;
-	alarm->repeat = NULL;
-	alarm->trigger = NULL;
-
-	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);
-
-	g_assert (alarm->uid != NULL);
-
-	return alarm;
-}
-
-/**
- * cal_component_get_alarm_uids:
- * @comp: A calendar component.
- *
- * Builds a list of the unique identifiers of the alarm subcomponents inside a
- * calendar component.
- *
- * Return value: List of unique identifiers for alarms.  This should be freed
- * using cal_obj_uid_list_free().
- **/
-GList *
-cal_component_get_alarm_uids (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcompiter iter;
-	GList *l;
-
-	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);
-
-	l = NULL;
-	for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *subcomp;
-		icalproperty *prop;
-		
-		subcomp = icalcompiter_deref (&iter);
-		for (prop = icalcomponent_get_first_property (subcomp, ICAL_X_PROPERTY);
-		     prop;
-		     prop = icalcomponent_get_next_property (subcomp, ICAL_X_PROPERTY)) {
-			const char *xname;
-			
-			xname = icalproperty_get_x_name (prop);
-			g_assert (xname != NULL);
-			
-			if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0) {
-				const char *auid;
-				
-				auid = alarm_uid_from_prop (prop);
-				l = g_list_append (l, g_strdup (auid));
-			}
-		}
-	}
-
-	return l;
-}
-
-/**
- * cal_component_get_alarm:
- * @comp: A calendar component.
- * @auid: Unique identifier for the sought alarm subcomponent.
- *
- * Queries a particular alarm subcomponent of a calendar component.
- *
- * Return value: The alarm subcomponent that corresponds to the specified @auid,
- * or #NULL if no alarm exists with that UID.  This should be freed using
- * cal_component_alarm_free().
- **/
-CalComponentAlarm *
-cal_component_get_alarm (CalComponent *comp, const char *auid)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *alarm;
-
-	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);
-
-	g_return_val_if_fail (auid != NULL, NULL);
-
-	alarm = g_hash_table_lookup (priv->alarm_uid_hash, auid);
-
-	if (alarm)
-		return make_alarm (alarm);
-	else
-		return NULL;
-}
-
-/**
- * cal_component_alarms_free:
- * @alarms: Component alarms structure.
- *
- * Frees a #CalComponentAlarms structure.
- **/
-void
-cal_component_alarms_free (CalComponentAlarms *alarms)
-{
-	GSList *l;
-
-	g_return_if_fail (alarms != NULL);
-
-	g_assert (alarms->comp != NULL);
-	gtk_object_unref (GTK_OBJECT (alarms->comp));
-
-	for (l = alarms->alarms; l; l = l->next) {
-		CalAlarmInstance *instance;
-
-		instance = l->data;
-		g_assert (instance != NULL);
-		g_free (instance);
-	}
-
-	g_slist_free (alarms->alarms);
-	g_free (alarms);
-}
-
-/**
- * cal_component_alarm_new:
- *
- *
- *
- * Return value: a new alarm component
- **/
-CalComponentAlarm *
-cal_component_alarm_new (void)
-{
-	CalComponentAlarm *alarm;
-	char *new_auid ;
-
-	alarm = g_new (CalComponentAlarm, 1);
-
-	alarm->icalcomp = icalcomponent_new (ICAL_VALARM_COMPONENT);
-
-	new_auid = cal_component_gen_uid ();
-	alarm->uid = icalproperty_new_x (new_auid);
-	icalproperty_set_x_name (alarm->uid, EVOLUTION_ALARM_UID_PROPERTY);
-	icalcomponent_add_property (alarm->icalcomp, alarm->uid);
-	g_free (new_auid);
-
-	alarm->action = NULL;
-	alarm->attach = NULL;
-	alarm->description.prop = NULL;
-	alarm->description.altrep_param = NULL;
-	alarm->duration = NULL;
-	alarm->repeat = NULL;
-	alarm->trigger = NULL;
-
-	return alarm;
-}
-
-/**
- * cal_component_alarm_clone:
- * @alarm: An alarm subcomponent.
- * 
- * Creates a new alarm subcomponent by copying the information from another one.
- * 
- * Return value: A newly-created alarm subcomponent with the same values as the
- * original one.  Should be freed with cal_component_alarm_free().
- **/
-CalComponentAlarm *
-cal_component_alarm_clone (CalComponentAlarm *alarm)
-{
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (alarm != NULL, NULL);
-
-	icalcomp = icalcomponent_new_clone (alarm->icalcomp);
-	return make_alarm (icalcomp);
-}
-
-/**
- * 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->uid = NULL;
-	alarm->action = NULL;
-	alarm->attach = NULL;
-	alarm->description.prop = NULL;
-	alarm->description.altrep_param = NULL;
-	alarm->duration = NULL;
-	alarm->repeat = NULL;
-	alarm->trigger = NULL;
-
-	g_free (alarm);
-}
-
-/**
- * cal_component_alarm_get_uid:
- * @alarm: An alarm subcomponent.
- *
- * Queries the unique identifier of an alarm subcomponent.
- *
- * Return value: UID of the alarm.
- **/
-const char *
-cal_component_alarm_get_uid (CalComponentAlarm *alarm)
-{
-	g_return_val_if_fail (alarm != NULL, NULL);
-
-	return alarm_uid_from_prop (alarm->uid);
-}
-
-/**
- * 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, CalAlarmAction *action)
-{
-	enum icalproperty_action ipa;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->action) {
-		*action = CAL_ALARM_NONE;
-		return;
-	}
-
-	ipa = icalproperty_get_action (alarm->action);
-
-	switch (ipa) {
-	case ICAL_ACTION_AUDIO:
-		*action = CAL_ALARM_AUDIO;
-		break;
-
-	case ICAL_ACTION_DISPLAY:
-		*action = CAL_ALARM_DISPLAY;
-		break;
-
-	case ICAL_ACTION_EMAIL:
-		*action = CAL_ALARM_EMAIL;
-		break;
-
-	case ICAL_ACTION_PROCEDURE:
-		*action = CAL_ALARM_PROCEDURE;
-		break;
-
-	case ICAL_ACTION_NONE:
-		*action = CAL_ALARM_NONE;
-		break;
-
-	default:
-		*action = CAL_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, CalAlarmAction action)
-{
-	enum icalproperty_action ipa;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != CAL_ALARM_NONE);
-	g_return_if_fail (action != CAL_ALARM_UNKNOWN);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	switch (action) {
-	case CAL_ALARM_AUDIO:
-		ipa = ICAL_ACTION_AUDIO;
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		ipa = ICAL_ACTION_DISPLAY;
-		break;
-
-	case CAL_ALARM_EMAIL:
-		ipa = ICAL_ACTION_EMAIL;
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		ipa = ICAL_ACTION_PROCEDURE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		ipa = ICAL_ACTION_NONE;
-	}
-
-	if (alarm->action)
-		icalproperty_set_action (alarm->action, ipa);
-	else {
-		alarm->action = icalproperty_new_action (ipa);
-		icalcomponent_add_property (alarm->icalcomp, alarm->action);
-	}
-}
-
-/**
- * cal_component_alarm_get_attach:
- * @alarm: An alarm.
- * @attach: Return value for the attachment; should be freed using icalattach_unref().
- * 
- * Queries the attachment property of an alarm.
- **/
-void
-cal_component_alarm_get_attach (CalComponentAlarm *alarm, icalattach **attach)
-{
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (attach != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (alarm->attach) {
-		*attach = icalproperty_get_attach (alarm->attach);
-		icalattach_ref (*attach);
-	} else
-		*attach = NULL;
-}
-
-/**
- * cal_component_alarm_set_attach:
- * @alarm: An alarm.
- * @attach: Attachment property or NULL to remove an existing property.
- * 
- * Sets the attachment property of an alarm.
- **/
-void
-cal_component_alarm_set_attach (CalComponentAlarm *alarm, icalattach *attach)
-{
-	g_return_if_fail (alarm != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (alarm->attach) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->attach);
-		icalproperty_free (alarm->attach);
-		alarm->attach = NULL;
-	}
-
-	if (attach) {
-		alarm->attach = icalproperty_new_attach (attach);
-		icalcomponent_add_property (alarm->icalcomp, alarm->attach);
-	}
-}
-
-/**
- * cal_component_alarm_get_description:
- * @alarm: An alarm.
- * @description: Return value for the description property and its parameters.
- * 
- * Queries the description property of an alarm.
- **/
-void
-cal_component_alarm_get_description (CalComponentAlarm *alarm, CalComponentText *description)
-{
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (description != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (alarm->description.prop)
-		description->value = icalproperty_get_description (alarm->description.prop);
-	else
-		description->value = NULL;
-
-	if (alarm->description.altrep_param)
-		description->altrep = icalparameter_get_altrep (alarm->description.altrep_param);
-	else
-		description->altrep = NULL;
-}
-
-/**
- * cal_component_alarm_set_description:
- * @alarm: An alarm.
- * @description: Description property and its parameters, or NULL for no description.
- * 
- * Sets the description property of an alarm.
- **/
-void
-cal_component_alarm_set_description (CalComponentAlarm *alarm, CalComponentText *description)
-{
-	g_return_if_fail (alarm != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (alarm->description.prop) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->description.prop);
-		icalproperty_free (alarm->description.prop);
-
-		alarm->description.prop = NULL;
-		alarm->description.altrep_param = NULL;
-	}
-
-	if (!description)
-		return;
-
-	g_return_if_fail (description->value != NULL);
-
-	alarm->description.prop = icalproperty_new_description (description->value);
-	icalcomponent_add_property (alarm->icalcomp, alarm->description.prop);
-
-	if (description->altrep) {
-		alarm->description.altrep_param = icalparameter_new_altrep (
-			(char *) description->altrep);
-		icalproperty_add_parameter (alarm->description.prop,
-					    alarm->description.altrep_param);
-	}
-}
-
-/**
- * cal_component_alarm_get_repeat:
- * @alarm: An alarm.
- * @repeat: Return value for the repeat/duration properties.
- * 
- * Queries the repeat/duration properties of an alarm.
- **/
-void
-cal_component_alarm_get_repeat (CalComponentAlarm *alarm, CalAlarmRepeat *repeat)
-{
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (repeat != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!(alarm->repeat && alarm->duration)) {
-		repeat->repetitions = 0;
-		memset (&repeat->duration, 0, sizeof (repeat->duration));
-		return;
-	}
-
-	repeat->repetitions = icalproperty_get_repeat (alarm->repeat);
-	repeat->duration = icalproperty_get_duration (alarm->duration);
-}
-
-/**
- * cal_component_alarm_set_repeat:
- * @alarm: An alarm.
- * @repeat: Repeat/duration values.  To remove any repetitions from the alarm,
- * set the @repeat.repetitions to 0.
- * 
- * Sets the repeat/duration values for an alarm.
- **/
-void
-cal_component_alarm_set_repeat (CalComponentAlarm *alarm, CalAlarmRepeat repeat)
-{
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (repeat.repetitions >= 0);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	/* Delete old properties */
-
-	if (alarm->repeat) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->repeat);
-		icalproperty_free (alarm->repeat);
-		alarm->repeat = NULL;
-	}
-
-	if (alarm->duration) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->duration);
-		icalproperty_free (alarm->duration);
-		alarm->duration = NULL;
-	}
-
-	/* Set the new properties */
-
-	if (repeat.repetitions == 0)
-		return; /* For zero extra repetitions the properties should not exist */
-
-	alarm->repeat = icalproperty_new_repeat (repeat.repetitions);
-	icalcomponent_add_property (alarm->icalcomp, alarm->repeat);
-
-	alarm->duration = icalproperty_new_duration (repeat.duration);
-	icalcomponent_add_property (alarm->icalcomp, alarm->duration);
-}
-
-/**
- * cal_component_alarm_get_trigger:
- * @alarm: An alarm.
- * @trigger: Return value for the trigger time.
- *
- * Queries the trigger time for an alarm.
- **/
-void
-cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalAlarmTrigger *trigger)
-{
-	icalparameter *param;
-	struct icaltriggertype t;
-	gboolean relative;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->trigger) {
-		trigger->type = CAL_ALARM_TRIGGER_NONE;
-		return;
-	}
-
-	/* 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:
-			relative = TRUE;
-			break;
-
-		case ICAL_VALUE_DATETIME:
-			relative = FALSE;
-			break;
-
-		default:
-			g_message ("cal_component_alarm_get_trigger(): Unknown value for trigger "
-				   "value %d; using RELATIVE", value);
-
-			relative = TRUE;
-			break;
-		}
-	} else
-		relative = TRUE;
-
-	/* Get trigger value and the RELATED parameter */
-
-	t = icalproperty_get_trigger (alarm->trigger);
-
-	if (relative) {
-		trigger->u.rel_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->type = CAL_ALARM_TRIGGER_RELATIVE_START;
-				break;
-
-			case ICAL_RELATED_END:
-				trigger->type = CAL_ALARM_TRIGGER_RELATIVE_END;
-				break;
-
-			default:
-				g_assert_not_reached ();
-			}
-		} else
-			trigger->type = CAL_ALARM_TRIGGER_RELATIVE_START;
-	} else {
-		trigger->u.abs_time = t.time;
-		trigger->type = CAL_ALARM_TRIGGER_ABSOLUTE;
-	}
-}
-
-/**
- * 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, CalAlarmTrigger trigger)
-{
-	struct icaltriggertype t;
-	icalparameter *param;
-	icalparameter_value value_type;
-	icalparameter_related related;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger.type != CAL_ALARM_TRIGGER_NONE);
-
-	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 */
-
-	related = ICAL_RELATED_START; /* Keep GCC happy */
-
-	t.time = icaltime_null_time ();
-	t.duration = icaldurationtype_null_duration ();
-	switch (trigger.type) {
-	case CAL_ALARM_TRIGGER_RELATIVE_START:
-		t.duration = trigger.u.rel_duration;
-		value_type = ICAL_VALUE_DURATION;
-		related = ICAL_RELATED_START;
-		break;
-
-	case CAL_ALARM_TRIGGER_RELATIVE_END:
-		t.duration = trigger.u.rel_duration;
-		value_type = ICAL_VALUE_DURATION;
-		related = ICAL_RELATED_END;
-		break;
-
-	case CAL_ALARM_TRIGGER_ABSOLUTE:
-		t.time = trigger.u.abs_time;
-		value_type = ICAL_VALUE_DATETIME;
-		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_ALARM_TRIGGER_ABSOLUTE) {
-		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);
-		}
-	}
-}
-
-/* Returns TRUE if both strings match, i.e. they are both NULL or the
-   strings are equal. */
-static gboolean
-cal_component_strings_match	(const gchar	*string1,
-				 const gchar	*string2)
-{
-	if (string1 == NULL || string2 == NULL)
-		return (string1 == string2) ? TRUE : FALSE;
-
-	if (!strcmp (string1, string2))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-/**
- * cal_component_event_dates_match:
- * @comp1: A calendar component object.
- * @comp2: A calendar component object.
- *
- * Checks if the DTSTART and DTEND properties of the 2 components match.
- * Note that the events may have different recurrence properties which are not
- * taken into account here.
- *
- * Returns: TRUE if the DTSTART and DTEND properties of the 2 components match.
- **/
-gboolean
-cal_component_event_dates_match	(CalComponent *comp1,
-				 CalComponent *comp2)
-{
-	CalComponentDateTime comp1_dtstart, comp1_dtend;
-	CalComponentDateTime comp2_dtstart, comp2_dtend;
-	gboolean retval = TRUE;
-
-	cal_component_get_dtstart (comp1, &comp1_dtstart);
-	cal_component_get_dtend   (comp1, &comp1_dtend);
-	cal_component_get_dtstart (comp2, &comp2_dtstart);
-	cal_component_get_dtend   (comp2, &comp2_dtend);
-
-	/* If either value is NULL they must both be NULL to match. */
-	if (comp1_dtstart.value == NULL || comp2_dtstart.value == NULL) {
-		if (comp1_dtstart.value != comp2_dtstart.value) {
-			retval = FALSE;
-			goto out;
-		}
-	} else {
-		if (icaltime_compare (*comp1_dtstart.value,
-				      *comp2_dtstart.value)) {
-			retval = FALSE;
-			goto out;
-		}
-	}
-
-	if (comp1_dtend.value == NULL || comp2_dtend.value == NULL) {
-		if (comp1_dtend.value != comp2_dtend.value) {
-			retval = FALSE;
-			goto out;
-		}
-	} else {
-		if (icaltime_compare (*comp1_dtend.value,
-				      *comp2_dtend.value)) {
-			retval = FALSE;
-			goto out;
-		}
-	}
-
-	/* Now check the timezones. */
-	if (!cal_component_strings_match (comp1_dtstart.tzid,
-					  comp2_dtstart.tzid)) {
-		retval = FALSE;
-		goto out;
-	}
-
-	if (!cal_component_strings_match (comp1_dtend.tzid,
-					  comp2_dtend.tzid)) {
-		retval = FALSE;
-	}
-
- out:
-
-	cal_component_free_datetime (&comp1_dtstart);
-	cal_component_free_datetime (&comp1_dtend);
-	cal_component_free_datetime (&comp2_dtstart);
-	cal_component_free_datetime (&comp2_dtend);
-
-	return retval;
-}
-
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
deleted file mode 100644
index 4961c504e4..0000000000
--- a/calendar/cal-util/cal-component.h
+++ /dev/null
@@ -1,438 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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; these are used by the data model
- * for ETable.
- *
- * NOTE: These are also used in the ETable specification, and the column
- *       numbers are saved in the user settings file. So don't reorder them!
- */
-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_STATUS,
-	CAL_COMPONENT_FIELD_COMPONENT,		/* not a real field */
-#if 0
-	CAL_COMPONENT_FIELD_LOCATION,
-#endif
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-
-/* Structures and enumerations to return properties and their parameters */
-
-/* CLASSIFICATION property */
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-
-/* Properties that have time and timezone information */
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-
-/* Way in which a period of time is specified */
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-
-/* Period of time, can have explicit start/end times or start/duration instead */
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-
-/* The type of range */
-typedef enum {
-	CAL_COMPONENT_RANGE_SINGLE,
-	CAL_COMPONENT_RANGE_THISPRIOR,
-	CAL_COMPONENT_RANGE_THISFUTURE,
-} CalComponentRangeType;
-
-typedef struct {
-	CalComponentRangeType type;
-	
-	CalComponentDateTime datetime;
-} CalComponentRange;
-
-/* Text properties */
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-
-/* Time transparency */
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-
-/* Organizer & Attendee */	
-typedef struct {
-	const char *value;
-	
-	const char *member;
-	icalparameter_cutype cutype;
-	icalparameter_role role;
-	icalparameter_partstat status;
-	gboolean rsvp;
-	
-	const char *delto;
-	const char *delfrom;
-	const char *sentby;
-	const char *cn;
-	const char *language;
-} CalComponentAttendee;
-	
-typedef struct {
-	const char *value;
-	const char *sentby;
-	const char *cn;
-	const char *language;
-} CalComponentOrganizer;
-
-/* Main calendar component object */
-
-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);
-void cal_component_rescan (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_categories (CalComponent *comp, const char **categories);
-void cal_component_set_categories (CalComponent *comp, const char *categories);
-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_contact_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_contact_list (CalComponent *comp, GSList *text_list);
-
-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_organizer (CalComponent *comp, CalComponentOrganizer *organizer);
-void cal_component_set_organizer (CalComponent *comp, CalComponentOrganizer *organizer);
-gboolean cal_component_has_organizer (CalComponent *comp);
-
-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_recurid (CalComponent *comp, CalComponentRange *recur_id);
-void cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id);
-
-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_status (CalComponent *comp, icalproperty_status *status);
-void cal_component_set_status (CalComponent *comp, icalproperty_status status);
-
-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);
-
-void cal_component_get_attendee_list (CalComponent *comp, GSList **attendee_list);
-void cal_component_set_attendee_list (CalComponent *comp, GSList *attendee_list);
-gboolean cal_component_has_attendees (CalComponent *comp);
-
-void cal_component_get_location (CalComponent *comp, const char **location);
-void cal_component_set_location (CalComponent *comp, const char *location);
-
-gboolean cal_component_event_dates_match (CalComponent *comp1, CalComponent *comp2);
-
-
-/* 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_text_list (GSList *text_list);
-void cal_component_free_attendee_list (GSList *attendee_list);
-
-/* Alarms */
-
-/* Opaque structure used to represent alarm subcomponents */
-typedef struct _CalComponentAlarm CalComponentAlarm;
-
-/* An alarm occurrence, i.e. a trigger instance */
-typedef struct {
-	/* UID of the alarm that triggered */
-	const char *auid;
-
-	/* Trigger time, i.e. "5 minutes before the appointment" */
-	time_t trigger;
-
-	/* Actual event occurrence to which this trigger corresponds */
-	time_t occur_start;
-	time_t occur_end;
-} CalAlarmInstance;
-
-/* Alarm trigger instances for a particular component */
-typedef struct {
-	/* The actual component */
-	CalComponent *comp;
-
-	/* List of CalAlarmInstance structures */
-	GSList *alarms;
-} CalComponentAlarms;
-
-/* Alarm types */
-typedef enum {
-	CAL_ALARM_NONE,
-	CAL_ALARM_AUDIO,
-	CAL_ALARM_DISPLAY,
-	CAL_ALARM_EMAIL,
-	CAL_ALARM_PROCEDURE,
-	CAL_ALARM_UNKNOWN
-} CalAlarmAction;
-
-/* Whether a trigger is relative to the start or end of an event occurrence, or
- * whether it is specified to occur at an absolute time.
- */
-typedef enum {
-	CAL_ALARM_TRIGGER_NONE,
-	CAL_ALARM_TRIGGER_RELATIVE_START,
-	CAL_ALARM_TRIGGER_RELATIVE_END,
-	CAL_ALARM_TRIGGER_ABSOLUTE
-} CalAlarmTriggerType;
-
-typedef struct {
-	CalAlarmTriggerType type;
-
-	union {
-		struct icaldurationtype rel_duration;
-		struct icaltimetype abs_time;
-	} u;
-} CalAlarmTrigger;
-
-typedef struct {
-	/* Number of extra repetitions, zero for none */
-	int repetitions;
-
-	/* Interval between repetitions */
-	struct icaldurationtype duration;
-} CalAlarmRepeat;
-
-gboolean cal_component_has_alarms (CalComponent *comp);
-void cal_component_add_alarm (CalComponent *comp, CalComponentAlarm *alarm);
-void cal_component_remove_alarm (CalComponent *comp, const char *auid);
-void cal_component_remove_all_alarms (CalComponent *comp);
-
-GList *cal_component_get_alarm_uids (CalComponent *comp);
-CalComponentAlarm *cal_component_get_alarm (CalComponent *comp, const char *auid);
-
-void cal_component_alarms_free (CalComponentAlarms *alarms);
-
-/* CalComponentAlarms */
-CalComponentAlarm *cal_component_alarm_new (void);
-CalComponentAlarm *cal_component_alarm_clone (CalComponentAlarm *alarm);
-void cal_component_alarm_free (CalComponentAlarm *alarm);
-
-const char *cal_component_alarm_get_uid (CalComponentAlarm *alarm);
-
-void cal_component_alarm_get_action (CalComponentAlarm *alarm, CalAlarmAction *action);
-void cal_component_alarm_set_action (CalComponentAlarm *alarm, CalAlarmAction action);
-
-void cal_component_alarm_get_attach (CalComponentAlarm *alarm, icalattach **attach);
-void cal_component_alarm_set_attach (CalComponentAlarm *alarm, icalattach *attach);
-
-void cal_component_alarm_get_description (CalComponentAlarm *alarm, CalComponentText *description);
-void cal_component_alarm_set_description (CalComponentAlarm *alarm, CalComponentText *description);
-
-void cal_component_alarm_get_repeat (CalComponentAlarm *alarm, CalAlarmRepeat *repeat);
-void cal_component_alarm_set_repeat (CalComponentAlarm *alarm, CalAlarmRepeat repeat);
-
-void cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalAlarmTrigger *trigger);
-void cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalAlarmTrigger 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 e050004031..0000000000
--- a/calendar/cal-util/cal-recur.c
+++ /dev/null
@@ -1,3980 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- *
- *
- * FIXME: I think there are a few errors in this code:
- *
- *  1) I'm not sure it should be generating events in parallel like it says
- *     above. That needs to be checked.
- *
- *  2) I didn't think about timezone changes when implementing this. I just
- *     assumed all the occurrences of the event would be in local time.
- *     But when clocks go back or forwards due to daylight-saving time, some
- *     special handling may be needed, especially for the shorter frequencies.
- *     e.g. for a MINUTELY frequency it should probably iterate over all the
- *     minutes before and after clocks go back (i.e. some may be the same local
- *     time but have different UTC offsets). For longer frequencies, if an
- *     occurrence lands on the overlapping or non-existant time when clocks
- *     go back/forward, then it may need to choose which of the times to use
- *     or move the time forward or something. I'm not sure this is clear in the
- *     spec.
- */
-
-/* This is the maximum year we will go up to (inclusive). Since we use time_t
-   values we can't go past 2037 anyway, and some of our VTIMEZONEs may stop
-   at 2037 as well. */
-#define MAX_YEAR	2037
-
-/* 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, inclusive. 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. It is the offset from the
-	   week_start_day. */
-	gint weekday_offset;
-
-	/* 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 flags;		/* The meaning of this depends on where the
-				   CalObjTime is used. In most cases this is
-				   set to TRUE to indicate that this is an
-				   RDATE with an end or a duration set.
-				   In the exceptions code, this is set to TRUE
-				   to indicate that this is an EXDATE with a
-				   DATE value. */
-};
-
-/* 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,
-						  CalRecurResolveTimezoneFn  tz_cb,
-						  gpointer	 tz_cb_data,
-						  icaltimezone	*default_timezone);
-
-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,
-						    gboolean exception,
-						    icaltimezone *zone,
-						    gboolean convert_end_date);
-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,
-						 icaltimezone		*zone,
-						 GSList			*rrules,
-						 GSList			*rdates,
-						 GSList			*exrules,
-						 GSList			*exdates,
-						 gboolean		 single_rule,
-						 CalObjTime		*event_start,
-						 time_t			 interval_start,
-						 CalObjTime		*chunk_start,
-						 CalObjTime		*chunk_end,
-						 gint			 duration_days,
-						 gint			 duration_seconds,
-						 gboolean		 convert_end_date,
-						 CalRecurInstanceFn	 cb,
-						 gpointer		 cb_data);
-
-static GArray* cal_obj_expand_recurrence	(CalObjTime	  *event_start,
-						 icaltimezone	  *zone,
-						 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);
-static gint cal_obj_time_weekday_offset		(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,
-						 icaltimezone *zone);
-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,
-						 CalRecurResolveTimezoneFn tz_cb,
-						 gpointer	 tz_cb_data);
-static gboolean cal_recur_ensure_rule_end_date	(CalComponent	*comp,
-						 icalproperty	*prop,
-						 gboolean	 exception,
-						 gboolean	 refresh,
-						 CalRecurResolveTimezoneFn tz_cb,
-						 gpointer	 tz_cb_data);
-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,
-						 icaltimezone	*default_timezone);
-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,
-			      CalRecurResolveTimezoneFn  tz_cb,
-			      gpointer			 tz_cb_data,
-			      icaltimezone		*default_timezone)
-{
-#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, tz_cb, tz_cb_data,
-					      default_timezone);
-}
-
-
-/*
- * 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 enddate
- * 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,
-				      CalRecurResolveTimezoneFn  tz_cb,
-				      gpointer		  tz_cb_data,
-				      icaltimezone	 *default_timezone)
-{
-	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;
-	gboolean single_rule, convert_end_date = FALSE;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (cb != NULL);
-	g_return_if_fail (tz_cb != NULL);
-	g_return_if_fail (start >= -1);
-	g_return_if_fail (end >= -1);
-
-	/* Get dtstart, dtend, recurrences, and exceptions. Note that
-	   cal_component_get_dtend() will convert a DURATION property to a
-	   DTEND so we don't need to worry about that. */
-
-	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;
-	}
-
-	/* For DATE-TIME values with a TZID, we use the supplied callback to
-	   resolve the TZID. For DATE values and DATE-TIME values without a
-	   TZID (i.e. floating times) we use the default timezone. */
-	if (dtstart.tzid && !dtstart.value->is_date) {
-		start_zone = (*tz_cb) (dtstart.tzid, tz_cb_data);
-	} else {
-		start_zone = default_timezone;
-
-		/* Flag that we need to convert the saved ENDDATE property
-		   to the default timezone. */
-		convert_end_date = TRUE;
-	}
-
-	dtstart_time = icaltime_as_timet_with_zone (*dtstart.value,
-						    start_zone);
-	if (start == -1)
-		start = dtstart_time;
-
-	if (dtend.value) {
-		/* If both DTSTART and DTEND are DATE values, and they are the
-		   same day, we add 1 day to DTEND. This means that most
-		   events created with the old Evolution behavior will still
-		   work OK. I'm not sure what Outlook does in this case. */
-		if (dtstart.value->is_date && dtend.value->is_date) {
-			if (icaltime_compare_date_only (*dtstart.value,
-							*dtend.value) == 0) {
-				icaltime_adjust (dtend.value, 1, 0, 0, 0);
-			}
-		}
-	} else {
-		/* If there is no DTEND, then if DTSTART is a DATE-TIME value
-		   we use the same time (so we have a single point in time).
-		   If DTSTART is a DATE value we add 1 day. */
-		dtend.value = g_new (struct icaltimetype, 1);
-		*dtend.value = *dtstart.value;
-
-		if (dtstart.value->is_date) {
-			icaltime_adjust (dtend.value, 1, 0, 0, 0);
-		}
-	}
-
-	if (dtend.tzid && !dtend.value->is_date) {
-		end_zone = (*tz_cb) (dtend.tzid, tz_cb_data);
-	} else {
-		end_zone = default_timezone;
-	}
-
-	/* We don't do this any more, since Outlook assumes that the DTEND
-	   date is not included. */
-#if 0
-	/* If DTEND is a DATE value, we add 1 day to it so that it includes
-	   the entire day. */
-	if (dtend.value->is_date) {
-		dtend.value->hour = 0;
-		dtend.value->minute = 0;
-		dtend.value->second = 0;
-		icaltime_adjust (dtend.value, 1, 0, 0, 0);
-	}
-#endif
-	dtend_time = icaltime_as_timet_with_zone (*dtend.value, end_zone);
-
-	/* 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) {
-		single_rule = TRUE;
-
-		elem.data = prop;
-		elem.next = NULL;
-		rrules = &elem;
-	} else {
-		single_rule = FALSE;
-
-		/* Make sure all the enddates for the rules are set. */
-		cal_recur_ensure_end_dates (comp, FALSE, tz_cb, tz_cb_data);
-
-		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. We do all calculation
-	   in the timezone of the DTSTART. */
-	cal_object_time_from_time (&interval_start, start, start_zone);
-	if (end != -1)
-		cal_object_time_from_time (&interval_end, end - 1, start_zone);
-
-	cal_object_time_from_time (&event_start, dtstart_time, start_zone);
-	cal_object_time_from_time (&event_end, dtend_time, start_zone);
-	
-	/* 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 <= MAX_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.flags  = FALSE;
-		}
-
-		if (!generate_instances_for_chunk (comp, dtstart_time,
-						   start_zone,
-						   rrules, rdates,
-						   exrules, exdates,
-						   single_rule,
-						   &event_start,
-						   start,
-						   &chunk_start, &chunk_end,
-						   days, seconds,
-						   convert_end_date,
-						   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:
- * @prop: An RRULE or EXRULE #icalproperty.
- * @exception: TRUE if this is an EXRULE rather than an RRULE.
- * @zone: The DTSTART timezone, used for converting the UNTIL property if it
- * is given as a DATE value.
- * @convert_end_date: TRUE if the saved end date needs to be converted to the
- * given @zone timezone. This is needed if the DTSTART is a DATE or floating
- * time.
- * 
- * 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,
-			     icaltimezone *zone, gboolean convert_end_date)
-{
-	struct icalrecurrencetype ir;
-	CalRecurrence *r;
-	gint max_elements, i;
-	GList *elem;
-
-	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) {
-		/* If COUNT is set, we use the pre-calculated enddate.
-		   Note that this can be 0 if the RULE doesn't actually
-		   generate COUNT instances. */
-		r->enddate = cal_recur_get_rule_end_date (prop, convert_end_date ? zone : NULL);
-	} else {
-		if (icaltime_is_null_time (ir.until)) {
-			/* If neither COUNT or UNTIL is set, the event
-			   recurs forever. */
-			r->enddate = 0;
-		} else if (ir.until.is_date) {
-			/* If UNTIL is a DATE, we stop at the end of
-			   the day, in local time (with the DTSTART timezone).
-			   Note that UNTIL is inclusive so we stop before
-			   midnight. */
-			ir.until.hour = 23;
-			ir.until.minute = 59;
-			ir.until.second = 59;
-			ir.until.is_date = FALSE;
-
-			r->enddate = icaltime_as_timet_with_zone (ir.until,
-								  zone);
-#if 0
-			g_print ("  until: %li - %s", r->enddate, ctime (&r->enddate));
-#endif
-
-		} else {
-			/* If UNTIL is a DATE-TIME, it must be in UTC. */
-			icaltimezone *utc_zone;
-			utc_zone = icaltimezone_get_utc_timezone ();
-			r->enddate = icaltime_as_timet_with_zone (ir.until,
-								  utc_zone);
-		}
-	}
-
-	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]));
-	for (elem = r->bymonth; elem; elem = elem->next) {
-		/* We need to convert from 1-12 to 0-11, i.e. subtract 1. */
-		int month = GPOINTER_TO_INT (elem->data) - 1;
-		elem->data = GINT_TO_POINTER (month);
-	}
-
-	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.
- *
- * This should only output instances whose start time is between chunk_start
- * and chunk_end (inclusive), or we may generate duplicates when we do the next
- * chunk. (This applies mainly to weekly recurrences, since weeks can span 2
- * years.)
- *
- * It should also only output instances that are on or after the event's
- * DTSTART property and that intersect the required interval, between
- * interval_start and interval_end.
- */
-static gboolean
-generate_instances_for_chunk (CalComponent	*comp,
-			      time_t             comp_dtstart,
-			      icaltimezone	*zone,
-			      GSList		*rrules,
-			      GSList		*rdates,
-			      GSList		*exrules,
-			      GSList		*exdates,
-			      gboolean		 single_rule,
-			      CalObjTime	*event_start,
-			      time_t		 interval_start,
-			      CalObjTime	*chunk_start,
-			      CalObjTime	*chunk_end,
-			      gint		 duration_days,
-			      gint		 duration_seconds,
-			      gboolean		 convert_end_date,
-			      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 icaltimetype start_tt, end_tt;
-	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,
-	   but not if we are just generating occurrences for a single rule. */
-	if (!single_rule) {
-		/* We add it if it is in this chunk. If it is after this chunk
-		   we set finished to FALSE, since we know we aren't finished
-		   yet. */
-		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, zone,
-						 convert_end_date);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, zone, 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 RDATE occurrence dates. If they have an end time
-	   or duration set, flag them as RDATEs, and store a pointer to the
-	   period in the rdate_periods array. Otherwise we can just treat them
-	   as normal occurrences. */
-	for (elem = rdates; elem; elem = elem->next) {
-		CalComponentPeriod *p;
-		CalObjRecurrenceDate rdate;
-
-		p = elem->data;
-
-		/* FIXME: We currently assume RDATEs are in the same timezone
-		   as DTSTART. We should get the RDATE timezone and convert
-		   to the DTSTART timezone first. */
-		cotime.year     = p->start.year;
-		cotime.month    = p->start.month - 1;
-		cotime.day      = p->start.day;
-		cotime.hour     = p->start.hour;
-		cotime.minute   = p->start.minute;
-		cotime.second   = p->start.second;
-		cotime.flags    = FALSE;
-
-		/* 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)
-		   FIXME. */
-		if (p->type != CAL_COMPONENT_PERIOD_DATETIME
-		    || p->u.end.second != -1) {
-			cotime.flags = 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, zone,
-						 convert_end_date);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, zone, 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) {
-		CalComponentDateTime *cdt;
-
-		cdt = elem->data;
-
-		/* FIXME: We currently assume EXDATEs are in the same timezone
-		   as DTSTART. We should get the EXDATE timezone and convert
-		   to the DTSTART timezone first. */
-		cotime.year     = cdt->value->year;
-		cotime.month    = cdt->value->month - 1;
-		cotime.day      = cdt->value->day;
-
-		/* If the EXDATE has a DATE value, set the time to the start
-		   of the day and set flags to TRUE so we know to skip all
-		   occurrences on that date. */
-		if (cdt->value->is_date) {
-			cotime.hour     = 0;
-			cotime.minute   = 0;
-			cotime.second   = 0;
-			cotime.flags    = TRUE;
-		} else {
-			cotime.hour     = cdt->value->hour;
-			cotime.minute   = cdt->value->minute;
-			cotime.second   = cdt->value->second;
-			cotime.flags    = FALSE;
-		}
-
-		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);
-#if 0
-		g_print ("Checking occurrence: %s\n",
-			 cal_obj_time_to_string (occ));
-#endif
-		start_tt = icaltime_null_time ();
-		start_tt.year   = occ->year;
-		start_tt.month  = occ->month + 1;
-		start_tt.day    = occ->day;
-		start_tt.hour   = occ->hour;
-		start_tt.minute = occ->minute;
-		start_tt.second = occ->second;
-		start_time = icaltime_as_timet_with_zone (start_tt, zone);
-
-		if (start_time == -1) {
-			g_warning ("time_t out of range");
-			finished = TRUE;
-			break;
-		}
-
-		/* Check to ensure that the start time is at or after the
-		   event's DTSTART time, and that it is inside the chunk that
-		   we are currently working on. (Note that the chunk_end time
-		   is never after the interval end time, so this also tests
-		   that we don't go past the end of the required interval). */
-		if (start_time < comp_dtstart
-		    || cal_obj_time_compare_func (occ, chunk_start) < 0
-		    || cal_obj_time_compare_func (occ, chunk_end) > 0) {
-#if 0
-			g_print ("  start time invalid\n");
-#endif
-			continue;
-		}
-
-		if (occ->flags) {
-			/* If it is an RDATE, we see if the end date or
-			   duration was set. If not, we use the same duration
-			   as the original occurrence. */
-			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_tt = icaltime_null_time ();
-		end_tt.year   = occ->year;
-		end_tt.month  = occ->month + 1;
-		end_tt.day    = occ->day;
-		end_tt.hour   = occ->hour;
-		end_tt.minute = occ->minute;
-		end_tt.second = occ->second;
-		end_time = icaltime_as_timet_with_zone (end_tt, zone);
-
-		if (end_time == -1) {
-			g_warning ("time_t out of range");
-			finished = TRUE;
-			break;
-		}
-
-		/* Check that the end time is after the interval start, so we
-		   know that it intersects the required interval. */
-		if (end_time <= interval_start) {
-#if 0
-			g_print ("  end time invalid\n");
-#endif
-			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 = NULL;
-	CalComponentPeriod *p;
-	gint lower, upper, middle, cmp = 0;
-
-	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) {
-		/* FIXME: We currently assume RDATEs are in the same timezone
-		   as DTSTART. We should get the RDATE timezone and convert
-		   to the DTSTART timezone first. */
-		occ->year     = p->u.end.year;
-		occ->month    = p->u.end.month - 1;
-		occ->day      = p->u.end.day;
-		occ->hour     = p->u.end.hour;
-		occ->minute   = p->u.end.minute;
-		occ->second   = p->u.end.second;
-		occ->flags    = FALSE;
-	} 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,
-					 icaltimezone	  *zone,
-					 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, zone);
-		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 frequency");
-		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_offset = cal_obj_time_weekday_offset (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 with an end or
-			   duration set, 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->flags && !current_time_is_exception) {
-				last_occ_kept = &g_array_index (occs,
-								CalObjTime,
-								j - 1);
-				last_occ_kept->flags = 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) {
-					/* If the exception is an EXDATE with
-					   a DATE value, we only have to
-					   compare the date. */
-					if (ex_occ->flags)
-						cmp = cal_obj_date_only_compare_func (ex_occ, occ);
-					else
-						cmp = cal_obj_time_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) {
-			/* We are keeping this occurrence, so we move it to
-			   the next free space, unless its position hasn't
-			   changed (i.e. all previous occurrences were also
-			   kept). */
-			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;
-		/* Positive values need to be decremented since the array is
-		   0-based. */
-		else
-			pos--;
-
-		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_offset;
-	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_offset;
-
-	interval_start_julian = g_date_julian (&interval_start_date);
-	interval_start_weekday_offset = cal_obj_time_weekday_offset (interval_start, recur_data->recur);
-	interval_start_julian -= interval_start_weekday_offset;
-
-	/* 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_offset);
-
-	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_offset);
-
-#ifdef CAL_OBJ_DEBUG
-	g_print ("Next  day: %s\n", cal_obj_time_to_string (cotime));
-	g_print ("Week Start: %s\n", cal_obj_time_to_string (&week_start));
-#endif
-
-	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) {
-#ifdef CAL_OBJ_DEBUG
-		g_print ("Interval end reached: %s\n",
-			 cal_obj_time_to_string (interval_end));
-#endif
-		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) {
-				/* Expand to every Mon/Tue/etc. in the year. */
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				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) {
-				/* Add the nth Mon/Tue/etc. in the year. */
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				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 {
-				/* Add the -nth Mon/Tue/etc. in the year. */
-				occ->month = 11;
-				occ->day = 31;
-				last_weekday = cal_obj_time_weekday (occ);
-				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) {
-				/* Expand to every Mon/Tue/etc. in the month.*/
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				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) {
-				/* Add the nth Mon/Tue/etc. in the month. */
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				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 {
-				/* Add the -nth Mon/Tue/etc. in the month. */
-				occ->day = time_days_in_month (occ->year,
-							       occ->month);
-				last_weekday = cal_obj_time_weekday (occ);
-
-				/* This calculates the number of days to step
-				   backwards from the last day of the month
-				   to the weekday we want. */
-				offset = (last_weekday + 7 - weekday) % 7;
-
-				/* This adds on the weeks. */
-				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 weekday_offset, new_weekday_offset;
-
-	/* 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;
-
-			/* FIXME: Currently we just ignore this, but maybe we
-			   should skip all elements where week_num != 0.
-			   The spec isn't clear about this. */
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			weekday_offset = cal_obj_time_weekday_offset (occ, recur_data->recur);
-			new_weekday_offset = (weekday + 7 - recur_data->recur->week_start_day) % 7;
-			cal_obj_time_add_days (occ, new_weekday_offset - weekday_offset);
-			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);
-
-		/* 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 or negative 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, e.g. 30th Feb. */
-static void
-cal_obj_time_add_months		(CalObjTime *cotime,
-				 gint	     months)
-{
-	guint month, years;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	month = cotime->month + months;
-	cotime->month = month % 12;
-	if (month > 0) {
-		cotime->year += month / 12;
-	} else {
-		years = month / 12;
-		if (cotime->month != 0) {
-			cotime->month += 12;
-			years -= 1;
-		}
-		cotime->year += years;
-	}
-}
-
-
-/* Adds a positive or negative 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)
-{
-	gint day, days_in_month;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	day = 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 or negative 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 or negative 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 or negative 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 (Mon) - 6 (Sun). */
-static gint
-cal_obj_time_weekday		(CalObjTime *cotime)
-{
-	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;
-
-	return weekday;
-}
-
-
-/* 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_offset	(CalObjTime *cotime,
-				 CalRecurrence *recur)
-{
-	GDate date;
-	gint weekday, offset;
-
-	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. */
-	offset = (weekday + 7 - recur->week_start_day) % 7;
-
-	return offset;
-}
-
-
-/* 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, first_full_week_start_offset, offset;
-
-	/* Find out the weekday of the 1st of the year, 0 (Mon) - 6 (Sun). */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 1, 1, cotime->year);
-	weekday = g_date_weekday (&date) - 1;
-
-	/* Calculate the first day of the year that starts a new week, i.e. the
-	   first week_start_day after weekday, using 0 = 1st Jan.
-	   e.g. if the 1st Jan is a Tuesday (1) and week_start_day is a
-	   Monday (0), the result will be (0 + 7 - 1) % 7 = 6 (7th Jan). */
-	week_start_day = recur_data->recur->week_start_day;
-	first_full_week_start_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 (first_full_week_start_offset >= 4)
-		first_full_week_start_offset -= 7;
-
-	/* Now add the days to get to the event's weekday. */
-	offset = first_full_week_start_offset + recur_data->weekday_offset;
-
-	/* 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,
-				 icaltimezone	*zone)
-{
-	struct icaltimetype tt;
-
-	tt = icaltime_from_timet_with_zone (t, FALSE, zone);
-
-	cotime->year     = tt.year;
-	cotime->month    = tt.month - 1;
-	cotime->day      = tt.day;
-	cotime->hour     = tt.hour;
-	cotime->minute   = tt.minute;
-	cotime->second   = tt.second;
-	cotime->flags    = 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];
-	char *weekdays[] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",
-			     "   " };
-	gint weekday;
-
-	weekday = cal_obj_time_weekday (cotime);
-
-	sprintf (buffer, "%s %02i/%02i/%04i %02i:%02i:%02i",
-		 weekdays[weekday],
-		 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,
-			    CalRecurResolveTimezoneFn  tz_cb,
-			    gpointer		 tz_cb_data)
-{
-	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,
-							   tz_cb, tz_cb_data);
-	}
-
-	/* 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,
-							   tz_cb, tz_cb_data);
-	}
-
-	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,
-				CalRecurResolveTimezoneFn	 tz_cb,
-				gpointer			 tz_cb_data)
-{
-	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, NULL) != -1)
-			return FALSE;
-	}
-
-	/* Calculate the end date. Note that we initialize end_date to 0, so
-	   if the RULE doesn't generate COUNT instances we save a time_t of 0.
-	   Also note that we use the UTC timezone as the default timezone.
-	   In get_end_date() if the DTSTART is a DATE or floating time, we will
-	   convert the ENDDATE to the current timezone. */
-	cb_data.count = rule.count;
-	cb_data.instances = 0;
-	cb_data.end_date = 0;
-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,
-					      cal_recur_ensure_rule_end_date_cb,
-					      &cb_data, tz_cb, tz_cb_data,
-					      icaltimezone_get_utc_timezone ());
-
-	/* 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;
-}
-
-
-/* If default_timezone is set, the saved ENDDATE parameter is assumed to be
-   in that timezone. This is used when the DTSTART is a DATE or floating
-   value, since the RRULE end date will change depending on the timezone that
-   it is evaluated in. */
-static time_t
-cal_recur_get_rule_end_date	(icalproperty	*prop,
-				 icaltimezone	*default_timezone)
-{
-	icalparameter *param;
-	const char *xname, *xvalue;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-	icaltimezone *zone;
-
-	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);
-
-				zone = default_timezone ? default_timezone : 
-					icaltimezone_get_utc_timezone ();
-				return icaltime_as_timet_with_zone (icaltime,
-								    zone);
-			}
-		}
-
-		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;
-	icaltimezone *utc_zone;
-	struct icaltimetype icaltime;
-	const char *end_date_string, *xname;
-
-	/* We save the value as a UTC DATE-TIME. */
-	utc_zone = icaltimezone_get_utc_timezone ();
-	icaltime = icaltime_from_timet_with_zone (end_date, FALSE, utc_zone);
-	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 6ffeb2cb8a..0000000000
--- a/calendar/cal-util/cal-recur.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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);
-
-typedef icaltimezone* (* CalRecurResolveTimezoneFn)	(const char   *tzid,
-							 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.
- *
- * The tz_cb is used to resolve references to timezones. It is passed a TZID
- * and should return the icaltimezone* corresponding to that TZID. We need to
- * do this as we access timezones in different ways on the client & server.
- *
- * The default_timezone argument is used for DTSTART or DTEND properties that
- * are DATE values or do not have a TZID (i.e. floating times).
- */
-void	cal_recur_generate_instances	(CalComponent		*comp,
-					 time_t			 start,
-					 time_t			 end,
-					 CalRecurInstanceFn	 cb,
-					 gpointer                cb_data,
-					 CalRecurResolveTimezoneFn tz_cb,
-					 gpointer		   tz_cb_data,
-					 icaltimezone		*default_timezone);
-
-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 8ba1ff7d63..0000000000
--- a/calendar/cal-util/cal-util.c
+++ /dev/null
@@ -1,560 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.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_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);
-}
-
-icalcomponent *
-cal_util_new_top_level (void)
-{
-	icalcomponent *icalcomp;
-	icalproperty *prop;
-
-	icalcomp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-
-	/* RFC 2445, section 4.7.1 */
-	prop = icalproperty_new_calscale ("GREGORIAN");
-	icalcomponent_add_property (icalcomp, prop);
-
-       /* RFC 2445, section 4.7.3 */
-	prop = icalproperty_new_prodid ("-//Ximian//NONSGML Evolution Calendar//EN");
-	icalcomponent_add_property (icalcomp, prop);
-
-	/* RFC 2445, section 4.7.4.  This is the iCalendar spec version, *NOT*
-	 * the product version!  Do not change this!
-	 */
-	prop = icalproperty_new_version ("2.0");
-	icalcomponent_add_property (icalcomp, prop);
-
-	return icalcomp;
-}
-
-/* Computes the range of time in which recurrences should be generated for a
- * component in order to compute alarm trigger times.
- */
-static void
-compute_alarm_range (CalComponent *comp, GList *alarm_uids, time_t start, time_t end,
-		     time_t *alarm_start, time_t *alarm_end)
-{
-	GList *l;
-	time_t repeat_time;
-
-	*alarm_start = start;
-	*alarm_end = end;
-
-	repeat_time = 0;
-
-	for (l = alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-		CalAlarmRepeat repeat;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_get_repeat (alarm, &repeat);
-		cal_component_alarm_free (alarm);
-
-		switch (trigger.type) {
-		case CAL_ALARM_TRIGGER_NONE:
-		case CAL_ALARM_TRIGGER_ABSOLUTE:
-			break;
-
-		case CAL_ALARM_TRIGGER_RELATIVE_START:
-		case CAL_ALARM_TRIGGER_RELATIVE_END:
-			dur = &trigger.u.rel_duration;
-  			dur_time = icaldurationtype_as_int (*dur);
-
-			if (repeat.repetitions != 0) {
-				int rdur;
-
-				rdur = repeat.repetitions * icaldurationtype_as_int (repeat.duration);
-				repeat_time = MAX (repeat_time, rdur);
-			}
-
-			if (dur->is_neg)
-				/* If the duration is negative then dur_time
-				 * will be negative as well; that is why we
-				 * subtract to expand the range.
-				 */
-				*alarm_end = MAX (*alarm_end, end - dur_time);
-			else
-				*alarm_start = MIN (*alarm_start, start - dur_time);
-
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	*alarm_start -= repeat_time;
-
-	g_assert (*alarm_start <= *alarm_end);
-}
-
-/* Closure data to generate alarm occurrences */
-struct alarm_occurrence_data {
-	/* These are the info we have */
-	GList *alarm_uids;
-	time_t start;
-	time_t end;
-
-	/* This is what we compute */
-	GSList *triggers;
-	int n_triggers;
-};
-
-static void
-add_trigger (struct alarm_occurrence_data *aod, const char *auid, time_t trigger,
-	     time_t occur_start, time_t occur_end)
-{
-	CalAlarmInstance *instance;
-
-	instance = g_new (CalAlarmInstance, 1);
-	instance->auid = auid;
-	instance->trigger = trigger;
-	instance->occur_start = occur_start;
-	instance->occur_end = occur_end;
-
-	aod->triggers = g_slist_prepend (aod->triggers, instance);
-	aod->n_triggers++;
-}
-
-/* Callback used from cal_recur_generate_instances(); generates triggers for all
- * of a component's RELATIVE alarms.
- */
-static gboolean
-add_alarm_occurrences_cb (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	struct alarm_occurrence_data *aod;
-	GList *l;
-
-	aod = data;
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		CalAlarmRepeat repeat;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-		time_t occur_time, trigger_time;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_get_repeat (alarm, &repeat);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_RELATIVE_START
-		    && trigger.type != CAL_ALARM_TRIGGER_RELATIVE_END)
-			continue;
-
-		dur = &trigger.u.rel_duration;
-  		dur_time = icaldurationtype_as_int (*dur);
-
-		if (trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START)
-			occur_time = start;
-		else
-			occur_time = end;
-
-		/* If dur->is_neg is true then dur_time will already be
-		 * negative.  So we do not need to test for dur->is_neg here; we
-		 * can simply add the dur_time value to the occur_time and get
-		 * the correct result.
-		 */
-
-		trigger_time = occur_time + dur_time;
-
-		/* Add repeating alarms */
-
-		if (repeat.repetitions != 0) {
-			int i;
-			time_t repeat_time;
-
-			repeat_time = icaldurationtype_as_int (repeat.duration);
-
-			for (i = 0; i < repeat.repetitions; i++) {
-				time_t t;
-
-				t = trigger_time + (i + 1) * repeat_time;
-
-				if (t >= aod->start && t < aod->end)
-					add_trigger (aod, auid, t, start, end);
-			}
-		}
-
-		/* Add the trigger itself */
-
-		if (trigger_time >= aod->start && trigger_time < aod->end)
-			add_trigger (aod, auid, trigger_time, start, end);
-	}
-
-	return TRUE;
-}
-
-/* Generates the absolute triggers for a component */
-static void
-generate_absolute_triggers (CalComponent *comp, struct alarm_occurrence_data *aod,
-			    CalRecurResolveTimezoneFn resolve_tzid,
-			    gpointer user_data,
-			    icaltimezone *default_timezone)
-{
-	GList *l;
-	CalComponentDateTime dt_start, dt_end;
-
-	cal_component_get_dtstart (comp, &dt_start);
-	cal_component_get_dtend (comp, &dt_end);
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmRepeat repeat;
-		CalAlarmTrigger trigger;
-		time_t abs_time;
-		time_t occur_start, occur_end;
-		icaltimezone *zone;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_get_repeat (alarm, &repeat);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE)
-			continue;
-
-		/* Absolute triggers are always in UTC; see RFC 2445 section 4.8.6.3 */
-		zone = icaltimezone_get_utc_timezone ();
-
-		abs_time = icaltime_as_timet_with_zone (trigger.u.abs_time, zone);
-
-		/* No particular occurrence, so just use the times from the component */
-
-		if (dt_start.value) {
-			if (dt_start.tzid && !dt_start.value->is_date)
-				zone = (* resolve_tzid) (dt_start.tzid, user_data);
-			else
-				zone = default_timezone;
-
-			occur_start = icaltime_as_timet_with_zone (*dt_start.value, zone);
-		} else
-			occur_start = -1;
-
-		if (dt_end.value) {
-			if (dt_end.tzid && !dt_end.value->is_date)
-				zone = (* resolve_tzid) (dt_end.tzid, user_data);
-			else
-				zone = default_timezone;
-
-			occur_end = icaltime_as_timet_with_zone (*dt_end.value, zone);
-		} else
-			occur_end = -1;
-
-		/* Add repeating alarms */
-
-		if (repeat.repetitions != 0) {
-			int i;
-			time_t repeat_time;
-
-			repeat_time = icaldurationtype_as_int (repeat.duration);
-
-			for (i = 0; i < repeat.repetitions; i++) {
-				time_t t;
-
-				t = abs_time + (i + 1) * repeat_time;
-
-				if (t >= aod->start && t < aod->end)
-					add_trigger (aod, auid, t, occur_start, occur_end);
-			}
-		}
-
-		/* Add the trigger itself */
-
-		if (abs_time >= aod->start && abs_time < aod->end)
-			add_trigger (aod, auid, abs_time, occur_start, occur_end);
-	}
-
-	cal_component_free_datetime (&dt_start);
-	cal_component_free_datetime (&dt_end);
-}
-
-/* Compares two alarm instances; called from g_slist_sort() */
-static gint
-compare_alarm_instance (gconstpointer a, gconstpointer b)
-{
-	const CalAlarmInstance *aia, *aib;
-
-	aia = a;
-	aib = b;
-
-	if (aia->trigger < aib->trigger)
-		return -1;
-	else if (aia->trigger > aib->trigger)
-		return 1;
-	else
-		return 0;
-}
-
-/**
- * cal_util_generate_alarms_for_comp
- * @comp: the CalComponent to generate alarms from
- * @start: start time
- * @end: end time
- * @resolve_tzid: callback for resolving timezones
- * @user_data: data to be passed to the resolve_tzid callback
- * @default_timezone: the timezone used to resolve DATE and floating DATE-TIME
- * values.
- *
- * Generates alarm instances for a calendar component.  Returns the instances
- * structure, or NULL if no alarm instances occurred in the specified time
- * range.
- */
-CalComponentAlarms *
-cal_util_generate_alarms_for_comp (CalComponent *comp,
-				   time_t start,
-				   time_t end,
-				   CalRecurResolveTimezoneFn resolve_tzid,
-				   gpointer user_data,
-				   icaltimezone *default_timezone)
-{
-	GList *alarm_uids;
-	time_t alarm_start, alarm_end;
-	struct alarm_occurrence_data aod;
-	CalComponentAlarms *alarms;
-
-	if (!cal_component_has_alarms (comp))
-		return NULL;
-
-	alarm_uids = cal_component_get_alarm_uids (comp);
-	compute_alarm_range (comp, alarm_uids, start, end, &alarm_start, &alarm_end);
-
-	aod.alarm_uids = alarm_uids;
-	aod.start = start;
-	aod.end = end;
-	aod.triggers = NULL;
-	aod.n_triggers = 0;
-
-	cal_recur_generate_instances (comp, alarm_start, alarm_end,
-				      add_alarm_occurrences_cb, &aod,
-				      resolve_tzid, user_data,
-				      default_timezone);
-
-	/* We add the ABSOLUTE triggers separately */
-	generate_absolute_triggers (comp, &aod, resolve_tzid, user_data, default_timezone);
-
-	if (aod.n_triggers == 0)
-		return NULL;
-
-	/* Create the component alarm instances structure */
-
-	alarms = g_new (CalComponentAlarms, 1);
-	alarms->comp = comp;
-	gtk_object_ref (GTK_OBJECT (alarms->comp));
-	alarms->alarms = g_slist_sort (aod.triggers, compare_alarm_instance);
-
-	return alarms;
-}
-
-/**
- * cal_util_generate_alarms_for_list
- * @comps: list of CalComponent's
- * @start: start time
- * @end: end time
- * @comp_alarms: list to be returned
- * @resolve_tzid: callback for resolving timezones
- * @user_data: data to be passed to the resolve_tzid callback
- * @default_timezone: the timezone used to resolve DATE and floating DATE-TIME
- * values.
- *
- * Iterates through all the components in the comps list and generates alarm
- * instances for them; putting them in the comp_alarms list.
- *
- * Returns: the number of elements it added to that list.
- */
-int
-cal_util_generate_alarms_for_list (GList *comps,
-				   time_t start,
-				   time_t end,
-				   GSList **comp_alarms,
-				   CalRecurResolveTimezoneFn resolve_tzid,
-				   gpointer user_data,
-				   icaltimezone *default_timezone)
-{
-	GList *l;
-	int n;
-
-	n = 0;
-
-	for (l = comps; l; l = l->next) {
-		CalComponent *comp;
-		CalComponentAlarms *alarms;
-
-		comp = CAL_COMPONENT (l->data);
-		alarms = cal_util_generate_alarms_for_comp (comp, start, end, resolve_tzid, user_data, default_timezone);
-
-		if (alarms) {
-			*comp_alarms = g_slist_prepend (*comp_alarms, alarms);
-			n++;
-		}
-	}
-
-	return n;
-}
-
-
-/* Converts an iCalendar PRIORITY value to a translated string. Any unknown
-   priority value (i.e. not 0-9) will be returned as "" (undefined). */
-char *
-cal_util_priority_to_string (int priority)
-{
-	char *retval;
-
-	if (priority <= 0)
-		retval = "";
-	else if (priority <= 4)
-		retval = _("High");
-	else if (priority == 5)
-		retval = _("Normal");
-	else if (priority <= 9)
-		retval = _("Low");
-	else
-		retval = "";
-
-	return retval;
-}
-
-
-/* Converts a translated priority string to an iCalendar priority value.
-   Returns -1 if the priority string is not valid. */
-int
-cal_util_priority_from_string (const char *string)
-{
-	int priority;
-
-	/* An empty string is the same as 'None'. */
-	if (!string || !string[0] || !g_strcasecmp (string, _("Undefined")))
-		priority = 0;
-	else if (!g_strcasecmp (string, _("High")))
-		priority = 3;
-	else if (!g_strcasecmp (string, _("Normal")))
-		priority = 5;
-	else if (!g_strcasecmp (string, _("Low")))
-		priority = 7;
-	else
-		priority = -1;
-
-	return priority;
-}
-
-char *
-cal_util_expand_uri (char *uri, gboolean tasks)
-{
-	char *file_uri, *file_name;
-
-	if (!strncmp (uri, "file://", 7)) {
-		file_uri = uri + 7;
-		if (strlen (file_uri) > 4
-		    && !strcmp (file_uri + strlen (file_uri) - 4, ".ics")) {
-			
-			/* it's a .ics file */
-			return g_strdup (uri);
-		}
-
-		/* we assume it's a dir and glom <type>.ics onto the end. */
-		if (tasks)
-			file_name = g_concat_dir_and_file (file_uri, "tasks.ics");
-		else
-			file_name = g_concat_dir_and_file (file_uri, "calendar.ics");
-		file_uri = g_strdup_printf("file://%s", file_name);
-		g_free(file_name);
-	} else {
-		file_uri = g_strdup (uri);
-	}
-
-	return file_uri;
-}
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
deleted file mode 100644
index d4ccfb5388..0000000000
--- a/calendar/cal-util/cal-util.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ical.h>
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-#include <cal-util/cal-recur.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);
-
-/* 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;
-
-/* Used for mode stuff */
-typedef enum {
-	CAL_MODE_INVALID = -1,
-	CAL_MODE_LOCAL   = 1 << 0,
-	CAL_MODE_REMOTE  = 1 << 1,
-	CAL_MODE_ANY     = 0x07
-} CalMode;
-
-void cal_obj_uid_list_free (GList *list);
-
-icalcomponent *cal_util_new_top_level (void);
-
-CalComponentAlarms *cal_util_generate_alarms_for_comp (CalComponent *comp,
-						       time_t start,
-						       time_t end,
-						       CalRecurResolveTimezoneFn resolve_tzid,
-						       gpointer user_data,
-						       icaltimezone *default_timezone);
-int cal_util_generate_alarms_for_list (GList *comps,
-				       time_t start,
-				       time_t end,
-				       GSList **comp_alarms,
-				       CalRecurResolveTimezoneFn resolve_tzid,
-				       gpointer user_data,
-				       icaltimezone *default_timezone);
-
-icaltimezone *cal_util_resolve_tzid (const char *tzid, gpointer data);
-
-char *cal_util_priority_to_string (int priority);
-int cal_util_priority_from_string (const char *string);
-
-char *cal_util_expand_uri (char *uri, gboolean tasks);
-
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
deleted file mode 100644
index 5078a1db94..0000000000
--- a/calendar/cal-util/test-recur.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- *
- * NOTE: currently it starts from the event start date and continues
- * until all recurrence rules/dates end or we reach MAX_OCCURRENCES
- * occurrences. So it does not test generating occurrences for a specific
- * interval. A nice addition might be to do this automatically and compare
- * the results from the complete set to ensure they match.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkmain.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);
-}
-
-
-/* This resolves any TZIDs in the components. The VTIMEZONEs must be in the
-   file we are reading. */
-static icaltimezone*
-resolve_tzid_cb		(const char	*tzid,
-			 gpointer	 user_data)
-{
-	icalcomponent *vcalendar_comp = user_data;
-
-        if (!tzid || !tzid[0])
-                return NULL;
-        else if (!strcmp (tzid, "UTC"))
-                return icaltimezone_get_utc_timezone ();
-
-	return icalcomponent_get_timezone (vcalendar_comp, tzid);
-}
-
-
-static void
-generate_occurrences	(icalcomponent	*icalcomp)
-{
-	icalcompiter iter;
-	icaltimezone *default_timezone;
-
-	/* This is the timezone we will use for DATE and floating values. */
-	default_timezone = icaltimezone_get_utc_timezone ();
-
-	for (iter = icalcomponent_begin_component (icalcomp, ICAL_ANY_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *tmp_icalcomp;
-		CalComponent *comp;
-		icalcomponent_kind kind;
-		gint occurrences;
-
-		tmp_icalcomp = icalcompiter_deref (&iter);
-		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));
-		g_print ("Instances:\n");
-
-		occurrences = 0;
-		/* I use specific times when I am trying to pin down a bug seen
-		   in one of the calendar views. */
-#if 0
-		cal_recur_generate_instances (comp, 982022400, 982108800,
-					      occurrence_cb, &occurrences,
-					      resolve_tzid_cb, icalcomp,
-					      default_timezone);
-#else
-		cal_recur_generate_instances (comp, -1, -1,
-					      occurrence_cb, &occurrences,
-					      resolve_tzid_cb, icalcomp,
-					      default_timezone);
-#endif
-
-		/* Print the component again so we can see the
-		   X-EVOLUTION-ENDDATE parameter (only set if COUNT is used).
-		*/
-		g_print ("#############################################################################\n");
-#if 0
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-#endif
-	}
-}
-
-
-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 3dcf8dc384..0000000000
--- a/calendar/cal-util/timeutil.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Damon Chaplin <damon@ximian.com>
- */
-
-#include <string.h>
-#include <ctype.h>
-#include <glib.h>
-#include <ical.h>
-#include "timeutil.h"
-
-
-
-#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 */
-
-
-/* Number of days in a month, using 0 (Jan) to 11 (Dec). For leap years,
-   add 1 to February (month 1). */
-static const int days_in_month[12] = {
-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-
-
-/**************************************************************************
- * time_t manipulation functions.
- *
- * NOTE: these use the Unix timezone functions like mktime() and localtime()
- * and so should not be used in Evolution. New Evolution code should use
- * icaltimetype values rather than time_t values wherever possible.
- **************************************************************************/
-
-static void
-print_time_t (time_t t)
-{
-	struct tm *tm = localtime (&t);
-	
-	printf ("%d/%02d/%02d %02d:%02d:%02d",
-		1900 + tm->tm_year, tm->tm_mon+1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
-
-/* 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;
-
-	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);
-		printf ("\n");
-		return time;
-	}
-
-	return new_time;
-}
-
-time_t
-time_add_week (time_t time, int weeks)
-{
-	return time_add_day (time, weeks * 7);
-}
-
-/* Returns the start of the day, according to the local time. */
-time_t
-time_day_begin (time_t t)
-{
-	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);
-}
-
-/* Returns the end of the day, according to the local time. */
-time_t
-time_day_end (time_t t)
-{
-	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);
-}
-
-
-/**************************************************************************
- * time_t manipulation functions, using timezones in libical.
- *
- * NOTE: these are only here to make the transition to the timezone
- * functions easier. New code should use icaltimetype values rather than
- * time_t values wherever possible.
- **************************************************************************/
-
-
-/* Adds or subtracts a number of days to/from the given time_t value, using
-   the given timezone.
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_add_day_with_zone (time_t time, int days, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Add/subtract the number of days. */
-	icaltime_adjust (&tt, days, 0, 0, 0);
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-
-/* Adds or subtracts a number of weeks to/from the given time_t value, using
-   the given timezone.
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_add_week_with_zone (time_t time, int weeks, icaltimezone *zone)
-{
-	return time_add_day_with_zone (time, weeks * 7, zone);
-}
-
-
-/* Adds or subtracts a number of months to/from the given time_t value, using
-   the given timezone.
-
-   If the day would be off the end of the month (e.g. adding 1 month to
-   30th January, would lead to an invalid day, 30th February), it moves it
-   down to the last day in the month, e.g. 28th Feb (or 29th in a leap year.)
-
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_add_month_with_zone (time_t time, int months, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-	int day, days_in_month;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Add on the number of months. */
-	tt.month += months;
-
-	/* Save the day, and set it to 1, so we don't overflow into the next
-	   month. */
-	day = tt.day;
-	tt.day = 1;
-
-	/* Normalize it, fixing any month overflow. */
-	tt = icaltime_normalize (tt);
-
-	/* If we go past the end of a month, set it to the last day. */
-	days_in_month = time_days_in_month (tt.year, tt.month - 1);
-	if (day > days_in_month)
-		day = days_in_month;
-
-	tt.day = day;
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-
-/* Returns the start of the year containing the given time_t, using the given
-   timezone.
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_year_begin_with_zone (time_t time, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Set it to the start of the year. */
-	tt.month  = 1;
-	tt.day    = 1;
-	tt.hour   = 0;
-	tt.minute = 0;
-	tt.second = 0;
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-
-/* Returns the start of the month containing the given time_t, using the given
-   timezone.
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_month_begin_with_zone (time_t time, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Set it to the start of the month. */
-	tt.day    = 1;
-	tt.hour   = 0;
-	tt.minute = 0;
-	tt.second = 0;
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-
-/* Returns the start of the week containing the given time_t, using the given
-   timezone. week_start_day should use the same values as mktime(),
-   i.e. 0 (Sun) to 6 (Sat).
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_week_begin_with_zone (time_t time, int week_start_day, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-	int weekday, offset;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Get the weekday. */
-	weekday = time_day_of_week (tt.day, tt.month - 1, tt.year);
-
-	/* Calculate the current offset from the week start day. */
-	offset = (weekday + 7 - week_start_day) % 7;
-
-	/* Set it to the start of the month. */
-	tt.day -= offset;
-	tt.hour   = 0;
-	tt.minute = 0;
-	tt.second = 0;
-
-	/* Normalize it, to fix any overflow. */
-	tt = icaltime_normalize (tt);
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-
-/* Returns the start of the day containing the given time_t, using the given
-   timezone.
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_day_begin_with_zone (time_t time, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Set it to the start of the day. */
-	tt.hour   = 0;
-	tt.minute = 0;
-	tt.second = 0;
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-
-/* Returns the end of the day containing the given time_t, using the given
-   timezone. (The end of the day is the start of the next day.)
-   NOTE: this function is only here to make the transition to the timezone
-   functions easier. New code should use icaltimetype values and
-   icaltime_adjust() to add or subtract days, hours, minutes & seconds. */
-time_t
-time_day_end_with_zone (time_t time, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Set it to the start of the next day. */
-	tt.day++;
-	tt.hour   = 0;
-	tt.minute = 0;
-	tt.second = 0;
-
-	/* Normalize it, to fix any overflow. */
-	tt = icaltime_normalize (tt);
-
-	/* Convert back to a time_t. */
-	return icaltime_as_timet_with_zone (tt, zone);
-}
-
-/**
- * time_to_gdate_with_zone:
- * @date: Destination #GDate value.
- * @time: A time value.
- * @zone: Desired timezone for destination @date, or NULL if the UTC timezone
- * is desired.
- * 
- * Converts a time_t value to a #GDate structure using the specified timezone.
- * This is analogous to g_date_set_time() but takes the timezone into account.
- **/
-void
-time_to_gdate_with_zone (GDate *date, time_t time, icaltimezone *zone)
-{
-	struct icaltimetype tt;
-
-	g_return_if_fail (date != NULL);
-	g_return_if_fail (time != -1);
-
-	tt = icaltime_from_timet_with_zone (time, FALSE,
-					    zone ? zone : icaltimezone_get_utc_timezone ());
-
-	g_date_set_dmy (date, tt.day, tt.month, tt.year);
-}
-
-
-/**************************************************************************
- * General time functions.
- **************************************************************************/
-
-
-/* Returns the number of days in the month. Year is the normal year, e.g. 2001.
-   Month is 0 (Jan) to 11 (Dec). */
-int
-time_days_in_month (int year, int month)
-{
-	int days;
-
-	g_return_val_if_fail (year >= 1900, 0);
-	g_return_val_if_fail ((month >= 0) && (month < 12), 0);
-
-	days = days_in_month[month];
-	if (month == 1 && time_is_leap_year (year))
-		days++;
-
-	return days;
-}
-
-
-/* Returns the 1-based day number within the year of the specified date.
-   Year is the normal year, e.g. 2001. Month is 0 to 11. */
-int
-time_day_of_year (int day, int month, int year)
-{
-	int i;
-
-	for (i = 0; i < month; i++) {
-		day += days_in_month[i];
-
-		if (month == 1 && time_is_leap_year (year))
-			day++;
-	}
-
-	return day;
-}
-
-
-/* Returns the day of the week for the specified date, 0 (Sun) to 6 (Sat).
-   For the days that were removed on the Gregorian reformation, it returns
-   Thursday. Year is the normal year, e.g. 2001. Month is 0 to 11. */
-int
-time_day_of_week (int day, int month, int year)
-{
-	int n;
-
-	n = (year - 1) * 365 + time_leap_years_up_to (year - 1)
-	  + time_day_of_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;
-}
-
-
-/* Returns whether the specified year is a leap year. Year is the normal year,
-   e.g. 2001. */
-gboolean
-time_is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-
-/* Returns the number of leap years since year 1 up to (but not including) the
-   specified year. Year is the normal year, e.g. 2001. */
-int
-time_leap_years_up_to (int year)
-{
-  /* There is normally a leap year every 4 years, except at the turn of
-     centuries since 1700. But there is a leap year on centuries since 1700
-     which are divisible by 400. */
-  return (year / 4
-	  - ((year > 1700) ? (year / 100 - 17) : 0)
-	  + ((year > 1600) ? ((year - 1600) / 400) : 0));
-}
-
-
-/**
- * isodate_from_time_t:
- * @t: A time value.
- * 
- * Creates an ISO 8601 UTC representation from a time value.
- * 
- * Return value: String with the ISO 8601 representation of the UTC time.
- **/
-char *
-isodate_from_time_t (time_t t)
-{
-	struct tm *tm;
-	char isotime[40];
-
-	tm = gmtime (&t);
-	strftime (isotime, sizeof (isotime)-1, "%Y%m%dT%H%M%SZ", tm);
-	return g_strdup (isotime);
-}
-
-/**
- * time_from_isodate:
- * @str: Date/time value in ISO 8601 format.
- * 
- * Converts an ISO 8601 UTC time string into a time_t value.
- * 
- * Return value: Time_t corresponding to the specified ISO string.
- * Note that we only allow UTC times at present.
- **/
-time_t
-time_from_isodate (const char *str)
-{
-	struct icaltimetype tt = icaltime_null_time ();
-	icaltimezone *utc_zone;
-	int len, i;
-
-	g_return_val_if_fail (str != NULL, -1);
-
-	/* yyyymmdd[Thhmmss[Z]] */
-
-	len = strlen (str);
-
-	if (!(len == 8 || len == 15 || len == 16))
-		return -1;
-
-	for (i = 0; i < len; i++)
-		if (!((i != 8 && i != 15 && isdigit (str[i]))
-		      || (i == 8 && str[i] == 'T')
-		      || (i == 15 && str[i] == 'Z')))
-			return -1;
-
-#define digit_at(x,y) (x[y] - '0')
-
-	tt.year = digit_at (str, 0) * 1000
-		+ digit_at (str, 1) * 100
-		+ digit_at (str, 2) * 10
-		+ digit_at (str, 3);
-
-	tt.month = digit_at (str, 4) * 10
-		 + digit_at (str, 5);
-
-	tt.day = digit_at (str, 6) * 10
-	       + digit_at (str, 7);
-
-	if (len > 8) {
-		tt.hour = digit_at (str, 9) * 10
-			+ digit_at (str, 10);
-		tt.minute  = digit_at (str, 11) * 10
-			   + digit_at (str, 12);
-		tt.second  = digit_at (str, 13) * 10
-			   + digit_at (str, 14);
-	}
-
-	utc_zone = icaltimezone_get_utc_timezone ();
-
-	return icaltime_as_timet_with_zone (tt, utc_zone);
-}
-
-struct tm
-icaltimetype_to_tm (struct icaltimetype *itt)
-{
-	struct tm tm;
-	
-	memset (&tm, 0, sizeof (struct tm));
-
-	if (!itt->is_date) {
-		tm.tm_sec = itt->second;
-		tm.tm_min = itt->minute;
-		tm.tm_hour = itt->hour;
-	}
-
-	tm.tm_mday = itt->day;
-	tm.tm_mon = itt->month - 1;
-	tm.tm_year = itt->year - 1900;
-	tm.tm_wday = time_day_of_week (itt->day, itt->month - 1, itt->year);
-	tm.tm_isdst = -1;
-	
-	return tm;
-}
-
-/**
- * icaltimetype_to_tm_with_zone:
- * @itt: A time value.
- * @from_zone: Source timezone.
- * @to_zone: Destination timezone.
- * 
- * Converts a time value from one timezone to another, and returns a struct tm
- * representation of the time.
- * 
- * Return value: The converted time as a struct tm.  All fields will be
- * set properly except for tm.tm_yday.
- **/
-struct tm
-icaltimetype_to_tm_with_zone (struct icaltimetype *itt,
-			      icaltimezone *from_zone,
-			      icaltimezone *to_zone)
-{
-	struct tm tm;
-	struct icaltimetype itt_copy;
-
-	memset (&tm, 0, sizeof (tm));
-	tm.tm_isdst = -1;
-
-	g_return_val_if_fail (itt != NULL, tm);
-
-	itt_copy = *itt;
-
-	icaltimezone_convert_time (&itt_copy, from_zone, to_zone);
-	tm = icaltimetype_to_tm (&itt_copy);
-
-	return tm;
-}
-
-struct icaltimetype
-tm_to_icaltimetype (struct tm *tm, gboolean is_date)
-{
-	struct icaltimetype itt;
-
-	memset (&itt, 0, sizeof (struct icaltimetype));
-
-	if (!is_date) {
-		itt.second = tm->tm_sec;
-		itt.minute = tm->tm_min;
-		itt.hour = tm->tm_hour;
-	}
-
-	itt.day = tm->tm_mday;
-	itt.month = tm->tm_mon + 1;
-	itt.year = tm->tm_year+ 1900;
-    
-	itt.is_utc = 0;
-	itt.is_date = is_date; 
-	
-	return itt;
-}
-
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
deleted file mode 100644
index 77a8f180e1..0000000000
--- a/calendar/cal-util/timeutil.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef TIMEUTIL_H
-#define TIMEUTIL_H
-
-
-#include <time.h>
-#include <ical.h>
-#include <glib.h>
-
-
-/**************************************************************************
- * General time functions.
- **************************************************************************/
-
-/* Returns the number of days in the month. Year is the normal year, e.g. 2001.
-   Month is 0 (Jan) to 11 (Dec). */
-int	time_days_in_month	(int year, int month);
-
-/* Returns the 1-based day number within the year of the specified date.
-   Year is the normal year, e.g. 2001. Month is 0 to 11. */
-int	time_day_of_year	(int day, int month, int year);
-
-/* Returns the day of the week for the specified date, 0 (Sun) to 6 (Sat).
-   For the days that were removed on the Gregorian reformation, it returns
-   Thursday. Year is the normal year, e.g. 2001. Month is 0 to 11. */
-int	time_day_of_week	(int day, int month, int year);
-
-/* Returns whether the specified year is a leap year. Year is the normal year,
-   e.g. 2001. */
-gboolean time_is_leap_year	(int year);
-
-/* Returns the number of leap years since year 1 up to (but not including) the
-   specified year. Year is the normal year, e.g. 2001. */
-int	time_leap_years_up_to	(int year);
-
-/* Convert to or from an ISO 8601 representation of a time, in UTC,
-   e.g. "20010708T183000Z". */
-char   *isodate_from_time_t     (time_t t);
-time_t	time_from_isodate	(const char *str);
-
-
-/**************************************************************************
- * time_t manipulation functions.
- *
- * NOTE: these use the Unix timezone functions like mktime() and localtime()
- * and so should not be used in Evolution. New Evolution code should use
- * icaltimetype values rather than time_t values wherever possible.
- **************************************************************************/
-
-/* Add or subtract a number of days, weeks or months. */
-time_t	time_add_day		(time_t time, int days);
-time_t	time_add_week		(time_t time, int weeks);
-
-/* Returns the beginning or end of the day. */
-time_t	time_day_begin		(time_t t);
-time_t	time_day_end		(time_t t);
-
-
-/**************************************************************************
- * time_t manipulation functions, using timezones in libical.
- *
- * NOTE: these are only here to make the transition to the timezone
- * functions easier. New code should use icaltimetype values rather than
- * time_t values wherever possible.
- **************************************************************************/
-
-/* Adds or subtracts a number of days to/from the given time_t value, using
-   the given timezone. */
-time_t	time_add_day_with_zone (time_t time, int days, icaltimezone *zone);
-
-/* Adds or subtracts a number of weeks to/from the given time_t value, using
-   the given timezone. */
-time_t	time_add_week_with_zone (time_t time, int weeks, icaltimezone *zone);
-
-/* Adds or subtracts a number of months to/from the given time_t value, using
-   the given timezone. */
-time_t	time_add_month_with_zone (time_t time, int months, icaltimezone *zone);
-
-/* Returns the start of the year containing the given time_t, using the given
-   timezone. */
-time_t	time_year_begin_with_zone (time_t time, icaltimezone *zone);
-
-/* Returns the start of the month containing the given time_t, using the given
-   timezone. */
-time_t	time_month_begin_with_zone (time_t time, icaltimezone *zone);
-
-/* Returns the start of the week containing the given time_t, using the given
-   timezone. week_start_day should use the same values as mktime(),
-   i.e. 0 (Sun) to 6 (Sat). */
-time_t	time_week_begin_with_zone (time_t time, int week_start_day,
-				   icaltimezone *zone);
-
-/* Returns the start of the day containing the given time_t, using the given
-   timezone. */
-time_t	time_day_begin_with_zone (time_t time, icaltimezone *zone);
-
-/* Returns the end of the day containing the given time_t, using the given
-   timezone. (The end of the day is the start of the next day.) */
-time_t	time_day_end_with_zone (time_t time, icaltimezone *zone);
-
-void time_to_gdate_with_zone (GDate *date, time_t time, icaltimezone *zone);
-
-/**************************************************************************
- * struct tm manipulation 
- **************************************************************************/
-
-struct tm icaltimetype_to_tm (struct icaltimetype *itt);
-struct tm icaltimetype_to_tm_with_zone (struct icaltimetype *itt,
-					icaltimezone *from_zone,
-					icaltimezone *to_zone);
-struct icaltimetype tm_to_icaltimetype (struct tm *tm, gboolean is_date);
-
-#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 e8ba6ad844..0000000000
--- a/calendar/conduits/calendar/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-e-calendar.conduit
-*.lo
-.libs
-libecalendar_conduit.la
-e-calendar-conduit-control-applet
-e-calendar-conduit-control-applet.desktop
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
deleted file mode 100644
index d92667bb04..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_builddir)/calendar/cal-client	\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# Calendar Conduit
-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = 	\
-	calendar-conduit.c
-
-libecalendar_conduit_la_LDFLAGS = -module -avoid-version
-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.a				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/libwombat/libwombat-static.la		 	\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-calendar.conduit: e-calendar.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' 				\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp 	\
-	&& mv e-calendar.conduit.tmp e-calendar.conduit
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-calendar.conduit
-
-EXTRA_DIST = \
-	e-calendar.conduit.in
-
-install-data-local:
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index f86e753232..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1778 +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 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <bonobo-conf/bonobo-config-database.h>
-#include <cal-client/cal-client-types.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.6"
-#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)
-
-#define PILOT_MAX_ADVANCE 99
-
-typedef struct _ECalLocalRecord ECalLocalRecord;
-typedef struct _ECalConduitCfg ECalConduitCfg;
-typedef struct _ECalConduitContext ECalConduitContext;
-
-/* Local Record */
-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 appointment structure */
-	struct Appointment *appt;
-};
-
-static void
-calconduit_destroy_record (ECalLocalRecord *local)
-{
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	free_Appointment (local->appt);
-	g_free (local->appt);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _ECalConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	gboolean secret;
-	gchar *last_uri;
-};
-
-static ECalConduitCfg *
-calconduit_load_configuration (guint32 pilot_id) 
-{
-	ECalConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
- 	gchar prefix[256];
-	
-	c = g_new0 (ECalConduitCfg, 1);
-	g_assert (c != NULL);
-
-	/* Pilot ID */
-	c->pilot_id = pilot_id;
-
-	/* Sync Type */
-	management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", pilot_id);
-	gnome_config_push_prefix (prefix);
-
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", c->pilot_id);
-	gnome_config_push_prefix (prefix);
-
-	gnome_config_set_bool ("secret", c->secret);
-	gnome_config_set_string ("last_uri", c->last_uri);
-
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->pilot_id = c->pilot_id;
-	retval->sync_type = c->sync_type;
-	retval->secret = c->secret;
-	retval->last_uri = g_strdup (c->last_uri);
-	
-	return retval;
-}
-
-static void 
-calconduit_destroy_configuration (ECalConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Context */
-struct _ECalConduitContext {
-	ECalConduitCfg *cfg;
-	GnomePilotDBInfo *dbi;
-
-	ECalConduitCfg *new_cfg;
-	GtkWidget *ps;
-	
-	struct AppointmentAppInfo ai;
-
-	CalClient *client;
-
-	icaltimezone *timezone;
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static ECalConduitContext *
-e_calendar_context_new (guint32 pilot_id) 
-{
-	ECalConduitContext *ctxt;
-
-	ctxt = g_new0 (ECalConduitContext, 1);
-	g_assert (ctxt != NULL);
-	
-	ctxt->cfg = calconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = calconduit_dupe_configuration (ctxt->cfg);
-	ctxt->ps = NULL;
-	ctxt->dbi = NULL;
-	ctxt->client = NULL;
-	ctxt->timezone = NULL;
-	ctxt->uids = NULL;
-	ctxt->changed = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-	
-	return ctxt;
-}
-
-static gboolean
-e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-
-	return TRUE;
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		calconduit_destroy_configuration (ctxt->cfg);
-
-	if (ctxt->client != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->client));
-	
-	if (ctxt->uids != NULL)
-		cal_obj_uid_list_free (ctxt->uids);
-	
-	if (ctxt->changed != NULL)
-		cal_client_change_list_free (ctxt->changed);
-	
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_calendar_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			calconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-}
-
-/* Debug routines */
-static char *
-print_local (ECalLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->appt && local->appt->description) {
-		g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
-			    mktime (&local->appt->begin),
-			    mktime (&local->appt->end),
-			    local->appt->description ?
-			    local->appt->description : "",
-			    local->appt->note ?
-			    local->appt->note : "");
-		return buff;
-	}
-
-	return "";
-}
-
-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);
-
-	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
-		    mktime (&appt.begin),
-		    mktime (&appt.end),
-		    appt.description ?
-		    appt.description : "",
-		    appt.note ?
-		    appt.note : "");
-
-	free_Appointment (&appt);
-
-	return buff;
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	gboolean *success = data;
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		*success = TRUE;
-	} else {
-		*success = FALSE;
-		WARN ("Failed to open calendar!\n");
-	}
-	
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	gboolean success = FALSE;
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened",
-			    start_calendar_server_cb, &success);
-
-	if (!cal_client_open_default_calendar (ctxt->client, FALSE))
-		return -1;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static icaltimezone *
-get_timezone (CalClient *client, const char *tzid) 
-{
-	icaltimezone *timezone = NULL;
-
-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (timezone == NULL)
-		 cal_client_get_timezone (client, tzid, &timezone);
-	
-	return timezone;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	Bonobo_ConfigDatabase db;
-	icaltimezone *timezone = NULL;
-	char *location;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return NULL;
- 	}
-
-	CORBA_exception_free (&ev);
-
-	location = bonobo_config_get_string_with_default (db,
-		"/Calendar/Display/Timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	bonobo_object_release_unref (db, NULL);
-
-	return timezone;	
-}
-
-
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-calendar-%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_SUNDAY_WEEKDAY;
-	case 1:
-		return ICAL_MONDAY_WEEKDAY;
-	case 2:
-		return ICAL_TUESDAY_WEEKDAY;
-	case 3:
-		return ICAL_WEDNESDAY_WEEKDAY;
-	case 4:
-		return ICAL_THURSDAY_WEEKDAY;
-	case 5:
-		return ICAL_FRIDAY_WEEKDAY;
-	case 6:
-		return ICAL_SATURDAY_WEEKDAY;
-	}
-
-	return ICAL_NO_WEEKDAY;
-}
-
-static int
-get_pilot_day (icalrecurrencetype_weekday wd) 
-{
-	switch (wd) {
-	case ICAL_SUNDAY_WEEKDAY:
-		return 0;
-	case ICAL_MONDAY_WEEKDAY:
-		return 1;
-	case ICAL_TUESDAY_WEEKDAY:
-		return 2;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		return 3;
-	case ICAL_THURSDAY_WEEKDAY:
-		return 4;
-	case ICAL_FRIDAY_WEEKDAY:
-		return 5;
-	case ICAL_SATURDAY_WEEKDAY:
-		return 6;
-	default:
-		return -1;
-	}
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static gboolean
-is_all_day (CalClient *client, CalComponentDateTime *dt_start, CalComponentDateTime *dt_end) 
-{
-	time_t dt_start_time, dt_end_time;
-	icaltimezone *timezone;
-
-	if (dt_start->value->is_date && dt_end->value->is_date)
-		return TRUE;
-	
-	timezone = get_timezone (client, dt_start->tzid);
-	dt_start_time = icaltime_as_timet_with_zone (*dt_start->value, timezone);
-	dt_end_time = icaltime_as_timet_with_zone (*dt_end->value, get_timezone (client, dt_end->tzid));
-
-	if (dt_end_time == time_add_day_with_zone (dt_start_time, 1, timezone))
-		return TRUE;
-
-	return FALSE;
-}
-
-static gboolean
-process_multi_day (ECalConduitContext *ctxt, CalClientChange *ccc, GList **multi_uid, GList **multi_ccc)
-{
-	CalComponentDateTime dt_start, dt_end;
-	icaltimezone *tz_start, *tz_end;
-	time_t event_start, event_end, day_end;
-	struct icaltimetype *old_start_value, *old_end_value;
-	const char *uid;
-	gboolean last = FALSE;
-	gboolean ret = TRUE;
-
-	*multi_ccc = NULL;
-	*multi_uid = NULL;
-	
-	if (ccc->type == CAL_CLIENT_CHANGE_DELETED)
-		return FALSE;
-
-	/* Start time */
-	cal_component_get_dtstart (ccc->comp, &dt_start);
-	if (dt_start.value->is_date)
-		tz_start = ctxt->timezone;
-	else
-		tz_start = get_timezone (ctxt->client, dt_start.tzid);
-	event_start = icaltime_as_timet_with_zone (*dt_start.value, tz_start);
-
-	cal_component_get_dtend (ccc->comp, &dt_end);
-	if (dt_end.value->is_date)
-		tz_end = ctxt->timezone;
-	else
-		tz_end = get_timezone (ctxt->client, dt_end.tzid);
-	event_end = icaltime_as_timet_with_zone (*dt_end.value, tz_end);
-
-	day_end = time_day_end_with_zone (event_start, ctxt->timezone);			
-	if (day_end >= event_end) {
-		ret = FALSE;
-		goto cleanup;
-	} else if (cal_component_has_recurrences (ccc->comp)) {
-		ret = TRUE;
-		goto cleanup;
-	}
-
-	old_start_value = dt_start.value;
- 	old_end_value = dt_end.value;
-	while (!last) {
-		CalComponent *clone = cal_component_clone (ccc->comp);
-		char *new_uid = cal_component_gen_uid ();
-		struct icaltimetype start_value, end_value;
-		CalClientChange *c = g_new0 (CalClientChange, 1);
-		
-		if (day_end >= event_end) {
-			day_end = event_end;
-			last = TRUE;
-		}
-
-		cal_component_set_uid (clone, new_uid);
-
-		start_value = icaltime_from_timet_with_zone (event_start, FALSE, tz_start);
-		dt_start.value = &start_value;
-		cal_component_set_dtstart (clone, &dt_start);
-		
-		end_value = icaltime_from_timet_with_zone (day_end, FALSE, tz_end);
-		dt_end.value = &end_value;
-		cal_component_set_dtend (clone, &dt_end);
-
-		cal_client_update_object (ctxt->client, clone);
-
-		c->comp = clone;
-		c->type = CAL_CLIENT_CHANGE_ADDED;
-		
-		*multi_ccc = g_list_prepend (*multi_ccc, c);
-		*multi_uid = g_list_prepend (*multi_uid, new_uid);
-
-		event_start = day_end;
-		day_end = time_day_end_with_zone (event_start, ctxt->timezone);
-	}
-	dt_start.value = old_start_value;
-	dt_end.value = old_end_value;
-	
-	cal_component_get_uid (ccc->comp, &uid);
-	cal_client_remove_object (ctxt->client, uid);
-	ccc->type = CAL_CLIENT_CHANGE_DELETED;
-
- cleanup:
-	cal_component_free_datetime (&dt_start);
-	cal_component_free_datetime (&dt_end);
-
-	return ret;
-}
-
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert ((pos > 0 && pos <= 5) || (pos == -1));
-
-	return ((abs (pos) * 8) + weekday) * (pos < 0 ? -1 : 1);
-}
-
-static GList *
-next_changed_item (ECalConduitContext *ctxt, GList *changes) 
-{
-	CalClientChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		cal_component_get_uid (ccc->comp, &uid);
-		if (g_hash_table_lookup (ctxt->changed_hash, uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
-{
-	CalClientChange *ccc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ccc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ccc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ccc->type) {
-	case CAL_CLIENT_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;
-		
-	case CAL_CLIENT_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-		
-	case CAL_CLIENT_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (ECalLocalRecord *local,
-			      ECalConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	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, *edl = NULL, *l;
-	CalComponentText *description;
-	CalComponentDateTime dt_start, dt_end;
-	CalComponentClassification classif;
-	icaltimezone *default_tz = ctxt->timezone;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-	
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Appointment appt;		
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&appt, 0, sizeof (struct Appointment));
-			unpack_Appointment (&appt, record, 0xffff);
-			local->appt->alarm = appt.alarm;
-			local->appt->advance = appt.advance;
-			local->appt->advanceUnits = appt.advanceUnits;
-			free_Appointment (&appt);
-		}
-	}
-
-	/* 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 = e_pilot_utf8_to_pchar (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 = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->appt->note = NULL;
-	} else {
-		local->appt->note = NULL;
-	}
-
-	/* Start/End */
-	cal_component_get_dtstart (comp, &dt_start);
-	cal_component_get_dtend (comp, &dt_end);
-	if (dt_start.value) {
-		icaltimezone_convert_time (dt_start.value, 
-					   get_timezone (ctxt->client, dt_start.tzid),
-					   default_tz);
-		local->appt->begin = icaltimetype_to_tm (dt_start.value);
-	}
-	
-	if (dt_start.value && dt_end.value) {
-		if (is_all_day (ctxt->client, &dt_start, &dt_end)) {
-			local->appt->event = 1;
-		} else {
-			icaltimezone_convert_time (dt_end.value, 
-						   get_timezone (ctxt->client, dt_end.tzid),
-						   default_tz);
-			local->appt->end = icaltimetype_to_tm (dt_end.value);
-			local->appt->event = 0;
-		}
-	} else {
-		local->appt->event = 1;
-	}
-	cal_component_free_datetime (&dt_start);
-	cal_component_free_datetime (&dt_end);	
-
-	/* 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] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-				icalrecurrencetype_weekday wd;
-
-				wd = icalrecurrencetype_day_day_of_week (recur->by_day[i]);
-				local->appt->repeatDays[get_pilot_day (wd)] = 1;
-			}
-			
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			if (recur->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
-				local->appt->repeatType = repeatMonthlyByDate;
-				break;
-			}
-			
-			/* FIX ME Not going to work with -ve by_day */
-			local->appt->repeatType = repeatMonthlyByDay;
-			switch (icalrecurrencetype_day_position (recur->by_day[0])) {
-			case 1:
-				local->appt->repeatDay = dom1stSun;
-				break;
-			case 2:
-				local->appt->repeatDay = dom2ndSun;
-				break;
-			case 3:
-				local->appt->repeatDay = dom3rdSun;
-				break;
-			case 4:
-				local->appt->repeatDay = dom4thSun;
-				break;
-			case 5:
-				local->appt->repeatDay = domLastSun;
-				break;
-			}
-			local->appt->repeatDay += get_pilot_day (icalrecurrencetype_day_day_of_week (recur->by_day[0]));
-			break;
-		case ICAL_YEARLY_RECURRENCE:
-			local->appt->repeatType = repeatYearly;
-			break;
-		default:
-			break;
-		}
-
-		if (local->appt->repeatType != repeatNone) {
-			local->appt->repeatFrequency = recur->interval;
-		}
-		
-		if (icaltime_is_null_time (recur->until)) {
-			local->appt->repeatForever = 1;
-		} else {
-			local->appt->repeatForever = 0;
-			icaltimezone_convert_time (&recur->until, 
-						   icaltimezone_get_utc_timezone (),
-						   default_tz);
-			local->appt->repeatEnd = icaltimetype_to_tm (&recur->until);
-		}
-		
-		cal_component_free_recur_list (list);
-	}
-
-	/* Exceptions */
-	cal_component_get_exdate_list (comp, &edl);
-	local->appt->exceptions = g_slist_length (edl);
-	local->appt->exception = g_new0 (struct tm, local->appt->exceptions);	
-	for (l = edl, i = 0; l != NULL; l = l->next, i++) {
-		CalComponentDateTime *dt = l->data;
-
-		icaltimezone_convert_time (dt->value, 
-					   icaltimezone_get_utc_timezone (),
-					   default_tz);
-		*local->appt->exception = icaltimetype_to_tm (dt->value);
-	}
-	cal_component_free_exdate_list (edl);
-
-	/* Alarm */
-	local->appt->alarm = 0;
-	if (cal_component_has_alarms (comp)) {
-		GList *uids, *l;		
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-
-		uids = cal_component_get_alarm_uids (comp);
-		for (l = uids; l != NULL; l = l->next) {
-			alarm = cal_component_get_alarm (comp, l->data);
-			cal_component_alarm_get_trigger (alarm, &trigger);
-			
-			if ((trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START
-			     && trigger.u.rel_duration.is_neg)) {
-				local->appt->advanceUnits = advMinutes;
-				local->appt->advance = 
-					trigger.u.rel_duration.minutes
-					+ trigger.u.rel_duration.hours * 60
-					+ trigger.u.rel_duration.days * 60 * 24
-					+ trigger.u.rel_duration.weeks * 7 * 60 * 24;
-
-				if (local->appt->advance > PILOT_MAX_ADVANCE) {
-					local->appt->advanceUnits = advHours;
-					local->appt->advance = 
-						trigger.u.rel_duration.minutes / 60
-						+ trigger.u.rel_duration.hours
-						+ trigger.u.rel_duration.days * 24
-						+ trigger.u.rel_duration.weeks * 7 * 24;
-				}
-				if (local->appt->advance > PILOT_MAX_ADVANCE) {
-					local->appt->advanceUnits = advDays;
-					local->appt->advance =
-						trigger.u.rel_duration.minutes / (60 * 24)
-						+ trigger.u.rel_duration.hours / 24
-						+ trigger.u.rel_duration.days
-						+ trigger.u.rel_duration.weeks * 7;
-				}
-				if (local->appt->advance > PILOT_MAX_ADVANCE)
-					local->appt->advance = PILOT_MAX_ADVANCE;
-
-				local->appt->alarm = 1;
-				break;
-			}
-			cal_component_alarm_free (alarm);
-		}
-		cal_obj_uid_list_free (uids);
-	}
-	
-	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);
-		gtk_object_unref (GTK_OBJECT (comp));
-	} 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);
-		gtk_object_unref (GTK_OBJECT (comp));
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp,
-			 icaltimezone *timezone)
-{
-	CalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone), it;
-	struct icalrecurrencetype recur;
-	CalComponentText summary = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};
-	GSList *edl = NULL;	
-	char *txt;
-	int pos, i;
-	
-	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);
-	}
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (appt.description);
-	cal_component_set_summary (comp, &summary);
-	free (txt);
-
-	/* The iCal description field */
-	if (!appt.note) {
-		cal_component_set_description_list (comp, NULL);
-	} else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (appt.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (!is_empty_time (appt.begin)) {
-		it = tm_to_icaltimetype (&appt.begin, FALSE);
-		dt.value = &it;
-		cal_component_set_dtstart (comp, &dt);
-	}
-
-	if (appt.event) {
-		it = tm_to_icaltimetype (&appt.begin, FALSE);
-		icaltime_adjust (&it, 1, 0, 0, 0);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	} else if (!is_empty_time (appt.end)) {
-		it = tm_to_icaltimetype (&appt.end, 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;
-		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;
-		if (appt.repeatDay < domLastSun)
-			recur.by_day[0] = nth_weekday ((appt.repeatDay / 7) + 1, 
-						       get_ical_day (appt.repeatDay % 7));
-		else
-			recur.by_day[0] = nth_weekday (-1, get_ical_day (appt.repeatDay % 7));		
-		break;
-		
-	case repeatMonthlyByDate:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		recur.by_month_day[0] = appt.begin.tm_mday;
-		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.repeatForever) {
-			recur.until = tm_to_icaltimetype (&appt.repeatEnd, TRUE);
-		}
-
-		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);		
-	}
-
-	/* Exceptions */
-	for (i = 0; i < appt.exceptions; i++) {
-		struct tm ex;
-		CalComponentDateTime *dt = g_new0 (CalComponentDateTime, 1);
-
-		dt->value = g_new0 (struct icaltimetype, 1);
-		dt->tzid = NULL;		
-		
-		ex = appt.exception[i];
-		*dt->value = tm_to_icaltimetype (&ex, TRUE);
-		
-		edl = g_slist_prepend (edl, dt);
-	}
-	cal_component_set_exdate_list (comp, edl);
-	cal_component_free_exdate_list (edl);
-
-	/* Alarm */
-	if (appt.alarm) {
-		CalComponentAlarm *alarm = NULL;
-		CalAlarmTrigger trigger;
-		gboolean found = FALSE;
-		
-		if (cal_component_has_alarms (comp)) {
-			GList *uids, *l;
-			
-			uids = cal_component_get_alarm_uids (comp);
-			for (l = uids; l != NULL; l = l->next) {
-				alarm = cal_component_get_alarm (comp, l->data);
-				cal_component_alarm_get_trigger (alarm, &trigger);
-				if ((trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START
-				     && trigger.u.rel_duration.is_neg)) {
-					found = TRUE;
-					break;
-				}
-				cal_component_alarm_free (alarm);
-			}
-			cal_obj_uid_list_free (uids);
-		}
-		if (!found)
-			alarm = cal_component_alarm_new ();
-
-		memset (&trigger, 0, sizeof (CalAlarmTrigger));
-		trigger.type = CAL_ALARM_TRIGGER_RELATIVE_START;
-		trigger.u.rel_duration.is_neg = 1;
-		switch (appt.advanceUnits) {
-		case advMinutes:
-			trigger.u.rel_duration.minutes = appt.advance;
-			break;
-		case advHours:
-			trigger.u.rel_duration.hours = appt.advance;
-			break;
-		case advDays:
-			trigger.u.rel_duration.days = appt.advance;
-			break;
-		}
-		cal_component_alarm_set_trigger (alarm, trigger);
-		cal_component_alarm_set_action (alarm, CAL_ALARM_DISPLAY);
-
-		if (!found)
-			cal_component_add_alarm (comp, alarm);
-		cal_component_alarm_free (alarm);
-	}
-	
-	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);
-
-	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)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = cal_client_get_uri (ctxt->client);
-	LOG("  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>");
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-	
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG ("    doing slow sync\n");
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *removed = NULL, *added = NULL, *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	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);
-
-	ctxt->dbi = dbi;	
-	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 timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG ("  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone));
-	
-	/* Set the default timezone on the backend. */
-	if (ctxt->timezone)
-		cal_client_set_default_timezone (ctxt->client, ctxt->timezone);
-
-	/* Load the uid <--> pilot id mapping */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_EVENT);
-
-	/* Find the added, modified and deleted items */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	ctxt->changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_EVENT, change_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	/* See if we need to split up any events */
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalClientChange *ccc = l->data;
-		GList *multi_uid = NULL, *multi_ccc = NULL;
-		
-		if (process_multi_day (ctxt, ccc, &multi_uid, &multi_ccc)) {
-			ctxt->uids = g_list_concat (ctxt->uids, multi_uid);
-			
-			added = g_list_concat (added, multi_ccc);
-			removed = g_list_prepend (removed, ccc);
-		}
-	}
-
-	/* Remove the events that were split up */
-	g_list_concat (ctxt->changed, added);
-	for (l = removed; l != NULL; l = l->next) {
-		CalClientChange *ccc = l->data;
-		const char *uid;
-
-		cal_component_get_uid (ccc->comp, &uid);
-		if (e_pilot_map_lookup_pid (ctxt->map, uid, FALSE) == 0) {
-			ctxt->changed = g_list_remove (ctxt->changed, ccc);
-			gtk_object_unref (GTK_OBJECT (ccc->comp));
-			g_free (ccc);
-		}
-	}
-	g_list_free (removed);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalClientChange *ccc = l->data;
-		const char *uid;
-		
-		cal_component_get_uid (ccc->comp, &uid);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ccc);
-
-			switch (ccc->type) {
-			case CAL_CLIENT_CHANGE_ADDED:
-				add_records++;
-				break;
-			case CAL_CLIENT_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case CAL_CLIENT_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == CAL_CLIENT_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-	
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_EVENT);
-	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);
-
-	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);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (cal_client_get_uri (ctxt->client));
-	calconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-	
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_EVENT, change_id);
-	cal_client_change_list_free (changed);
-	g_free (change_id);
-	
-	LOG ("---------------------------------------------------------\n");
-
-	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);
-			g_list_prepend (ctxt->locals, *local);
-
-			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);
-			g_list_prepend (ctxt->locals, *local);
-		} 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, -1);
-
-	if (*local == NULL) {
-		LOG ("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) {
-			CalClientChange *ccc = iterator->data;
-		
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CalClientChange *ccc = iterator->data;
-			
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} 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 (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	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, ctxt->timezone);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-	
-	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, ctxt->timezone);
-	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);
-
-	e_pilot_map_remove_by_uid (ctxt->map, 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, TRUE);
-	
-	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);
-
-	calconduit_destroy_record (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);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (ECalConduitContext *ctxt)
-{
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			ECalConduitContext *ctxt)
-{
-	LOG ("create_settings_window");
-
-	ctxt->ps = e_pilot_settings_new ();
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG ("display_settings");
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG ("save_settings");
-
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	
-	calconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG ("revert_settings");
-
-	calconduit_save_configuration (ctxt->cfg);
-	calconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = calconduit_dupe_configuration (ctxt->cfg);
-}
-
-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);
-
-	ctxt = e_calendar_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	/* Sync signals */
-	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);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	ECalConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (obj, "calconduit_context");
-	e_calendar_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index e75d889234..0000000000
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ /dev/null
@@ -1,9 +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="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
deleted file mode 100644
index 3ee063c770..0000000000
--- a/calendar/conduits/todo/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
-e-todo-conduit-control-applet
-e-todo-conduit-control-applet.desktop
-e-todo.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
deleted file mode 100644
index 036e4f153a..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_builddir)/calendar/cal-client	\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# ToDo Conduit
-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = 	\
-	todo-conduit.c
-
-libetodo_conduit_la_LDFLAGS = -module -avoid-version
-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.a				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/libwombat/libwombat-static.la	 		\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-todo.conduit: e-todo.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' 				\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp 		\
-	&& mv e-todo.conduit.tmp e-todo.conduit
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-todo.conduit
-
-EXTRA_DIST = \
-	e-todo.conduit.in
-
-install-data-local:
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index a7bea27a8f..0000000000
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ /dev/null
@@ -1,9 +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="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index a460bd6ebc..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1435 +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 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <cal-client/cal-client-types.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-todo.h>
-#include <libical/src/libical/icaltypes.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.4"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "etodoconduit"
-
-#define DEBUG_TODOCONDUIT 1
-/* #undef DEBUG_TODOCONDUIT */
-
-#ifdef DEBUG_TODOCONDUIT
-#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 _EToDoLocalRecord EToDoLocalRecord;
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-typedef struct _EToDoConduitGui EToDoConduitGui;
-typedef struct _EToDoConduitContext EToDoConduitContext;
-
-/* Local Record */
-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 */
-	struct ToDo *todo;
-};
-
-static void
-todoconduit_destroy_record (EToDoLocalRecord *local) 
-{
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	free_ToDo (local->todo);
-	g_free (local->todo);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _EToDoConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	gboolean secret;
-	gint priority;
-
-	gchar *last_uri;
-};
-
-static EToDoConduitCfg *
-todoconduit_load_configuration (guint32 pilot_id) 
-{
-	EToDoConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	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);
-
-	c->pilot_id = pilot_id;
-
-	management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-	
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->priority = gnome_config_get_int ("priority=3");
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-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 ("secret", c->secret);
-	gnome_config_set_int ("priority", c->priority);
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-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->pilot_id = c->pilot_id;
-
-	retval->secret = c->secret;
-	retval->priority = c->priority;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EToDoConduitGui {
-	GtkWidget *priority;
-};
-
-static EToDoConduitGui *
-e_todo_gui_new (EPilotSettings *ps) 
-{
-	EToDoConduitGui *gui;
-	GtkWidget *lbl;
-	GtkObject *adj;
-	gint rows;
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EToDoConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Priority:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	adj = gtk_adjustment_new (1, 1, 5, 1, 5, 5);
-	gui->priority = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gui->priority), TRUE);
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->priority, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->priority);
-	
-	return gui;
-}
-
-static void
-e_todo_gui_fill_widgets (EToDoConduitGui *gui, EToDoConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gui->priority), cfg->priority);
-}
-
-static void
-e_todo_gui_fill_config (EToDoConduitGui *gui, EToDoConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->priority = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (gui->priority));
-}
-
-static void
-e_todo_gui_destroy (EToDoConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EToDoConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EToDoConduitCfg *cfg;
-	EToDoConduitCfg *new_cfg;
-	EToDoConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct ToDoAppInfo ai;
-
-	CalClient *client;
-
-	icaltimezone *timezone;
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static EToDoConduitContext *
-e_todo_context_new (guint32 pilot_id) 
-{
-	EToDoConduitContext *ctxt = g_new0 (EToDoConduitContext, 1);
-
-	ctxt->cfg = todoconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = todoconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->client = NULL;
-	ctxt->uids = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static gboolean
-e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-	
-	return TRUE;
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		todoconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		todoconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_todo_gui_destroy (ctxt->gui);
-	
-	if (ctxt->client != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->client));
-
-	if (ctxt->uids != NULL)
-		cal_obj_uid_list_free (ctxt->uids);
-
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_todo_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			todoconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->changed != NULL)
-		cal_client_change_list_free (ctxt->changed);
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EToDoLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->todo && local->todo->description) {
-		g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
-			    local->todo->indefinite,
-			    mktime (& local->todo->due),
-			    local->todo->priority,
-			    local->todo->complete,
-			    local->todo->description ?
-			    local->todo->description : "",
-			    local->todo->note ?
-			    local->todo->note : "");
-		return buff;
-	}
-
-	return "";
-}
-
-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);
-
-	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
-		    todo.indefinite,
-		    mktime (&todo.due),
-		    todo.priority,
-		    todo.complete,
-		    todo.description ?
-		    todo.description : "",
-		    todo.note ?
-		    todo.note : "");
-
-	free_ToDo (&todo);
-	
-	return buff;
-}
-
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	gboolean *success = data;
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		*success = TRUE;
-	} else {
-		*success = FALSE;
-		WARN ("Failed to open calendar!\n");
-	}
-	
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	gboolean success = FALSE;
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened",
-			    start_calendar_server_cb, &success);
-
-	if (!cal_client_open_default_tasks (ctxt->client,  FALSE))
-		return -1;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-	
-	if (success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static icaltimezone *
-get_timezone (CalClient *client, const char *tzid) 
-{
-	icaltimezone *timezone = NULL;
-
-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (timezone == NULL)
-		 cal_client_get_timezone (client, tzid, &timezone);
-	
-	return timezone;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	Bonobo_ConfigDatabase db;
-	icaltimezone *timezone = NULL;
-	char *location;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return NULL;
- 	}
-
-	CORBA_exception_free (&ev);
-
-	location = bonobo_config_get_string_with_default (db,
-		"/Calendar/Display/Timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	bonobo_object_release_unref (db, NULL);
-
-	return timezone;	
-}
-
-static char *
-map_name (EToDoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Tasks/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static GList *
-next_changed_item (EToDoConduitContext *ctxt, GList *changes) 
-{
-	CalClientChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		cal_component_get_uid (ccc->comp, &uid);
-		if (g_hash_table_lookup (ctxt->changed_hash, uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
-{
-	CalClientChange *ccc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ccc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ccc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ccc->type) {
-	case CAL_CLIENT_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case CAL_CLIENT_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case CAL_CLIENT_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EToDoLocalRecord *local,
-			      EToDoConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	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;
-	icalproperty_status status;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime due;
-	CalComponentClassification classif;
-	icaltimezone *default_tz = get_default_timezone ();
-	
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* Don't overwrite the category */
-	if (local->local.ID != 0) {
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;			
-		}
-	}
-
-	/* 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 = e_pilot_utf8_to_pchar (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 = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->todo->note = NULL;
-	} else {
-		local->todo->note = NULL;
-	}
-
-	cal_component_get_due (comp, &due);	
-	if (due.value) {
-		icaltimezone_convert_time (due.value,
-					   get_timezone (ctxt->client, due.tzid),
-					   default_tz);
-		local->todo->due = icaltimetype_to_tm (due.value);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-	cal_component_free_datetime (&due);	
-
-	cal_component_get_status (comp, &status);	
-	if (status == ICAL_STATUS_COMPLETED)
-		local->todo->complete = 1;
-	else
-		local->todo->complete = 0;
-	
-	cal_component_get_priority (comp, &priority);
-	if (priority && *priority != 0) {
-		if (*priority <= 3)
-			local->todo->priority = 1;
-		else if (*priority == 4)
-			local->todo->priority = 2;
-		else if (*priority == 5)
-			local->todo->priority = 3;
-		else if (*priority <= 7)
-			local->todo->priority = 4;
-		else
-			local->todo->priority = 5;
-		
-		cal_component_free_priority (priority);
-	} else {
-		local->todo->priority = ctxt->cfg->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);
-		gtk_object_unref (GTK_OBJECT (comp));
-	} 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);
-		gtk_object_unref (GTK_OBJECT (comp));
-	} else {
-		INFO ("Object did not exist");
-	}
-
-
-}
-
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp,
-			 icaltimezone *timezone)
-{
-	CalComponent *comp;
-	struct ToDo todo;
-	CalComponentText summary = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};
-	struct icaltimetype due, now;
-	icaltimezone *utc_zone;
-	int priority;
-	char *txt;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	utc_zone = icaltimezone_get_utc_timezone ();
-	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-					     utc_zone);
-
-	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);
-	}
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (todo.description);
-	cal_component_set_summary (comp, &summary);
-	free (txt);
-	
-	/* The iCal description field */
-	if (!todo.note) {
-		cal_component_set_comment_list (comp, NULL);
-	} else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (todo.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (todo.complete) {
-		int percent = 100;
-
-		cal_component_set_completed (comp, &now);
-		cal_component_set_percent (comp, &percent);
-		cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
-	} else {
-		int *percent = NULL;
-		icalproperty_status status;
-		
-		cal_component_set_completed (comp, NULL);
-		
-		cal_component_get_percent (comp, &percent);
-		if (percent == NULL || *percent == 100) {
-			int p = 0;
-			cal_component_set_percent (comp, &p);
-		}
-		if (percent != NULL)
-			cal_component_free_percent (percent);
-
-		cal_component_get_status (comp, &status);
-		if (status == ICAL_STATUS_COMPLETED)
-			cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
-	}
-
-	if (!is_empty_time (todo.due)) {
-		due = tm_to_icaltimetype (&todo.due, FALSE);
-		dt.value = &due;
-		cal_component_set_due (comp, &dt);
-	}
-
-	switch (todo.priority) {
-	case 1:
-		priority = 3;
-		break;
-	case 2:
-		priority = 4;
-		break;
-	case 3:
-		priority = 5;
-		break;
-	case 4:
-		priority = 7;
-		break;
-	default:
-		priority = 9;
-	}
-	
-	cal_component_set_priority (comp, &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);
-
-	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)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are no objects or objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = cal_client_get_uri (ctxt->client);
-	LOG("  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>");
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG ("    doing slow sync\n");
-	} 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, *change_id;
-	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->dbi = dbi;	
-	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 timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG ("  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone));
-
-	/* Load the uid <--> pilot id map */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_TODO);
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	ctxt->changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_TODO, change_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalClientChange *ccc = l->data;
-		const char *uid;
-		
-		cal_component_get_uid (ccc->comp, &uid);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-			
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ccc);
-			
-			switch (ccc->type) {
-			case CAL_CLIENT_CHANGE_ADDED:
-				add_records++;
-				break;
-			case CAL_CLIENT_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case CAL_CLIENT_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == CAL_CLIENT_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-
-	/* 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);
-
-	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);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-
-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (cal_client_get_uri (ctxt->client));
-	todoconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_TODO, change_id);
-	cal_client_change_list_free (changed);
-	g_free (change_id);
-	
-	LOG ("---------------------------------------------------------\n");
-
-	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);
-			g_list_prepend (ctxt->locals, *local);
-			
-			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);
-			g_list_prepend (ctxt->locals, *local);
-		} 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 ("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) {
-			CalClientChange *ccc = iterator->data;
-		
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CalClientChange *ccc = iterator->data;
-			
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);			
-			g_list_prepend (ctxt->locals, *local);
-		} 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 (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	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, ctxt->timezone);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	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, ctxt->timezone);
-	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);
-
-	e_pilot_map_remove_by_uid (ctxt->map, 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, TRUE);
-	
-	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);
-
-	todoconduit_destroy_record (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);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EToDoConduitContext *ctxt)
-{
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_todo_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EToDoConduitContext *ctxt)
-{
-	LOG ("create_settings_window");
-
-	ctxt->ps = e_pilot_settings_new ();
-	ctxt->gui = e_todo_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG ("display_settings");
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG ("save_settings");
-
-	ctxt->new_cfg->secret = e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_todo_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-	
-	todoconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG ("revert_settings");
-
-	todoconduit_save_configuration (ctxt->cfg);
-	todoconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = todoconduit_dupe_configuration (ctxt->cfg);
-}
-
-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);
-
-	ctxt = e_todo_context_new (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);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	EToDoConduitContext *ctxt;
-	
-	ctxt = gtk_object_get_data (obj, "todoconduit_context");
-	e_todo_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index cd98cc234e..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-.pure
-evolution-calendar
-evolution-calendar.pure
-evolution-calendar.h
-evolution-calendar-common.c
-evolution-calendar-skels.c
-evolution-calendar-stubs.c
-*.lo
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
-Evolution-Composer-common.c
-Evolution-Composer-skels.c
-Evolution-Composer-stubs.c
-Evolution-Composer.h
-GNOME_Evolution_Calendar_Control.oaf
-GNOME_Evolution_Calendar.oaf
-GNOME_Evolution_Calendar_gnomecal.oaf
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
deleted file mode 100644
index ce53fba7e6..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ /dev/null
@@ -1,200 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
-
-	<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:GNOME_Evolution_Calendar_ShellComponent"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/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:GNOME_Evolution_Calendar_Summary_ComponentFactory"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Summary_Component"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Evolution Tasks control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/tasks-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A Bonobo control which displays a task list."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to create a component editor factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to centralize calendar component editor dialogs"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:title" type="string"
-		       _value="Calendar and Tasks"/>
-
-	<oaf_attribute name="evolution:config_item:description" type="string"
-		       _value="This page can be used to configure Calendar and Task preferences"/>
-
-	<oaf_attribute name="evolution:config_item:icon_name" type="string"
-		       value="evolution-calendar.png"/>
-
-	<oaf_attribute name="evolution:config_item:type" type="stringv">
-		<item value="calendar"/>
-		<item value="tasks"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
-    
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Calendar."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index 20e2207907..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,213 +0,0 @@
-## CORBA stuff
-
-IDLS =												   	\
-	$(top_srcdir)/composer/Evolution-Composer.idl						  	\
-	$(top_srcdir)/calendar/idl/evolution-calendar.idl						\
-	$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED =                 			\
-        Evolution-Composer.h              		\
-        Evolution-Composer-common.c       		\
-        Evolution-Composer-skels.c        		\
-        Evolution-Composer-stubs.c			\
-	Evolution-Addressbook-SelectNames.h		\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c	\
-	evolution-calendar.h				\
-	evolution-calendar-common.c			\
-	evolution-calendar-skels.c			\
-	evolution-calendar-stubs.c
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                $(srcdir)/../../composer/Evolution-Composer.idl
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-
-BUILT_SOURCES = $(IDL_GENERATED)
-
-SUBDIRS = alarm-notify 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)/calendar/cal-client			\
-	-I$(top_builddir)/calendar/cal-client			\
-	-I$(top_srcdir)/libical/src/libical			\
-	-I$(top_builddir)/libical/src/libical			\
-	-I$(top_srcdir)/addressbook/backend/ebook		\
-	-I$(top_builddir)/addressbook/backend/ebook		\
-	-I$(top_srcdir)/widgets					\
-	-I$(includedir)						\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-        -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"        	\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-iconsdir = $(datadir)/images/evolution
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = 					\
-	e-itip-control.glade			\
-	goto-dialog.glade
-
-etspecdir = $(datadir)/evolution/etspec/
-etspec_DATA = e-calendar-table.etspec e-meeting-time-sel.etspec
-
-evolution_calendar_SOURCES =			\
-	$(IDL_GENERATED)			\
-	cal-search-bar.c			\
-	cal-search-bar.h			\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-model.c			\
-	calendar-model.h			\
-	calendar-offline-handler.c		\
-	calendar-offline-handler.h		\
-	calendar-view.c				\
-	calendar-view.h				\
-	calendar-view-factory.c			\
-	calendar-view-factory.h			\
-	comp-editor-factory.c			\
-	comp-editor-factory.h			\
-	comp-util.c				\
-	comp-util.h				\
-	config-control-factory.c		\
-	config-control-factory.h		\
-	control-factory.c			\
-	control-factory.h			\
-	component-factory.c			\
-	component-factory.h			\
-	e-calendar-table.h			\
-	e-calendar-table.c			\
-	e-cell-date-edit-text.h			\
-	e-cell-date-edit-text.c			\
-	e-day-view-layout.c			\
-	e-day-view-layout.h			\
-	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-attendee.c			\
-	e-meeting-attendee.h			\
-	e-meeting-model.c			\
-	e-meeting-model.h			\
-	e-meeting-time-sel.c			\
-	e-meeting-time-sel.h			\
-	e-meeting-time-sel-item.c		\
-	e-meeting-time-sel-item.h		\
-	e-meeting-types.h			\
-	e-meeting-utils.c			\
-	e-meeting-utils.h			\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-layout.c			\
-	e-week-view-layout.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				\
-	e-tasks.c				\
-	e-tasks.h				\
-	e-timezone-entry.c			\
-	e-timezone-entry.h			\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	goto.c					\
-	goto.h					\
-	itip-control-factory.c			\
-	itip-control-factory.h			\
-	itip-utils.c				\
-	itip-utils.h				\
-	main.c					\
-	misc.c					\
-	misc.h					\
-	print.c					\
-	print.h					\
-	tag-calendar.c				\
-	tag-calendar.h				\
-	tasks-control-factory.c			\
-	tasks-control-factory.h			\
-	tasks-control.c				\
-	tasks-control.h				\
-	tasks-migrate.c				\
-	tasks-migrate.h				\
-	weekday-picker.c			\
-	weekday-picker.h
-
-evolution_calendar_LDADD =								\
-	alarm-notify/libalarm.a								\
-	$(DB3_LDADD)									\
-	$(top_builddir)/widgets/menus/libmenus.la					\
-	$(top_builddir)/shell/libeshell.la						\
-	$(top_builddir)/calendar/cal-client/libcal-client.la				\
-	$(top_builddir)/calendar/cal-util/libcal-util.la				\
-	$(top_builddir)/e-util/libeutil.la						\
-	$(top_builddir)/libical/src/libical/libical-evolution.la			\
-	$(top_builddir)/libwombat/libwombat.la						\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
-	$(top_builddir)/camel/libcamel.la						\
-	$(top_builddir)/libversit/libversit.a						\
-	$(top_builddir)/e-util/ename/libename.la					\
-	dialogs/libcal-dialogs.a							\
-	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a					\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-evolution_calendar_LDFLAGS = -export-dynamic
-
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Calendar.oaf.in
-
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-EXTRA_DIST =	 			\
-	$(glade_DATA)			\
-	$(etspec_DATA)			\
-	$(oaf_in_files)
-
-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
-
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/gui/alarm-notify/.cvsignore b/calendar/gui/alarm-notify/.cvsignore
deleted file mode 100644
index 479589e914..0000000000
--- a/calendar/gui/alarm-notify/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-evolution-alarm-notify
-GNOME_Evolution_Calendar_AlarmNotify.oaf
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
deleted file mode 100644
index 86f5c71493..0000000000
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
-            type="exe"
-            location="evolution-alarm-notify">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the alarm notification service"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
-
-	<oaf_attribute name="description" type="string"
-                       _value="Alarm notification service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
deleted file mode 100644
index 6d77398ade..0000000000
--- a/calendar/gui/alarm-notify/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-bin_PROGRAMS = evolution-alarm-notify
-
-noinst_LIBRARIES = libalarm.a
-
-libalarm_a_SOURCES =	\
-	alarm.c		\
-	alarm.h
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"evolution-alarm-notify\"	\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/widgets				\
-	-I$(includedir)					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-iconsdir = $(datadir)/images/evolution
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA =		\
-	alarm-notify.glade
-
-evolution_alarm_notify_SOURCES =	\
-	$(CORBA_GENERATED)		\
-	alarm-notify.c			\
-	alarm-notify.h			\
-	alarm-notify-dialog.c		\
-	alarm-notify-dialog.h		\
-	alarm-queue.c			\
-	alarm-queue.h			\
-	config-data.c			\
-	config-data.h			\
-	notify-main.c			\
-	save.c				\
-	save.h
-
-evolution_alarm_notify_LDADD =						\
-	libalarm.a							\
-	$(top_builddir)/calendar/cal-client/libcal-client.la		\
-	$(top_builddir)/calendar/cal-util/libcal-util.la		\
-	$(top_builddir)/libical/src/libical/libical-evolution.la	\
-	$(top_builddir)/libwombat/libwombat.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-evolution_alarm_notify_LDFLAGS = -export-dynamic
-
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Calendar_AlarmNotify.oaf.in
-
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-EXTRA_DIST =		\
-	$(oaf_DATA)	\
-	$(oaf_in_files)	\
-	$(glade_DATA)
-
-BUILT_SOURCES = $(CORBA_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 2ad6783cf9..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtklabel.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-winhints.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <glade/glade.h>
-#include <e-util/e-time-utils.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-scroll-frame.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include "cal-util/timeutil.h"
-#include "alarm-notify-dialog.h"
-#include "config-data.h"
-
-
-GtkWidget *make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow);
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *message;
-	GtkWidget *snooze_time;
-	GtkWidget *html;
-
-	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);
-}
-
-static void
-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)
-{
-
-	if (!strncmp ("file:///", url, strlen ("file:///"))) {
-		FILE *fp;
-		const char *filename = url + strlen ("file://");
-		char buf[4096];
-		size_t len;
-
-		fp = fopen (filename, "r");
-
-		if (fp == NULL) {
-			g_warning ("Error opening image: %s\n", url);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-			return;
-		}
-
-		while ((len = fread (buf, 1, sizeof(buf), fp)) > 0)
-			gtk_html_stream_write (stream, buf, len);
-
-		if (feof (fp)) {
-			fclose (fp);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-			return;
-		}
-
-		fclose (fp);
-	}
-
-	g_warning ("Error loading image");
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-	return;
-}
-
-GtkWidget *
-make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow)
-{
-	GtkWidget *html, *frame;
-
-	gtk_widget_push_visual(gdk_rgb_get_visual());
-	gtk_widget_push_colormap(gdk_rgb_get_cmap());
-
-	html = gtk_html_new();
-
-	gtk_html_set_default_content_type (GTK_HTML (html),
-					   "charset=utf-8");
-	gtk_html_load_empty (GTK_HTML (html));
-
-	gtk_signal_connect (GTK_OBJECT (html), "url_requested",
-			    GTK_SIGNAL_FUNC (url_requested_cb),
-			    NULL);
-
-	gtk_widget_pop_colormap();
-	gtk_widget_pop_visual();
-
-	frame = e_scroll_frame_new(NULL, NULL);
-
-	e_scroll_frame_set_policy(E_SCROLL_FRAME(frame),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-
-
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (frame),
-					GTK_SHADOW_IN);
-
-	gtk_widget_set_usize (frame, 300, 200);
-
-	gtk_container_add(GTK_CONTAINER (frame), html);
-
-	gtk_widget_show_all(frame);
-
-	gtk_object_set_user_data(GTK_OBJECT (frame), html);
-	return frame;
-}
-
-static void
-write_times (GtkHTMLStream *stream, char *start, char *end)
-{
-	if (start)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", U_("Starting:"), start);
-	if (end)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", U_("Ending:"), end);
-
-}
-
-/* Converts a time_t to a string, relative to the specified timezone */
-static char *
-timet_to_str_with_zone (time_t t, icaltimezone *zone)
-{
-	struct icaltimetype itt;
-	struct tm tm;
-	char buf[256];
-
-	if (t == -1)
-		return g_strdup (_("invalid time"));
-
-	itt = icaltime_from_timet_with_zone (t, FALSE, zone);
-	tm = icaltimetype_to_tm (&itt);
-
-	e_time_format_date_and_time (&tm, config_data_get_24_hour_format (),
-				     FALSE, FALSE, buf, sizeof (buf));
-	return g_strdup (buf);
-}
-
-/* Creates a heading for the alarm notification dialog */
-static void
-write_html_heading (GtkHTMLStream *stream, const char *message,
-		    CalComponentVType vtype, time_t occur_start, time_t occur_end)
-{
-	char *buf;
-	char *start, *end;
-	char *bg_path = "file://" EVOLUTION_ICONSDIR "/bcg.png";
-	char *image_path = "file://" EVOLUTION_ICONSDIR "/alarm.png";
-	icaltimezone *current_zone;
-
-	/* Stringize the times */
-
-	current_zone = config_data_get_timezone ();
-
-	buf = timet_to_str_with_zone (occur_start, current_zone);
-	start = e_utf8_from_locale_string (buf);
-	g_free (buf);
-
-	buf = timet_to_str_with_zone (occur_end, current_zone);
-	end = e_utf8_from_locale_string (buf);
-	g_free (buf);
-
-	/* Write the header */
-
-	gtk_html_stream_printf (stream,
-				"<HTML><BODY background=\"%s\">"
-				"<TABLE WIDTH=\"100%%\">"
-				"<TR>"
-				"<TD><IMG SRC=\"%s\" ALIGN=\"top\" BORDER=\"0\"></TD>"
-				"<TD><H1>%s</H1></TD>"
-				"</TR>"
-				"</TABLE>",
-				bg_path,
-				image_path,
-				U_("Evolution Alarm"));
-
-	gtk_html_stream_printf (stream, "<br><br><font size=\"+2\">%s</font><br><br>", message);
-
-	/* Write the times */
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		write_times (stream, start, end);
-		break;
-
-	case CAL_COMPONENT_TODO:
-		write_times (stream, start, end);
-		break;
-
-	default:
-		/* Only VEVENTs and VTODOs can have alarms */
-		g_assert_not_reached ();
-		break;
-	}
-
-	g_free (start);
-	g_free (end);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur_start: Start of occurrence time for the event.
- * @occur_end: End of occurrence time for the event.
- * @vtype: Type of the component which corresponds to the alarm.
- * @message; Message to display in the dialog; usually comes from the component.
- * @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_start, time_t occur_end,
-		     CalComponentVType vtype, const char *message,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	GtkHTMLStream *stream;
-	icaltimezone *current_zone;
-	char *buf, *title;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-
-	/* Only VEVENTs or VTODOs can have alarms */
-	g_return_val_if_fail (vtype == CAL_COMPONENT_EVENT || vtype == CAL_COMPONENT_TODO, FALSE);
-	g_return_val_if_fail (message != NULL, 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->message = glade_xml_get_widget (an->xml, "message");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-	an->html = gtk_object_get_user_data (GTK_OBJECT (glade_xml_get_widget (an->xml, "frame")));
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->message
-	      && 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 */
-
-	current_zone = config_data_get_timezone ();
-
-	buf = timet_to_str_with_zone (trigger, current_zone);
-	title = g_strdup_printf (_("Alarm on %s"), buf);
-	g_free (buf);
-
-	gtk_window_set_title (GTK_WINDOW (an->dialog), title);
-	g_free (title);
-
-	/* html heading */
-	stream = gtk_html_begin (GTK_HTML (an->html));
-	write_html_heading (stream, message, vtype, occur_start, occur_end);
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-
-	/* 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! */
-
-	if (!GTK_WIDGET_REALIZED (an->dialog))
-		gtk_widget_realize (an->dialog);
-
-	gnome_win_hints_set_state (an->dialog, WIN_STATE_STICKY);
-	gnome_win_hints_set_layer (an->dialog, WIN_LAYER_ONTOP);
-	gnome_window_icon_set_from_file (GTK_WINDOW (an->dialog), EVOLUTION_ICONSDIR "/alarm.png");
-
-	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 812463de8d..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_start, time_t occur_end,
-			      CalComponentVType vtype, const char *message,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
deleted file mode 100644
index 7dbb77ceeb..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <cal-client/cal-client.h>
-#include "alarm-notify.h"
-#include "alarm-queue.h"
-#include "save.h"
-#include "e-util/e-url.h"
-
-
-
-/* A loaded client */
-typedef struct {
-	/* The actual client */
-	CalClient *client;
-
-	/* The URI of the client in gnome-vfs's format.  This *is* the key that
-	 * is stored in the uri_client_hash hash table below.
-	 */
-	EUri *uri;
-
-	/* Number of times clients have requested this URI to be added to the
-	 * alarm notification system.
-	 */
-	int refcount;
-} LoadedClient;
-
-/* Private part of the AlarmNotify structure */
-struct _AlarmNotifyPrivate {
-	/* Mapping from EUri's to LoadedClient structures */
-	GHashTable *uri_client_hash;
-};
-
-
-
-static void alarm_notify_class_init (AlarmNotifyClass *class);
-static void alarm_notify_init (AlarmNotify *an);
-static void alarm_notify_destroy (GtkObject *object);
-
-static void AlarmNotify_addCalendar (PortableServer_Servant servant,
-				     const CORBA_char *str_uri,
-				     CORBA_Environment *ev);
-static void AlarmNotify_removeCalendar (PortableServer_Servant servant,
-					const CORBA_char *str_uri,
-					CORBA_Environment *ev);
-
-
-static BonoboXObjectClass *parent_class;
-
-
-
-BONOBO_X_TYPE_FUNC_FULL (AlarmNotify,
-			 GNOME_Evolution_Calendar_AlarmNotify,
-			 BONOBO_X_OBJECT_TYPE,
-			 alarm_notify);
-
-/* Class initialization function for the alarm notify service */
-static void
-alarm_notify_class_init (AlarmNotifyClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);
-
-	class->epv.addCalendar = AlarmNotify_addCalendar;
-	class->epv.removeCalendar = AlarmNotify_removeCalendar;
-
-	object_class->destroy = alarm_notify_destroy;
-}
-
-/* Object initialization function for the alarm notify system */
-static void
-alarm_notify_init (AlarmNotify *an)
-{
-	AlarmNotifyPrivate *priv;
-
-	priv = g_new0 (AlarmNotifyPrivate, 1);
-	an->priv = priv;
-
-	priv->uri_client_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-/* Callback used from g_hash-table_forach(), used to destroy a loade client */
-static void
-destroy_loaded_client_cb (gpointer key, gpointer value, gpointer data)
-{
-	LoadedClient *lc;
-	char *str_uri;
-
-	str_uri = key;
-	lc = value;
-	
-	g_free (str_uri);
-	gtk_object_unref (GTK_OBJECT (lc->client));
-	e_uri_free (lc->uri);
-	g_free (lc);
-}
-
-/* Destroy handler for the alarm notify system */
-static void
-alarm_notify_destroy (GtkObject *object)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_ALARM_NOTIFY (object));
-
-	an = ALARM_NOTIFY (object);
-	priv = an->priv;
-
-	g_hash_table_foreach (priv->uri_client_hash, destroy_loaded_client_cb, NULL);
-
-	g_hash_table_destroy (priv->uri_client_hash);
-	priv->uri_client_hash = NULL;
-
-	g_free (priv);
-	an->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Looks for a canonicalized URI inside an array of URIs; returns the index
- * within the array or -1 if not found.
- */
-static int
-find_uri_index (GPtrArray *uris, const char *str_uri)
-{
-	int i;
-
-	for (i = 0; i < uris->len; i++) {
-		char *uri;
-
-		uri = uris->pdata[i];
-		if (strcmp (uri, str_uri) == 0)
-			break;
-	}
-
-	if (i == uris->len)
-		return -1;
-	else
-		return i;
-}
-
-/* Frees an array of URIs and the URIs within it. */
-static void
-free_uris (GPtrArray *uris)
-{
-	int i;
-
-	for (i = 0; i < uris->len; i++) {
-		char *uri;
-
-		uri = uris->pdata[i];
-		g_free (uri);
-	}
-
-	g_ptr_array_free (uris, TRUE);
-}
-
-/* Adds an URI to the list of calendars to load on startup */
-static void
-add_uri_to_load (EUri *uri)
-{
-	char *str_uri;
-	GPtrArray *loaded_uris;
-	int i;
-
-	/* Canonicalize the URI */
-	str_uri = e_uri_to_string (uri, FALSE);
-	g_assert (str_uri != NULL);
-
-	loaded_uris = get_calendars_to_load ();
-	if (!loaded_uris) {
-		g_message ("add_uri_to_load(): Could not get the list of calendars to load; "
-			   "will not add `%s'", str_uri);
-		g_free (str_uri);
-		return;
-	}
-
-	/* Look for the URI in the list of calendars to load */
-
-	i = find_uri_index (loaded_uris, str_uri);
-
-	/* We only need to add the URI if we didn't find it among the list of
-	 * calendars.
-	 */
-	if (i != -1) {
-		g_free (str_uri);
-		free_uris (loaded_uris);
-		return;
-	}
-
-	g_ptr_array_add (loaded_uris, str_uri);
-	save_calendars_to_load (loaded_uris);
-
-	free_uris (loaded_uris);
-}
-
-/* Removes an URI from the list of calendars to load on startup */
-static void
-remove_uri_to_load (EUri *uri)
-{
-	char *str_uri;
-	GPtrArray *loaded_uris;
-	char *loaded_uri;
-	int i;
-
-	/* Canonicalize the URI */
-	str_uri = e_uri_to_string (uri, FALSE);
-	g_assert (str_uri != NULL);
-
-	loaded_uris = get_calendars_to_load ();
-	if (!loaded_uris) {
-		g_message ("remove_uri_to_load(): Could not get the list of calendars to load; "
-			   "will not add `%s'", str_uri);
-		g_free (str_uri);
-		return;
-	}
-
-	/* Look for the URI in the list of calendars to load */
-
-	i = find_uri_index (loaded_uris, str_uri);
-	g_free (str_uri);
-
-	/* If we didn't find it, there is no need to remove it */
-	if (i == -1) {
-		free_uris (loaded_uris);
-		return;
-	}
-
-	loaded_uri = loaded_uris->pdata[i];
-	g_free (loaded_uri);
-
-	g_ptr_array_remove_index (loaded_uris, i);
-	save_calendars_to_load (loaded_uris);
-
-	free_uris (loaded_uris);
-}
-
-/* AlarmNotify::addCalendar method */
-static void
-AlarmNotify_addCalendar (PortableServer_Servant servant,
-			 const CORBA_char *str_uri,
-			 CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	alarm_notify_add_calendar (an, str_uri, TRUE, ev);
-}
-
-/* AlarmNotify::removeCalendar method */
-static void
-AlarmNotify_removeCalendar (PortableServer_Servant servant,
-			    const CORBA_char *str_uri,
-			    CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-	LoadedClient *lc;
-	EUri *uri;
-	char *orig_str;
-	gboolean found;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	uri = e_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	remove_uri_to_load (uri);
-
-	found = g_hash_table_lookup_extended (priv->uri_client_hash, str_uri,
-					      (gpointer *) &orig_str,
-					      (gpointer *) &lc);
-	e_uri_free (uri);
-
-	if (!lc) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound,
-				     NULL);
-		return;
-	}
-
-	g_assert (lc->refcount > 0);
-
-	lc->refcount--;
-	if (lc->refcount > 0)
-		return;
-
-	g_hash_table_remove (priv->uri_client_hash, str_uri);
-
-	g_free (orig_str);
-	gtk_object_unref (GTK_OBJECT (lc->client));
-	e_uri_free (lc->uri);
-	g_free (lc);
-}
-
-
-
-/**
- * alarm_notify_new:
- * 
- * Creates a new #AlarmNotify object.
- * 
- * Return value: A newly-created #AlarmNotify, or NULL if its corresponding
- * CORBA object could not be created.
- **/
-AlarmNotify *
-alarm_notify_new (void)
-{
-	AlarmNotify *an;
-
-	an = gtk_type_new (TYPE_ALARM_NOTIFY);
-	return an;
-}
-
-/**
- * alarm_notify_add_calendar:
- * @an: An alarm notification service.
- * @uri: URI of the calendar to load.
- * @load_afterwards: Whether this calendar should be loaded in the future
- * when the alarm daemon starts up.
- * @ev: CORBA environment for exceptions.
- * 
- * Tells the alarm notification service to load a calendar and start monitoring
- * its alarms.  It can optionally be made to save the URI of this calendar so
- * that it can be loaded in the future when the alarm daemon starts up.
- **/
-void
-alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_afterwards,
-			   CORBA_Environment *ev)
-{
-	AlarmNotifyPrivate *priv;
-	EUri *uri;
-	CalClient *client;
-	LoadedClient *lc;
-
-	g_return_if_fail (an != NULL);
-	g_return_if_fail (IS_ALARM_NOTIFY (an));
-	g_return_if_fail (str_uri != NULL);
-	g_return_if_fail (ev != NULL);
-
-	priv = an->priv;
-
-	uri = e_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	if (load_afterwards)
-		add_uri_to_load (uri);
-
-	lc = g_hash_table_lookup (priv->uri_client_hash, str_uri);
-
-	if (lc) {
-		e_uri_free (uri);
-		g_assert (lc->refcount > 0);
-		lc->refcount++;
-		return;
-	}
-
-	client = cal_client_new ();
-
-	if (client) {
-		if (cal_client_open_calendar (client, str_uri, FALSE)) {
-			lc = g_new (LoadedClient, 1);
-			lc->client = client;
-			lc->uri = uri;
-			lc->refcount = 1;
-			g_hash_table_insert (priv->uri_client_hash,
-					     g_strdup (str_uri), lc);
-
-			alarm_queue_add_client (client);
-		} else {
-			gtk_object_unref (GTK_OBJECT (client));
-			client = NULL;
-		}
-	}
-
-	if (!client) {
-		e_uri_free (uri);
-
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError,
-				     NULL);
-		return;
-	}
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index e71828ca53..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,220 +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>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <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>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <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>message</name>
-	  <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>Custom</class>
-	  <name>frame</name>
-	  <creation_function>make_html_display</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 11 Oct 2001 08:19:04 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <can_focus>True</can_focus>
-	  <label>C_lose</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <can_focus>True</can_focus>
-	  <label>Snoo_ze</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <can_focus>True</can_focus>
-	  <label>_Edit appointment</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<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>
-	<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-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
deleted file mode 100644
index 858c3a7d87..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_H
-#define ALARM_NOTIFY_H
-
-#include <bonobo/bonobo-xobject.h>
-#include "evolution-calendar.h"
-
-
-
-#define TYPE_ALARM_NOTIFY            (alarm_notify_get_type ())
-#define ALARM_NOTIFY(obj)            (GTK_CHECK_CAST ((obj), TYPE_ALARM_NOTIFY, AlarmNotify))
-#define ALARM_NOTIFY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_ALARM_NOTIFY,		\
-				      AlarmNotifyClass))
-#define IS_ALARM_NOTIFY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_ALARM_NOTIFY))
-#define IS_ALARM_NOTIFY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_ALARM_NOTIFY))
-
-typedef struct _AlarmNotify AlarmNotify;
-typedef struct _AlarmNotifyClass AlarmNotifyClass;
-
-typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
-
-struct _AlarmNotify {
-	BonoboXObject xobject;
-
-	/* Private data */
-	AlarmNotifyPrivate *priv;
-};
-
-struct _AlarmNotifyClass {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_AlarmNotify__epv epv;
-};
-
-GtkType alarm_notify_get_type (void);
-
-AlarmNotify *alarm_notify_new (void);
-
-void alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_afterwards,
-				CORBA_Environment *ev);
-
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
deleted file mode 100644
index fd22649e71..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-object.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <cal-util/timeutil.h>
-#include "alarm.h"
-#include "alarm-notify-dialog.h"
-#include "alarm-queue.h"
-#include "config-data.h"
-#include "save.h"
-
-
-
-/* Whether the queueing system has been initialized */
-static gboolean alarm_queue_inited;
-
-/* When the alarm queue system is inited, this gets set to the last time an
- * alarm notification was issued.  This lets us present any notifications that
- * should have happened while the alarm daemon was not running.
- */
-static time_t saved_notification_time;
-
-/* Clients we are monitoring for alarms */
-static GHashTable *client_alarms_hash = NULL;
-
-/* Structure that stores a client we are monitoring */
-typedef struct {
-	/* Monitored client */
-	CalClient *client;
-
-	/* Number of times this client has been registered */
-	int refcount;
-
-	/* Hash table of component UID -> CompQueuedAlarms.  If an element is
-	 * present here, then it means its cqa->queued_alarms contains at least
-	 * one queued alarm.  When all the alarms for a component have been
-	 * dequeued, the CompQueuedAlarms structure is removed from the hash
-	 * table.  Thus a CQA exists <=> it has queued alarms.
-	 */
-	GHashTable *uid_alarms_hash;
-} ClientAlarms;
-
-/* Pair of a CalComponentAlarms and the mapping from queued alarm IDs to the
- * actual alarm instance structures.
- */
-typedef struct {
-	/* The parent client alarms structure */
-	ClientAlarms *parent_client;
-
-	/* The actual component and its alarm instances */
-	CalComponentAlarms *alarms;
-
-	/* List of QueuedAlarm structures */
-	GSList *queued_alarms;
-} CompQueuedAlarms;
-
-/* Pair of a queued alarm ID and the alarm trigger instance it refers to */
-typedef struct {
-	/* Alarm ID from alarm.h */
-	gpointer alarm_id;
-
-	/* Instance from our parent CompQueuedAlarms->alarms->alarms list */
-	CalAlarmInstance *instance;
-
-	/* Whether this is a snoozed queued alarm or a normal one */
-	guint snooze : 1;
-} QueuedAlarm;
-
-/* Alarm ID for the midnight refresh function */
-static gpointer midnight_refresh_id = NULL;
-
-static void display_notification (time_t trigger, CompQueuedAlarms *cqa,
-				  gpointer alarm_id, gboolean use_description);
-static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-
-
-
-/* Alarm queue engine */
-
-static void load_alarms_for_today (ClientAlarms *ca);
-static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data);
-
-/* Queues an alarm trigger for midnight so that we can load the next day's worth
- * of alarms.
- */
-static void
-queue_midnight_refresh (void)
-{
-	time_t midnight;
-	icaltimezone *zone;
-
-	g_assert (midnight_refresh_id == NULL);
-
-	zone = config_data_get_timezone ();
-
-	midnight = time_day_end_with_zone (time (NULL), zone);
-
-	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
-	if (!midnight_refresh_id) {
-		g_message ("queue_midnight_refresh(): Could not set up the midnight refresh alarm!");
-		/* FIXME: what to do? */
-	}
-}
-
-/* Loads a client's alarms; called from g_hash_table_foreach() */
-static void
-add_client_alarms_cb (gpointer key, gpointer value, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = value;
-	load_alarms_for_today (ca);
-}
-
-/* Loads the alarms for the new day every midnight */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	/* Re-load the alarms for all clients */
-
-	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
-
-	/* Re-schedule the midnight update */
-
-	midnight_refresh_id = NULL;
-	queue_midnight_refresh ();
-}
-
-/* Looks up a client in the client alarms hash table */
-static ClientAlarms *
-lookup_client (CalClient *client)
-{
-	return g_hash_table_lookup (client_alarms_hash, client);
-}
-
-/* Looks up a queued alarm based on its alarm ID */
-static QueuedAlarm *
-lookup_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	GSList *l;
-	QueuedAlarm *qa;
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	g_assert (l != NULL);
-	return qa;
-}
-
-/* Removes an alarm from the list of alarms of a component.  If the alarm was
- * the last one listed for the component, it removes the component itself.
- */
-static void
-remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	const char *uid;
-	GSList *l;
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
-
-	g_free (qa);
-
-	/* If this was the last queued alarm for this component, remove the
-	 * component itself.
-	 */
-
-	if (cqa->queued_alarms != NULL)
-		return;
-
-	cal_component_get_uid (cqa->alarms->comp, &uid);
-	g_hash_table_remove (cqa->parent_client->uid_alarms_hash, uid);
-	cqa->parent_client = NULL;
-
-	cal_component_alarms_free (cqa->alarms);
-	cqa->alarms = NULL;
-
-	g_free (cqa);
-}
-
-/* Callback used when an alarm triggers */
-static void
-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	CalComponent *comp;
-	QueuedAlarm *qa;
-	CalComponentAlarm *alarm;
-	CalAlarmAction action;
-
-	cqa = data;
-	comp = cqa->alarms->comp;
-
-	save_notification_time (trigger);
-
-	qa = lookup_queued_alarm (cqa, alarm_id);
-
-	/* Decide what to do based on the alarm action.  We use the trigger that
-	 * is passed to us instead of the one from the instance structure
-	 * because this may be a snoozed alarm instead of an original
-	 * occurrence.
-	 */
-
-	alarm = cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	cal_component_alarm_get_action (alarm, &action);
-	cal_component_alarm_free (alarm);
-
-	switch (action) {
-	case CAL_ALARM_AUDIO:
-		audio_notification (trigger, cqa, alarm_id);
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		display_notification (trigger, cqa, alarm_id, TRUE);
-		break;
-
-	case CAL_ALARM_EMAIL:
-		mail_notification (trigger, cqa, alarm_id);
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		procedure_notification (trigger, cqa, alarm_id);
-		break;
-
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-}
-
-/* Adds the alarms in a CalComponentAlarms structure to the alarms queued for a
- * particular client.  Also puts the triggers in the alarm timer queue.
- */
-static void
-add_component_alarms (ClientAlarms *ca, CalComponentAlarms *alarms)
-{
-	const char *uid;
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	/* No alarms? */
-	if (alarms->alarms == NULL) {
-		cal_component_alarms_free (alarms);
-		return;
-	}
-
-	cqa = g_new (CompQueuedAlarms, 1);
-	cqa->parent_client = ca;
-	cqa->alarms = alarms;
-
-	cqa->queued_alarms = NULL;
-
-	for (l = alarms->alarms; l; l = l->next) {
-		CalAlarmInstance *instance;
-		gpointer alarm_id;
-		QueuedAlarm *qa;
-
-		instance = l->data;
-
-		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-		if (!alarm_id) {
-			g_message ("add_component_alarms(): Could not schedule a trigger for "
-				   "%ld, discarding...", (long) instance->trigger);
-			continue;
-		}
-
-		qa = g_new (QueuedAlarm, 1);
-		qa->alarm_id = alarm_id;
-		qa->instance = instance;
-		qa->snooze = FALSE;
-
-		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-	}
-
-	cal_component_get_uid (alarms->comp, &uid);
-
-	/* If we failed to add all the alarms, then we should get rid of the cqa */
-	if (cqa->queued_alarms == NULL) {
-		g_message ("add_component_alarms(): Could not add any of the alarms "
-			   "for the component `%s'; discarding it...", uid);
-
-		cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-
-		g_free (cqa);
-		return;
-	}
-
-	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	g_hash_table_insert (ca->uid_alarms_hash, (char *) uid, cqa);
-}
-
-/* Loads the alarms of a client for a given range of time */
-static void
-load_alarms (ClientAlarms *ca, time_t start, time_t end)
-{
-	GSList *comp_alarms;
-	GSList *l;
-
-	comp_alarms = cal_client_get_alarms_in_range (ca->client, start, end);
-
-	for (l = comp_alarms; l; l = l->next) {
-		CalComponentAlarms *alarms;
-
-		alarms = l->data;
-		add_component_alarms (ca, alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/* Loads today's remaining alarms for a client */
-static void
-load_alarms_for_today (ClientAlarms *ca)
-{
-	time_t now, day_end;
-	icaltimezone *zone;
-
-	now = time (NULL);
-
-	zone = config_data_get_timezone ();
-
-	day_end = time_day_end_with_zone (now, zone);
-	load_alarms (ca, now, day_end);
-}
-
-/* Adds any alarms that should have occurred while the alarm daemon was not
- * running.
- */
-static void
-load_missed_alarms (ClientAlarms *ca)
-{
-	time_t now;
-
-	now = time (NULL);
-
-	g_assert (saved_notification_time != -1);
-
-	/* We add 1 to the saved_notification_time to make the time ranges
-	 * half-open; we do not want to display the "last" displayed alarm
-	 * twice, once when it occurs and once when the alarm daemon restarts.
-	 */
-	load_alarms (ca, saved_notification_time + 1, now);
-}
-
-/* Called when a calendar client finished loading; we load its alarms */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	load_alarms_for_today (ca);
-	load_missed_alarms (ca);
-}
-
-/* Looks up a component's queued alarm structure in a client alarms structure */
-static CompQueuedAlarms *
-lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)
-{
-	return g_hash_table_lookup (ca->uid_alarms_hash, uid);
-}
-
-/* Removes a component an its alarms */
-static void
-remove_comp (ClientAlarms *ca, const char *uid)
-{
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	cqa = lookup_comp_queued_alarms (ca, uid);
-	if (!cqa)
-		return;
-
-	/* If a component is present, then it means we must have alarms queued
-	 * for it.
-	 */
-	g_assert (cqa->queued_alarms != NULL);
-
-	for (l = cqa->queued_alarms; l;) {
-		QueuedAlarm *qa;
-
-		qa = l->data;
-
-		/* Get the next element here because the list element will go
-		 * away in remove_queued_alarm().  The qa will be freed there as
-		 * well.
-		 */
-		l = l->next;
-
-		alarm_remove (qa->alarm_id);
-		remove_queued_alarm (cqa, qa->alarm_id);
-	}
-
-	/* The list should be empty now, and thus the queued component alarms
-	 * structure should have been freed and removed from the hash table.
-	 */
-	g_assert (lookup_comp_queued_alarms (ca, uid) == NULL);
-}
-
-/* Called when a calendar component changes; we must reload its corresponding
- * alarms.
- */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-	time_t now, day_end;
-	CalComponentAlarms *alarms;
-	gboolean found;
-	icaltimezone *zone;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-
-	now = time (NULL);
-
-	zone = config_data_get_timezone ();
-
-	day_end = time_day_end_with_zone (now, zone);
-
-	found = cal_client_get_alarms_for_object (ca->client, uid, now, day_end, &alarms);
-
-	if (!found)
-		return;
-
-	add_component_alarms (ca, alarms);
-}
-
-/* Called when a calendar component is removed; we must delete its corresponding
- * alarms.
- */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-}
-
-
-
-/* Notification functions */
-
-/* Creates a snooze alarm based on an existing one.  The snooze offset is
- * compued with respect to the current time.
- */
-static void
-create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
-{
-	QueuedAlarm *orig_qa, *qa;
-	CalAlarmInstance *instance;
-	time_t t;
-	gpointer new_id;
-
-	orig_qa = lookup_queued_alarm (cqa, alarm_id);
-
-	t = time (NULL);
-	t += snooze_mins * 60;
-
-	new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL);
-	if (!new_id) {
-		g_message ("create_snooze(): Could not schedule a trigger for "
-			   "%ld, discarding...", (long) t);
-		return;
-	}
-
-	instance = g_new (CalAlarmInstance, 1);
-	instance->auid = orig_qa->instance->auid;
-	instance->trigger = t;
-	instance->occur_start = orig_qa->instance->occur_start;
-	instance->occur_end = orig_qa->instance->occur_end;
-
-	cqa->alarms->alarms = g_slist_prepend (cqa->alarms->alarms, instance);
-
-	qa = g_new (QueuedAlarm, 1);
-	qa->alarm_id = new_id;
-	qa->instance = instance;
-	qa->snooze = TRUE;
-
-	cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-}
-
-/* Launches a component editor for a component */
-static void
-edit_component (CompQueuedAlarms *cqa)
-{
-	CalComponent *comp;
-	const char *uid;
-	const char *uri;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CompEditorFactory factory;
-
-	comp = cqa->alarms->comp;
-	cal_component_get_uid (comp, &uid);
-
-	uri = cal_client_get_uri (cqa->parent_client->client);
-
-	/* Get the factory */
-
-	CORBA_exception_init (&ev);
-	factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory",
-					0, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("edit_component(): Could not activate the component editor factory");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Edit the component */
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("edit_component(): Exception while editing the component");
-
-	CORBA_exception_free (&ev);
-
-	/* Get rid of the factory */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("edit_component(): Could not unref the calendar component factory");
-
-	CORBA_exception_free (&ev);
-}
-
-struct notify_dialog_closure {
-	CompQueuedAlarms *cqa;
-	gpointer alarm_id;
-};
-
-/* Callback used from the alarm notify dialog */
-static void
-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	struct notify_dialog_closure *c;
-
-	c = data;
-
-	switch (result) {
-	case ALARM_NOTIFY_SNOOZE:
-		create_snooze (c->cqa, c->alarm_id, snooze_mins);
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		edit_component (c->cqa);
-		break;
-
-	case ALARM_NOTIFY_CLOSE:
-		/* Do nothing */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	remove_queued_alarm (c->cqa, c->alarm_id);
-	g_free (c);
-}
-
-/* Performs notification of a display alarm */
-static void
-display_notification (time_t trigger, CompQueuedAlarms *cqa,
-		      gpointer alarm_id, gboolean use_description)
-{
-	CalComponent *comp;
-	CalComponentVType vtype;
-	CalComponentText text;
-	QueuedAlarm *qa;
-	const char *message;
-	struct notify_dialog_closure *c;
-	gboolean use_summary;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	g_assert (qa != NULL);
-
-	vtype = cal_component_get_vtype (comp);
-
-	/* Pick a sensible notification message.  First we try the DESCRIPTION
-	 * from the alarm, then the SUMMARY of the component.
-	 */
-
-	use_summary = TRUE;
-	message = NULL;
-
-	if (use_description) {
-		CalComponentAlarm *alarm;
-
-		alarm = cal_component_get_alarm (comp, qa->instance->auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_description (alarm, &text);
-		cal_component_alarm_free (alarm);
-
-		if (text.value) {
-			message = text.value;
-			use_summary = FALSE;
-		}
-	}
-
-	if (use_summary) {
-		cal_component_get_summary (comp, &text);
-		if (text.value)
-			message = text.value;
-		else
-			message = _("No description available.");
-	}
-
-	c = g_new (struct notify_dialog_closure, 1);
-	c->cqa = cqa;
-	c->alarm_id = alarm_id;
-
-	if (!alarm_notify_dialog (trigger,
-				  qa->instance->occur_start, qa->instance->occur_end,
-				  vtype, message,
-				  notify_dialog_cb, c))
-		g_message ("display_notification(): Could not create the alarm notify dialog");
-}
-
-/* Performs notification of an audio alarm */
-static void
-audio_notification (time_t trigger, CompQueuedAlarms *cqa,
-		    gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	CalComponent *comp;
-	CalComponentAlarm *alarm;
-	icalattach *attach;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	g_assert (qa != NULL);
-
-	alarm = cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	cal_component_alarm_get_attach (alarm, &attach);
-	cal_component_alarm_free (alarm);
-
-	if (attach && icalattach_get_is_url (attach)) {
-		const char *url;
-
-		url = icalattach_get_url (attach);
-		g_assert (url != NULL);
-
-		gnome_sound_play (url); /* this sucks */
-	}
-
-	if (attach)
-		icalattach_unref (attach);
-
-	/* We present a notification message in addition to playing the sound */
-	display_notification (trigger, cqa, alarm_id, FALSE);
-}
-
-/* Performs notification of a mail alarm */
-static void
-mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	GtkWidget *dialog;
-
-	/* FIXME */
-
-	display_notification (trigger, cqa, alarm_id, FALSE);
-
-	dialog = gnome_warning_dialog (_("Evolution does not support calendar reminders with\n"
-					 "email notifications yet, but this reminder was\n"
-					 "configured to send an email.  Evolution will display\n"
-					 "a normal reminder dialog box instead."));
-	gnome_dialog_run (GNOME_DIALOG (dialog));
-}
-
-/* Performs notification of a procedure alarm */
-static gboolean
-procedure_notification_dialog (const char *cmd, const char *url) 
-{
-	GtkWidget *dialog, *label, *checkbox;
-	char *str;
-	int btn;
-	
-	if (is_blessed_program (url))
-		return TRUE;
-	
-	dialog = gnome_dialog_new (_("Warning"),
-				   GNOME_STOCK_BUTTON_YES,
-				   GNOME_STOCK_BUTTON_NO,
-				   NULL);
-
-	str = g_strdup_printf (_("An Evolution Calendar reminder is about to trigger. "
-				 "This reminder is configured to run the following program:\n\n"
-				 "        %s\n\n"
-				 "Are you sure you want to run this program?"),
-			       cmd);
-	label = gtk_label_new (str);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    label, TRUE, TRUE, 4);
-	g_free (str);
-
-	checkbox = gtk_check_button_new_with_label
-		(_("Do not ask me about this program again."));
-	gtk_widget_show (checkbox);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), 
-			    checkbox, TRUE, TRUE, 4);
-
-	/* Run the dialog */
-	btn = gnome_dialog_run (GNOME_DIALOG (dialog));
-	if (btn == GNOME_YES && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
-		save_blessed_program (url);
-	gnome_dialog_close (GNOME_DIALOG (dialog));
-
-	return (btn == GNOME_YES);
-}
-
-static void
-procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	CalComponent *comp;
-	CalComponentAlarm *alarm;
-	CalComponentText description;
-	icalattach *attach;
-	const char *url;
-	char *cmd;
-	int result;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	g_assert (qa != NULL);
-
-	alarm = cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	cal_component_alarm_get_attach (alarm, &attach);
-	cal_component_alarm_get_description (alarm, &description);
-	cal_component_alarm_free (alarm);
-
-	/* If the alarm has no attachment, simply display a notification dialog. */
-	if (!attach)
-		goto fallback;
-
-	if (!icalattach_get_is_url (attach)) {
-		icalattach_unref (attach);
-		goto fallback;
-	}
-
-	url = icalattach_get_url (attach);
-	g_assert (url != NULL);
-
-	/* Ask for confirmation before executing the stuff */
-	if (description.value)
-		cmd = g_strconcat (url, " ", description.value, NULL);
-	else
-		cmd = (char *) url;
-
-	result = 0;
-	if (procedure_notification_dialog (cmd, url))
-		result = gnome_execute_shell (NULL, cmd);
-	
-	if (cmd != (char *) url)
-		g_free (cmd);
-
-	icalattach_unref (attach);
-
-	/* Fall back to display notification if we got an error */
-	if (result < 0)
-		goto fallback;
-
-	remove_queued_alarm (cqa, alarm_id);
-	return;
-
- fallback:
-
-	display_notification (trigger, cqa, alarm_id, FALSE);
-}
-
-
-
-/**
- * alarm_queue_init:
- *
- * Initializes the alarm queueing system.  This should be called near the
- * beginning of the program.
- **/
-void
-alarm_queue_init (void)
-{
-	g_return_if_fail (alarm_queue_inited == FALSE);
-
-	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-	queue_midnight_refresh ();
-
-	saved_notification_time = get_saved_notification_time ();
-	if (saved_notification_time == -1) {
-		saved_notification_time = time (NULL);
-		save_notification_time (saved_notification_time);
-	}
-
-	alarm_queue_inited = TRUE;
-}
-
-/**
- * alarm_queue_done:
- *
- * Shuts down the alarm queueing system.  This should be called near the end
- * of the program.  All the monitored calendar clients should already have been
- * unregistered with alarm_queue_remove_client().
- **/
-void
-alarm_queue_done (void)
-{
-	g_return_if_fail (alarm_queue_inited);
-
-	/* All clients must be unregistered by now */
-	g_return_if_fail (g_hash_table_size (client_alarms_hash) == 0);
-
-	g_hash_table_destroy (client_alarms_hash);
-	client_alarms_hash = NULL;
-
-	g_assert (midnight_refresh_id != NULL);
-	alarm_remove (midnight_refresh_id);
-	midnight_refresh_id = NULL;
-
-	alarm_queue_inited = FALSE;
-}
-
-/**
- * alarm_queue_add_client:
- * @client: A calendar client.
- *
- * Adds a calendar client to the alarm queueing system.  Alarm trigger
- * notifications will be presented at the appropriate times.  The client should
- * be removed with alarm_queue_remove_client() when receiving notifications
- * from it is no longer desired.
- *
- * A client can be added any number of times to the alarm queueing system,
- * but any single alarm trigger will only be presented once for a particular
- * client.  The client must still be removed the same number of times from the
- * queueing system when it is no longer wanted.
- **/
-void
-alarm_queue_add_client (CalClient *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	ca = lookup_client (client);
-	if (ca) {
-		ca->refcount++;
-		return;
-	}
-
-	ca = g_new (ClientAlarms, 1);
-
-	ca->client = client;
-	gtk_object_ref (GTK_OBJECT (ca->client));
-
-	ca->refcount = 1;
-	g_hash_table_insert (client_alarms_hash, client, ca);
-
-	ca->uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED)
-		gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-				    GTK_SIGNAL_FUNC (cal_opened_cb), ca);
-
-	gtk_signal_connect (GTK_OBJECT (client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), ca);
-	gtk_signal_connect (GTK_OBJECT (client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), ca);
-
-	if (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED) {
-		load_alarms_for_today (ca);
-		load_missed_alarms (ca);
-	}
-}
-
-/* Called from g_hash_table_foreach(); adds a component UID to a list */
-static void
-add_uid_cb (gpointer key, gpointer value, gpointer data)
-{
-	GSList **uids;
-	const char *uid;
-
-	uids = data;
-	uid = key;
-
-	*uids = g_slist_prepend (*uids, (char *) uid);
-}
-
-/* Removes all the alarms queued for a particular calendar client */
-static void
-remove_client_alarms (ClientAlarms *ca)
-{
-	GSList *uids;
-	GSList *l;
-
-	/* First we build a list of UIDs so that we can remove them one by one */
-
-	uids = NULL;
-	g_hash_table_foreach (ca->uid_alarms_hash, add_uid_cb, &uids);
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-
-		uid = l->data;
-
-		remove_comp (ca, uid);
-	}
-
-	g_slist_free (uids);
-
-	/* The hash table should be empty now */
-
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-}
-
-/**
- * alarm_queue_remove_client:
- * @client: A calendar client.
- *
- * Removes a calendar client from the alarm queueing system.
- **/
-void
-alarm_queue_remove_client (CalClient *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	ca = lookup_client (client);
-	g_return_if_fail (ca != NULL);
-
-	g_assert (ca->refcount > 0);
-	ca->refcount--;
-
-	if (ca->refcount > 0)
-		return;
-
-	remove_client_alarms (ca);
-
-	/* Clean up */
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (ca->client), ca);
-
-	gtk_object_unref (GTK_OBJECT (ca->client));
-	ca->client = NULL;
-
-	g_hash_table_destroy (ca->uid_alarms_hash);
-	ca->uid_alarms_hash = NULL;
-
-	g_free (ca);
-
-	g_hash_table_remove (client_alarms_hash, client);
-}
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
deleted file mode 100644
index a37119145f..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_QUEUE_H
-#define ALARM_QUEUE_H
-
-#include <cal-client/cal-client.h>
-
-
-void alarm_queue_init (void);
-void alarm_queue_done (void);
-
-void alarm_queue_add_client (CalClient *client);
-void alarm_queue_remove_client (CalClient *client);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
deleted file mode 100644
index 8c6c4c59cd..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <gdk/gdk.h>
-#include "alarm.h"
-
-
-
-/* Our glib timeout */
-static guint timeout_id;
-
-/* The list of pending alarms */
-static GList *alarms = NULL;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-static void setup_timeout (time_t now);
-
-
-
-/* Removes the head alarm from the queue.  Does not touch the timeout_id. */
-static void
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	g_assert (alarms != NULL);
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	g_free (ar);
-}
-
-/* Callback from the alarm timeout */
-static gboolean
-alarm_ready_cb (gpointer data)
-{
-	time_t now;
-
-	g_assert (alarms != NULL);
-	timeout_id = 0;
-
-	now = time (NULL);
-
-	while (alarms) {
-		AlarmRecord *notify_id, *ar;
-		AlarmRecord ar_copy;
-
-		ar = alarms->data;
-
-		if (ar->trigger > now)
-			break;
-
-		notify_id = ar;
-
-		ar_copy = *ar;
-		ar = &ar_copy;
-
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
-
-		(* ar->alarm_fn) (notify_id, ar->trigger, ar->data);
-
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (notify_id, ar->data);
-	}
-
-	if (alarms) {
-		/* We need this check because one of the alarm_fn above may have
-		 * re-entered and added an alarm of its own, so the timer will
-		 * already be set up.
-		 */
-		if (timeout_id == 0)
-			setup_timeout (now);
-	} else
-		g_assert (timeout_id == 0);
-
-	return FALSE;
-}
-
-/* Sets up a timeout for the next minute.  We do not need to be concerned with
- * timezones here, as this is just a periodic check on the alarm queue.
- */
-static void
-setup_timeout (time_t now)
-{
-	time_t next, diff;
-	struct tm tm;
-
-	g_assert (timeout_id == 0);
-	g_assert (alarms != NULL);
-
-	tm = *localtime (&now);
-	tm.tm_sec = 0;
-	tm.tm_min++; /* next minute */
-
-	next = mktime (&tm);
-	g_assert (next != -1);
-
-	diff = next - now;
-
-	g_assert (diff >= 0);
-	timeout_id = g_timeout_add (diff * 1000, alarm_ready_cb, NULL);
-}
-
-/* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */
-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 void
-queue_alarm (AlarmRecord *ar)
-{
-	time_t now;
-	AlarmRecord *old_head;
-
-	if (alarms) {
-		g_assert (timeout_id != 0);
-
-		old_head = alarms->data;
-	} else {
-		g_assert (timeout_id == 0);
-
-		old_head = NULL;
-	}
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return;
-
-	/* Set the timer for removal upon activation */
-
-	if (!old_head) {
-		now = time (NULL);
-		setup_timeout (now);
-	}
-}
-
-
-
-/**
- * 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)
-{
-	AlarmRecord *ar;
-
-	g_return_val_if_fail (trigger != -1, NULL);
-	g_return_val_if_fail (alarm_fn != NULL, NULL);
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	queue_alarm (ar);
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *notify_id, *ar;
-	AlarmRecord ar_copy;
-	AlarmRecord *old_head;
-	GList *l;
-
-	g_return_if_fail (alarm != NULL);
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	notify_id = ar;
-
-	if (old_head == ar) {
-		ar_copy = *ar;
-		ar = &ar_copy;
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
-	} else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	/* Reset the timeout */
-
-	g_assert (timeout_id != 0);
-
-	if (!alarms) {
-		g_source_remove (timeout_id);
-		timeout_id = 0;
-	}
-
-	/* Notify about destructiono of the alarm */
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (notify_id, ar->data);
-
-}
-
-/**
- * alarm_done:
- * 
- * Terminates the alarm timer mechanism.  This should be called at the end of
- * the program.
- **/
-void
-alarm_done (void)
-{
-	GList *l;
-
-	if (timeout_id == 0) {
-		g_assert (alarms == NULL);
-		return;
-	}
-
-	g_assert (alarms != NULL);
-
-	g_source_remove (timeout_id);
-	timeout_id = 0;
-
-	for (l = alarms; l; l = l->next) {
-		AlarmRecord *ar;
-
-		ar = l->data;
-
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar, ar->data);
-
-		g_free (ar);
-	}
-
-	g_list_free (alarms);
-	alarms = NULL;
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index 23fde886c9..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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>
-#include <glib.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data);
-
-void alarm_done (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-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
deleted file mode 100644
index 71170a3ad6..0000000000
--- a/calendar/gui/alarm-notify/config-data.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "config-data.h"
-#include "save.h"
-
-
-
-/* Whether we have initied ourselves by reading the data from the configuration engine */
-static gboolean inited;
-
-/* Configuration values */
-static icaltimezone *local_timezone;
-static gboolean use_24_hour_format;
-
-
-
-/* Copied from ../calendar-config.c; returns whether the locale has 'am' and
- * 'pm' strings defined.
- */
-static gboolean
-locale_supports_12_hour_format (void)
-{  
-	char s[16];
-	time_t t = 0;
-
-	strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-/* Ensures that the configuration values have been read */
-static void
-ensure_inited (void)
-{
-	Bonobo_ConfigDatabase db;
-	char *location;
-
-	if (inited)
-		return;
-
-	inited = TRUE;
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL) {
-		/* This sucks */
-		local_timezone = icaltimezone_get_utc_timezone ();
-
-		/* This sucks as well */
-		use_24_hour_format = TRUE;
-
-		return;
-	}
-
-	location = bonobo_config_get_string_with_default (db,
-		"/Calendar/Display/Timezone", "UTC", NULL);
-	if (location && location[0]) {
-		local_timezone = icaltimezone_get_builtin_timezone (location);
-	} else {
-		local_timezone = icaltimezone_get_utc_timezone ();
-	}
-	g_free (location);
-
-	if (locale_supports_12_hour_format ()) {
-		/* Wasn't the whole point of a configuration engine *NOT* to
-		 * have apps specify their own stupid defaults everywhere, but
-		 * just in a schema file?
-		 */
-		use_24_hour_format = bonobo_config_get_boolean_with_default (
-			db,
-			"/Calendar/Display/Use24HourFormat", FALSE, NULL);
-	} else
-		use_24_hour_format = TRUE;
-
-	discard_config_db (db);
-}
-
-icaltimezone *
-config_data_get_timezone (void)
-{
-	ensure_inited ();
-
-	return local_timezone;
-}
-
-gboolean
-config_data_get_24_hour_format (void)
-{
-	ensure_inited ();
-
-	return use_24_hour_format;
-}
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
deleted file mode 100644
index 06a73ba562..0000000000
--- a/calendar/gui/alarm-notify/config-data.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 CONFIG_DATA_H
-#define CONFIG_DATA_H
-
-#include <glib.h>
-#include <ical.h>
-
-icaltimezone *config_data_get_timezone (void);
-
-gboolean config_data_get_24_hour_format (void);
-
-#endif
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
deleted file mode 100644
index 8b6daab254..0000000000
--- a/calendar/gui/alarm-notify/notify-main.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/* Evolution calendar - Alarm notification service main file
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <liboaf/liboaf.h>
-#include "alarm.h"
-#include "alarm-queue.h"
-#include "alarm-notify.h"
-#include "save.h"
-
-
-
-static GnomeClient *master_client = NULL;
-
-static BonoboGenericFactory *factory;
-
-static AlarmNotify *alarm_notify_service;
-
-
-/* Callback for the master client's "die" signal.  We must terminate the daemon
- * since the session is ending.
- */
-static void
-client_die_cb (GnomeClient *client)
-{
-	gtk_main_quit ();
-}
-
-/* Sees if a session manager is present.  If so, it tells the SM how to restart
- * the daemon when the session starts.  It also sets the die callback so that
- * the daemon can terminate properly when the session ends.
- */
-static void
-set_session_parameters (char **argv)
-{
-	int flags;
-	char *args[2];
-
-	master_client = gnome_master_client ();
-	flags = gnome_client_get_flags (master_client);
-
-	if (!(flags & GNOME_CLIENT_IS_CONNECTED))
-		return;
-
-	/* The daemon should always be started up by the session manager when
-	 * the session starts.  The daemon will take care of loading whatever
-	 * calendars it was told to load.
-	 */
-	gnome_client_set_restart_style (master_client, GNOME_RESTART_ANYWAY);
-
-	args[0] = argv[0];
-	args[1] = NULL;
-
-	gnome_client_set_restart_command (master_client, 1, args);
-
-	gtk_signal_connect (GTK_OBJECT (master_client), "die",
-			    GTK_SIGNAL_FUNC (client_die_cb), NULL);
-}
-
-/* Creates the singleton alarm notify service object */
-static gboolean
-init_alarm_notify_service (void)
-{
-	g_assert (alarm_notify_service == NULL);
-
-	alarm_notify_service = alarm_notify_new ();
-	return (alarm_notify_service != NULL);
-}
-
-/* Factory function for the alarm notify service; just creates and references a
- * singleton service object.
- */
-static BonoboObject *
-alarm_notify_factory_fn (BonoboGenericFactory *factory, void *data)
-{
-	g_assert (alarm_notify_service != NULL);
-
-	bonobo_object_ref (BONOBO_OBJECT (alarm_notify_service));
-	return BONOBO_OBJECT (alarm_notify_service);
-}
-
-/* Loads the calendars that the alarm daemon has been told to load in the past */
-static void
-load_calendars (void)
-{
-	GPtrArray *uris;
-	int i;
-
-	uris = get_calendars_to_load ();
-	if (!uris) {
-		g_message ("load_calendars(): Could not get the list of calendars to load");
-		return;
-	}
-
-	for (i = 0; i < uris->len; i++) {
-		char *uri;
-		CORBA_Environment ev;
-
-		uri = uris->pdata[i];
-
-		CORBA_exception_init (&ev);
-		alarm_notify_add_calendar (alarm_notify_service, uri, FALSE, &ev);
-
-		if (ev._major == CORBA_USER_EXCEPTION) {
-			char *ex_id;
-			
-			ex_id = CORBA_exception_id (&ev);
-			if (strcmp (ex_id, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI) == 0)
-				g_message ("load_calendars(): Invalid URI `%s'; will not load "
-					   "that calendar.", uri);
-			else if (strcmp (ex_id,
-					 ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError)
-				 == 0)
-				g_message ("load_calendars(): Could not contact the backend "
-					   "while trying to load `%s'", uri);
-		} else if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("load_calendars(): Exception while loading calendar `%s'", uri);
-
-		CORBA_exception_free (&ev);
-
-		g_free (uri);
-	}
-
-	g_ptr_array_free (uris, TRUE);
-}
-
-int
-main (int argc, char **argv)
-{
-	free (malloc (8));
-
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	if (gnome_init_with_popt_table ("evolution-alarm-notify", VERSION, argc, argv,
-					oaf_popt_options, 0, NULL) != 0)
-		g_error (_("Could not initialize GNOME"));
-
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	if (!gnome_vfs_init ())
-		g_error (_("Could not initialize gnome-vfs"));
-
-	glade_gnome_init ();
-
-	alarm_queue_init ();
-
-	if (!init_alarm_notify_service ())
-		g_error (_("Could not create the alarm notify service"));
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory",
-					      alarm_notify_factory_fn, NULL);
-	if (!factory)
-		g_error (_("Could not create the alarm notify service factory"));
-
-	set_session_parameters (argv);
-
-	load_calendars ();
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (factory));
-	factory = NULL;
-
-	/* FIXME: free the alarm_notify_service */
-
-	alarm_queue_done ();
-	alarm_done ();
-
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/calendar/gui/alarm-notify/save.c b/calendar/gui/alarm-notify/save.c
deleted file mode 100644
index 92dc94b65a..0000000000
--- a/calendar/gui/alarm-notify/save.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Evolution calendar - Functions to save alarm notification times
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/bonobo-arg.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include "evolution-calendar.h"
-#include "save.h"
-
-
-
-/* Key names for the configuration values */
-
-#define KEY_LAST_NOTIFICATION_TIME "/Calendar/AlarmNotify/LastNotificationTime"
-#define KEY_NUM_CALENDARS_TO_LOAD "/Calendar/AlarmNotify/NumCalendarsToLoad"
-#define BASE_KEY_CALENDAR_TO_LOAD "/Calendar/AlarmNotify/CalendarToLoad"
-#define KEY_NUM_BLESSED_PROGRAMS "/Calendar/AlarmNotify/NumBlessedPrograms"
-#define BASE_KEY_BLESSED_PROGRAM "/Calendar/AlarmNotify/BlessedProgram"
-
-
-
-/* Tries to get the config database object; returns CORBA_OBJECT_NIL on failure. */
-Bonobo_ConfigDatabase
-get_config_db (void)
-{
-	CORBA_Environment ev;
-	Bonobo_ConfigDatabase db;
-
-	CORBA_exception_init (&ev);
-
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		g_message ("get_config_db(): Could not get the config database object");
-		db = CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return db;
-}
-
-/* Syncs a database and unrefs it */
-void
-discard_config_db (Bonobo_ConfigDatabase db)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Bonobo_ConfigDatabase_sync (db, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("discard_config_db(): Got an exception during the sync command");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-
-	bonobo_object_release_unref (db, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("discard_config_db(): Could not release/unref the database");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * save_notification_time:
- * @t: A time value.
- * 
- * Saves the last notification time so that it can be fetched the next time the
- * alarm daemon is run.  This way the daemon can show alarms that should have
- * triggered while it was not running.
- **/
-void
-save_notification_time (time_t t)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-
-	g_return_if_fail (t != -1);
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-
-	bonobo_config_set_long (db, KEY_LAST_NOTIFICATION_TIME, (long) t, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("save_notification_time(): Could not save the value");
-
-	CORBA_exception_free (&ev);
-
-	discard_config_db (db);
-}
-
-/**
- * get_saved_notification_time:
- * 
- * Queries the last saved value for alarm notification times.
- * 
- * Return value: The last saved value, or -1 if no value had been saved before.
- **/
-time_t
-get_saved_notification_time (void)
-{
-	Bonobo_ConfigDatabase db;
-	long t;
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL)
-		return -1;
-
-	t = bonobo_config_get_long_with_default (db, KEY_LAST_NOTIFICATION_TIME, -1, NULL);
-
-	discard_config_db (db);
-
-	return (time_t) t;
-}
-
-/**
- * save_calendars_to_load:
- * @uris: A list of URIs of calendars.
- * 
- * Saves the list of calendars that should be loaded the next time the alarm
- * daemon starts up.
- **/
-void
-save_calendars_to_load (GPtrArray *uris)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	int len, i;
-
-	g_return_if_fail (uris != NULL);
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL)
-		return;
-
-	len = uris->len;
-
-	CORBA_exception_init (&ev);
-
-	bonobo_config_set_long (db, KEY_NUM_CALENDARS_TO_LOAD, len, &ev);
-	if (BONOBO_EX (&ev))
-		g_warning ("Cannot save config key %s -- %s", KEY_NUM_CALENDARS_TO_LOAD, BONOBO_EX_ID (&ev));
-
-	for (i = 0; i < len; i++) {
-		const char *uri;
-		char *key;
-
-		uri = uris->pdata[i];
-
-		key = g_strdup_printf ("%s%d", BASE_KEY_CALENDAR_TO_LOAD, i);
-		bonobo_config_set_string (db, key, uri, &ev);
-		if (BONOBO_EX (&ev))
-			g_warning ("Cannot save config key %s -- %s", key, BONOBO_EX_ID (&ev));
-		g_free (key);
-	}
-
-	CORBA_exception_free (&ev);
-
-	discard_config_db (db);
-}
-
-/**
- * get_calendars_to_load:
- * 
- * Gets the list of calendars that should be loaded when the alarm daemon starts
- * up.
- * 
- * Return value: A list of URIs, or NULL if the value could not be retrieved.
- **/
-GPtrArray *
-get_calendars_to_load (void)
-{
-	Bonobo_ConfigDatabase db;
-	GPtrArray *uris;
-	int len, i;
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL)
-		return NULL;
-
-	/* Getting the default value below is not necessarily an error, as we
-	 * may not have saved the list of calendar yet.
-	 */
-
-	len = bonobo_config_get_long_with_default (db, KEY_NUM_CALENDARS_TO_LOAD, 0, NULL);
-
-	uris = g_ptr_array_new ();
-	g_ptr_array_set_size (uris, len);
-
-	for (i = 0; i < len; i++) {
-		char *key;
-		gboolean used_default;
-
-		key = g_strdup_printf ("%s%d", BASE_KEY_CALENDAR_TO_LOAD, i);
-		uris->pdata[i] = bonobo_config_get_string_with_default (db, key, "", &used_default);
-		if (used_default)
-			g_message ("get_calendars_to_load(): Could not read calendar name %d", i);
-
-		g_free (key);
-	}
-
-	return uris;
-}
-
-/**
- * save_blessed_program:
- * @program: a program name
- * 
- * Saves a program name as "blessed"
- **/
-void
-save_blessed_program (const char *program)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	char *key;
-	int len;
-
-	g_return_if_fail (program != NULL);
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL)
-		return;
-
-	/* Up the number saved */
-	len = bonobo_config_get_long_with_default (db, KEY_NUM_BLESSED_PROGRAMS, 0, NULL);
-	len++;
-	
-	bonobo_config_set_long (db, KEY_NUM_BLESSED_PROGRAMS, len, &ev);
-	if (BONOBO_EX (&ev))
-		g_warning ("Cannot save config key %s -- %s", KEY_NUM_BLESSED_PROGRAMS, BONOBO_EX_ID (&ev));
-
-	/* Save the program name */
-	key = g_strdup_printf ("%s%d", BASE_KEY_BLESSED_PROGRAM, len - 1);
-	bonobo_config_set_string (db, key, program, &ev);
-	if (BONOBO_EX (&ev))
-		g_warning ("Cannot save config key %s -- %s", key, BONOBO_EX_ID (&ev));
-	g_free (key);
-
-	CORBA_exception_free (&ev);
-
-	discard_config_db (db);
-}
-
-/**
- * is_blessed_program:
- * @program: a program name
- * 
- * Checks to see if a program is blessed
- * 
- * Return value: TRUE if program is blessed, FALSE otherwise
- **/
-gboolean
-is_blessed_program (const char *program)
-{
-	Bonobo_ConfigDatabase db;
-	int len, i;
-
-	g_return_val_if_fail (program != NULL, FALSE);
-
-	db = get_config_db ();
-	if (db == CORBA_OBJECT_NIL)
-		return FALSE;
-
-	/* Getting the default value below is not necessarily an error, as we
-	 * may not have saved the list of calendar yet.
-	 */
-
-	len = bonobo_config_get_long_with_default (db, KEY_NUM_BLESSED_PROGRAMS, 0, NULL);
-
-	for (i = 0; i < len; i++) {
-		char *key, *value;
-		gboolean used_default;
-
-		key = g_strdup_printf ("%s%d", BASE_KEY_BLESSED_PROGRAM, i);
-		value = bonobo_config_get_string_with_default (db, key, "", &used_default);
-		if (used_default)
-			g_message ("get_calendars_to_load(): Could not read calendar name %d", i);
-
-		if (value != NULL && !strcmp (value, program)) {
-			g_free (key);
-			g_free (value);
-			return TRUE;
-		}
-		
-		g_free (key);
-		g_free (value);
-	}
-
-	return FALSE;
-}
diff --git a/calendar/gui/alarm-notify/save.h b/calendar/gui/alarm-notify/save.h
deleted file mode 100644
index 50371e0a5b..0000000000
--- a/calendar/gui/alarm-notify/save.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Evolution calendar - Functions to save alarm notification times
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 SAVE_H
-#define SAVE_H
-
-#include <time.h>
-#include <bonobo-conf/bonobo-config-database.h>
-
-Bonobo_ConfigDatabase get_config_db (void);
-void discard_config_db (Bonobo_ConfigDatabase db);
-
-void save_notification_time (time_t t);
-time_t get_saved_notification_time (void);
-
-void save_calendars_to_load (GPtrArray *uris);
-GPtrArray *get_calendars_to_load (void);
-
-void save_blessed_program (const char *program);
-gboolean is_blessed_program (const char *program);
-
-#endif
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
deleted file mode 100644
index 2483b2b126..0000000000
--- a/calendar/gui/cal-search-bar.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-unicode.h>
-#include "cal-search-bar.h"
-
-
-
-/* IDs and option items for the ESearchBar */
-enum {
-	SEARCH_ANY_FIELD_CONTAINS,
-	SEARCH_SUMMARY_CONTAINS,
-	SEARCH_DESCRIPTION_CONTAINS,
-	SEARCH_COMMENT_CONTAINS,
-	SEARCH_CATEGORY_IS,
-};
-
-static ESearchBarItem search_option_items[] = {
-	{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL },
-	{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, NULL },
-	{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, NULL },
-	{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS, NULL },
-	{ N_("Category is"), SEARCH_CATEGORY_IS, NULL },
-	{ NULL, -1, NULL }
-};
-
-/* IDs for the categories suboptions */
-#define CATEGORIES_ALL 0
-#define CATEGORIES_UNMATCHED 1
-#define CATEGORIES_OFFSET 3
-
-/* Private part of the CalSearchBar structure */
-struct CalSearchBarPrivate {
-	/* Array of categories */
-	GPtrArray *categories;
-};
-
-
-
-static void cal_search_bar_class_init (CalSearchBarClass *class);
-static void cal_search_bar_init (CalSearchBar *cal_search);
-static void cal_search_bar_destroy (GtkObject *object);
-
-static void cal_search_bar_search_activated (ESearchBar *search);
-
-static ESearchBarClass *parent_class = NULL;
-
-/* Signal IDs */
-enum {
-	SEXP_CHANGED,
-	CATEGORY_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };
-
-
-
-/**
- * cal_search_bar_get_type:
- * 
- * Registers the #CalSearchBar class if necessary and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CalSearchBar class.
- **/
-GtkType
-cal_search_bar_get_type (void)
-{
-	static GtkType cal_search_bar_type = 0;
-
-	if (!cal_search_bar_type) {
-		static const GtkTypeInfo cal_search_bar_info = {
-			"CalSearchBar",
-			sizeof (CalSearchBar),
-			sizeof (CalSearchBarClass),
-			(GtkClassInitFunc) cal_search_bar_class_init,
-			(GtkObjectInitFunc) cal_search_bar_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_search_bar_type = gtk_type_unique (E_SEARCH_BAR_TYPE, &cal_search_bar_info);
-	}
-
-	return cal_search_bar_type;
-}
-
-/* Class initialization function for the calendar search bar */
-static void
-cal_search_bar_class_init (CalSearchBarClass *class)
-{
-	ESearchBarClass *e_search_bar_class;
-	GtkObjectClass *object_class;
-
-	e_search_bar_class = (ESearchBarClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (E_SEARCH_BAR_TYPE);
-
-	cal_search_bar_signals[SEXP_CHANGED] =
-		gtk_signal_new ("sexp_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalSearchBarClass, sexp_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	cal_search_bar_signals[CATEGORY_CHANGED] =
-		gtk_signal_new ("category_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalSearchBarClass, category_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, cal_search_bar_signals, LAST_SIGNAL);
-
-	class->sexp_changed = NULL;
-	class->category_changed = NULL;
-
-	e_search_bar_class->search_activated = cal_search_bar_search_activated;
-
-	object_class->destroy = cal_search_bar_destroy;
-}
-
-/* Object initialization function for the calendar search bar */
-static void
-cal_search_bar_init (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-
-	priv = g_new (CalSearchBarPrivate, 1);
-	cal_search->priv = priv;
-
-	priv->categories = g_ptr_array_new ();
-	g_ptr_array_set_size (priv->categories, 0);
-}
-
-/* Frees an array of categories */
-static void
-free_categories (GPtrArray *categories)
-{
-	int i;
-
-	for (i = 0; i < categories->len; i++) {
-		g_assert (categories->pdata[i] != NULL);
-		g_free (categories->pdata[i]);
-	}
-
-	g_ptr_array_free (categories, TRUE);
-}
-
-/* Destroy handler for the calendar search bar */
-static void
-cal_search_bar_destroy (GtkObject *object)
-{
-	CalSearchBar *cal_search;
-	CalSearchBarPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_SEARCH_BAR (object));
-
-	cal_search = CAL_SEARCH_BAR (object);
-	priv = cal_search->priv;
-
-	if (priv->categories) {
-		free_categories (priv->categories);
-		priv->categories = NULL;
-	}
-
-	g_free (priv);
-	cal_search->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Emits the "sexp_changed" signal for the calendar search bar */
-static void
-notify_sexp_changed (CalSearchBar *cal_search, const char *sexp)
-{
-	gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED],
-			 sexp);
-}
-
-/* Returns the string of the currently selected category, NULL for "Unmatched",
- * or (const char *) 1 for "All".
- */
-static const char *
-get_current_category (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	int id, subid;
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-
-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
-	if (id != SEARCH_CATEGORY_IS)
-		return NULL;
-
-	subid = e_search_bar_get_subitem_id (E_SEARCH_BAR (cal_search));
-	if (subid == CATEGORIES_ALL)
-		return (const char *) 1;
-	else if (subid == CATEGORIES_UNMATCHED)
-		return NULL;
-	else {
-		int i;
-
-		i = subid - CATEGORIES_OFFSET;
-		g_assert (i >= 0 && i < priv->categories->len);
-
-		return priv->categories->pdata[i];
-	}
-}
-
-/* Sets the query string to be (contains? "field" "text") */
-static void
-notify_query_contains (CalSearchBar *cal_search, const char *field)
-{
-	char *text;
-	char *sexp;
-
-	text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));
-	if (!text)
-		return; /* This is an error in the UTF8 conversion, not an empty string! */
-
-	sexp = g_strdup_printf ("(contains? \"%s\" \"%s\")", field, text);
-	g_free (text);
-
-	notify_sexp_changed (cal_search, sexp);
-	g_free (sexp);
-}
-
-/* Returns a sexp for the selected category in the drop-down menu.  The "All"
- * option is returned as (const char *) 1, and the "Unfiled" option is returned
- * as NULL.
- */
-static char *
-get_category_sexp (CalSearchBar *cal_search)
-{
-	const char *category;
-
-	category = get_current_category (cal_search);
-
-	if (category == NULL)
-		return g_strdup ("(has-categories? #f)"); /* Unfiled items */
-	else if (category == (const char *) 1)
-		return NULL; /* All items */
-	else
-		return g_strdup_printf ("(has-categories? \"%s\")", category); /* Specific category */
-}
-
-/* Sets the query string to the appropriate match for categories */
-static void
-notify_category_is (CalSearchBar *cal_search)
-{
-	char *sexp;
-
-	sexp = get_category_sexp (cal_search);
-	if (!sexp)
-		notify_sexp_changed (cal_search, "#t"); /* Match all */
-	else
-		notify_sexp_changed (cal_search, sexp);
-
-	if (sexp)
-		g_free (sexp);
-}
-
-/* Creates a new query from the values in the widgets and notifies upstream */
-static void
-regen_query (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	int id;
-	const char *category;
-
-	priv = cal_search->priv;
-
-	/* Fetch the data from the ESearchBar's entry widgets */
-
-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
-
-	/* Generate the different types of queries */
-
-	switch (id) {
-	case SEARCH_ANY_FIELD_CONTAINS:
-		notify_query_contains (cal_search, "any");
-		break;
-
-	case SEARCH_SUMMARY_CONTAINS:
-		notify_query_contains (cal_search, "summary");
-		break;
-
-	case SEARCH_DESCRIPTION_CONTAINS:
-		notify_query_contains (cal_search, "description");
-		break;
-
-	case SEARCH_COMMENT_CONTAINS:
-		notify_query_contains (cal_search, "comment");
-		break;
-
-	case SEARCH_CATEGORY_IS:
-		notify_category_is (cal_search);
-
-		category = cal_search_bar_get_category (cal_search);
-		gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED],
-				 category);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* search_activated handler for the calendar search bar */
-static void
-cal_search_bar_search_activated (ESearchBar *search)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = CAL_SEARCH_BAR (search);
-	regen_query (cal_search);
-}
-
-
-
-/* Creates the suboptions menu for the ESearchBar with the list of categories */
-static void
-make_suboptions (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	ESearchBarSubitem *subitems;
-	int i;
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-
-	/* Categories plus "all", "unmatched", separator, terminator */
-	subitems = g_new (ESearchBarSubitem, priv->categories->len + 3 + 1);
-
-	/* All, unmatched, separator */
-
-	subitems[0].text = _("Any Category");
-	subitems[0].id = CATEGORIES_ALL;
-	subitems[0].translate = FALSE;
-
-	subitems[1].text = _("Unmatched");
-	subitems[1].id = CATEGORIES_UNMATCHED;
-	subitems[1].translate = FALSE;
-
-	/* All the other items */
-
-	if (priv->categories->len > 0) {
-		subitems[2].text = NULL; /* separator */
-		subitems[2].id = 0;
-
-		for (i = 0; i < priv->categories->len; i++) {
-			const char *category;
-			char *str;
-
-			category = priv->categories->pdata[i];
-			str = e_utf8_to_gtk_string (GTK_WIDGET (cal_search), category);
-			if (!str)
-				str = g_strdup ("");
-
-			subitems[i + CATEGORIES_OFFSET].text      = str;
-			subitems[i + CATEGORIES_OFFSET].id        = i + CATEGORIES_OFFSET;
-			subitems[i + CATEGORIES_OFFSET].translate = FALSE;
-		}
-
-		subitems[i + CATEGORIES_OFFSET].id = -1; /* terminator */
-	} else
-		subitems[2].id = -1; /* terminator */
-
-	e_search_bar_set_suboption (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, subitems);
-
-	/* Free the strings */
-	for (i = 0; i < priv->categories->len; i++)
-		g_free (subitems[i + CATEGORIES_OFFSET].text);
-
-	g_free (subitems);
-}
-
-/**
- * cal_search_bar_construct:
- * @cal_search: A calendar search bar.
- * 
- * Constructs a calendar search bar by binding its menu and option items.
- * 
- * Return value: The same value as @cal_search.
- **/
-CalSearchBar *
-cal_search_bar_construct (CalSearchBar *cal_search)
-{
-	g_return_val_if_fail (cal_search != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_SEARCH_BAR (cal_search), NULL);
-
-	e_search_bar_construct (E_SEARCH_BAR (cal_search), NULL, search_option_items);
-	make_suboptions (cal_search);
-
-	e_search_bar_set_ids (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, CATEGORIES_ALL);
-
-	return cal_search;
-}
-
-/**
- * cal_search_bar_new:
- * 
- * Creates a new calendar search bar.
- * 
- * Return value: A newly-created calendar search bar.  You should connect to the
- * "sexp_changed" signal to monitor changes in the generated sexps.
- **/
-GtkWidget *
-cal_search_bar_new (void)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = gtk_type_new (TYPE_CAL_SEARCH_BAR);
-	return GTK_WIDGET (cal_search_bar_construct (cal_search));
-}
-
-/* Used from qsort() */
-static int
-compare_categories_cb (const void *a, const void *b)
-{
-	const char **ca, **cb;
-
-	ca = (const char **) a;
-	cb = (const char **) b;
-
-	/* FIXME: should use some utf8 strcoll() thingy */
-	return strcmp (*ca, *cb);
-}
-
-/* Creates a sorted array of categories based on the original one; copies the
- * string values.
- */
-static GPtrArray *
-sort_categories (GPtrArray *categories)
-{
-	GPtrArray *c;
-	int i;
-
-	c = g_ptr_array_new ();
-	g_ptr_array_set_size (c, categories->len);
-
-	for (i = 0; i < categories->len; i++)
-		c->pdata[i] = g_strdup (categories->pdata[i]);
-
-	qsort (c->pdata, c->len, sizeof (gpointer), compare_categories_cb);
-
-	return c;
-}
-
-/**
- * cal_search_bar_set_categories:
- * @cal_search: A calendar search bar.
- * @categories: Array of pointers to strings for the category names.
- * 
- * Sets the list of categories that are to be shown in the drop-down list
- * of a calendar search bar.  The search bar will automatically add an item
- * for "unfiled" components, that is, those that have no categories assigned
- * to them.
- **/
-void
-cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories)
-{
-	CalSearchBarPrivate *priv;
-
-	g_return_if_fail (cal_search != NULL);
-	g_return_if_fail (IS_CAL_SEARCH_BAR (cal_search));
-	g_return_if_fail (categories != NULL);
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-	free_categories (priv->categories);
-
-	priv->categories = sort_categories (categories);
-	make_suboptions (cal_search);
-}
-
-/**
- * cal_search_bar_get_category:
- * @cal_search: A calendar search bar.
- * 
- * Queries the currently selected category name in a calendar search bar.
- * If "All" or "Unfiled" are selected, this function will return NULL.
- * 
- * Return value: Name of the selected category, or NULL if there is no
- * selected category.
- **/
-const char *
-cal_search_bar_get_category (CalSearchBar *cal_search)
-{
-	const char *category;
-
-	category = get_current_category (cal_search);
-
-	if (!category || category == (const char *) 1)
-		return NULL;
-	else
-		return category;
-}
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
deleted file mode 100644
index 5cfb29fa76..0000000000
--- a/calendar/gui/cal-search-bar.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_SEARCH_BAR_H
-#define CAL_SEARCH_BAR_H
-
-#include <libgnome/gnome-defs.h>
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_CAL_SEARCH_BAR            (cal_search_bar_get_type ())
-#define CAL_SEARCH_BAR(obj)            (GTK_CHECK_CAST ((obj), TYPE_CAL_SEARCH_BAR, CalSearchBar))
-#define CAL_SEARCH_BAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CAL_SEARCH_BAR,	\
-					CalSearchBarClass))
-#define IS_CAL_SEARCH_BAR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CAL_SEARCH_BAR))
-#define IS_CAL_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CAL_SEARCH_BAR))
-
-typedef struct CalSearchBarPrivate CalSearchBarPrivate;
-
-typedef struct {
-	ESearchBar search_bar;
-
-	/* Private data */
-	CalSearchBarPrivate *priv;
-} CalSearchBar;
-
-typedef struct {
-	ESearchBarClass parent_class;
-
-	/* Notification signals */
-
-	void (* sexp_changed) (CalSearchBar *cal_search, const char *sexp);
-	void (* category_changed) (CalSearchBar *cal_search, const char *category);
-} CalSearchBarClass;
-
-GtkType cal_search_bar_get_type (void);
-
-CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search);
-
-GtkWidget *cal_search_bar_new (void);
-
-void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories);
-
-const char *cal_search_bar_get_category (CalSearchBar *cal_search);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index 30a1654f1b..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <pwd.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <cal-util/timeutil.h>
-#include "shell/Evolution.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "gnome-cal.h"
-#include "goto.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-#include "itip-utils.h"
-#include "evolution-shell-component-utils.h"
-
-/* A list of all of the calendars started */
-static GList *all_calendars = NULL;
-
-/* Focusing information for the calendar view.  We have to keep track of this
- * ourselves because with Bonobo controls, we may get unpaired focus_out events.
- */
-typedef struct {
-	guint calendar_focused : 1;
-	guint taskpad_focused : 1;
-} FocusData;
-
-/* Prints the calendar at its current view and time range */
-static void
-print (GnomeCalendar *gcal, gboolean preview)
-{
-	time_t start;
-	GnomeCalendarViewType view_type;
-	PrintView print_view;
-
-	gnome_calendar_get_current_time_range (gcal, &start, NULL);
-	view_type = gnome_calendar_get_view (gcal);
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		print_view = PRINT_VIEW_DAY;
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		print_view = PRINT_VIEW_WEEK;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		print_view = PRINT_VIEW_MONTH;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	print_calendar (gcal, preview, start, print_view);
-}
-
-/* File/Print callback */
-static void
-file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, FALSE);
-}
-
-static void
-file_print_preview_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, TRUE);
-}
-
-/* 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);
-}
-
-
-/* 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 *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_previous (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-next_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_next (gcal);
-	set_normal_cursor (gcal);
-}
-
-void
-calendar_goto_today (GnomeCalendar *gcal)
-{
-	set_clock_cursor (gcal);
-	gnome_calendar_goto_today (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-today_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	calendar_goto_today (gcal);
-}
-
-static void
-goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	goto_dialog (gcal);
-}
-
-static void
-show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW, FALSE, TRUE);
-}
-
-static void
-show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_WORK_WEEK_VIEW, FALSE, TRUE);
-}
-
-static void
-show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_WEEK_VIEW, FALSE, TRUE);
-}
-
-static void
-show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW, FALSE, TRUE);
-}
-
-
-
-static void
-cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	set_clock_cursor (gcal);
-	gnome_calendar_cut_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-copy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_copy_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-paste_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_paste_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selection (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-	CalClient *client;
-	GList *comp_list;
-	icaltimezone *utc;
-	time_t start = time (NULL), end;
-
-	gcal = GNOME_CALENDAR (data);
-
-	utc = icaltimezone_get_utc_timezone ();
-	start = time_day_begin_with_zone (start, utc);
-	end = time_add_week_with_zone (start, 6, utc);
-
-	client = gnome_calendar_get_cal_client (gcal);
-	comp_list = cal_client_get_free_busy (client, NULL, start, end);
-	if (comp_list) {
-		GList *l;
-
-		for (l = comp_list; l; l = l->next) {
-			CalComponent *comp = CAL_COMPONENT (l->data);
-			itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp, client, NULL);
-
-			gtk_object_unref (GTK_OBJECT (comp));
-		}
-
- 		g_list_free (comp_list);
-	}
-}
-
-/* Does a queryInterface on the control's parent control frame for the ShellView interface */
-static GNOME_Evolution_ShellView
-get_shell_view_interface (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	control_frame = bonobo_control_get_control_frame (control);
-
-	g_assert (control_frame != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	shell_view = Bonobo_Unknown_queryInterface (control_frame,
-						    "IDL:GNOME/Evolution/ShellView:1.0",
-						    &ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("get_shell_view_interface(): "
-			   "Could not queryInterface() on the control frame");
-		shell_view = CORBA_OBJECT_NIL;
-		goto out;
-	}
-
-	CORBA_exception_free (&ev);
-
- out:
-
-	return shell_view;
-}
-
-/* Displays the currently displayed time range in the folder bar label on the
-   shell view, according to which view we are showing. */
-void
-calendar_set_folder_bar_label (GnomeCalendar *gcal, BonoboControl *control)
-{
-	icaltimezone *zone;
-	struct icaltimetype start_tt, end_tt;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	char buffer[512], end_buffer[256];
-	GnomeCalendarViewType view;
-
-	gnome_calendar_get_visible_time_range (gcal, &start_time, &end_time);
-	zone = gnome_calendar_get_timezone (gcal);
-
-	start_tt = icaltime_from_timet_with_zone (start_time, FALSE, zone);
-	start_tm.tm_year = start_tt.year - 1900;
-	start_tm.tm_mon = start_tt.month - 1;
-	start_tm.tm_mday = start_tt.day;
-	start_tm.tm_hour = start_tt.hour;
-	start_tm.tm_min = start_tt.minute;
-	start_tm.tm_sec = start_tt.second;
-	start_tm.tm_isdst = -1;
-	start_tm.tm_wday = time_day_of_week (start_tt.day, start_tt.month - 1,
-					     start_tt.year);
-
-	/* Take one off end_time so we don't get an extra day. */
-	end_tt = icaltime_from_timet_with_zone (end_time - 1, FALSE, zone);
-	end_tm.tm_year = end_tt.year - 1900;
-	end_tm.tm_mon = end_tt.month - 1;
-	end_tm.tm_mday = end_tt.day;
-	end_tm.tm_hour = end_tt.hour;
-	end_tm.tm_min = end_tt.minute;
-	end_tm.tm_sec = end_tt.second;
-	end_tm.tm_isdst = -1;
-	end_tm.tm_wday = time_day_of_week (end_tt.day, end_tt.month - 1,
-					   end_tt.year);
-
-	view = gnome_calendar_get_view (gcal);
-
-	switch (view) {
-	case GNOME_CAL_DAY_VIEW:
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year
-		    && start_tm.tm_mon == end_tm.tm_mon
-		    && start_tm.tm_mday == end_tm.tm_mday) {
-			strftime (buffer, sizeof (buffer),
-				  _("%A %d %B %Y"), &start_tm);
-		} else if (start_tm.tm_year == end_tm.tm_year) {
-			strftime (buffer, sizeof (buffer),
-				  _("%a %d %b"), &start_tm);
-			strftime (end_buffer, sizeof (end_buffer),
-				  _("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		} else {
-			strftime (buffer, sizeof (buffer),
-				  _("%a %d %b %Y"), &start_tm);
-			strftime (end_buffer, sizeof (end_buffer),
-				  _("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year) {
-			if (start_tm.tm_mon == end_tm.tm_mon) {
-				strftime (buffer, sizeof (buffer),
-					  "%d", &start_tm);
-				strftime (end_buffer, sizeof (end_buffer),
-					  _("%d %B %Y"), &end_tm);
-				strcat (buffer, " - ");
-				strcat (buffer, end_buffer);
-			} else {
-				strftime (buffer, sizeof (buffer),
-					  _("%d %B"), &start_tm);
-				strftime (end_buffer, sizeof (end_buffer),
-					  _("%d %B %Y"), &end_tm);
-				strcat (buffer, " - ");
-				strcat (buffer, end_buffer);
-			}
-		} else {
-			strftime (buffer, sizeof (buffer),
-				  _("%d %B %Y"), &start_tm);
-			strftime (end_buffer, sizeof (end_buffer),
-				  _("%d %B %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	control_util_set_folder_bar_label (control, buffer);
-}
-
-void
-control_util_set_folder_bar_label (BonoboControl *control, char *label)
-{
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	shell_view = get_shell_view_interface (control);
-	if (shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_ShellView_setFolderBarLabel (shell_view, label, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("control_util_set_folder_bar_label(): Could not set the folder bar label");
-
-	CORBA_exception_free (&ev);
-}
-
-void
-control_util_show_settings (GnomeCalendar *gcal)
-{
-	BonoboControl *control;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	control = gtk_object_get_data (GTK_OBJECT (gcal), "control");
-	if (control == NULL)
-		return;
-
-	shell_view = get_shell_view_interface (control);
-	if (shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_ShellView_showSettings (shell_view, &ev);
-	
-	if (BONOBO_EX (&ev))
-		g_message ("control_util_show_settings(): Could not show settings");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Sensitizes the UI Component menu/toolbar calendar commands based on the
- * number of selected events. (This will always be 0 or 1 currently.)  If enable
- * is FALSE, all will be disabled.  Otherwise, the currently-selected number of
- * events will be used.
- */
-static void
-sensitize_calendar_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	int n_selected;
-	
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	n_selected = enable ? gnome_calendar_get_num_events_selected (gcal) : 0;
-
-	bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Copy", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive",
-				      enable ? "1" : "0",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-}
-
-/* Sensitizes the UI Component menu/toolbar tasks commands based on the number
- * of selected tasks.  If enable is FALSE, all will be disabled.  Otherwise, the
- * currently-selected number of tasks will be used.
- */
-static void
-sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	int n_selected;
-	
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	n_selected = enable ? gnome_calendar_get_num_tasks_selected (gcal) : 0;
-
-	bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Copy", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive",
-				      enable ? "1" : "0",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-}
-
-/* Callback used when the dates shown by the GnomeCalendar are changed.
-   We want to update the dates in the folder bar. */
-static void
-gcal_calendar_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	calendar_set_folder_bar_label (gcal, control);
-}
-
-/* Callback used when the selection in the calendar views changes */
-static void
-gcal_calendar_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	sensitize_calendar_commands (gcal, control, TRUE);
-}
-
-/* Callback used when the selection in the taskpad changes */
-static void
-gcal_taskpad_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	sensitize_taskpad_commands (gcal, control, TRUE);
-}
-
-/* Callback used when the focus changes for a calendar view */
-static void
-gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	if (in) {
-		gtk_signal_connect (GTK_OBJECT (gcal), "calendar_selection_changed",
-				    GTK_SIGNAL_FUNC (gcal_calendar_selection_changed_cb), control);
-		sensitize_calendar_commands (gcal, control, TRUE);
-		focus->calendar_focused = TRUE;
-	} else if (focus->calendar_focused) {
-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       GTK_SIGNAL_FUNC (gcal_calendar_selection_changed_cb),
-					       control);
-		sensitize_calendar_commands (gcal, control, FALSE);
-		focus->calendar_focused = FALSE;
-	}
-}
-
-/* Callback used when the taskpad focus changes */
-static void
-gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	if (in) {
-		gtk_signal_connect (GTK_OBJECT (gcal), "taskpad_selection_changed",
-				    GTK_SIGNAL_FUNC (gcal_taskpad_selection_changed_cb), control);
-		sensitize_taskpad_commands (gcal, control, TRUE);
-		focus->taskpad_focused = TRUE;
-	} else if (focus->taskpad_focused) {
-		/* With Bonobo controls, we may get unpaired focus_out events.
-		 * That is why we have to keep track of this ourselves instead
-		 * of blindly assumming that we are getting this event because
-		 * the taskpad was in fact focused.
-		 */
-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       GTK_SIGNAL_FUNC (gcal_taskpad_selection_changed_cb),
-					       control);
-		sensitize_taskpad_commands (gcal, control, FALSE);
-		focus->taskpad_focused = FALSE;
-	}
-
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),
-
-	BONOBO_UI_VERB ("Cut", cut_cmd),
-	BONOBO_UI_VERB ("Copy", copy_cmd),
-	BONOBO_UI_VERB ("Paste", paste_cmd),
-	BONOBO_UI_VERB ("Delete", delete_cmd),
-
-	BONOBO_UI_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_VERB ("CalendarGoto", goto_clicked),
-
-	BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked),
-	BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
-	BONOBO_UI_VERB ("ShowWeekView", show_week_view_clicked),
-	BONOBO_UI_VERB ("ShowMonthView", show_month_view_clicked),
-
-	BONOBO_UI_VERB ("PublishFreeBusy", publish_freebusy_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] =
-{
-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewAppointment",	              "new_appointment.xpm"),
-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewMeeting",	              "meeting.xpm"),
-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask",	              "new_task-16.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Cut",			      "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Copy",			      "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Paste",			      "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Delete",			      "evolution-trash-mini.png"),
-	E_PIXMAP ("/menu/File/Print/Print",				      "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/PrintPreview",			      "print-preview.xpm"),
-	E_PIXMAP ("/menu/View/ViewBegin/Goto",				      "goto-16.png"),
-
-	E_PIXMAP ("/Toolbar/New",					      "buttons/new_appointment.png"),
-	E_PIXMAP ("/Toolbar/NewTask",					      "buttons/new_task.png"),
-	E_PIXMAP ("/Toolbar/Print",					      "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/Delete",					      "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/Prev",					      "buttons/arrow-left-24.png"),
-	E_PIXMAP ("/Toolbar/Next",					      "buttons/arrow-right-24.png"),
-	E_PIXMAP ("/Toolbar/Goto",					      "buttons/goto-24.png"),
-	E_PIXMAP ("/Toolbar/DayView",					      "buttons/dayview.xpm"),
-	E_PIXMAP ("/Toolbar/WorkWeekView",				      "buttons/workweekview.xpm"),
-	E_PIXMAP ("/Toolbar/WeekView",					      "buttons/weekview.xpm"),
-	E_PIXMAP ("/Toolbar/MonthView",					      "buttons/monthview.xpm"),
-
-	E_PIXMAP_END
-};
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *gcal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-	FocusData *focus;
-
-	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);
-
-	gnome_calendar_set_ui_component (gcal, uic);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, gcal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-calendar.xml",
-			       "evolution-calendar");
-
-	e_pixmaps_update (uic, pixmaps);
-
-	gnome_calendar_setup_view_menus (gcal, uic);
-
-	gtk_signal_connect (GTK_OBJECT (gcal), "dates_shown_changed",
-			    GTK_SIGNAL_FUNC (gcal_calendar_dates_change_cb),
-			    control);
-	gtk_signal_connect (GTK_OBJECT (gcal), "calendar_focus_change",
-			    GTK_SIGNAL_FUNC (gcal_calendar_focus_change_cb), control);
-	gtk_signal_connect (GTK_OBJECT (gcal), "taskpad_focus_change",
-			    GTK_SIGNAL_FUNC (gcal_taskpad_focus_change_cb), control);
-
-	sensitize_calendar_commands (gcal, control, FALSE);
-	sensitize_taskpad_commands (gcal, control, FALSE);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	/* Show the dialog for setting the timezone if the user hasn't chosen
-	   a default timezone already. This is done in the startup wizard now,
-	   so we don't do it here. */
-#if 0
-	calendar_config_check_timezone_set ();
-#endif
-
-	calendar_set_folder_bar_label (gcal, control);
-
-	focus = g_new (FocusData, 1);
-	focus->calendar_focused = FALSE;
-	focus->taskpad_focused = FALSE;
-
-	gtk_object_set_data (GTK_OBJECT (control), "focus_data", focus);
-}
-
-void
-calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
-{
-	FocusData *focus;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	gnome_calendar_set_ui_component (gcal, uic);
-
-	focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	gtk_object_remove_data (GTK_OBJECT (control), "focus_data");
-	g_free (focus);
-
-	gnome_calendar_discard_view_menus (gcal);
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (gcal), control);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-}
-
-/* Removes a calendar from our list of all calendars when it is destroyed. */
-static void
-on_calendar_destroyed (GnomeCalendar *gcal)
-{
-	all_calendars = g_list_remove (all_calendars, gcal);
-}
-
-GnomeCalendar *
-new_calendar (void)
-{
-	GtkWidget *gcal;
-
-	gcal = gnome_calendar_new ();
-	if (!gcal) {
-		gnome_warning_dialog (_("Could not create the calendar view.  Please check your "
-					"ORBit and OAF setup."));
-		return NULL;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (gcal), "destroy",
-			    GTK_SIGNAL_FUNC (on_calendar_destroyed), NULL);
-
-	all_calendars = g_list_prepend (all_calendars, gcal);
-
-	return GNOME_CALENDAR (gcal);
-}
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
deleted file mode 100644
index 9ebac6eef4..0000000000
--- a/calendar/gui/calendar-commands.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include "gnome-cal.h"
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-component.h>
-
-/* This tells all the calendars to reload the config settings. */
-void update_all_config_settings (void);
-
-GnomeCalendar *new_calendar (void);
-
-void calendar_control_activate (BonoboControl *control, GnomeCalendar *gcal);
-void calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal);
-
-void calendar_goto_today (GnomeCalendar *gcal);
-
-void calendar_set_folder_bar_label (GnomeCalendar *gcal, BonoboControl *control);
-
-/* Used by calendar and tasks control to set the folder title bar label. */
-void control_util_set_folder_bar_label (BonoboControl *control, char *label);
-
-/* Used by calendar views and tasks to show the settings dialog */
-void control_util_show_settings (GnomeCalendar *gcal);
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
deleted file mode 100644
index b4a2b3ab89..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,729 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#include <config.h>
-
-#include <errno.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-exception.h>
-#include "evolution-shell-component.h"
-#include "calendar-offline-handler.h"
-#include "component-factory.h"
-#include "tasks-control-factory.h"
-#include "config-control-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#include "tasks-control.h"
-#include "tasks-migrate.h"
-
-
-
-/* OAFIID for the component.  */
-#define COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent"
- 
-/* Folder type IDs */
-#define FOLDER_CALENDAR "calendar"
-#define FOLDER_TASKS "tasks"
-
-/* IDs for user creatable items */
-#define CREATE_EVENT_ID "event"
-#define CREATE_ALLDAY_EVENT_ID "allday-event"
-#define CREATE_MEETING_ID "meeting"
-#define CREATE_TASK_ID "task"
-
-char *evolution_dir;
-EvolutionShellClient *global_shell_client = NULL;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ FOLDER_CALENDAR,
-	  "evolution-calendar.png",
-	  N_("Calendar"),
-	  N_("Folder containing appointments and events"),
-	  TRUE, NULL, NULL },
-	{ FOLDER_TASKS,
-	  "evolution-tasks.png",
-	  N_("Tasks"),
-	  N_("Folder containing to-do items"),
-	  TRUE, NULL, NULL },
-	{ NULL, NULL }
-};
-
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     const char *view_info,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!g_strcasecmp (type, "calendar")) {
-		control = control_factory_new_control ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else if (!g_strcasecmp (type, "tasks")) {
-		control = tasks_control_new ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else {
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-	}
-
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-	if (!g_strcasecmp (type, "calendar") && *view_info)
-		bonobo_control_set_property (control, "view", view_info, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	GnomeVFSURI *uri;
-
-	CORBA_exception_init (&ev);
-
-	if (strcmp (type, FOLDER_CALENDAR) && strcmp (type, FOLDER_TASKS)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	uri = gnome_vfs_uri_new (physical_uri);
-	if (uri) {
-		/* we don't need to do anything */
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_OK, &ev);
-		gnome_vfs_uri_unref (uri);
-	}
-	else {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Asks the alarm daemon to stop monitoring the specified URI */
-static void
-stop_alarms (GnomeVFSURI *uri)
-{
-	char *str_uri;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_AlarmNotify an;
-
-	/* Activate the alarm notification service */
-
-	CORBA_exception_init (&ev);
-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("stop_alarms(): Could not activate the alarm notification service");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Ask the service to remove the URI from its list of calendars */
-
-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	g_assert (str_uri != NULL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_AlarmNotify_removeCalendar (an, str_uri, &ev);
-	g_free (str_uri);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI)) {
-		g_message ("stop_alarms(): Invalid URI reported from the alarm notification service");
-	} else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound)) {
-		/* This is OK; the service may not have loaded that calendar */
-	} else if (BONOBO_EX (&ev)) {
-		g_message ("stop_alarms(): Could not issue the removeCalendar request");
-	}
-	
-	CORBA_exception_free (&ev);
-
-	/* Get rid of the service */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (an, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("stop_alarms(): Could not unref the alarm notification service");
-	CORBA_exception_free (&ev);
-}
-
-static void
-remove_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	GnomeVFSURI *dir_uri, *data_uri, *backup_uri;
-	GnomeVFSResult data_result, backup_result;
-
-	/* check type */
-	if (strcmp (type, FOLDER_CALENDAR) && strcmp (type, FOLDER_TASKS)) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener of "
-				   "an unsupported folder type");
-
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* check URI */
-	dir_uri = gnome_vfs_uri_new (physical_uri);
-	if (!dir_uri) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* Compute the URIs of the appropriate files */
-
-	if (strcmp (type, FOLDER_CALENDAR) == 0) {
-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics");
-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics~");
-	} else if (strcmp (type, FOLDER_TASKS) == 0) {
-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics");
-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics~");
-	} else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (!data_uri || !backup_uri) {
-		CORBA_Environment ev;
-
-		g_message ("remove_folder(): Could not generate the data/backup URIs");
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener "
-				   "of an invalid URI");
-
-		CORBA_exception_free (&ev);
-
-		goto out;
-	}
-
-	/* Ask the alarm daemon to stop monitoring this URI */
-
-	stop_alarms (data_uri);
-
-	/* Delete the data and backup files; the shell will take care of the rest */
-
-	data_result = gnome_vfs_unlink_from_uri (data_uri);
-	backup_result = gnome_vfs_unlink_from_uri (backup_uri);
-
-	if ((data_result == GNOME_VFS_OK || data_result == GNOME_VFS_ERROR_NOT_FOUND)
-	    && (backup_result == GNOME_VFS_OK || backup_result == GNOME_VFS_ERROR_NOT_FOUND)) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_OK,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener about success");
-
-		CORBA_exception_free (&ev);
-	} else {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener about failure");
-
-		CORBA_exception_free (&ev);
-	}
-
- out:
-
-	gnome_vfs_uri_unref (dir_uri);
-
-	if (data_uri)
-		gnome_vfs_uri_unref (data_uri);
-
-	if (backup_uri)
-		gnome_vfs_uri_unref (backup_uri);
-}
-
-static GNOME_Evolution_ShellComponentListener_Result
-xfer_file (GnomeVFSURI *base_src_uri,
-	   GnomeVFSURI *base_dest_uri,
-	   const char *file_name,
-	   int remove_source)
-{
-	GnomeVFSURI *src_uri, *dest_uri;
-	GnomeVFSHandle *hin, *hout;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo file_info;
-	GnomeVFSFileSize size;
-	char *buffer;
-
-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);
-
-	result = gnome_vfs_open_uri (&hin, src_uri, GNOME_VFS_OPEN_READ);
-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */
-	}
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_get_file_info_uri (src_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);
-
-	result = gnome_vfs_create_uri (&hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	/* write source file to destination file */
-	buffer = g_malloc (file_info.size);
-	result = gnome_vfs_read (hin, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_write (hout, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	if (remove_source) {
-		char *text_uri;
-
-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */
-
-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);
-		result = gnome_vfs_unlink (text_uri);
-		g_free (text_uri);
-	}
-
-	gnome_vfs_close (hin);
-	gnome_vfs_close (hout);
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-	g_free (buffer);
-
-	return GNOME_Evolution_ShellComponentListener_OK;
-}
-
-static void
-xfer_folder (EvolutionShellComponent *shell_component,
-	     const char *source_physical_uri,
-	     const char *destination_physical_uri,
-	     const char *type,
-	     gboolean remove_source,
-	     const GNOME_Evolution_ShellComponentListener listener,
-	     void *closure)
-{
-	CORBA_Environment ev;
-	GnomeVFSURI *src_uri;
-	GnomeVFSURI *dest_uri;
-	GnomeVFSResult result;
-	char *filename, *backup_filename;
-
-	CORBA_exception_init (&ev);
-
-	/* check type */
-	if (strcmp (type, FOLDER_CALENDAR) && strcmp (type, FOLDER_TASKS)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* check URIs */
-	src_uri = gnome_vfs_uri_new (source_physical_uri);
-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);
-	if (!src_uri || ! dest_uri) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	if (strcmp (type, FOLDER_CALENDAR) == 0) {
-		filename = "calendar.ics";
-		backup_filename = "calendar.ics~";
-	} else if (strcmp (type, FOLDER_TASKS) == 0) {
-		filename = "tasks.ics";
-		backup_filename = "tasks.ics~";
-	} else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	result = xfer_file (src_uri, dest_uri, filename, remove_source);
-	if (result == GNOME_Evolution_ShellComponentListener_OK)
-		result = xfer_file (src_uri, dest_uri, backup_filename, remove_source);
-	
-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &ev);
-
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-
-        CORBA_exception_free (&ev);	
-}
-
-static GList *shells = NULL;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	static gboolean migrated = FALSE;
-	
-	evolution_dir = g_strdup (evolution_homedir);
-
-	if (!migrated) {
-		tasks_migrate ();
-		migrated = TRUE;
-	}
-
-	shells = g_list_append (shells, shell_component);
-
-	global_shell_client = shell_client;
-
-	config_control_factory_register (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)));
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-	      gpointer user_data)
-{
-	shells = g_list_remove (shells, shell_component);
-	
-	if (g_list_length (shells) == 0)
-		gtk_main_quit ();
-}
-
-/* Computes the final URI for a calendar component */
-static char *
-get_data_uri (const char *uri, CalComponentVType vtype)
-{
-	if (uri) {
-		if (*uri != '/' && strncmp (uri, "file:", 5) != 0)
-			return g_strdup (uri);
-		if (vtype == CAL_COMPONENT_EVENT)
-			return g_concat_dir_and_file (uri, "calendar.ics");
-		else if (vtype == CAL_COMPONENT_TODO)
-			return g_concat_dir_and_file (uri, "tasks.ics");
-		else
-			g_assert_not_reached ();
-	} else {
-		if (vtype == CAL_COMPONENT_EVENT)
-			return g_concat_dir_and_file (g_get_home_dir (),
-						      "evolution/local/Calendar/calendar.ics");
-		else if (vtype == CAL_COMPONENT_TODO)
-			return g_concat_dir_and_file (g_get_home_dir (),
-						      "evolution/local/Tasks/tasks.ics");
-		else
-			g_assert_not_reached ();
-	}
-
-	return NULL;
-}
-
-/* Creates a calendar component at a specified URI.  If the URI is NULL then it
- * uses the default folder for that type of component.
- */
-static void
-create_component (const char *uri, GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	char *real_uri;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CompEditorFactory factory;
-	CalComponentVType vtype;
-
-	switch (type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:
-		vtype = CAL_COMPONENT_EVENT;
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		vtype = CAL_COMPONENT_TODO;
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	real_uri = get_data_uri (uri, vtype);
-
-	/* Get the factory */
-
-	CORBA_exception_init (&ev);
-	factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory",
-					0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("create_component(): Could not activate the component editor factory");
-		CORBA_exception_free (&ev);
-		g_free (real_uri);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Create the item */
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_CompEditorFactory_editNew (factory, real_uri, type, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("create_component(): Exception while creating the component");
-
-	CORBA_exception_free (&ev);
-	g_free (real_uri);
-
-	/* Get rid of the factory */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (factory, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("create_component(): Could not unref the calendar component factory");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Callback used when we must create a user-creatable item */
-static void
-sc_user_create_new_item_cb (EvolutionShellComponent *shell_component,
-			    const char *id,
-			    const char *parent_folder_physical_uri,
-			    const char *parent_folder_type)
-{
-	if (strcmp (id, CREATE_EVENT_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)
-			create_component (parent_folder_physical_uri, 
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);
-		else
-			create_component (NULL,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);
- 	} else if (strcmp (id, CREATE_ALLDAY_EVENT_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)
-			create_component (parent_folder_physical_uri, 
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);
-		else
-			create_component (NULL,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);
-	} else if (strcmp (id, CREATE_MEETING_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)
-			create_component (parent_folder_physical_uri,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);
-		else
-			create_component (NULL,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);
-	} else if (strcmp (id, CREATE_TASK_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_TASKS) == 0)
-			create_component (parent_folder_physical_uri,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);
-		else
-			create_component (NULL, 
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);
-	} else
-		g_assert_not_reached ();
-}
-
-
-/* The factory function.  */
-
-static void
-add_creatable_item (EvolutionShellComponent *shell_component,
-		    const char *id,
-		    const char *description,
-		    const char *menu_description,
-		    char menu_shortcut,
-		    const char *icon_name)
-{
-	char *icon_path;
-	GdkPixbuf *icon;
-
-	if (icon_name == NULL) {
-		icon_path = NULL;
-		icon = NULL;
-	} else {
-		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
-		icon = gdk_pixbuf_new_from_file (icon_path);
-	}
-
-	evolution_shell_component_add_user_creatable_item (shell_component,
-							   id,
-							   description,
-							   menu_description,
-							   menu_shortcut,
-							   icon);
-
-	if (icon != NULL)
-		gdk_pixbuf_unref (icon);
-	g_free (icon_path);
-}
-
-static BonoboObject *
-create_object (void)
-{
-	EvolutionShellComponent *shell_component;
-	CalendarOfflineHandler *offline_handler;	
-
-	shell_component = evolution_shell_component_new (folder_types,
-							 NULL,
-							 create_view,
-							 create_folder,
-							 remove_folder,
-							 xfer_folder,
-							 NULL, /* populate_folder_context_menu_fn */
-							 NULL, /* get_dnd_selection_fn */
-							 NULL  /* closure */);
-
-	/* Offline handler */
-	offline_handler = calendar_offline_handler_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component), 
-				     BONOBO_OBJECT (offline_handler));
-	
-	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);
-
-	/* User creatable items */
-
-	add_creatable_item (shell_component, CREATE_MEETING_ID,
-			    _("New meeting"), _("_Meeting"),
-			    's', "meeting-request.png");
-
-	add_creatable_item (shell_component, CREATE_TASK_ID,
-			    _("New task"), _("_Task"),
-			    't', "new_task-16.png");
-
-	add_creatable_item (shell_component, CREATE_ALLDAY_EVENT_ID,
-			    _("New All Day Appointment"), _("All _Day Appointment"),
-			    'd', "new_all_day_event.png");
-
-	add_creatable_item (shell_component, CREATE_EVENT_ID,
-			    _("New appointment"), _("_Appointment"),
-			    'a', "new_appointment.xpm");
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
-			    GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-component_factory_init (void)
-{
-	BonoboObject *object;
-	int result;
-
-	object = create_object ();
-
-	result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (object));
-
-	if (result == OAF_REG_ERROR)
-		g_error ("Cannot initialize Evolution's calendar component.");
-}
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
deleted file mode 100644
index 576255cb6d..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  Ximian, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#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 572db1fe2c..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <time.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-config.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include <cal-util/timeutil.h>
-#include "component-factory.h"
-#include "calendar-commands.h"
-#include "e-tasks.h"
-#include "e-cell-date-edit-text.h"
-#include "calendar-config.h"
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo-conf/bonobo-config-database.h>
-
-typedef struct
-{
-	gchar	       *timezone;
-	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;
-	char           *tasks_due_today_color;
-	char           *tasks_overdue_color;
-	gboolean	hide_completed_tasks;
-	CalUnits	hide_completed_tasks_units;
-	gint		hide_completed_tasks_value;
-	gboolean	confirm_delete;
-	gboolean	confirm_expunge;
-	gboolean        use_default_reminder;
-	int             default_reminder_interval;
-	CalUnits        default_reminder_units;
-} CalendarConfig;
-
-
-static CalendarConfig *config = NULL;
-
-static void config_read			(void);
-
-static void on_timezone_set		(GnomeDialog	*dialog,
-					 int		 button,
-					 ETimezoneDialog *etd);
-static gboolean on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-						 GdkEvent	*event,
-						 ETimezoneDialog *etd);
-
-void
-calendar_config_init			(void)
-{
-	if (config)
-		return;
-
-	config = g_new0 (CalendarConfig, 1);
-
-	config_read ();
-}
-
-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, in which
-   case the user can choose between 12 and 24-hour time formats. */
-gboolean
-calendar_config_locale_supports_12_hour_format (void)
-{
-	char s[16];
-	time_t t = 0;
-
-	strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-static void
-config_read				(void)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	char *units;
-
-	CORBA_exception_init (&ev);
-
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return;
- 	}
-
-	CORBA_exception_free (&ev);
-
-	/* Default to UTC if the timezone is not set or is "". */
-	config->timezone =  bonobo_config_get_string_with_default (db,
-                "/Calendar/Display/Timezone", "UTC", NULL);
-	if (!config->timezone || !config->timezone[0]) {
-		g_free (config->timezone);
-		config->timezone = g_strdup ("UTC");
-	}
-
- 	config->working_days = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/WorkingDays", CAL_MONDAY | CAL_TUESDAY |
-		CAL_WEDNESDAY | CAL_THURSDAY | CAL_FRIDAY, NULL);
-
-	config->week_start_day = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/WeekStartDay", 1, NULL);
-
-	/* If the locale defines 'am' and 'pm' strings then the user has the
-	   choice of 12-hour or 24-hour time format, with 12-hour as the
-	   default. If the locale doesn't have 'am' and 'pm' strings we have
-	   to use 24-hour format, or strftime()/strptime() won't work. */
-	if (calendar_config_locale_supports_12_hour_format ()) {
-		config->use_24_hour_format = bonobo_config_get_boolean_with_default (db, "/Calendar/Display/Use24HourFormat", FALSE, NULL);
-	} else {
-		config->use_24_hour_format = TRUE;
-	}
-
-	config->week_start_day = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/WeekStartDay", 1, NULL);
-
-	config->day_start_hour = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/DayStartHour", 9, NULL);
-
-	config->day_start_minute = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/DayStartMinute", 0, NULL);
-
-	config->day_end_hour =  bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/DayEndHour", 17, NULL);
-
-	config->day_end_minute = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/DayEndMinute", 0, NULL);
-
-	config->time_divisions = bonobo_config_get_long_with_default (db,
-                "/Calendar/Display/TimeDivisions", 30, NULL);
-
-	config->view = bonobo_config_get_long_with_default (db,
-		"/Calendar/Display/View", 0, NULL);
-
-	config->hpane_pos = bonobo_config_get_float_with_default (db,
-                "/Calendar/Display/HPanePosition", 1.0, NULL);
-
-	config->vpane_pos = bonobo_config_get_float_with_default (db,
-                "/Calendar/Display/VPanePosition", 1.0, NULL);
-
-	config->month_hpane_pos = bonobo_config_get_float_with_default (db,
-                "/Calendar/Display/MonthHPanePosition", 0.0, NULL);
-
-	config->month_vpane_pos = bonobo_config_get_float_with_default (db,
-                "/Calendar/Display/MonthVPanePosition", 1.0, NULL);
-
-	config->compress_weekend =  bonobo_config_get_boolean_with_default (db,
-                "/Calendar/Display/CompressWeekend", TRUE, NULL);
-
-	config->show_event_end =  bonobo_config_get_boolean_with_default (db,
-                "/Calendar/Display/ShowEventEndTime", TRUE, NULL);
-
-	/* 'DateNavigator' settings. */
-
-	config->dnav_show_week_no = bonobo_config_get_boolean_with_default (db,
-                "/Calendar/DateNavigator/ShowWeekNumbers", FALSE, NULL);
-
-	/* Task list settings */
-
-	config->tasks_due_today_color = bonobo_config_get_string_with_default (
-		db, "/Calendar/Tasks/Colors/TasksDueToday", "blue", NULL);
-
-	config->tasks_overdue_color = bonobo_config_get_string_with_default (
-		db, "/Calendar/Tasks/Colors/TasksOverdue", "red", NULL);
-
-	config->hide_completed_tasks = bonobo_config_get_boolean_with_default (
-		db, "/Calendar/Tasks/HideCompletedTasks", FALSE, NULL);
-
-	units = bonobo_config_get_string_with_default (db,
-		"/Calendar/Tasks/HideCompletedTasksUnits", "days", NULL);
-
-	if (!strcmp (units, "minutes"))
-		config->hide_completed_tasks_units = CAL_MINUTES;
-	else if (!strcmp (units, "hours"))
-		config->hide_completed_tasks_units = CAL_HOURS;
-	else
-		config->hide_completed_tasks_units = CAL_DAYS;
-
-	g_free (units);
-
-	config->hide_completed_tasks_value = bonobo_config_get_long_with_default (
-		db, "/Calendar/Tasks/HideCompletedTasksValue", 1, NULL);
-
-	/* Confirmation */
-	config->confirm_delete = bonobo_config_get_boolean_with_default (
-		db, "/Calendar/Other/ConfirmDelete", TRUE, NULL);
-	config->confirm_expunge = bonobo_config_get_boolean_with_default (
-		db, "/Calendar/Other/ConfirmExpunge", TRUE, NULL);
-
-	/* Default reminders */
-	config->use_default_reminder = bonobo_config_get_boolean_with_default (
-		db, "/Calendar/Other/UseDefaultReminder", FALSE, NULL);
-
-	config->default_reminder_interval = bonobo_config_get_long_with_default (
-		db, "/Calendar/Other/DefaultReminderInterval", 15, NULL);
-
-	units = bonobo_config_get_string_with_default (db,
-		"/Calendar/Other/DefaultReminderUnits", "minutes", NULL);
-
-	if (!strcmp (units, "days"))
-		config->default_reminder_units = CAL_DAYS;
-	else if (!strcmp (units, "hours"))
-		config->default_reminder_units = CAL_HOURS;
-	else
-		config->default_reminder_units = CAL_MINUTES; /* changed from above because
-							       * if bonobo-config fucks up
-							       * we want minutes, not days!
-							       */
-	g_free (units);
-
-	bonobo_object_release_unref (db, NULL);
-}
-
-/* Returns the string representation of a units value */
-static const char *
-units_to_string (CalUnits units)
-{
-	switch (units) {
-	case CAL_DAYS:
-		return "days";
-
-	case CAL_HOURS:
-		return "hours";
-
-	case CAL_MINUTES:
-		return "minutes";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-void
-calendar_config_write			(void)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return;
- 	}
-
-	if (config->timezone)
-		bonobo_config_set_string (db, "/Calendar/Display/Timezone",
-					  config->timezone, NULL);
-
-	bonobo_config_set_long (db, "/Calendar/Display/WorkingDays",
-				config->working_days, NULL);
-	bonobo_config_set_boolean (db, "/Calendar/Display/Use24HourFormat",
-				   config->use_24_hour_format, NULL);
-	bonobo_config_set_long (db, "/Calendar/Display/WeekStartDay",
-				config->week_start_day, NULL);
-	bonobo_config_set_long (db, "/Calendar/Display/DayStartHour",
-				config->day_start_hour, NULL);
-	bonobo_config_set_long (db, "/Calendar/Display/DayStartMinute",
-				config->day_start_minute, NULL);
-	bonobo_config_set_long (db, "/Calendar/Display/DayEndHour",
-				config->day_end_hour, NULL);
-	bonobo_config_set_long (db, "/Calendar/Display/DayEndMinute",
-				config->day_end_minute, NULL);
-	bonobo_config_set_boolean (db, "/Calendar/Display/CompressWeekend",
-				   config->compress_weekend, NULL);
-	bonobo_config_set_boolean (db, "/Calendar/Display/ShowEventEndTime",
-				   config->show_event_end, NULL);
-
-	bonobo_config_set_boolean (db,
-				   "/Calendar/DateNavigator/ShowWeekNumbers",
-				   config->dnav_show_week_no, NULL);
-
-	bonobo_config_set_string (db, "/Calendar/Tasks/Colors/TasksDueToday",
-				  config->tasks_due_today_color, NULL);
-
-	bonobo_config_set_string (db, "/Calendar/Tasks/Colors/TasksOverdue",
-				  config->tasks_overdue_color, NULL);
-
-	bonobo_config_set_boolean (db, "/Calendar/Tasks/HideCompletedTasks",
-				   config->hide_completed_tasks, NULL);
-
-	bonobo_config_set_string (db,
-				  "/Calendar/Tasks/HideCompletedTasksUnits",
-				  units_to_string (config->hide_completed_tasks_units), NULL);
-	bonobo_config_set_long (db,
-				"/Calendar/Tasks/HideCompletedTasksValue",
-				config->hide_completed_tasks_value, NULL);
-
-	bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmDelete", config->confirm_delete, NULL);
-	bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmExpunge", config->confirm_expunge, NULL);
-
-	bonobo_config_set_boolean (db, "/Calendar/Other/UseDefaultReminder",
-				   config->use_default_reminder, NULL);
-
-	bonobo_config_set_long (db, "/Calendar/Other/DefaultReminderInterval",
-				config->default_reminder_interval, NULL);
-
-	bonobo_config_set_string (db, "/Calendar/Other/DefaultReminderUnits",
-				  units_to_string (config->default_reminder_units), NULL);
-
-	Bonobo_ConfigDatabase_sync (db, &ev);
-
-	bonobo_object_release_unref (db, NULL);
-
-	CORBA_exception_free (&ev);
-}
-
-void
-calendar_config_write_on_exit		(void)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return;
- 	}
-
-	bonobo_config_set_long (db, "/Calendar/Display/View",
-				config->view, NULL);
-	bonobo_config_set_long (db, "/Calendar/Display/TimeDivisions",
-				config->time_divisions, NULL);
-	bonobo_config_set_float (db, "/Calendar/Display/HPanePosition",
-				 config->hpane_pos, NULL);
-	bonobo_config_set_float (db, "/Calendar/Display/VPanePosition",
-				 config->vpane_pos, NULL);
-	bonobo_config_set_float (db, "/Calendar/Display/MonthHPanePosition",
-				 config->month_hpane_pos, NULL);
-	bonobo_config_set_float (db, "/Calendar/Display/MonthVPanePosition",
-				 config->month_vpane_pos, NULL);
-
-	bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmExpunge",
-				   config->confirm_expunge, NULL);
-
-	Bonobo_ConfigDatabase_sync (db, &ev);
-
-	bonobo_object_release_unref (db, NULL);
-
-	CORBA_exception_free (&ev);
-}
-
-
-/*
- * Calendar Settings.
- */
-
-/* The current timezone, e.g. "Europe/London". It may be NULL, in which case
-   you should assume UTC (though Evolution will show the timezone-setting
-   dialog the next time a calendar or task folder is selected). */
-gchar*
-calendar_config_get_timezone		(void)
-{
-	return config->timezone;
-}
-
-
-/* Sets the timezone. If set to NULL it defaults to UTC.
-   FIXME: Should check it is being set to a valid timezone. */
-void
-calendar_config_set_timezone		(gchar	     *timezone)
-{
-	g_free (config->timezone);
-
-	if (timezone && timezone[0])
-		config->timezone = g_strdup (timezone);
-	else
-		config->timezone = g_strdup ("UTC");
-}
-
-
-/* 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;
-}
-
-
-/* Settings to hide completed tasks. */
-gboolean
-calendar_config_get_hide_completed_tasks	(void)
-{
-	return config->hide_completed_tasks;
-}
-
-
-void
-calendar_config_set_hide_completed_tasks	(gboolean	hide)
-{
-	config->hide_completed_tasks = hide;
-}
-
-
-CalUnits
-calendar_config_get_hide_completed_tasks_units	(void)
-{
-	return config->hide_completed_tasks_units;
-}
-
-
-void
-calendar_config_set_hide_completed_tasks_units	(CalUnits	units)
-{
-	config->hide_completed_tasks_units = units;
-}
-
-
-gint
-calendar_config_get_hide_completed_tasks_value	(void)
-{
-	return config->hide_completed_tasks_value;
-}
-
-
-void
-calendar_config_set_hide_completed_tasks_value	(gint		value)
-{
-	config->hide_completed_tasks_value = value;
-}
-
-/**
- * calendar_config_get_confirm_delete:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when deleting calendar/tasks items.
- *
- * Return value: Whether confirmation is required when deleting items.
- **/
-gboolean
-calendar_config_get_confirm_delete (void)
-{
-	return config->confirm_delete;
-}
-
-/**
- * calendar_config_set_confirm_delete:
- * @confirm: Whether confirmation is required when deleting items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when deleting calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_delete (gboolean confirm)
-{
-	config->confirm_delete = confirm;
-}
-
-/**
- * calendar_config_get_confirm_expunge:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when expunging calendar/tasks items.
- *
- * Return value: Whether confirmation is required when expunging items.
- **/
-gboolean
-calendar_config_get_confirm_expunge (void)
-{
-	return config->confirm_expunge;
-}
-
-/**
- * calendar_config_set_confirm_expunge:
- * @confirm: Whether confirmation is required when expunging items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when expunging calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_expunge (gboolean confirm)
-{
-	config->confirm_expunge = confirm;
-}
-
-/* This sets all the common config settings for an ECalendar widget.
-   These are the week start day, and whether we show week numbers. */
-void
-calendar_config_configure_e_calendar	(ECalendar	*cal)
-{
-	gboolean dnav_show_week_no;
-	gint week_start_day;
-
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "show_week_numbers", dnav_show_week_no,
-			       "week_start_day", week_start_day,
-			       NULL);
-}
-
-
-/* This sets all the common config settings for an EDateEdit widget.
-   These are the week start day, whether we show week numbers, and whether we
-   use 24 hour format. */
-void
-calendar_config_configure_e_date_edit	(EDateEdit	*dedit)
-{
-	gboolean dnav_show_week_no, use_24_hour;
-	gint week_start_day;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_date_edit_set_week_start_day (dedit, week_start_day);
-	e_date_edit_set_show_week_numbers (dedit, dnav_show_week_no);
-	e_date_edit_set_use_24_hour_format (dedit, use_24_hour);
-}
-
-
-/* This sets all the common config settings for an ECellDateEdit ETable item.
-   These are the settings for the ECalendar popup and the time list (if we use
-   24 hour format, and the hours of the working day). */
-void
-calendar_config_configure_e_cell_date_edit	(ECellDateEdit	*ecde)
-{
-	gboolean use_24_hour;
-	gint start_hour, end_hour;
-	ECellPopup *ecp;
-	ECellDateEditText *ecd;
-	char *location;
-	icaltimezone *zone;
-
-	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
-
-	ecp = E_CELL_POPUP (ecde);
-	ecd = E_CELL_DATE_EDIT_TEXT (ecp->child);
-
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	calendar_config_configure_e_calendar (E_CALENDAR (ecde->calendar));
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	start_hour = calendar_config_get_day_start_hour ();
-	end_hour = calendar_config_get_day_end_hour ();
-
-	/* Round up the end hour. */
-	if (calendar_config_get_day_end_minute () != 0)
-		end_hour++;
-
-	e_cell_date_edit_freeze (ecde);
-	gtk_object_set (GTK_OBJECT (ecde),
-			"use_24_hour_format", use_24_hour,
-#if 0
-			/* We use the default 0 - 24 now. */
-			"lower_hour", start_hour,
-			"upper_hour", end_hour,
-#endif
-			NULL);
-	e_cell_date_edit_thaw (ecde);
-
-	e_cell_date_edit_text_set_timezone (ecd, zone);
-	e_cell_date_edit_text_set_use_24_hour_format (ecd, use_24_hour);
-}
-
-
-/* This sets all the common config settings for an ECalendarTable widget.
-   These are the settings for the ECalendar popup and the time list (if we use
-   24 hour format, and the hours of the working day). */
-void
-calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table)
-{
-	CalendarModel *model;
-	gboolean use_24_hour;
-	char *location;
-	icaltimezone *zone;
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	model = e_calendar_table_get_model (cal_table);
-	calendar_model_set_use_24_hour_format (model, use_24_hour);
-
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-	calendar_model_set_timezone (model, zone);
-
-	calendar_config_configure_e_cell_date_edit (cal_table->dates_cell);
-
-	/* Reload the event/tasks, since the 'Hide Completed Tasks' option
-	   may have been changed, so the query needs to be updated. */
-	calendar_model_refresh (model);
-}
-
-
-
-void
-calendar_config_check_timezone_set ()
-{
-	ETimezoneDialog *timezone_dialog;
-	GtkWidget *dialog;
-	GList *elem;
-	char *zone;
-
-	zone = calendar_config_get_timezone ();
-	if (zone && zone[0])
-		return;
-
-	/* Show timezone dialog. */
-	timezone_dialog = e_timezone_dialog_new ();
-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
-
-	/* Hide the cancel button, which is the 2nd button. */
-	elem = g_list_nth (GNOME_DIALOG (dialog)->buttons, 1);
-	gtk_widget_hide (elem->data);
-
-	gtk_signal_connect (GTK_OBJECT (dialog), "clicked",
-			    GTK_SIGNAL_FUNC (on_timezone_set),
-			    timezone_dialog);
-	gtk_signal_connect (GTK_OBJECT (dialog), "delete-event",
-			    GTK_SIGNAL_FUNC (on_timezone_dialog_delete_event),
-			    timezone_dialog);
-
-	gtk_widget_show (dialog);
-}
-
-
-static void
-on_timezone_set			(GnomeDialog	*dialog,
-				 int		 button,
-				 ETimezoneDialog *etd)
-{
-	char *display_name;
-	icaltimezone *zone;
-
-	e_timezone_dialog_get_timezone (etd, &display_name);
-
-	/* We know it can only be a builtin timezone, since there is no way
-	   to set it to anything else. */
-	zone = e_timezone_dialog_get_builtin_timezone (display_name);
-	if (zone) {
-		calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-		calendar_config_write ();
-		update_all_config_settings ();
-		e_tasks_update_all_config_settings ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (etd));
-}
-
-
-static gboolean
-on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-				 GdkEvent	*event,
-				 ETimezoneDialog *etd)
-{
-	gtk_object_unref (GTK_OBJECT (etd));
-	return TRUE;
-}
-
-
-/**
- * calendar_config_get_tasks_due_today_color:
- *
- * Queries the color to be used to display tasks that are due today.
- *
- * Return value: An X color specification.
- **/
-const char *
-calendar_config_get_tasks_due_today_color (void)
-{
-	g_assert (config->tasks_due_today_color != NULL);
-	return config->tasks_due_today_color;
-}
-
-/**
- * calendar_config_set_tasks_due_today_color:
- * @color: X color specification
- *
- * Sets the color to be used to display tasks that are due today.
- **/
-void
-calendar_config_set_tasks_due_today_color (const char *color)
-{
-	g_return_if_fail (color != NULL);
-
-	g_assert (config->tasks_due_today_color != NULL);
-
-	g_free (config->tasks_due_today_color);
-	config->tasks_due_today_color = g_strdup (color);
-}
-
-/**
- * calendar_config_get_tasks_overdue_color:
- *
- * Queries the color to be used to display overdue tasks.
- *
- * Return value: An X color specification.
- **/
-const char *
-calendar_config_get_tasks_overdue_color (void)
-{
-	g_assert (config->tasks_overdue_color != NULL);
-	return config->tasks_overdue_color;
-}
-
-/**
- * calendar_config_set_tasks_overdue_color:
- * @color: X color specification
- *
- * Sets the color to be used to display overdue tasks.
- **/
-void
-calendar_config_set_tasks_overdue_color (const char *color)
-{
-	g_return_if_fail (color != NULL);
-
-	g_assert (config->tasks_overdue_color != NULL);
-
-	g_free (config->tasks_overdue_color);
-	config->tasks_overdue_color = g_strdup (color);
-}
-
-/**
- * calendar_config_get_use_default_reminder:
- *
- * Queries whether new appointments should be created with a default reminder.
- *
- * Return value: Boolean value indicating whether new appointments should be
- * created with a default reminder from the values of
- * calendar_config_get_default_reminder_interval() and
- * calendar_config_get_default_reminder_units().
- **/
-gboolean
-calendar_config_get_use_default_reminder (void)
-{
-	return config->use_default_reminder;
-}
-
-/**
- * calendar_config_set_use_default_reminder:
- * @value: Whether to create new appointments with a default reminder.
- *
- * Sets whether newly-created appointments should get a default reminder set
- * them.
- **/
-void
-calendar_config_set_use_default_reminder (gboolean value)
-{
-	config->use_default_reminder = value;
-}
-
-/**
- * calendar_config_get_default_reminder_interval:
- *
- * Queries the interval for the default reminder of newly-created
- * appointments, i.e. 5 in "5 minutes".
- *
- * Return value: Interval for default reminders.
- **/
-int
-calendar_config_get_default_reminder_interval (void)
-{
-	return config->default_reminder_interval;
-}
-
-/**
- * calendar_config_set_default_reminder_interval:
- * @interval: Interval value, e.g. 5 for "5 minutes".
- *
- * Sets the interval that should be used for the default reminder in new
- * appointments.
- **/
-void
-calendar_config_set_default_reminder_interval (int interval)
-{
-	config->default_reminder_interval = interval;
-}
-
-/**
- * calendar_config_get_default_reminder_units:
- *
- * Queries the units of time in which default reminders should be created for
- * new appointments, e.g. CAL_MINUTES for "5 minutes".
- *
- * Return value: Time units for default reminders.
- **/
-CalUnits
-calendar_config_get_default_reminder_units (void)
-{
-	return config->default_reminder_units;
-}
-
-/**
- * calendar_config_set_default_reminder_units:
- * @units: Time units, e.g. CAL_MINUTES for "5 minutes".
- *
- * Sets the units to be used for default reminders in new appointments.
- **/
-void
-calendar_config_set_default_reminder_units (CalUnits units)
-{
-	config->default_reminder_units = units;
-}
-
-/**
- * calendar_config_get_hide_completed_tasks_sexp:
- *
- * Returns the subexpression to use to filter out completed tasks according
- * to the config settings. The returned sexp should be freed.
- **/
-char*
-calendar_config_get_hide_completed_tasks_sexp (void)
-{
-	char *sexp = NULL;
-
-	if (calendar_config_get_hide_completed_tasks ()) {
-		CalUnits units;
-		gint value;
-
-		units = calendar_config_get_hide_completed_tasks_units ();
-		value = calendar_config_get_hide_completed_tasks_value ();
-
-		if (value == 0) {
-			/* If the value is 0, we want to hide completed tasks
-			   immediately, so we filter out all completed tasks.*/
-			sexp = g_strdup ("(not is-completed?)");
-		} else {
-			char *location, *isodate;
-			icaltimezone *zone;
-			struct icaltimetype tt;
-			time_t t;
-
-			/* Get the current time, and subtract the appropriate
-			   number of days/hours/minutes. */
-			location = calendar_config_get_timezone ();
-			zone = icaltimezone_get_builtin_timezone (location);
-			tt = icaltime_current_time_with_zone (zone);
-
-			switch (units) {
-			case CAL_DAYS:
-				icaltime_adjust (&tt, -value, 0, 0, 0);
-				break;
-			case CAL_HOURS:
-				icaltime_adjust (&tt, 0, -value, 0, 0);
-				break;
-			case CAL_MINUTES:
-				icaltime_adjust (&tt, 0, 0, -value, 0);
-				break;
-			default:
-				g_assert_not_reached ();
-			}
-
-			t = icaltime_as_timet_with_zone (tt, zone);
-
-			/* Convert the time to an ISO date string, and build
-			   the query sub-expression. */
-			isodate = isodate_from_time_t (t);
-			sexp = g_strdup_printf ("(not (completed-before? (make-time \"%s\")))", isodate);
-		}
-	}
-
-	return sexp;
-}
-
-char *
-calendar_config_default_calendar_folder (void)
-{
-	Bonobo_ConfigDatabase db;
-	char *uri;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return NULL;
- 	}
-
-	uri = bonobo_config_get_string (db, "/DefaultFolders/calendar_uri", &ev);
-	bonobo_object_release_unref (db, NULL);
-
-	if (BONOBO_EX (&ev)) {
-		CORBA_exception_free (&ev);
-		return NULL;		
-	}
-	
-	return uri;	
-}
-
-char *
-calendar_config_default_tasks_folder (void)
-{
-	Bonobo_ConfigDatabase db;
-	char *uri;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		CORBA_exception_free (&ev);
-		return NULL;
- 	}
-
-	uri = bonobo_config_get_string (db, "/DefaultFolders/tasks_uri", &ev);
-	bonobo_object_release_unref (db, NULL);
-
-	if (BONOBO_EX (&ev)) {
-		CORBA_exception_free (&ev);
-		return NULL;		
-	}
-	
-	return uri;	
-}
-
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index 6f0a9ee0fd..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_
-
-#include <widgets/misc/e-calendar.h>
-#include <widgets/misc/e-dateedit.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include "e-calendar-table.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;
-
-
-/* Units for settings. */
-typedef enum
-{
-	CAL_DAYS,
-	CAL_HOURS,
-	CAL_MINUTES
-} CalUnits;
-
-
-void	  calendar_config_init			(void);
-void	  calendar_config_write			(void);
-void	  calendar_config_write_on_exit		(void);
-
-
-/*
- * Calendar Settings.
- */
-
-/* The current timezone, e.g. "Europe/London". */
-gchar*	  calendar_config_get_timezone		(void);
-void	  calendar_config_set_timezone		(gchar	     *timezone);
-
-/* 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);
-
-/* Colors for the task list */
-const char *calendar_config_get_tasks_due_today_color	(void);
-void	    calendar_config_set_tasks_due_today_color	(const char *color);
-
-const char *calendar_config_get_tasks_overdue_color	(void);
-void	    calendar_config_set_tasks_overdue_color	(const char *color);
-
-/* Settings to hide completed tasks. */
-gboolean  calendar_config_get_hide_completed_tasks	(void);
-void	  calendar_config_set_hide_completed_tasks	(gboolean	hide);
-
-CalUnits  calendar_config_get_hide_completed_tasks_units(void);
-void	  calendar_config_set_hide_completed_tasks_units(CalUnits	units);
-
-gint	  calendar_config_get_hide_completed_tasks_value(void);
-void	  calendar_config_set_hide_completed_tasks_value(gint		value);
-
-char*	  calendar_config_get_hide_completed_tasks_sexp (void);
-
-/* Confirmation options */
-gboolean  calendar_config_get_confirm_delete (void);
-void      calendar_config_set_confirm_delete (gboolean confirm);
-
-gboolean  calendar_config_get_confirm_expunge (void);
-void      calendar_config_set_confirm_expunge (gboolean confirm);
-
-/* Default reminder options */
-gboolean calendar_config_get_use_default_reminder (void);
-void     calendar_config_set_use_default_reminder (gboolean value);
-
-int      calendar_config_get_default_reminder_interval (void);
-void     calendar_config_set_default_reminder_interval (int interval);
-
-CalUnits calendar_config_get_default_reminder_units (void);
-void     calendar_config_set_default_reminder_units (CalUnits units);
-
-
-/* Convenience functions to configure common properties of ECalendar,
-   EDateEdit & ECalendarTable widgets, and the ECellDateEdit ETable cell. */
-void	  calendar_config_configure_e_calendar		(ECalendar	*cal);
-void	  calendar_config_configure_e_date_edit		(EDateEdit	*dedit);
-void	  calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table);
-void	  calendar_config_configure_e_cell_date_edit	(ECellDateEdit	*ecde);
-
-/* Shows the timezone dialog if the user hasn't set a default timezone. */
-void	  calendar_config_check_timezone_set	(void);
-
-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
-   supports 12-hour time format. */
-gboolean  calendar_config_locale_supports_12_hour_format(void);
-
-/* Default folders, read-only */
-char *calendar_config_default_calendar_folder (void);
-char *calendar_config_default_tasks_folder (void);
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
deleted file mode 100644
index e8317402ac..0000000000
--- a/calendar/gui/calendar-model.c
+++ /dev/null
@@ -1,2465 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <sys/types.h>
-
-#include <ctype.h>
-
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-time-utils.h>
-#include <cal-util/timeutil.h>
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "comp-util.h"
-#include "itip-utils.h"
-#include "calendar-model.h"
-#include "evolution-activity-client.h"
-#include "e-cell-date-edit-text.h"
-#include "misc.h"
-
-/* This specifies how often we refresh the list, so that completed tasks are
-   hidden according to the config setting, and overdue tasks change color etc.
-   It is in milliseconds, so this is 10 minutes.
-   Note that if the user is editing an item in the list, they will probably
-   lose their edit, so this isn't ideal. */
-#define CALENDAR_MODEL_REFRESH_TIMEOUT	1000 * 60 * 10
-
-/* These hold the date values of the objects, so we can free the values when
-   we no longer need them. */
-typedef struct _CalendarModelObjectData CalendarModelObjectData;
-struct _CalendarModelObjectData {
-	ECellDateEditValue *dtstart;
-	ECellDateEditValue *dtend;
-	ECellDateEditValue *due;
-	ECellDateEditValue *completed;
-};
-
-/* We use a pointer to this value to indicate that the property is not set. */
-static ECellDateEditValue unset_date_edit_value;
-
-/* Private part of the ECalendarModel structure */
-struct _CalendarModelPrivate {
-	/* Calendar client we are using */
-	CalClient *client;
-
-	/* Types of objects we are dealing with */
-	CalObjType type;
-
-	/* S-expression for query and the query object */
-	char *sexp;
-	CalQuery *query;
-
-	/* Array of pointers to calendar objects */
-	GArray *objects;
-
-	/* Array of CalendarModelObjectData* holding data for each of the
-	   objects in the objects array above. */
-	GArray *objects_data;
-
-	/* UID -> array index hash */
-	GHashTable *uid_index_hash;
-
-	/* Type of components to create when using click-to-add in the table */
-	CalComponentVType new_comp_vtype;
-
-	/* Whether we display dates in 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* The default category to use when creating new tasks, e.g. when the
-	   filter is set to a certain category we use that category when
-	   creating a new task. */
-	gchar *default_category;
-
-	/* Addresses for determining icons */
-	GList *addresses;
-	
-	/* The current timezone. */
-	icaltimezone *zone;
-
-	/* The id of our timeout function for refreshing the list. */
-	gint timeout_id;
-
-	/* The activity client used to show messages on the status bar. */
-	EvolutionActivityClient *activity;
-};
-
-
-
-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);
-static char * calendar_model_value_to_string (ETableModel *etm, int col, const void *value);
-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;
-	etm_class->value_to_string = calendar_model_value_to_string;
-}
-
-
-static gboolean
-calendar_model_timeout_cb (gpointer data)
-{
-	CalendarModel *model;
-
-	g_return_val_if_fail (IS_CALENDAR_MODEL (data), FALSE);
-
-	model = CALENDAR_MODEL (data);
-
-	GDK_THREADS_ENTER ();
-
-	calendar_model_refresh (model);
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-/* 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->sexp = g_strdup ("#t"); /* match all by default */
-	priv->query = NULL;
-
-	priv->objects = g_array_new (FALSE, TRUE, sizeof (CalComponent *));
-	priv->objects_data = g_array_new (FALSE, FALSE, sizeof (CalendarModelObjectData));
-	priv->uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->new_comp_vtype = CAL_COMPONENT_EVENT;
-	priv->use_24_hour_format = TRUE;
-
-	priv->timeout_id = g_timeout_add (CALENDAR_MODEL_REFRESH_TIMEOUT,
-					  calendar_model_timeout_cb, model);
-
-	priv->addresses = itip_addresses_get ();
-	
-	priv->zone = NULL;
-
-	priv->activity = NULL;
-}
-
-static void
-calendar_model_free_object_data (CalendarModel *model,
-				 CalendarModelObjectData *object_data)
-{
-	if (object_data->dtstart != &unset_date_edit_value)
-		g_free (object_data->dtstart);
-
-	if (object_data->dtend != &unset_date_edit_value)
-		g_free (object_data->dtend);
-
-	if (object_data->due != &unset_date_edit_value)
-		g_free (object_data->due);
-
-	if (object_data->completed != &unset_date_edit_value)
-		g_free (object_data->completed);
-}
-
-/* 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;
-		CalendarModelObjectData *object_data;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-
-		object_data = &g_array_index (priv->objects_data,
-					      CalendarModelObjectData, i);
-		calendar_model_free_object_data (model, object_data);
-	}
-
-	g_array_set_size (priv->objects, 0);
-	g_array_set_size (priv->objects_data, 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;
-
-	if (priv->timeout_id) {
-		g_source_remove (priv->timeout_id);
-		priv->timeout_id = 0;
-	}
-
-	/* 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;
-	}
-
-	if (priv->sexp) {
-		g_free (priv->sexp);
-		priv->sexp = NULL;
-	}
-
-	if (priv->query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->query), model);
-		gtk_object_unref (GTK_OBJECT (priv->query));
-		priv->query = 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;
-
-	g_array_free (priv->objects_data, TRUE);
-	priv->objects_data = NULL;
-
-	g_free (priv->default_category);
-
-	itip_addresses_free (priv->addresses);
-
-	if (priv->activity) {
-		gtk_object_unref (GTK_OBJECT (priv->activity));
-		priv->activity = 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;
-}
-
-/* Builds a string based on the list of CATEGORIES properties of a calendar
- * component.
- */
-static char *
-get_categories (CalComponent *comp)
-{
-	const char *categories;
-
-	cal_component_get_categories (comp, &categories);
-
-	return categories ? (char*) categories : "";
-}
-
-/* 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_PRIVATE:
-		return _("Private");
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		return _("Confidential");
-
-	default:
-		return _("Public");
-	}
-}
-
-/* Returns an ECellDateEditValue* for a COMPLETED property of a
-   calendar component. Note that we cache these in the objects_data array so
-   we can free them eventually. */
-static ECellDateEditValue*
-get_completed	(CalendarModel *model,
-		 CalComponent  *comp,
-		 int row)
-{
-	CalendarModelPrivate *priv;
-	CalendarModelObjectData *object_data;
-	struct icaltimetype *completed;
-
-	priv = model->priv;
-
-	object_data = &g_array_index (priv->objects_data,
-				      CalendarModelObjectData, row);
-
-	if (!object_data->completed) {
-		cal_component_get_completed (comp, &completed);
-
-		if (completed) {
-			object_data->completed = g_new (ECellDateEditValue, 1);
-			object_data->completed->tt = *completed;
-			object_data->completed->zone = icaltimezone_get_utc_timezone ();
-			cal_component_free_icaltimetype (completed);
-		} else {
-			object_data->completed = &unset_date_edit_value;
-		}
-	}
-
-	return (object_data->completed == &unset_date_edit_value)
-		? NULL : object_data->completed;
-}
-
-/* Returns an ECellDateEditValue* for a DTSTART, DTEND or DUE property of a
-   calendar component. Note that we cache these in the objects_data array so
-   we can free them eventually. */
-static ECellDateEditValue*
-get_date_edit_value (CalendarModel *model, CalComponent *comp,
-		     int col, int row)
-{
-	CalendarModelPrivate *priv;
-	CalComponentDateTime dt;
-	CalendarModelObjectData *object_data;
-	ECellDateEditValue **value;
-
-	priv = model->priv;
-
-	object_data = &g_array_index (priv->objects_data,
-				      CalendarModelObjectData, row);
-
-	if (col == CAL_COMPONENT_FIELD_DTSTART)
-		value = &object_data->dtstart;
-	else if (col == CAL_COMPONENT_FIELD_DTEND)
-		value = &object_data->dtend;
-	else
-		value = &object_data->due;
-
-	if (!(*value)) {
-		if (col == CAL_COMPONENT_FIELD_DTSTART)
-			cal_component_get_dtstart (comp, &dt);
-		else if (col == CAL_COMPONENT_FIELD_DTEND)
-			cal_component_get_dtend (comp, &dt);
-		else
-			cal_component_get_due (comp, &dt);
-
-		if (dt.value) {
-			CalClientGetStatus status;
-			icaltimezone *zone;
-
-			/* For a DTEND with a DATE value, we subtract 1 from
-			   the day to display it. */
-			if (col == CAL_COMPONENT_FIELD_DTEND
-			    && dt.value->is_date) {
-				icaltime_adjust (dt.value, -1, 0, 0, 0);
-			}
-
-			*value = g_new (ECellDateEditValue, 1);
-			(*value)->tt = *dt.value;
-
-			/* FIXME: TIMEZONES: Handle error. */
-			status = cal_client_get_timezone (model->priv->client,
-							  dt.tzid, &zone);
-			(*value)->zone = zone;
-		} else {
-			*value = &unset_date_edit_value;
-		}
-
-		cal_component_free_datetime (&dt);
-	}
-
-	return (*value == &unset_date_edit_value) ? NULL : *value;
-}
-
-/* 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 int
-get_percent (CalComponent *comp)
-{
-	int *percent, retval;
-
-	cal_component_get_percent (comp, &percent);
-
-	if (percent) {
-		retval = *percent;
-		cal_component_free_percent (percent);
-	} else {
-		retval = -1;
-	}
-
-	return retval;
-}
-
-/* Builds a string for the PRIORITY property of a calendar component */
-static char *
-get_priority (CalComponent *comp)
-{
-	int *priority;
-	char *retval = "";
-
-	cal_component_get_priority (comp, &priority);
-
-	if (priority) {
-		retval = cal_util_priority_to_string (*priority);
-		cal_component_free_priority (priority);
-	}
-
-	return retval;
-}
-
-/* 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);
-
-	if (transp == CAL_COMPONENT_TRANSP_TRANSPARENT)
-		return _("Free");
-	else
-		return _("Busy");
-}
-
-/* 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
-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 component is overdue.  Sigh, this is very similar to
- * get_color() below.
- */
-static gboolean
-is_overdue (CalendarModel *model, 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 {
-		struct icaltimetype now_tt;
-		CalClientGetStatus status;
-		icaltimezone *zone;
-
-		/* Second, is it already completed? */
-
-		if (is_complete (comp)) {
-			retval = FALSE;
-			goto out;
-		}
-
-		/* Third, are we overdue as of right now? */
-
-		/* Get the current time in the same timezone as the DUE date.*/
-		/* FIXME: TIMEZONES: Handle error. */
-		status = cal_client_get_timezone (model->priv->client, dt.tzid,
-						  &zone);
-		now_tt = icaltime_current_time_with_zone (zone);
-
-		if (icaltime_compare (*dt.value, now_tt) <= 0)
-			retval = TRUE;
-		else
-			retval = FALSE;
-	}
-
- out:
-
-	cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-/* Computes the color to be used to display a component */
-static const char *
-get_color (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-	const char *retval;
-
-	cal_component_get_due (comp, &dt);
-
-	/* First, do we have a due date? */
-
-	if (!dt.value)
-		retval = NULL;
-	else {
-		struct icaltimetype now_tt;
-		CalClientGetStatus status;
-		icaltimezone *zone;
-
-		/* Second, is it already completed? */
-
-		if (is_complete (comp)) {
-			retval = NULL;
-			goto out;
-		}
-
-		/* Third, is it due today? */
-
-		/* Get the current time in the same timezone as the DUE date.*/
-		/* FIXME: TIMEZONES: Handle error. */
-		status = cal_client_get_timezone (model->priv->client, dt.tzid,
-						  &zone);
-		now_tt = icaltime_current_time_with_zone (zone);
-
-		if (icaltime_compare_date_only (*dt.value, now_tt) == 0) {
-			retval = calendar_config_get_tasks_due_today_color ();
-			goto out;
-		}
-
-		/* Fourth, are we overdue as of right now?  We use <= in the
-		 * comparison below so that the table entries change color
-		 * immediately.
-		 */
-
-		if (icaltime_compare (*dt.value, now_tt) <= 0)
-			retval = calendar_config_get_tasks_overdue_color ();
-		else
-			retval = NULL;
-	}
-
- out:
-
-	cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-static void *
-get_status (CalComponent *comp)
-{
-	icalproperty_status status;
-
-	cal_component_get_status (comp, &status);
-
-	switch (status) {
-	case ICAL_STATUS_NONE:
-		return "";
-
-	case ICAL_STATUS_NEEDSACTION:
-		return _("Not Started");
-
-	case ICAL_STATUS_INPROCESS:
-		return _("In Progress");
-
-	case ICAL_STATUS_COMPLETED:
-		return _("Completed");
-
-	case ICAL_STATUS_CANCELLED:
-		return _("Cancelled");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-#if 0
-static void *
-get_location (CalComponent *comp)
-{
-	const char *location;
-
-	cal_component_get_location (comp, &location);
-	return (void*) location;
-}
-#endif
-
-/* 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);
-
-#if 0
-	g_print ("In calendar_model_value_at: %i\n", col);
-#endif
-
-	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, row);
-
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-		return get_date_edit_value (model, comp, col, row);
-
-	case CAL_COMPONENT_FIELD_GEO:
-		return get_geo (comp);
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return GINT_TO_POINTER (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:
-	{
-		ItipAddress *ia;		
-		CalComponentOrganizer organizer;		
-		GSList *attendees = NULL, *sl;		
-		gint retval = 0;
-
-		if (cal_component_has_recurrences (comp))
-			return GINT_TO_POINTER (1);
-		
-		cal_component_get_organizer (comp, &organizer);
-		if (organizer.value != NULL) {
-			GList *l;
-			const char *text = itip_strip_mailto (organizer.value);
-			
-			for (l = priv->addresses; l != NULL; l = l->next) {
-				ia = l->data;
-				
-				if (!strcmp (text, ia->address)) {
-					retval = 3;
-					goto cleanup;
-				}
-			}
-		}		
-		
-		cal_component_get_attendee_list (comp, &attendees);
-		for (sl = attendees; sl != NULL; sl = sl->next) {
-			CalComponentAttendee *ca = sl->data;
-			const char *text;
-			GList *l;
-
-			text = itip_strip_mailto (ca->value);
-			for (l = priv->addresses; l != NULL; l = l->next) {
-				ia = l->data;
-				
-				if (!strcmp (text, ia->address)) {
-					if (ca->delto != NULL)
-						retval = 3;
-					else
-						retval = 2;
-					goto cleanup;
-				}
-			}
-		}
-
-		cleanup:
-		cal_component_free_attendee_list (attendees);
-		return GINT_TO_POINTER (retval);		
-		break;
-	}
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return GINT_TO_POINTER (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 (is_overdue (model, comp));
-
-	case CAL_COMPONENT_FIELD_COLOR:
-		return (void *) get_color (model, comp);
-
-	case CAL_COMPONENT_FIELD_STATUS:
-		return get_status (comp);
-
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		return comp;
-
-#if 0
-	case CAL_COMPONENT_FIELD_LOCATION :
-		return get_location (comp);
-#endif
-
-	default:
-		g_message ("calendar_model_value_at(): Requested invalid column %d", col);
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* 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);
-}
-
-
-static void
-set_classification (CalComponent *comp,
-		    const char *value)
-{
-	CalComponentClassification classif;
-
-	if (!g_strcasecmp (value, _("Private")))
-		classif = CAL_COMPONENT_CLASS_PRIVATE;
-	else if (!g_strcasecmp (value, _("Confidential")))
-		classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;
-	else
-		classif = CAL_COMPONENT_CLASS_PUBLIC;
-
-	cal_component_set_classification (comp, classif);
-}
-
-
-/* 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 void *value)
-{
-	ECellDateEditValue *dv = (ECellDateEditValue*) value;
-
-	if (!dv) {
-		ensure_task_not_complete (comp);
-	} else {
-		time_t t;
-
-		/* We assume that COMPLETED is entered in the current timezone,
-		   even though it gets stored in UTC. */
-		t = icaltime_as_timet_with_zone (dv->tt, dv->zone);
-
-		ensure_task_complete (comp, t);
-	}
-}
-
-/* Sets a CalComponentDateTime value */
-static void
-set_datetime (CalendarModel *model, CalComponent *comp, const void *value,
-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt),
-	      gboolean is_dtend)
-{
-	ECellDateEditValue *dv = (ECellDateEditValue*) value;
-
-	if (!dv) {
-		(* set_func) (comp, NULL);
-	} else {
-		CalComponentDateTime dt;
-
-		dt.value = &dv->tt;
-		dt.tzid = icaltimezone_get_tzid (dv->zone);
-
-		/* For a DTEND with a DATE value, we add 1 day to it. */
-		if (is_dtend && dt.value->is_date) {
-			icaltime_adjust (dt.value, 1, 0, 0, 0);
-		}
-
-		(* 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);
-}
-
-/* Sets the percent value of a calendar component */
-static void
-set_percent (CalComponent *comp, const void *value)
-{
-	gint percent = GPOINTER_TO_INT (value);
-
-	g_return_if_fail (percent >= -1);
-	g_return_if_fail (percent <= 100);
-
-	/* A value of -1 means it isn't set. */
-	if (percent == -1) {
-		cal_component_set_percent (comp, NULL);
-		ensure_task_not_complete (comp);
-	} else {
-		cal_component_set_percent (comp, &percent);
-
-		if (percent == 100)
-			ensure_task_complete (comp, -1);
-		else
-			ensure_task_not_complete (comp);
-	}
-}
-
-/* Sets the priority of a calendar component */
-static void
-set_priority (CalComponent *comp, const char *value)
-{
-	int priority;
-
-	priority = cal_util_priority_from_string (value);
-	/* If the priority is invalid (which should never happen) output a
-	   warning and set it to undefined. */
-	if (priority == -1) {
-		g_warning ("Invalid priority");
-		priority = 0;
-	}
-
-	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 transparency of a calendar component */
-static void
-set_transparency (CalComponent *comp, const char *value)
-{
-	CalComponentTransparency transp;
-
-	if (!g_strcasecmp (value, _("Free")))
-		transp = CAL_COMPONENT_TRANSP_TRANSPARENT;
-	else
-		transp = CAL_COMPONENT_TRANSP_OPAQUE;
-
-	cal_component_set_transparency (comp, transp);
-}
-
-/* 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);
-	}
-}
-
-/* Sets the status of a calendar component. */
-static void
-set_status (CalComponent *comp, const char *value)
-{
-	icalproperty_status status;
-	int percent;
-
-	/* An empty string is the same as 'None'. */
-	if (!value[0] || !g_strcasecmp (value, _("None")))
-		status = ICAL_STATUS_NONE;
-	else if (!g_strcasecmp (value, _("Not Started")))
-		status = ICAL_STATUS_NEEDSACTION;
-	else if (!g_strcasecmp (value, _("In Progress")))
-		status = ICAL_STATUS_INPROCESS;
-	else if (!g_strcasecmp (value, _("Completed")))
-		status = ICAL_STATUS_COMPLETED;
-	else if (!g_strcasecmp (value, _("Cancelled")))
-		status = ICAL_STATUS_CANCELLED;
-	else {
-		g_warning ("Invalid status: %s\n", value);
-		return;
-	}
-
-	cal_component_set_status (comp, status);
-
-	if (status == ICAL_STATUS_NEEDSACTION) {
-		percent = 0;
-		cal_component_set_percent (comp, &percent);
-		cal_component_set_completed (comp, NULL);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		ensure_task_complete (comp, -1);
-	}
-}
-
-#if 0
-static void
-set_location (CalComponent *comp, const char *value)
-{
-	if (string_is_empty (value)) {
-		cal_component_set_location (comp, NULL);
-		return;
-	}
-
-	cal_component_set_location (comp, value);
-}
-#endif
-
-/* 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);
-
-#if 0
-	g_print ("In calendar_model_set_value_at: %i\n", col);
-#endif
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		set_categories (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		set_classification (comp, value);
-		break;
-
-	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,
-			      TRUE);
-		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,
-			      FALSE);
-		break;
-
-	case CAL_COMPONENT_FIELD_DUE:
-		set_datetime (model, comp, value, cal_component_set_due,
-			      FALSE);
-		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;
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		set_transparency (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_URL:
-		set_url (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		set_complete (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_STATUS:
-		set_status (comp, value);
-		break;
-
-#if 0
-	case CAL_COMPONENT_FIELD_LOCATION :
-		set_location (comp, value);
-		break;
-#endif
-
-	default:
-		g_message ("calendar_model_set_value_at(): Requested invalid column %d", col);
-		g_assert_not_reached ();
-		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_CLASSIFICATION:
-	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:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_STATUS:
-		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;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	/* FIXME: This should support other types of components, but for now it
-	 * is only used for the task list.
-	 */
-	if (priv->new_comp_vtype == CAL_COMPONENT_EVENT)
-		comp = cal_comp_event_new_with_defaults ();
-	else {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, priv->new_comp_vtype);
-	}
-
-	set_categories (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_CATEGORIES, row));
-	set_classification (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_CLASSIFICATION, row));
-	set_completed (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_COMPLETED, row));
-	/* FIXME: Need to reset dtstart if dtend happens before it */
-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DTEND, row), cal_component_set_dtend, TRUE);
-	/* FIXME: Need to reset dtend if dtstart happens after it */
-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DTSTART, row), cal_component_set_dtstart, FALSE);
-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DUE, row), cal_component_set_due, FALSE);
-	set_geo (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_GEO, row));
-	set_percent (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_PERCENT, row));
-	set_priority (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_PRIORITY, row));
-	set_summary (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_SUMMARY, row));
-	set_transparency (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_TRANSPARENCY, row));
-	set_url (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_URL, row));
-	set_complete (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_COMPLETE, row));
-	set_status (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_STATUS, row));
-
-	if (!cal_client_update_object (priv->client, comp)) {
-		/* FIXME: Show error dialog. */
-		g_message ("calendar_model_append_row(): Could not add new object!");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Duplicates a string value */
-static char *
-dup_string (const char *value)
-{
-	return g_strdup (value);
-}
-
-static void*
-dup_date_edit_value (const void *value)
-{
-	ECellDateEditValue *dv, *orig_dv;
-
-	if (value == NULL)
-		return NULL;
-
-	orig_dv = (ECellDateEditValue*) value;
-
-	dv = g_new (ECellDateEditValue, 1);
-	*dv = *orig_dv;
-
-	return dv;
-}
-
-/* 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:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_STATUS:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-		return dup_date_edit_value (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return (void *) value;
-
-	case CAL_COMPONENT_FIELD_COMPONENT: {
-		CalComponent *comp;
-
-		comp = CAL_COMPONENT (value);
-		gtk_object_ref (GTK_OBJECT (comp));
-		return comp;
-	}
-
-	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:
-		if (value)
-			g_free (value);
-		break;
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		break;
-
-	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_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_STATUS:
-		if (value)
-			g_free (value);
-		break;
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		break;
-
-	case CAL_COMPONENT_FIELD_URL:
-		if (value)
-			g_free (value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-	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:
-		break;
-
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		if (value)
-			gtk_object_unref (GTK_OBJECT (value));
-		break;
-
-	default:
-		g_message ("calendar_model_free_value(): Requested invalid column %d", col);
-	}
-}
-
-/* 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)
-{
-	CalendarModel *model;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	model = CALENDAR_MODEL (etm);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return g_strdup (model->priv->default_category ? model->priv->default_category : "");
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_STATUS:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	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:
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return GINT_TO_POINTER (-1);
-
-	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)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		/* This could be a hack or not.  If the categories field only
-		 * contains the default category, then it possibly means that
-		 * the user has not entered anything at all in the click-to-add;
-		 * the category is in the value because we put it there in
-		 * calendar_model_initialize_value().
-		 */
-		if (priv->default_category && value && strcmp (priv->default_category, value) == 0)
-			return TRUE;
-		else
-			return string_is_empty (value);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_STATUS:
-		return string_is_empty (value);
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-		return value ? FALSE : TRUE;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return (GPOINTER_TO_INT (value) < 0) ? TRUE : FALSE;
-
-	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:
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		return TRUE;
-
-	default:
-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);
-		return TRUE;
-	}
-}
-
-static char*
-date_value_to_string (ETableModel *etm, const void *value)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	ECellDateEditValue *dv = (ECellDateEditValue *) value;
-	struct icaltimetype tt;
-	struct tm tmp_tm;
-	char buffer[64];
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	if (!dv)
-		return g_strdup ("");
-
-	/* We currently convert all the dates to the current timezone. */
-	tt = dv->tt;
-	icaltimezone_convert_time (&tt, dv->zone, priv->zone);
-
-	tmp_tm.tm_year = tt.year - 1900;
-	tmp_tm.tm_mon = tt.month - 1;
-	tmp_tm.tm_mday = tt.day;
-	tmp_tm.tm_hour = tt.hour;
-	tmp_tm.tm_min = tt.minute;
-	tmp_tm.tm_sec = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (tt.day, tt.month - 1, tt.year);
-
-	e_time_format_date_and_time (&tmp_tm, priv->use_24_hour_format,
-				     TRUE, FALSE,
-				     buffer, sizeof (buffer));
-	return e_utf8_from_locale_string (buffer);
-}
-
-
-static char *
-calendar_model_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_STATUS:
-		return g_strdup (value);
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-		return date_value_to_string (etm, value);
-
-	case CAL_COMPONENT_FIELD_ICON:
-		if (GPOINTER_TO_INT (value) == 0)
-			return e_utf8_from_locale_string (_("Normal"));
-		else if (GPOINTER_TO_INT (value) == 1)
-			return e_utf8_from_locale_string (_("Recurring"));
-		else
-			return e_utf8_from_locale_string (_("Assigned"));
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-		return e_utf8_from_locale_string (value ? _("Yes") : _("No"));
-
-	case CAL_COMPONENT_FIELD_COLOR:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		if (GPOINTER_TO_INT (value) < 0)
-			return NULL;
-		else
-			return g_strdup_printf ("%i%%", GPOINTER_TO_INT (value));
-
-	default:
-		g_message ("calendar_model_value_as_string(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-
-
-/**
- * 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 component is updated in the live query */
-static void
-query_obj_updated_cb (CalQuery *query, const char *uid,
-		      gboolean query_in_progress, int n_scanned, int total,
-		      gpointer data)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	int orig_idx;
-	CalComponent *new_comp;
-	const char *new_comp_uid;
-	int *new_idx;
-	CalClientGetStatus status;
-	CalendarModelObjectData new_object_data = { NULL, NULL, NULL, NULL };
-
-	model = CALENDAR_MODEL (data);
-	priv = model->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	orig_idx = remove_object (model, uid);
-
-	status = cal_client_get_object (priv->client, uid, &new_comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* 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);
-			g_array_append_val (priv->objects_data, new_object_data);
-
-			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);
-			e_table_model_row_inserted (E_TABLE_MODEL (model), *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);
-			g_array_insert_val (priv->objects_data, orig_idx,
-					    new_object_data);
-
-			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);
-		else
-			e_table_model_no_change (E_TABLE_MODEL (model));
-
-		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);
-		else
-			e_table_model_no_change (E_TABLE_MODEL (model));
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Callback used when a component is removed from the live query */
-static void
-query_obj_removed_cb (CalQuery *query, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	int idx;
-
-	model = CALENDAR_MODEL (data);
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	idx = remove_object (model, uid);
-
-	if (idx != -1)
-		e_table_model_row_deleted (E_TABLE_MODEL (model), idx);
-	else
-		e_table_model_no_change (E_TABLE_MODEL (model));
-}
-
-/* Callback used when a query ends */
-static void
-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)
-{
-	CalendarModel *model;
-
-	model = CALENDAR_MODEL (data);
-
-	/* FIXME */
-
-	calendar_model_set_status_message (model, NULL);
-
-	if (status != CAL_QUERY_DONE_SUCCESS)
-		g_warning ("query done: %s\n", error_str);
-}
-
-/* Callback used when an evaluation error occurs when running a query */
-static void
-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
-{
-	CalendarModel *model;
-
-	model = CALENDAR_MODEL (data);
-
-	/* FIXME */
-
-	calendar_model_set_status_message (model, NULL);
-
-	g_warning ("eval error: %s\n", error_str);
-}
-
-/* Builds a complete query sexp for the calendar model by adding the predicates
- * to filter only for the type of objects that the model supports, and
- * whether we want completed tasks.
- */
-static char *
-adjust_query_sexp (CalendarModel *model, const char *sexp)
-{
-	CalendarModelPrivate *priv;
-	CalObjType type;
-	char *type_sexp;
-	char *completed_sexp;
-	char *new_sexp;
-
-	priv = model->priv;
-
-	type = priv->type;
-
-	if (!(type & CALOBJ_TYPE_ANY))
-		type_sexp = g_strdup ("#t");
-	else
-		type_sexp = g_strdup_printf (
-			"(or %s %s %s)",
-			(type & CALOBJ_TYPE_EVENT) ? "(= (get-vtype) \"VEVENT\")" : "",
-			(type & CALOBJ_TYPE_TODO) ? "(= (get-vtype) \"VTODO\")" : "",
-			(type & CALOBJ_TYPE_JOURNAL) ? "(= (get-vtype) \"VJOURNAL\")" : "");
-
-	/* Create a sub-expression for filtering out completed tasks, based on
-	   the config settings. */
-	completed_sexp = calendar_config_get_hide_completed_tasks_sexp ();
-
-	new_sexp = g_strdup_printf ("(and %s %s %s)", type_sexp,
-				    completed_sexp ? completed_sexp : "",
-				    sexp);
-	g_free (type_sexp);
-	g_free (completed_sexp);
-
-#if 0
-	g_print ("Calendar model sexp:\n%s\n", new_sexp);
-#endif
-
-	return new_sexp;
-}
-
-/* Restarts a query */
-static void
-update_query (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	CalQuery *old_query;
-	char *real_sexp;
-
-	priv = model->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-	free_objects (model);
-	e_table_model_changed (E_TABLE_MODEL (model));
-
-	if (!(priv->client
-	      && cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	old_query = priv->query;
-	priv->query = NULL;
-
-	if (old_query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), model);
-		gtk_object_unref (GTK_OBJECT (old_query));
-	}
-
-	g_assert (priv->sexp != NULL);
-	real_sexp = adjust_query_sexp (model, priv->sexp);
-
-	calendar_model_set_status_message (model, _("Searching"));
-	priv->query = cal_client_get_query (priv->client, real_sexp);
-	g_free (real_sexp);
-
-	if (!priv->query) {
-		g_message ("update_query(): Could not create the query");
-		calendar_model_set_status_message (model, NULL);
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), model);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_removed",
-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), model);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), model);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), model);
-}
-
-/* Callback used when a calendar is opened into the server */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	CalendarModel *model;
-
-	model = CALENDAR_MODEL (data);
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	update_query (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;
-	CalendarModelObjectData *object_data;
-
-	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);
-
-	object_data = &g_array_index (priv->objects_data,
-				      CalendarModelObjectData, *idx);
-	calendar_model_free_object_data (model, object_data);
-	g_array_remove_index (priv->objects_data, *idx);
-
-	gtk_object_unref (GTK_OBJECT (orig_comp));
-
-	n = *idx;
-	g_free (idx);
-
-	return n;
-}
-
-/* Displays messages on the status bar */
-#define EVOLUTION_TASKS_PROGRESS_IMAGE "evolution-tasks-mini.png"
-static GdkPixbuf *progress_icon[2] = { NULL, NULL };
-
-void
-calendar_model_set_status_message (CalendarModel *model, const char *message)
-{
-	extern EvolutionShellClient *global_shell_client; /* ugly */
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	if (!message || !*message) {
-		if (priv->activity) {
-			gtk_object_unref (GTK_OBJECT (priv->activity));
-			priv->activity = NULL;
-		}
-	}
-	else if (!priv->activity) {
-		int display;
-		char *client_id = g_strdup_printf ("%p", model);
-
-		if (progress_icon[0] == NULL)
-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_TASKS_PROGRESS_IMAGE);
-		priv->activity = evolution_activity_client_new (
-			global_shell_client, client_id,
-			progress_icon, message, TRUE, &display);
-
-		g_free (client_id);
-	}
-	else
-		evolution_activity_client_update (priv->activity, message, -1.0);
-}
-
-/**
- * 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;
-
-	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));
-	}
-
-	priv->client = client;
-	priv->type = type;
-
-	if (priv->client) {
-		if (cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED)
-			update_query (model);
-		else
-			gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), model);
-	}
-}
-
-/**
- * calendar_model_set_query:
- * @model: A calendar model.
- * @sexp: Sexp that defines the query.
- * 
- * Sets the query sexp that a calendar model will use to filter its contents.
- **/
-void
-calendar_model_set_query (CalendarModel *model, const char *sexp)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-	g_return_if_fail (sexp != NULL);
-
-	priv = model->priv;
-
-	if (priv->sexp)
-		g_free (priv->sexp);
-
-	priv->sexp = g_strdup (sexp);
-
-	update_query (model);
-}
-
-
-/**
- * calendar_model_set_new_comp_vtype:
- * @model: A calendar model.
- * @vtype: Type of calendar components to create.
- *
- * Sets the type of calendar components that will be created by a calendar table
- * model when the click-to-add functionality of the table is used.
- **/
-void
-calendar_model_set_new_comp_vtype (CalendarModel *model, CalComponentVType vtype)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-	g_return_if_fail (vtype != CAL_COMPONENT_NO_TYPE);
-
-	priv = model->priv;
-	priv->new_comp_vtype = vtype;
-}
-
-/**
- * calendar_model_get_new_comp_vtype:
- * @model: A calendar model.
- *
- * Queries the type of calendar components that are created by a calendar table
- * model when using the click-to-add functionality in a table.
- *
- * Return value: Type of components that are created.
- **/
-CalComponentVType
-calendar_model_get_new_comp_vtype (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), CAL_COMPONENT_NO_TYPE);
-
-	priv = model->priv;
-	return priv->new_comp_vtype;
-}
-
-
-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!");
-}
-
-
-/**
- * calendar_model_get_component:
- * @model: A calendar model.
- * @row: Row number of sought calendar component.
- *
- * Queries a calendar component from a calendar model based on its row number.
- *
- * Return value: The sought calendar component.
- **/
-CalComponent *
-calendar_model_get_component (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 server. */
-static void
-ensure_task_complete (CalComponent *comp,
-		      time_t completed_date)
-{
-	struct icaltimetype *old_completed = NULL;
-	int *old_percent, new_percent;
-	icalproperty_status status;
-	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) {
-		icaltimezone *utc_zone;
-		struct icaltimetype new_completed;
-
-		/* COMPLETED is stored in UTC. */
-		utc_zone = icaltimezone_get_utc_timezone ();
-		new_completed = icaltime_from_timet_with_zone (completed_date,
-							       FALSE,
-							       utc_zone);
-		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, &status);
-	if (status != ICAL_STATUS_COMPLETED) {
-		cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
-	}
-}
-
-
-/* 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)
-{
-	icalproperty_status 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 == ICAL_STATUS_COMPLETED)
-		cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
-}
-
-
-/* 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) {
-		e_table_model_pre_change (E_TABLE_MODEL (model));
-		model->priv->use_24_hour_format = use_24_hour_format;
-		/* Get the views to redraw themselves. */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
-
-void
-calendar_model_set_default_category	(CalendarModel	*model,
-					 const char	*default_category)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	g_free (model->priv->default_category);
-	model->priv->default_category = g_strdup (default_category);
-}
-
-
-
-/* The current timezone. */
-icaltimezone*
-calendar_model_get_timezone		(CalendarModel	*model)
-{
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	return model->priv->zone;
-}
-
-
-void
-calendar_model_set_timezone		(CalendarModel	*model,
-					 icaltimezone	*zone)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (model->priv->zone != zone) {
-		e_table_model_pre_change (E_TABLE_MODEL (model));
-		model->priv->zone = zone;
-
-		/* The timezone affects the times shown for COMPLETED and
-		   maybe other fields, so we need to redisplay everything. */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
-
-/**
- * calendar_model_refresh:
- * @model: A calendar model.
- * 
- * Refreshes the calendar model, reloading the events/tasks from the server.
- * Be careful about doing this when the user is editing an event/task.
- **/
-void
-calendar_model_refresh (CalendarModel *model)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	update_query (model);
-}
diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h
deleted file mode 100644
index 6ac175034c..0000000000
--- a/calendar/gui/calendar-model.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_set_query	  (CalendarModel   *model,
-						   const char      *sexp);
-
-void		calendar_model_refresh		  (CalendarModel   *model);
-
-void		calendar_model_set_new_comp_vtype  (CalendarModel     *model,
-						    CalComponentVType  vtype);
-CalComponentVType calendar_model_get_new_comp_vtype (CalendarModel    *model);
-
-void		calendar_model_mark_task_complete (CalendarModel   *model,
-						   gint		    row);
-
-CalComponent*	calendar_model_get_component	  (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);
-
-/* The current timezone. */
-icaltimezone*	calendar_model_get_timezone	    (CalendarModel *model);
-void		calendar_model_set_timezone	    (CalendarModel *model,
-						     icaltimezone  *zone);
-
-void		calendar_model_set_default_category (CalendarModel	*model,
-						     const char		*default_category);
-
-void            calendar_model_set_status_message   (CalendarModel      *model,
-						     const char         *message);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c
deleted file mode 100644
index a01d3fa160..0000000000
--- a/calendar/gui/calendar-offline-handler.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-offline-handler.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- *   Dan Winship <danw@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/util/e-util.h>
-#include "e-util/e-url.h"
-#include <cal-client/cal-client.h>
-#include "calendar-offline-handler.h"
-
-#define PARENT_TYPE bonobo_x_object_get_type ()
-static BonoboXObjectClass *parent_class = NULL;
-
-struct _CalendarOfflineHandlerPrivate {
-	CalClient *client;
-	
-	GNOME_Evolution_OfflineProgressListener listener_interface;
-
-	gboolean is_offline;	
-};
-
-static void
-add_connection (gpointer data, gpointer user_data)
-{
-	EUri *uri = e_uri_new (data);	
-	GNOME_Evolution_ConnectionList *list = user_data;
-
-	g_return_if_fail (uri != NULL);
-	
-	if (uri->host != NULL)
-		list->_buffer[list->_length].hostName = CORBA_string_dup (uri->host);
-	else
-		list->_buffer[list->_length].hostName = CORBA_string_dup ("Unknown");
-	if (uri->protocol != NULL)
-		list->_buffer[list->_length].type = CORBA_string_dup (uri->protocol);
-	else
-		list->_buffer[list->_length].type = CORBA_string_dup ("Unknown");
-	list->_length++;
-
-	e_uri_free (uri);
-}
-
-static GNOME_Evolution_ConnectionList *
-create_connection_list (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-	GNOME_Evolution_ConnectionList *list;
-	GList *uris;
-
-	priv = offline_handler->priv;
-
- 	uris = cal_client_uri_list (priv->client, CAL_MODE_REMOTE);	
-
-	list = GNOME_Evolution_ConnectionList__alloc ();
-	list->_length = 0;
-	list->_maximum = g_list_length (uris);
-	list->_buffer = CORBA_sequence_GNOME_Evolution_Connection_allocbuf (list->_maximum);
-
-	g_list_foreach (uris, add_connection, list);
-
-	return list;
-}
-
-/* GNOME::Evolution::Offline methods.  */
-static CORBA_boolean
-impl__get_isOffline (PortableServer_Servant servant,
-		     CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	return priv->is_offline;
-}
-
-static void
-impl_prepareForOffline (PortableServer_Servant servant,
-			GNOME_Evolution_ConnectionList **active_connection_list,
-			CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	*active_connection_list = create_connection_list (offline_handler);
-}
-
-static void
-update_offline (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-	GNOME_Evolution_ConnectionList *connection_list;
-	CORBA_Environment ev;
-
-	priv = offline_handler->priv;
-
-	connection_list = create_connection_list (offline_handler);
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_OfflineProgressListener_updateProgress (priv->listener_interface, 
-								connection_list, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_warning ("Error updating offline progress");
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-backend_cal_set_mode (CalClient *client, CalClientSetModeStatus status, CalMode mode, gpointer data)
-{
-	CalendarOfflineHandler *offline_handler = data;
-
-	update_offline (offline_handler);
-}
-
-static void
-backend_cal_opened (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	CalendarOfflineHandler *offline_handler = data;
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS) {
-		update_offline (offline_handler);
-		gtk_object_unref (GTK_OBJECT (client));
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_set_mode", 
-			    backend_cal_set_mode, offline_handler);
-	cal_client_set_mode (client, CAL_MODE_LOCAL);
-}
-
-static void
-backend_go_offline (gpointer data, gpointer user_data)
-{
-	CalendarOfflineHandler *offline_handler = user_data;
-	char *uri = data;
-	CalClient *client;
-	gboolean success;
-	
-	client = cal_client_new ();
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened", 
-			    backend_cal_opened, offline_handler);
-	success = cal_client_open_calendar (client, uri, TRUE);
-	if (!success) {
-		update_offline (offline_handler);
-		gtk_object_unref (GTK_OBJECT (client));
-		return;		
-	}	
-}
-
-static void
-impl_goOffline (PortableServer_Servant servant,
-		const GNOME_Evolution_OfflineProgressListener progress_listener,
-		CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	GList *uris;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	/* To update the status */
-	priv->listener_interface = CORBA_Object_duplicate (progress_listener, ev);
-
-	uris = cal_client_uri_list (priv->client, CAL_MODE_REMOTE);
-
-	g_list_foreach (uris, backend_go_offline, offline_handler);	
-}
-
-static void
-impl_goOnline (PortableServer_Servant servant,
-	       CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-}
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (object);
-	priv = offline_handler->priv;
-
-	if (priv->listener_interface != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->listener_interface, &ev);
-		CORBA_exception_free (&ev);
-	}
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* GTK+ type initialization.  */
-
-static void
-calendar_offline_handler_class_init (CalendarOfflineHandlerClass *klass)
-{
-	GtkObjectClass *object_class;
-	POA_GNOME_Evolution_Offline__epv *epv;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	epv = & klass->epv;
-	epv->_get_isOffline    = impl__get_isOffline;
-	epv->prepareForOffline = impl_prepareForOffline;
-	epv->goOffline         = impl_goOffline;
-	epv->goOnline          = impl_goOnline;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-calendar_offline_handler_init (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-
-	priv = g_new (CalendarOfflineHandlerPrivate, 1);
-	offline_handler->priv = priv;
-
-	priv->client = cal_client_new ();
-	priv->listener_interface = CORBA_OBJECT_NIL;
-	priv->is_offline = FALSE;
-}
-
-CalendarOfflineHandler *
-calendar_offline_handler_new (void)
-{
-	CalendarOfflineHandler *new;
-
-	new = gtk_type_new (calendar_offline_handler_get_type ());
-	
-	return new;
-}
-
-BONOBO_X_TYPE_FUNC_FULL (CalendarOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, calendar_offline_handler);
diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h
deleted file mode 100644
index 4b87fd659f..0000000000
--- a/calendar/gui/calendar-offline-handler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-offline-handler.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#ifndef _CALENDAR_OFFLINE_HANDLER_H_
-#define _CALENDAR_OFFLINE_HANDLER_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-xobject.h>
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CALENDAR_TYPE_OFFLINE_HANDLER			(calendar_offline_handler_get_type ())
-#define CALENDAR_OFFLINE_HANDLER(obj)			(GTK_CHECK_CAST ((obj), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandler))
-#define CALENDAR_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandlerClass))
-#define CALENDAR_IS_OFFLINE_HANDLER(obj)			(GTK_CHECK_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))
-#define CALENDAR_IS_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))
-
-
-typedef struct _CalendarOfflineHandler        CalendarOfflineHandler;
-typedef struct _CalendarOfflineHandlerPrivate CalendarOfflineHandlerPrivate;
-typedef struct _CalendarOfflineHandlerClass   CalendarOfflineHandlerClass;
-
-struct _CalendarOfflineHandler {
-	BonoboXObject parent;
-
-	CalendarOfflineHandlerPrivate *priv;
-};
-
-struct _CalendarOfflineHandlerClass {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Offline__epv epv;
-};
-
-
-GtkType             calendar_offline_handler_get_type  (void);
-CalendarOfflineHandler *calendar_offline_handler_new       (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _CALENDAR_OFFLINE_HANDLER_H_ */
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
deleted file mode 100644
index 0c3f0562f9..0000000000
--- a/calendar/gui/calendar-view-factory.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "calendar-view-factory.h"
-#include "calendar-view.h"
-
-
-
-/* Private part of the CalendarViewFactory structure */
-struct _CalendarViewFactoryPrivate {
-	/* Type of views created by this factory */
-	GnomeCalendarViewType view_type;
-};
-
-
-
-static void calendar_view_factory_class_init (CalendarViewFactoryClass *class);
-static void calendar_view_factory_init (CalendarViewFactory *cal_view_factory);
-static void calendar_view_factory_destroy (GtkObject *object);
-
-static const char *calendar_view_factory_get_title (GalViewFactory *factory);
-static const char *calendar_view_factory_get_type_code (GalViewFactory *factory);
-static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const char *name);
-
-static GalViewFactoryClass *parent_class = NULL;
-
-
-
-/**
- * calendar_view_factory_get_type:
- * 
- * Registers the #CalendarViewFactory class if necessary, and returns the type
- * ID associated to it.
- * 
- * Return value: The type ID of the #CalendarViewFactory class.
- **/
-GtkType
-calendar_view_factory_get_type (void)
-{
-	static GtkType calendar_view_factory_type;
-
-	if (!calendar_view_factory_type) {
-		static const GtkTypeInfo calendar_view_factory_info = {
-			"CalendarViewFactory",
-			sizeof (CalendarViewFactory),
-			sizeof (CalendarViewFactoryClass),
-			(GtkClassInitFunc) calendar_view_factory_class_init,
-			(GtkObjectInitFunc) calendar_view_factory_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		calendar_view_factory_type = gtk_type_unique (GAL_VIEW_FACTORY_TYPE,
-							      &calendar_view_factory_info);
-	}
-
-	return calendar_view_factory_type;
-}
-
-/* Class initialization function for the calendar view factory */
-static void
-calendar_view_factory_class_init (CalendarViewFactoryClass *class)
-{
-	GalViewFactoryClass *gal_view_factory_class;
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (GAL_VIEW_FACTORY_TYPE);
-
-	gal_view_factory_class = (GalViewFactoryClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	gal_view_factory_class->get_title = calendar_view_factory_get_title;
-	gal_view_factory_class->get_type_code = calendar_view_factory_get_type_code;
-	gal_view_factory_class->new_view = calendar_view_factory_new_view;
-
-	object_class->destroy = calendar_view_factory_destroy;
-}
-
-/* Object initialization class for the calendar view factory */
-static void
-calendar_view_factory_init (CalendarViewFactory *cal_view_factory)
-{
-	CalendarViewFactoryPrivate *priv;
-
-	priv = g_new0 (CalendarViewFactoryPrivate, 1);
-	cal_view_factory->priv = priv;
-}
-
-/* Destroy method for the calendar view factory */
-static void
-calendar_view_factory_destroy (GtkObject *object)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_VIEW_FACTORY (object));
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (object);
-	priv = cal_view_factory->priv;
-
-	g_free (priv);
-	cal_view_factory->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_title method for the calendar view factory */
-static const char *
-calendar_view_factory_get_title (GalViewFactory *factory)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);
-	priv = cal_view_factory->priv;
-
-	switch (priv->view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		return _("Day View");
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		return _("Work Week View");
-
-	case GNOME_CAL_WEEK_VIEW:
-		return _("Week View");
-
-	case GNOME_CAL_MONTH_VIEW:
-		return _("Month View");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* get_type_code method for the calendar view factory */
-static const char *
-calendar_view_factory_get_type_code (GalViewFactory *factory)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);
-	priv = cal_view_factory->priv;
-
-	switch (priv->view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		return "day_view";
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		return "work_week_view";
-
-	case GNOME_CAL_WEEK_VIEW:
-		return "week_view";
-
-	case GNOME_CAL_MONTH_VIEW:
-		return "month_view";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* new_view method for the calendar view factory */
-static GalView *
-calendar_view_factory_new_view (GalViewFactory *factory, const char *name)
-{
-	CalendarViewFactory *cal_view_factory;
-	CalendarViewFactoryPrivate *priv;
-	CalendarView *cal_view;
-
-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);
-	priv = cal_view_factory->priv;
-
-	cal_view = calendar_view_new (priv->view_type, name);
-	return GAL_VIEW (cal_view);
-}
-
-
-
-/**
- * calendar_view_factory_construct:
- * @cal_view_factory: A calendar view factory.
- * @view_type: Type of calendar views that the factory will create.
- * 
- * Constructs a calendar view factory by setting the type of views it will
- * create.
- * 
- * Return value: The same value as @cal_view_factory.
- **/
-CalendarViewFactory *
-calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,
-				 GnomeCalendarViewType view_type)
-{
-	CalendarViewFactoryPrivate *priv;
-
-	g_return_val_if_fail (cal_view_factory != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_VIEW_FACTORY (cal_view_factory), NULL);
-
-	priv = cal_view_factory->priv;
-
-	priv->view_type = view_type;
-
-	return cal_view_factory;
-}
-
-/**
- * calendar_view_factory_new:
- * @view_type: Type of calendar views that the factory will create.
- * 
- * Creates a new factory for calendar views.
- * 
- * Return value: A newly-created calendar view factory.
- **/
-CalendarViewFactory *
-calendar_view_factory_new (GnomeCalendarViewType view_type)
-{
-	CalendarViewFactory *cal_view_factory;
-
-	cal_view_factory = gtk_type_new (TYPE_CALENDAR_VIEW_FACTORY);
-	return calendar_view_factory_construct (cal_view_factory, view_type);
-}
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
deleted file mode 100644
index 6b3409afeb..0000000000
--- a/calendar/gui/calendar-view-factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_VIEW_FACTORY_H
-#define CALENDAR_VIEW_FACTORY_H
-
-#include <libgnome/gnome-defs.h>
-#include <gal/menus/gal-view-factory.h>
-#include "gnome-cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_CALENDAR_VIEW_FACTORY            (calendar_view_factory_get_type ())
-#define CALENDAR_VIEW_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY,  \
-					       CalendarViewFactory))
-#define CALENDAR_VIEW_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			   \
-					       TYPE_CALENDAR_VIEW_FACTORY, CalendarViewClass))
-#define IS_CALENDAR_VIEW_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW_FACTORY))
-#define IS_CALENDAR_VIEW_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),			   \
-					       TYPE_CALENDAR_VIEW_FACTORY))
-
-typedef struct _CalendarViewFactoryPrivate CalendarViewFactoryPrivate;
-
-typedef struct {
-	GalViewFactory factory;
-
-	/* Private data */
-	CalendarViewFactoryPrivate *priv;
-} CalendarViewFactory;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} CalendarViewFactoryClass;
-
-GtkType calendar_view_factory_get_type (void);
-
-CalendarViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,
-						      GnomeCalendarViewType view_type);
-
-CalendarViewFactory *calendar_view_factory_new (GnomeCalendarViewType view_type);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
deleted file mode 100644
index 7ab5e9f13c..0000000000
--- a/calendar/gui/calendar-view.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "calendar-view.h"
-
-
-
-/* Private part of the CalendarView structure */
-struct _CalendarViewPrivate {
-	/* Type of the view */
-	GnomeCalendarViewType view_type;
-
-	/* Title of the view */
-	char *title;
-};
-
-
-
-static void calendar_view_class_init (CalendarViewClass *class);
-static void calendar_view_init (CalendarView *cview);
-static void calendar_view_destroy (GtkObject *object);
-
-static void calendar_view_edit (GalView *view);
-static void calendar_view_load (GalView *view, const char *filename);
-static void calendar_view_save (GalView *view, const char *filename);
-static const char *calendar_view_get_title (GalView *view);
-static void calendar_view_set_title (GalView *view, const char *title);
-static const char *calendar_view_get_type_code (GalView *view);
-static GalView *calendar_view_clone (GalView *view);
-
-static GalViewClass *parent_class = NULL;
-
-
-
-/**
- * calendar_view_get_type:
- * 
- * Registers the #CalendarView class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CalendarView class.
- **/
-GtkType
-calendar_view_get_type (void)
-{
-	static GtkType calendar_view_type;
-
-	if (!calendar_view_type) {
-		static const GtkTypeInfo calendar_view_info = {
-			"CalendarView",
-			sizeof (CalendarView),
-			sizeof (CalendarViewClass),
-			(GtkClassInitFunc) calendar_view_class_init,
-			(GtkObjectInitFunc) calendar_view_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		calendar_view_type = gtk_type_unique (GAL_VIEW_TYPE, &calendar_view_info);
-	}
-
-	return calendar_view_type;
-}
-
-/* Class initialization function for the calendar view */
-static void
-calendar_view_class_init (CalendarViewClass *class)
-{
-	GalViewClass *gal_view_class;
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (GAL_VIEW_TYPE);
-
-	gal_view_class = (GalViewClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	gal_view_class->edit = calendar_view_edit;
-	gal_view_class->load = calendar_view_load;
-	gal_view_class->save = calendar_view_save;
-	gal_view_class->get_title = calendar_view_get_title;
-	gal_view_class->set_title = calendar_view_set_title;
-	gal_view_class->get_type_code = calendar_view_get_type_code;
-	gal_view_class->clone = calendar_view_clone;
-
-	object_class->destroy = calendar_view_destroy;
-}
-
-/* Object initialization function for the calendar view */
-static void
-calendar_view_init (CalendarView *cal_view)
-{
-	CalendarViewPrivate *priv;
-
-	priv = g_new0 (CalendarViewPrivate, 1);
-	cal_view->priv = priv;
-
-	priv->title = NULL;
-}
-
-/* Destroy method for the calendar view */
-static void
-calendar_view_destroy (GtkObject *object)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_VIEW (object));
-
-	cal_view = CALENDAR_VIEW (object);
-	priv = cal_view->priv;
-
-	if (priv->title) {
-		g_free (priv->title);
-		priv->title = NULL;
-	}
-
-	g_free (priv);
-	cal_view->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* edit method of the calendar view */
-static void
-calendar_view_edit (GalView *view)
-{
-	/* nothing */
-}
-
-/* load method of the calendar view */
-static void
-calendar_view_load (GalView *view, const char *filename)
-{
-	/* nothing */
-}
-
-/* save method of the calendar view */
-static void
-calendar_view_save (GalView *view, const char *filename)
-{
-	/* nothing */
-}
-
-/* get_title method of the calendar view */
-static const char *
-calendar_view_get_title (GalView *view)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	return priv->title;
-}
-
-/* set_title method of the calendar view */
-static void
-calendar_view_set_title (GalView *view, const char *title)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	if (priv->title)
-		g_free (priv->title);
-
-	priv->title = g_strdup (title);
-}
-
-/* get_type_code method for the calendar view */
-static const char *
-calendar_view_get_type_code (GalView *view)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	switch (priv->view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		return "day_view";
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		return "work_week_view";
-
-	case GNOME_CAL_WEEK_VIEW:
-		return "week_view";
-
-	case GNOME_CAL_MONTH_VIEW:
-		return "month_view";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* clone method for the calendar view */
-static GalView *
-calendar_view_clone (GalView *view)
-{
-	CalendarView *cal_view;
-	CalendarViewPrivate *priv;
-	CalendarView *new_view;
-	CalendarViewPrivate *new_priv;
-
-	cal_view = CALENDAR_VIEW (view);
-	priv = cal_view->priv;
-
-	new_view = gtk_type_new (TYPE_CALENDAR_VIEW);
-	new_priv = new_view->priv;
-
-	new_priv->view_type = priv->view_type;
-	new_priv->title = g_strdup (priv->title);
-
-	return GAL_VIEW (new_view);
-}
-
-
-
-/**
- * calendar_view_construct:
- * @cal_view: A calendar view.
- * @view_type: The type of calendar view that this object will represent.
- * @title: Title for the view.
- * 
- * Constructs a calendar view by setting its view type and title.
- * 
- * Return value: The same value as @cal_view.
- **/
-CalendarView *
-calendar_view_construct (CalendarView *cal_view,
-			 GnomeCalendarViewType view_type,
-			 const char *title)
-{
-	CalendarViewPrivate *priv;
-
-	g_return_val_if_fail (cal_view != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_VIEW (cal_view), NULL);
-	g_return_val_if_fail (title != NULL, NULL);
-
-	priv = cal_view->priv;
-
-	priv->view_type = view_type;
-	priv->title = g_strdup (title);
-
-	return cal_view;
-}
-
-/**
- * calendar_view_new:
- * @view_type: The type of calendar view that this object will represent.
- * @title: Title for the view.
- * 
- * Creates a new calendar view object.
- * 
- * Return value: A newly-created calendar view.
- **/
-CalendarView *
-calendar_view_new (GnomeCalendarViewType view_type, const char *title)
-{
-	CalendarView *cal_view;
-
-	cal_view = gtk_type_new (TYPE_CALENDAR_VIEW);
-	return calendar_view_construct (cal_view, view_type, title);
-}
-
-/**
- * calendar_view_get_view_type:
- * @cal_view: A calendar view.
- * 
- * Queries the calendar view type of a calendar view.
- * 
- * Return value: Type of calendar view.
- **/
-GnomeCalendarViewType
-calendar_view_get_view_type (CalendarView *cal_view)
-{
-	CalendarViewPrivate *priv;
-
-	g_return_val_if_fail (cal_view != NULL, GNOME_CAL_DAY_VIEW);
-	g_return_val_if_fail (IS_CALENDAR_VIEW (cal_view), GNOME_CAL_DAY_VIEW);
-
-	priv = cal_view->priv;
-	return priv->view_type;
-}
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
deleted file mode 100644
index 515038d874..0000000000
--- a/calendar/gui/calendar-view.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_VIEW_H
-#define CALENDAR_VIEW_H
-
-#include <libgnome/gnome-defs.h>
-#include <gal/menus/gal-view.h>
-#include "gnome-cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_CALENDAR_VIEW            (calendar_view_get_type ())
-#define CALENDAR_VIEW(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
-#define CALENDAR_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW,      	\
-				       CalendarViewClass))
-#define IS_CALENDAR_VIEW(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW))
-#define IS_CALENDAR_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))
-
-typedef struct _CalendarViewPrivate CalendarViewPrivate;
-
-typedef struct {
-	GalView view;
-
-	/* Private data */
-	CalendarViewPrivate *priv;
-} CalendarView;
-
-typedef struct {
-	GalViewClass parent_class;
-} CalendarViewClass;
-
-GtkType calendar_view_get_type (void);
-
-CalendarView *calendar_view_construct (CalendarView *cal_view,
-				       GnomeCalendarViewType view_type,
-				       const char *title);
-
-CalendarView *calendar_view_new (GnomeCalendarViewType view_type,
-				 const char *title);
-
-GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
deleted file mode 100644
index 805e0a5c0b..0000000000
--- a/calendar/gui/comp-editor-factory.c
+++ /dev/null
@@ -1,714 +0,0 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/bonobo-exception.h>
-#include <evolution-calendar.h>
-#include <e-util/e-url.h>
-#include <cal-client/cal-client.h>
-#include "calendar-config.h"
-#include "comp-editor-factory.h"
-#include "comp-util.h"
-#include "dialogs/event-editor.h"
-#include "dialogs/task-editor.h"
-
-
-
-/* A pending request */
-
-typedef enum {
-	REQUEST_EXISTING,
-	REQUEST_NEW
-} RequestType;
-
-typedef struct {
-	RequestType type;
-
-	union {
-		struct {
-			char *uid;
-		} existing;
-
-		struct {
-			 GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type;
-		} new;
-	} u;
-} Request;
-
-/* A client we have open */
-typedef struct {
-	/* Our parent CompEditorFactory */
-	CompEditorFactory *factory;
-
-	/* Uri of the calendar, used as key in the clients hash table */
-	char *uri;
-
-	/* Client of the calendar */
-	CalClient *client;
-
-	/* Hash table of Component structures that belong to this client */
-	GHashTable *uid_comp_hash;
-
-	/* Pending requests; they are pending if the client is still being opened */
-	GSList *pending;
-
-	/* Whether this is open or still waiting */
-	guint open : 1;
-} OpenClient;
-
-/* A component that is being edited */
-typedef struct {
-	/* Our parent client */
-	OpenClient *parent;
-
-	/* UID of the component we are editing, used as the key in the hash table */
-	const char *uid;
-
-	/* Component we are editing */
-	CalComponent *comp;
-
-	/* Component editor that is open */
-	CompEditor *editor;
-} Component;
-
-/* Private part of the CompEditorFactory structure */
-struct CompEditorFactoryPrivate {
-	/* Hash table of URI->OpenClient */
-	GHashTable *uri_client_hash;
-};
-
-
-
-static void comp_editor_factory_class_init (CompEditorFactoryClass *class);
-static void comp_editor_factory_init (CompEditorFactory *factory);
-static void comp_editor_factory_destroy (GtkObject *object);
-
-static void impl_editExisting (PortableServer_Servant servant,
-			       const CORBA_char *str_uri,
-			       const GNOME_Evolution_Calendar_CalObjUID uid,
-			       CORBA_Environment *ev);
-static void impl_editNew (PortableServer_Servant servant,
-			  const CORBA_char *str_uri,
-			  const GNOME_Evolution_Calendar_CalObjType type,
-			  CORBA_Environment *ev);
-
-static BonoboXObjectClass *parent_class = NULL;
-
-
-
-BONOBO_X_TYPE_FUNC_FULL (CompEditorFactory,
-			 GNOME_Evolution_Calendar_CompEditorFactory,
-			 BONOBO_X_OBJECT_TYPE,
-			 comp_editor_factory);
-
-/* Class initialization function for the component editor factory */
-static void
-comp_editor_factory_class_init (CompEditorFactoryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);
-
-	class->epv.editExisting = impl_editExisting;
-	class->epv.editNew = impl_editNew;
-
-	object_class->destroy = comp_editor_factory_destroy;
-}
-
-/* Object initialization function for the component editor factory */
-static void
-comp_editor_factory_init (CompEditorFactory *factory)
-{
-	CompEditorFactoryPrivate *priv;
-
-	priv = g_new (CompEditorFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->uri_client_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-/* Used from g_hash_table_foreach(); frees a component structure */
-static void
-free_component_cb (gpointer key, gpointer value, gpointer data)
-{
-	Component *c;
-
-	c = value;
-
-	c->parent = NULL;
-	c->uid = NULL;
-
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	c->comp = NULL;
-
-	g_free (c);
-}
-
-/* Frees a Request structure */
-static void
-free_request (Request *r)
-{
-	if (r->type == REQUEST_EXISTING) {
-		g_assert (r->u.existing.uid != NULL);
-		g_free (r->u.existing.uid);
-	}
-
-	g_free (r);
-}
-
-/* Frees an OpenClient structure */
-static void
-free_client (OpenClient *oc)
-{
-	GSList *l;
-
-	g_free (oc->uri);
-	oc->uri = NULL;
-
-	gtk_object_unref (GTK_OBJECT (oc->client));
-	oc->client = NULL;
-
-	g_hash_table_foreach (oc->uid_comp_hash, free_component_cb, NULL);
-	g_hash_table_destroy (oc->uid_comp_hash);
-	oc->uid_comp_hash = NULL;
-
-	for (l = oc->pending; l; l = l->next) {
-		Request *r;
-
-		r = l->data;
-		free_request (r);
-	}
-	g_slist_free (oc->pending);
-	oc->pending = NULL;
-
-	g_free (oc);
-}
-
-/* Used from g_hash_table_foreach(); frees a client structure */
-static void
-free_client_cb (gpointer key, gpointer value, gpointer data)
-{
-	OpenClient *oc;
-
-	oc = value;
-	free_client (oc);
-}
-
-/* Destroy handler for the component editor factory */
-static void
-comp_editor_factory_destroy (GtkObject *object)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_FACTORY (object));
-
-	factory = COMP_EDITOR_FACTORY (object);
-	priv = factory->priv;
-
-	g_hash_table_foreach (priv->uri_client_hash, free_client_cb, NULL);
-	g_hash_table_destroy (priv->uri_client_hash);
-	priv->uri_client_hash = NULL;
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Callback used when a component editor gets destroyed */
-static void
-editor_destroy_cb (GtkObject *object, gpointer data)
-{
-	Component *c;
-	OpenClient *oc;
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	c = data;
-	oc = c->parent;
-	factory = oc->factory;
-	priv = factory->priv;
-
-	/* Free the Component */
-
-	g_hash_table_remove (oc->uid_comp_hash, c->uid);
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	g_free (c);
-
-	/* See if we need to free the client */
-
-	g_assert (oc->pending == NULL);
-
-	if (g_hash_table_size (oc->uid_comp_hash) != 0)
-		return;
-
-	g_hash_table_remove (priv->uri_client_hash, oc->uri);
-	free_client (oc);
-}
-
-/* Starts editing an existing component on a client that is already open */
-static void
-edit_existing (OpenClient *oc, const char *uid)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-	CompEditor *editor;
-	Component *c;
-	CalComponentVType vtype;
-
-	g_assert (oc->open);
-
-	/* Get the object */
-
-	status = cal_client_get_object (oc->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* see below */
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object disappeared from the server */
-		return;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("edit_exiting(): Syntax error while getting component `%s'", uid);
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* Create the appropriate type of editor */
-
-	vtype = cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		editor = COMP_EDITOR (event_editor_new ());
-		break;
-
-	case CAL_COMPONENT_TODO:
-		editor = COMP_EDITOR (task_editor_new ());
-		break;
-
-	default:
-		g_message ("edit_exiting(): Unsupported object type %d", (int) vtype);
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* Set the client/object on the editor */
-
-	c = g_new (Component, 1);
-	c->parent = oc;
-	cal_component_get_uid (comp, &c->uid);
-	c->comp = comp;
-	c->editor = editor;
-
-	g_hash_table_insert (oc->uid_comp_hash, (char *) c->uid, c);
-
-	gtk_signal_connect (GTK_OBJECT (editor), "destroy",
-			    GTK_SIGNAL_FUNC (editor_destroy_cb), c);
-
-	comp_editor_set_cal_client (editor, oc->client);
-	comp_editor_edit_comp (editor, comp);
-	comp_editor_focus (editor);
-}
-
-/* Creates a component with the appropriate defaults for the specified component
- * type.
- */
-static CalComponent *
-get_default_event (gboolean all_day) 
-{
-	CalComponent *comp;
-	struct icaltimetype itt;
-	CalComponentDateTime dt;
-	char *location;
-	icaltimezone *zone;
-
-	comp = cal_comp_event_new_with_defaults ();
-
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	if (all_day) {
-		itt = icaltime_today ();
-
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		cal_component_set_dtstart (comp, &dt);
-		cal_component_set_dtend (comp, &dt);		
-	} else {
-		itt = icaltime_current_time_with_zone (zone);
-		itt.hour++;
-		itt.minute = 0;
-		itt.second = 0;
-		
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		cal_component_set_dtstart (comp, &dt);
-		itt.hour++;
-		cal_component_set_dtend (comp, &dt);
-	}
-
-	cal_component_commit_sequence (comp);
-
-	return comp;
-}
-
-static CalComponent *
-get_default_task (void)
-{
-	CalComponent *comp;
-	
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	return comp;
-}
-
-/* Edits a new object in the context of a client */
-static void
-edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	CalComponent *comp;
-	Component *c;
-	CompEditor *editor;
-	
-	switch (type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:
-		editor = COMP_EDITOR (event_editor_new ());
-		comp = get_default_event (FALSE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:
-		editor = COMP_EDITOR (event_editor_new ());
-		comp = get_default_event (TRUE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		editor = COMP_EDITOR (task_editor_new ());
-		comp = get_default_task ();
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	c = g_new (Component, 1);
-	c->parent = oc;
-	cal_component_get_uid (comp, &c->uid);
-	c->comp = comp;
-
-	c->editor = editor;
-
-	g_hash_table_insert (oc->uid_comp_hash, (char *) c->uid, c);
-
-	gtk_signal_connect (GTK_OBJECT (editor), "destroy",
-			    GTK_SIGNAL_FUNC (editor_destroy_cb), c);
-
-	comp_editor_set_cal_client (editor, oc->client);
-	comp_editor_edit_comp (editor, comp);
-	if (type == GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING)
-		event_editor_show_meeting (EVENT_EDITOR (editor));
-	comp_editor_focus (editor);
-}
-
-/* Resolves all the pending requests for a client */
-static void
-resolve_pending_requests (OpenClient *oc)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	GSList *l;
-	char *location;
-	icaltimezone *zone;
-
-	factory = oc->factory;
-	priv = factory->priv;
-
-	g_assert (oc->pending != NULL);
-
-	/* Set the default timezone in the backend. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-	if (zone)
-		cal_client_set_default_timezone (oc->client, zone);
-
-	for (l = oc->pending; l; l = l->next) {
-		Request *request;
-
-		request = l->data;
-
-		switch (request->type) {
-		case REQUEST_EXISTING:
-			edit_existing (oc, request->u.existing.uid);
-			break;
-
-		case REQUEST_NEW:
-			edit_new (oc, request->u.new.type);
-			break;
-		}
-
-		free_request (request);
-	}
-
-	g_slist_free (oc->pending);
-	oc->pending = NULL;
-}
-
-/* Callback used when a client is finished opening.  We resolve all the pending
- * requests.
- */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	OpenClient *oc;
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	oc = data;
-	factory = oc->factory;
-	priv = factory->priv;
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		oc->open = TRUE;
-		resolve_pending_requests (oc);
-		return;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		g_message ("cal_opened_cb(): Error while opening the calendar");
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* bullshit; we specified only_if_exists = FALSE */
-		g_assert_not_reached ();
-		return;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		g_message ("cal_opened_cb(): Method not supported when opening the calendar");
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	g_hash_table_remove (priv->uri_client_hash, oc->uri);
-	free_client (oc);
-}
-
-/* Creates a new OpenClient structure and queues the component editing/creation
- * process until the client is open.  Returns NULL if it could not issue the
- * open request.
- */
-static OpenClient *
-open_client (CompEditorFactory *factory, const char *uristr)
-{
-	CompEditorFactoryPrivate *priv;
-	CalClient *client;
-	OpenClient *oc;
-
-	priv = factory->priv;
-
-	client = cal_client_new ();
-	if (!client)
-		return NULL;
-
-	oc = g_new (OpenClient, 1);
-	oc->factory = factory;
-
-	oc->uri = g_strdup (uristr);
-
-	oc->client = client;
-	oc->uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	oc->pending = NULL;
-	oc->open = FALSE;
-
-	gtk_signal_connect (GTK_OBJECT (oc->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), oc);
-
-	if (!cal_client_open_calendar (oc->client, uristr, FALSE)) {
-		g_free (oc->uri);
-		gtk_object_unref (GTK_OBJECT (oc->client));
-		g_hash_table_destroy (oc->uid_comp_hash);
-		g_free (oc);
-
-		return NULL;
-	}
-
-	g_hash_table_insert (priv->uri_client_hash, oc->uri, oc);
-
-	return oc;
-}
-
-/* Looks up an open client or queues it for being opened.  Returns the client or
- * NULL on failure; in the latter case it sets the ev exception.
- */
-static OpenClient *
-lookup_open_client (CompEditorFactory *factory, const char *str_uri, CORBA_Environment *ev)
-{
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	EUri *uri;
-
-	priv = factory->priv;
-
-	/* Look up the client */
-
-	uri = e_uri_new (str_uri);
-	if (!uri) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_InvalidURI);
-		return NULL;
-	}
-	e_uri_free (uri);
-
-	oc = g_hash_table_lookup (priv->uri_client_hash, str_uri);
-	if (!oc) {
-		oc = open_client (factory, str_uri);
-		if (!oc) {
-			bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_BackendContactError);
-			return NULL;
-		}
-	}
-
-	return oc;
-}
-
-/* Queues a request for editing an existing object */
-static void
-queue_edit_existing (OpenClient *oc, const char *uid)
-{
-	Request *request;
-
-	g_assert (!oc->open);
-
-	request = g_new (Request, 1);
-	request->type = REQUEST_EXISTING;
-	request->u.existing.uid = g_strdup (uid);
-
-	oc->pending = g_slist_append (oc->pending, request);
-}
-
-/* ::editExisting() method implementation */
-static void
-impl_editExisting (PortableServer_Servant servant,
-		   const CORBA_char *str_uri,
-		   const GNOME_Evolution_Calendar_CalObjUID uid,
-		   CORBA_Environment *ev)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	Component *c;
-
-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	oc = lookup_open_client (factory, str_uri, ev);
-	if (!oc)
-		return;
-
-	if (!oc->open) {
-		queue_edit_existing (oc, uid);
-		return;
-	}
-
-	/* Look up the component */
-
-	c = g_hash_table_lookup (oc->uid_comp_hash, uid);
-	if (!c)
-		edit_existing (oc, uid);
-	else {
-		g_assert (c->editor != NULL);
-		comp_editor_focus (c->editor);
-	}
-}
-
-/* Queues a request for creating a new object */
-static void
-queue_edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	Request *request;
-
-	g_assert (!oc->open);
-
-	request = g_new (Request, 1);
-	request->type = REQUEST_NEW;
-	request->u.new.type = type;
-
-	oc->pending = g_slist_append (oc->pending, request);
-}
-
-/* ::editNew() method implementation */
-static void
-impl_editNew (PortableServer_Servant servant,
-	      const CORBA_char *str_uri,
-	      const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type,
-	      CORBA_Environment *ev)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
- 
-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	oc = lookup_open_client (factory, str_uri, ev);
-	if (!oc)
-		return;
-
-	if (!oc->open)
-		queue_edit_new (oc, corba_type);
-	else
-		edit_new (oc, corba_type);
-}
-
-
-
-/**
- * comp_editor_factory_new:
- * 
- * Creates a new calendar component editor factory.
- * 
- * Return value: A newly-created component editor factory.
- **/
-CompEditorFactory *
-comp_editor_factory_new (void)
-{
-	return gtk_type_new (TYPE_COMP_EDITOR_FACTORY);
-}
-
-
diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h
deleted file mode 100644
index 21e27941fc..0000000000
--- a/calendar/gui/comp-editor-factory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 COMP_EDITOR_FACTORY_H
-#define COMP_EDITOR_FACTORY_H
-
-#include <bonobo/bonobo-xobject.h>
-#include "evolution-calendar.h"
-
-
-
-#define TYPE_COMP_EDITOR_FACTORY            (comp_editor_factory_get_type ())
-#define COMP_EDITOR_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_FACTORY,	\
-					     CompEditorFactory))
-#define COMP_EDITOR_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			\
-					     TYPE_COMP_EDITOR_FACTORY, CompEditorFactoryClass))
-#define IS_COMP_EDITOR_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_FACTORY))
-#define IS_COMP_EDITOR_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR_FACTORY))
-
-typedef struct CompEditorFactoryPrivate CompEditorFactoryPrivate;
-
-typedef struct {
-	BonoboXObject xobject;
-
-	/* Private data */
-	CompEditorFactoryPrivate *priv;
-} CompEditorFactory;
-
-typedef struct {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_CompEditorFactory__epv epv;
-} CompEditorFactoryClass;
-
-GtkType comp_editor_factory_get_type (void);
-
-CompEditorFactory *comp_editor_factory_new (void);
-
-
-
-#endif
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
deleted file mode 100644
index 5edfb90af5..0000000000
--- a/calendar/gui/comp-util.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/* Evolution calendar - Utilities for manipulating CalComponent objects
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "calendar-config.h"
-#include "comp-util.h"
-#include "dialogs/delete-comp.h"
-
-
-
-/**
- * cal_comp_util_add_exdate:
- * @comp: A calendar component object.
- * @itt: Time for the exception.
- * 
- * Adds an exception date to the current list of EXDATE properties in a calendar
- * component object.
- **/
-void
-cal_comp_util_add_exdate (CalComponent *comp, time_t t, icaltimezone *zone)
-{
-	GSList *list;
-	CalComponentDateTime *cdt;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	cal_component_get_exdate_list (comp, &list);
-
-	cdt = g_new (CalComponentDateTime, 1);
-	cdt->value = g_new (struct icaltimetype, 1);
-	*cdt->value = icaltime_from_timet_with_zone (t, FALSE, zone);
-	cdt->tzid = g_strdup (icaltimezone_get_tzid (zone));
-
-	list = g_slist_append (list, cdt);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-}
-
-
-
-/* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
-static gboolean
-cal_component_compare_tzid (const char *tzid1, const char *tzid2)
-{
-	gboolean retval = TRUE;
-
-	if (tzid1) {
-		if (!tzid2 || strcmp (tzid1, tzid2))
-			retval = FALSE;
-	} else {
-		if (tzid2)
-			retval = FALSE;
-	}
-
-	return retval;
-}
-
-/**
- * cal_comp_util_compare_event_timezones:
- * @comp: A calendar component object.
- * @client: A #CalClient.
- * 
- * Checks if the component uses the given timezone for both the start and
- * the end time, or if the UTC offsets of the start and end times are the same
- * as in the given zone.
- *
- * Returns: TRUE if the component's start and end time are at the same UTC
- * offset in the given timezone.
- **/
-gboolean
-cal_comp_util_compare_event_timezones (CalComponent *comp,
-				       CalClient *client,
-				       icaltimezone *zone)
-{
-	CalClientGetStatus status;
-	CalComponentDateTime start_datetime, end_datetime;
-	const char *tzid;
-	gboolean retval = FALSE;
-	icaltimezone *start_zone, *end_zone;
-	int offset1, offset2;
-
-	tzid = icaltimezone_get_tzid (zone);
-
-	cal_component_get_dtstart (comp, &start_datetime);
-	cal_component_get_dtend (comp, &end_datetime);
-
-	/* If either the DTSTART or the DTEND is a DATE value, we return TRUE.
-	   Maybe if one was a DATE-TIME we should check that, but that should
-	   not happen often. */
-	if ((start_datetime.value && start_datetime.value->is_date)
-	    || (end_datetime.value && end_datetime.value->is_date)) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* If the event uses UTC for DTSTART & DTEND, return TRUE. Outlook
-	   will send single events as UTC, so we don't want to mark all of
-	   these. */
-	if ((!start_datetime.value || start_datetime.value->is_utc)
-	    && (!end_datetime.value || end_datetime.value->is_utc)) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* If the event uses floating time for DTSTART & DTEND, return TRUE.
-	   Imported vCalendar files will use floating times, so we don't want
-	   to mark all of these. */
-	if (!start_datetime.tzid && !end_datetime.tzid) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* FIXME: DURATION may be used instead. */
-	if (cal_component_compare_tzid (tzid, start_datetime.tzid)
-	    && cal_component_compare_tzid (tzid, end_datetime.tzid)) {
-		/* If both TZIDs are the same as the given zone's TZID, then
-		   we know the timezones are the same so we return TRUE. */
-		retval = TRUE;
-	} else {
-		/* If the TZIDs differ, we have to compare the UTC offsets
-		   of the start and end times, using their own timezones and
-		   the given timezone. */
-		status = cal_client_get_timezone (client,
-						  start_datetime.tzid,
-						  &start_zone);
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			goto out;
-
-		if (start_datetime.value) {
-			offset1 = icaltimezone_get_utc_offset (start_zone,
-							       start_datetime.value,
-							       NULL);
-			offset2 = icaltimezone_get_utc_offset (zone,
-							       start_datetime.value,
-							       NULL);
-			if (offset1 != offset2)
-				goto out;
-		}
-
-		status = cal_client_get_timezone (client,
-						  end_datetime.tzid,
-						  &end_zone);
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			goto out;
-
-		if (end_datetime.value) {
-			offset1 = icaltimezone_get_utc_offset (end_zone,
-							       end_datetime.value,
-							       NULL);
-			offset2 = icaltimezone_get_utc_offset (zone,
-							       end_datetime.value,
-							       NULL);
-			if (offset1 != offset2)
-				goto out;
-		}
-
-		retval = TRUE;
-	}
-
- out:
-
-	cal_component_free_datetime (&start_datetime);
-	cal_component_free_datetime (&end_datetime);
-
-	return retval;
-}
-
-/**
- * cal_comp_confirm_delete_empty_comp:
- * @comp: A calendar component.
- * @client: Calendar client where the component purportedly lives.
- * @widget: Widget to be used as the basis for UTF8 conversion.
- * 
- * Assumming a calendar component with an empty SUMMARY property (as per
- * string_is_empty()), asks whether the user wants to delete it based on
- * whether the appointment is on the calendar server or not.  If the
- * component is on the server, this function will present a confirmation
- * dialog and delete the component if the user tells it to.  If the component
- * is not on the server it will just return TRUE.
- * 
- * Return value: A result code indicating whether the component
- * was not on the server and is to be deleted locally, whether it
- * was on the server and the user deleted it, or whether the
- * user cancelled the deletion.
- **/
-ConfirmDeleteEmptyCompResult
-cal_comp_confirm_delete_empty_comp (CalComponent *comp, CalClient *client, GtkWidget *widget)
-{
-	const char *uid;
-	CalClientGetStatus status;
-	CalComponent *server_comp;
-
-	g_return_val_if_fail (comp != NULL, EMPTY_COMP_DO_NOT_REMOVE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), EMPTY_COMP_DO_NOT_REMOVE);
-	g_return_val_if_fail (client != NULL, EMPTY_COMP_DO_NOT_REMOVE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), EMPTY_COMP_DO_NOT_REMOVE);
-	g_return_val_if_fail (widget != NULL, EMPTY_COMP_DO_NOT_REMOVE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), EMPTY_COMP_DO_NOT_REMOVE);
-
-	/* See if the component is on the server.  If it is not, then it likely
-	 * means that the appointment is new, only in the day view, and we
-	 * haven't added it yet to the server.  In that case, we don't need to
-	 * confirm and we can just delete the event.  Otherwise, we ask
-	 * the user.
-	 */
-	cal_component_get_uid (comp, &uid);
-
-	status = cal_client_get_object (client, uid, &server_comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		gtk_object_unref (GTK_OBJECT (server_comp));
-		/* Will handle confirmation below */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("confirm_delete_empty_appointment(): Syntax error when getting "
-			   "object `%s'",
-			   uid);
-		/* However, the object *is* in the server, so confirm */
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		return EMPTY_COMP_REMOVE_LOCALLY;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* The event exists in the server, so confirm whether to delete it */
-
-	if (delete_component_dialog (comp, TRUE, 1, CAL_COMPONENT_EVENT, widget)) {
-		cal_client_remove_object (client, uid);
-		return EMPTY_COMP_REMOVED_FROM_SERVER;
-	} else
-		return EMPTY_COMP_DO_NOT_REMOVE;
-}
-
-/**
- * cal_comp_event_new_with_defaults:
- * 
- * Creates a new VEVENT component and adds any default alarms to it as set in
- * the program's configuration values.
- * 
- * Return value: A newly-created calendar component.
- **/
-CalComponent *
-cal_comp_event_new_with_defaults (void)
-{
-	CalComponent *comp;
-	int interval;
-	CalUnits units;
-	CalComponentAlarm *alarm;
-	CalAlarmTrigger trigger;
-
-	comp = cal_component_new ();
-
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	if (!calendar_config_get_use_default_reminder ())
-		return comp;
-
-	interval = calendar_config_get_default_reminder_interval ();
-	units = calendar_config_get_default_reminder_units ();
-
-	alarm = cal_component_alarm_new ();
-
-	/* We don't set the description of the alarm; we'll copy it from the
-	 * summary when it gets committed to the server.
-	 */
-
-	cal_component_alarm_set_action (alarm, CAL_ALARM_DISPLAY);
-
-	trigger.type = CAL_ALARM_TRIGGER_RELATIVE_START;
-
-	memset (&trigger.u.rel_duration, 0, sizeof (trigger.u.rel_duration));
-
-	trigger.u.rel_duration.is_neg = TRUE;
-
-	switch (units) {
-	case CAL_MINUTES:
-		trigger.u.rel_duration.minutes = interval;
-		break;
-
-	case CAL_HOURS:	
-		trigger.u.rel_duration.hours = interval;
-		break;
-
-	case CAL_DAYS:	
-		trigger.u.rel_duration.days = interval;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	cal_component_alarm_set_trigger (alarm, trigger);
-
-	cal_component_add_alarm (comp, alarm);
-	cal_component_alarm_free (alarm);
-
-	return comp;
-}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
deleted file mode 100644
index a4a55c0a2d..0000000000
--- a/calendar/gui/comp-util.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Evolution calendar - Utilities for manipulating CalComponent objects
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 COMP_UTIL_H
-#define COMP_UTIL_H
-
-#include <gtk/gtkwidget.h>
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-
-void cal_comp_util_add_exdate (CalComponent *comp, time_t t, icaltimezone *zone);
-
-
-/* Returns TRUE if the component uses the given timezone for both DTSTART
-   and DTEND, or if the UTC offsets of the start and end times are the same
-   as in the given zone. */
-gboolean cal_comp_util_compare_event_timezones (CalComponent *comp,
-						CalClient *client,
-						icaltimezone *zone);
-
-typedef enum {
-	EMPTY_COMP_REMOVE_LOCALLY,
-	EMPTY_COMP_REMOVED_FROM_SERVER,
-	EMPTY_COMP_DO_NOT_REMOVE
-} ConfirmDeleteEmptyCompResult;
-
-ConfirmDeleteEmptyCompResult cal_comp_confirm_delete_empty_comp (CalComponent *comp,
-								 CalClient *client,
-								 GtkWidget *widget);
-
-CalComponent *cal_comp_event_new_with_defaults (void);
-
-#endif
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
deleted file mode 100644
index b4a2b3ab89..0000000000
--- a/calendar/gui/component-factory.c
+++ /dev/null
@@ -1,729 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#include <config.h>
-
-#include <errno.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-exception.h>
-#include "evolution-shell-component.h"
-#include "calendar-offline-handler.h"
-#include "component-factory.h"
-#include "tasks-control-factory.h"
-#include "config-control-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#include "tasks-control.h"
-#include "tasks-migrate.h"
-
-
-
-/* OAFIID for the component.  */
-#define COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent"
- 
-/* Folder type IDs */
-#define FOLDER_CALENDAR "calendar"
-#define FOLDER_TASKS "tasks"
-
-/* IDs for user creatable items */
-#define CREATE_EVENT_ID "event"
-#define CREATE_ALLDAY_EVENT_ID "allday-event"
-#define CREATE_MEETING_ID "meeting"
-#define CREATE_TASK_ID "task"
-
-char *evolution_dir;
-EvolutionShellClient *global_shell_client = NULL;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ FOLDER_CALENDAR,
-	  "evolution-calendar.png",
-	  N_("Calendar"),
-	  N_("Folder containing appointments and events"),
-	  TRUE, NULL, NULL },
-	{ FOLDER_TASKS,
-	  "evolution-tasks.png",
-	  N_("Tasks"),
-	  N_("Folder containing to-do items"),
-	  TRUE, NULL, NULL },
-	{ NULL, NULL }
-};
-
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     const char *view_info,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!g_strcasecmp (type, "calendar")) {
-		control = control_factory_new_control ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else if (!g_strcasecmp (type, "tasks")) {
-		control = tasks_control_new ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else {
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-	}
-
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-	if (!g_strcasecmp (type, "calendar") && *view_info)
-		bonobo_control_set_property (control, "view", view_info, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	GnomeVFSURI *uri;
-
-	CORBA_exception_init (&ev);
-
-	if (strcmp (type, FOLDER_CALENDAR) && strcmp (type, FOLDER_TASKS)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	uri = gnome_vfs_uri_new (physical_uri);
-	if (uri) {
-		/* we don't need to do anything */
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_OK, &ev);
-		gnome_vfs_uri_unref (uri);
-	}
-	else {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Asks the alarm daemon to stop monitoring the specified URI */
-static void
-stop_alarms (GnomeVFSURI *uri)
-{
-	char *str_uri;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_AlarmNotify an;
-
-	/* Activate the alarm notification service */
-
-	CORBA_exception_init (&ev);
-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("stop_alarms(): Could not activate the alarm notification service");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Ask the service to remove the URI from its list of calendars */
-
-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	g_assert (str_uri != NULL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_AlarmNotify_removeCalendar (an, str_uri, &ev);
-	g_free (str_uri);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI)) {
-		g_message ("stop_alarms(): Invalid URI reported from the alarm notification service");
-	} else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound)) {
-		/* This is OK; the service may not have loaded that calendar */
-	} else if (BONOBO_EX (&ev)) {
-		g_message ("stop_alarms(): Could not issue the removeCalendar request");
-	}
-	
-	CORBA_exception_free (&ev);
-
-	/* Get rid of the service */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (an, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("stop_alarms(): Could not unref the alarm notification service");
-	CORBA_exception_free (&ev);
-}
-
-static void
-remove_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	GnomeVFSURI *dir_uri, *data_uri, *backup_uri;
-	GnomeVFSResult data_result, backup_result;
-
-	/* check type */
-	if (strcmp (type, FOLDER_CALENDAR) && strcmp (type, FOLDER_TASKS)) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener of "
-				   "an unsupported folder type");
-
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* check URI */
-	dir_uri = gnome_vfs_uri_new (physical_uri);
-	if (!dir_uri) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* Compute the URIs of the appropriate files */
-
-	if (strcmp (type, FOLDER_CALENDAR) == 0) {
-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics");
-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics~");
-	} else if (strcmp (type, FOLDER_TASKS) == 0) {
-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics");
-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics~");
-	} else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (!data_uri || !backup_uri) {
-		CORBA_Environment ev;
-
-		g_message ("remove_folder(): Could not generate the data/backup URIs");
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener "
-				   "of an invalid URI");
-
-		CORBA_exception_free (&ev);
-
-		goto out;
-	}
-
-	/* Ask the alarm daemon to stop monitoring this URI */
-
-	stop_alarms (data_uri);
-
-	/* Delete the data and backup files; the shell will take care of the rest */
-
-	data_result = gnome_vfs_unlink_from_uri (data_uri);
-	backup_result = gnome_vfs_unlink_from_uri (backup_uri);
-
-	if ((data_result == GNOME_VFS_OK || data_result == GNOME_VFS_ERROR_NOT_FOUND)
-	    && (backup_result == GNOME_VFS_OK || backup_result == GNOME_VFS_ERROR_NOT_FOUND)) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_OK,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener about success");
-
-		CORBA_exception_free (&ev);
-	} else {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("remove_folder(): Could not notify the listener about failure");
-
-		CORBA_exception_free (&ev);
-	}
-
- out:
-
-	gnome_vfs_uri_unref (dir_uri);
-
-	if (data_uri)
-		gnome_vfs_uri_unref (data_uri);
-
-	if (backup_uri)
-		gnome_vfs_uri_unref (backup_uri);
-}
-
-static GNOME_Evolution_ShellComponentListener_Result
-xfer_file (GnomeVFSURI *base_src_uri,
-	   GnomeVFSURI *base_dest_uri,
-	   const char *file_name,
-	   int remove_source)
-{
-	GnomeVFSURI *src_uri, *dest_uri;
-	GnomeVFSHandle *hin, *hout;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo file_info;
-	GnomeVFSFileSize size;
-	char *buffer;
-
-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);
-
-	result = gnome_vfs_open_uri (&hin, src_uri, GNOME_VFS_OPEN_READ);
-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */
-	}
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_get_file_info_uri (src_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);
-
-	result = gnome_vfs_create_uri (&hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	/* write source file to destination file */
-	buffer = g_malloc (file_info.size);
-	result = gnome_vfs_read (hin, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_write (hout, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	if (remove_source) {
-		char *text_uri;
-
-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */
-
-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);
-		result = gnome_vfs_unlink (text_uri);
-		g_free (text_uri);
-	}
-
-	gnome_vfs_close (hin);
-	gnome_vfs_close (hout);
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-	g_free (buffer);
-
-	return GNOME_Evolution_ShellComponentListener_OK;
-}
-
-static void
-xfer_folder (EvolutionShellComponent *shell_component,
-	     const char *source_physical_uri,
-	     const char *destination_physical_uri,
-	     const char *type,
-	     gboolean remove_source,
-	     const GNOME_Evolution_ShellComponentListener listener,
-	     void *closure)
-{
-	CORBA_Environment ev;
-	GnomeVFSURI *src_uri;
-	GnomeVFSURI *dest_uri;
-	GnomeVFSResult result;
-	char *filename, *backup_filename;
-
-	CORBA_exception_init (&ev);
-
-	/* check type */
-	if (strcmp (type, FOLDER_CALENDAR) && strcmp (type, FOLDER_TASKS)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* check URIs */
-	src_uri = gnome_vfs_uri_new (source_physical_uri);
-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);
-	if (!src_uri || ! dest_uri) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	if (strcmp (type, FOLDER_CALENDAR) == 0) {
-		filename = "calendar.ics";
-		backup_filename = "calendar.ics~";
-	} else if (strcmp (type, FOLDER_TASKS) == 0) {
-		filename = "tasks.ics";
-		backup_filename = "tasks.ics~";
-	} else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	result = xfer_file (src_uri, dest_uri, filename, remove_source);
-	if (result == GNOME_Evolution_ShellComponentListener_OK)
-		result = xfer_file (src_uri, dest_uri, backup_filename, remove_source);
-	
-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &ev);
-
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-
-        CORBA_exception_free (&ev);	
-}
-
-static GList *shells = NULL;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	static gboolean migrated = FALSE;
-	
-	evolution_dir = g_strdup (evolution_homedir);
-
-	if (!migrated) {
-		tasks_migrate ();
-		migrated = TRUE;
-	}
-
-	shells = g_list_append (shells, shell_component);
-
-	global_shell_client = shell_client;
-
-	config_control_factory_register (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)));
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-	      gpointer user_data)
-{
-	shells = g_list_remove (shells, shell_component);
-	
-	if (g_list_length (shells) == 0)
-		gtk_main_quit ();
-}
-
-/* Computes the final URI for a calendar component */
-static char *
-get_data_uri (const char *uri, CalComponentVType vtype)
-{
-	if (uri) {
-		if (*uri != '/' && strncmp (uri, "file:", 5) != 0)
-			return g_strdup (uri);
-		if (vtype == CAL_COMPONENT_EVENT)
-			return g_concat_dir_and_file (uri, "calendar.ics");
-		else if (vtype == CAL_COMPONENT_TODO)
-			return g_concat_dir_and_file (uri, "tasks.ics");
-		else
-			g_assert_not_reached ();
-	} else {
-		if (vtype == CAL_COMPONENT_EVENT)
-			return g_concat_dir_and_file (g_get_home_dir (),
-						      "evolution/local/Calendar/calendar.ics");
-		else if (vtype == CAL_COMPONENT_TODO)
-			return g_concat_dir_and_file (g_get_home_dir (),
-						      "evolution/local/Tasks/tasks.ics");
-		else
-			g_assert_not_reached ();
-	}
-
-	return NULL;
-}
-
-/* Creates a calendar component at a specified URI.  If the URI is NULL then it
- * uses the default folder for that type of component.
- */
-static void
-create_component (const char *uri, GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	char *real_uri;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CompEditorFactory factory;
-	CalComponentVType vtype;
-
-	switch (type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:
-		vtype = CAL_COMPONENT_EVENT;
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		vtype = CAL_COMPONENT_TODO;
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	real_uri = get_data_uri (uri, vtype);
-
-	/* Get the factory */
-
-	CORBA_exception_init (&ev);
-	factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory",
-					0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("create_component(): Could not activate the component editor factory");
-		CORBA_exception_free (&ev);
-		g_free (real_uri);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Create the item */
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_CompEditorFactory_editNew (factory, real_uri, type, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("create_component(): Exception while creating the component");
-
-	CORBA_exception_free (&ev);
-	g_free (real_uri);
-
-	/* Get rid of the factory */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (factory, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("create_component(): Could not unref the calendar component factory");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Callback used when we must create a user-creatable item */
-static void
-sc_user_create_new_item_cb (EvolutionShellComponent *shell_component,
-			    const char *id,
-			    const char *parent_folder_physical_uri,
-			    const char *parent_folder_type)
-{
-	if (strcmp (id, CREATE_EVENT_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)
-			create_component (parent_folder_physical_uri, 
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);
-		else
-			create_component (NULL,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);
- 	} else if (strcmp (id, CREATE_ALLDAY_EVENT_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)
-			create_component (parent_folder_physical_uri, 
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);
-		else
-			create_component (NULL,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);
-	} else if (strcmp (id, CREATE_MEETING_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)
-			create_component (parent_folder_physical_uri,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);
-		else
-			create_component (NULL,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);
-	} else if (strcmp (id, CREATE_TASK_ID) == 0) {
-		if (strcmp (parent_folder_type, FOLDER_TASKS) == 0)
-			create_component (parent_folder_physical_uri,
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);
-		else
-			create_component (NULL, 
-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);
-	} else
-		g_assert_not_reached ();
-}
-
-
-/* The factory function.  */
-
-static void
-add_creatable_item (EvolutionShellComponent *shell_component,
-		    const char *id,
-		    const char *description,
-		    const char *menu_description,
-		    char menu_shortcut,
-		    const char *icon_name)
-{
-	char *icon_path;
-	GdkPixbuf *icon;
-
-	if (icon_name == NULL) {
-		icon_path = NULL;
-		icon = NULL;
-	} else {
-		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
-		icon = gdk_pixbuf_new_from_file (icon_path);
-	}
-
-	evolution_shell_component_add_user_creatable_item (shell_component,
-							   id,
-							   description,
-							   menu_description,
-							   menu_shortcut,
-							   icon);
-
-	if (icon != NULL)
-		gdk_pixbuf_unref (icon);
-	g_free (icon_path);
-}
-
-static BonoboObject *
-create_object (void)
-{
-	EvolutionShellComponent *shell_component;
-	CalendarOfflineHandler *offline_handler;	
-
-	shell_component = evolution_shell_component_new (folder_types,
-							 NULL,
-							 create_view,
-							 create_folder,
-							 remove_folder,
-							 xfer_folder,
-							 NULL, /* populate_folder_context_menu_fn */
-							 NULL, /* get_dnd_selection_fn */
-							 NULL  /* closure */);
-
-	/* Offline handler */
-	offline_handler = calendar_offline_handler_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component), 
-				     BONOBO_OBJECT (offline_handler));
-	
-	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);
-
-	/* User creatable items */
-
-	add_creatable_item (shell_component, CREATE_MEETING_ID,
-			    _("New meeting"), _("_Meeting"),
-			    's', "meeting-request.png");
-
-	add_creatable_item (shell_component, CREATE_TASK_ID,
-			    _("New task"), _("_Task"),
-			    't', "new_task-16.png");
-
-	add_creatable_item (shell_component, CREATE_ALLDAY_EVENT_ID,
-			    _("New All Day Appointment"), _("All _Day Appointment"),
-			    'd', "new_all_day_event.png");
-
-	add_creatable_item (shell_component, CREATE_EVENT_ID,
-			    _("New appointment"), _("_Appointment"),
-			    'a', "new_appointment.xpm");
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
-			    GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-component_factory_init (void)
-{
-	BonoboObject *object;
-	int result;
-
-	object = create_object ();
-
-	result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (object));
-
-	if (result == OAF_REG_ERROR)
-		g_error ("Cannot initialize Evolution's calendar component.");
-}
diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h
deleted file mode 100644
index 576255cb6d..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  Ximian, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#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/config-control-factory.c b/calendar/gui/config-control-factory.c
deleted file mode 100644
index f2a9b48383..0000000000
--- a/calendar/gui/config-control-factory.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* config-control-factory.c
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "config-control-factory.h"
-
-#include "dialogs/cal-prefs-dialog.h"
-
-#include <bonobo/bonobo-generic-factory.h>
-
-
-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
-static BonoboGenericFactory *generic_factory = NULL;
-
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *generic_factory,
-	    void *data)
-{
-	EvolutionConfigControl *config_control;
-
-	config_control = cal_prefs_dialog_new ();
-
-	return BONOBO_OBJECT (config_control);
-}
-
-gboolean
-config_control_factory_register (GNOME_Evolution_Shell shell)
-{
-	generic_factory = bonobo_generic_factory_new (CONFIG_CONTROL_FACTORY_ID,
-						      factory_fn, shell);
-
-	if (generic_factory == NULL) {
-		g_warning ("Cannot register %s", CONFIG_CONTROL_FACTORY_ID);
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/calendar/gui/config-control-factory.h b/calendar/gui/config-control-factory.h
deleted file mode 100644
index b0ff927fa9..0000000000
--- a/calendar/gui/config-control-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* config-control-factory.h
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 CONFIG_CONTROL_FACTORY_H
-#define CONFIG_CONTROL_FACTORY_H
-
-#include "Evolution.h"
-
-gboolean  config_control_factory_register  (GNOME_Evolution_Shell shell);
-
-#endif
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index a17790f197..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#include <config.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist-file.h>
-#include <bonobo/bonobo-context.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <cal-util/timeutil.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 PROPERTY_CALENDAR_VIEW     "view"
-#define PROPERTY_CALENDAR_VIEW_IDX 2
-
-#define CONTROL_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	if (activate)
-		calendar_control_activate (control, gcal);
-	else
-		calendar_control_deactivate (control, gcal);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	const char *uri;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		uri = cal_client_get_uri (gnome_calendar_get_cal_client (gcal));
-		BONOBO_ARG_SET_STRING (arg, uri);
-		break;
-
-	case PROPERTY_CALENDAR_VIEW_IDX:
-		switch (gnome_calendar_get_view (gcal)) {
-		case GNOME_CAL_DAY_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "day");
-			break;
-		case GNOME_CAL_WEEK_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "week");
-			break;
-		case GNOME_CAL_WORK_WEEK_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "workweek");
-			break;
-		case GNOME_CAL_MONTH_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "month");
-			break;
-		}
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *string;
-	GnomeCalendarViewType view;
-
-	switch (arg_id) {
-	case PROPERTY_CALENDAR_URI_IDX:
-		string = BONOBO_ARG_GET_STRING (arg);
-		if (!gnome_calendar_open (gcal, string)) {
-			char *msg;
-
-			msg = g_strdup_printf (_("Could not open the folder in '%s'"), string);
-			gnome_error_dialog_parented (
-				msg,
-				GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-			g_free (msg);
-		}
-		break;
-
-	case PROPERTY_CALENDAR_VIEW_IDX:
-		string = BONOBO_ARG_GET_STRING (arg);
-		if (!g_strcasecmp (string, "week"))
-			view = GNOME_CAL_WEEK_VIEW;
-		else if (!g_strcasecmp (string, "workweek"))
-			view = GNOME_CAL_WORK_WEEK_VIEW;
-		else if (!g_strcasecmp (string, "month"))
-			view = GNOME_CAL_MONTH_VIEW;
-		else
-			view = GNOME_CAL_DAY_VIEW;
-
-		/* This doesn't actually work, because the GalView
-		 * comes along and resets the view. FIXME.
-		 */
-		gnome_calendar_set_view (gcal, view, FALSE, TRUE);
-		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_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_VIEW,
-				 PROPERTY_CALENDAR_VIEW_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The type of view to show"),
-				 0);
-
-	bonobo_control_set_properties (control, pbag);
-	bonobo_object_unref (BONOBO_OBJECT (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;
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-	
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-#if 0
-static int
-load_calendar (BonoboPersistFile *pf, const CORBA_char *filename, CORBA_Environment *ev, void *closure)
-{
-	GnomeCalendar *gcal = closure;
-	
-	return gnome_calendar_open (gcal, filename);
-}
-
-static int
-save_calendar (BonoboPersistFile *pf, const CORBA_char *filename,
-	       CORBA_Environment *ev,
-	       void *closure)
-{
-	/* Do not know how to save stuff yet */
-	return -1;
-}
-
-static void
-calendar_persist_init (GnomeCalendar *gcal, BonoboControl *control)
-{
-	BonoboPersistFile *f;
-
-	f = bonobo_persist_file_new (load_calendar, save_calendar, gcal);
-	bonobo_object_add_interface (BONOBO_OBJECT (control), BONOBO_OBJECT (f));
-}
-#endif
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = new_calendar ();
-	if (!gcal)
-		return NULL;
-
-	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;
-	}
-	gtk_object_set_data (GTK_OBJECT (gcal), "control", control);
-
-	calendar_properties_init (gcal, control);
-#if 0
-	calendar_persist_init (gcal, control);
-#endif
-					      
-	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 322b5a4a4e..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  Ximian, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ettore@ximian.com>
- */
-
-#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/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
deleted file mode 100644
index 64968755b7..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.pure
-Makefile
-Makefile.in
-Evolution-Addressbook-SelectNames.h
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-common.c
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
deleted file mode 100644
index aa107d84e0..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-IDLS = $(top_srcdir)/addressbook/gui/component/select-names/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
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-
-BUILT_SOURCES = $(IDL_GENERATED)
-
-INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"calendar-gui\"					\
-	-I$(top_srcdir)							\
-	-I$(top_srcdir)/calendar					\
-	-I$(top_srcdir)/calendar/cal-client				\
-	-I$(top_builddir)/calendar/cal-client				\
-	-I$(top_srcdir)/libical/src/libical				\
-	-I$(top_builddir)/libical/src/libical				\
-	-I$(top_builddir)/shell						\
-	-I$(top_srcdir)/shell						\
-	-I$(top_srcdir)/addressbook/backend/ebook			\
-	-I$(top_builddir)/addressbook/backend/ebook			\
-	-I$(includedir)							\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"				\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-noinst_LIBRARIES = libcal-dialogs.a
-
-libcal_dialogs_a_SOURCES =	\
-	$(IDL_GENERATED)	\
-	alarm-options.c		\
-	alarm-options.h		\
-	alarm-page.c		\
-	alarm-page.h		\
-	cal-prefs-dialog.c	\
-	cal-prefs-dialog.h	\
-	cancel-comp.c		\
-	cancel-comp.h		\
-	changed-comp.c		\
-	changed-comp.h		\
-	comp-editor.c		\
-	comp-editor.h		\
-	comp-editor-page.c	\
-	comp-editor-page.h	\
-	comp-editor-util.c	\
-	comp-editor-util.h	\
-	delete-comp.c		\
-	delete-comp.h		\
-	e-delegate-dialog.c	\
-	e-delegate-dialog.h	\
-	event-editor.c		\
-	event-editor.h		\
-	event-page.c		\
-	event-page.h		\
-	meeting-page.c		\
-	meeting-page.h		\
-	recurrence-page.c	\
-	recurrence-page.h	\
-	save-comp.c		\
-	save-comp.h		\
-	schedule-page.c		\
-	schedule-page.h		\
-	send-comp.c		\
-	send-comp.h		\
-	task-editor.c		\
-	task-editor.h		\
-	task-details-page.c	\
-	task-details-page.h	\
-	task-page.c		\
-	task-page.h
-
-iconsdir = $(datadir)/images/evolution
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA =				\
-	alarm-options.glade		\
-	alarm-page.glade		\
-	cal-prefs-dialog.glade		\
-	e-delegate-dialog.glade		\
-	event-page.glade		\
-	meeting-page.glade		\
-	recurrence-page.glade		\
-	schedule-page.glade		\
-	task-details-page.glade		\
-	task-page.glade
-
-etspecdir = $(datadir)/evolution/etspec/
-etspec_DATA = meeting-page.etspec
-
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-EXTRA_DIST =			\
-	$(glade_DATA)		\
-	$(etspec_DATA)
diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c
deleted file mode 100644
index 2ea6938633..0000000000
--- a/calendar/gui/dialogs/alarm-options.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/* Evolution calendar - Alarm options dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <glade/glade.h>
-#include "e-util/e-dialog-widgets.h"
-#include "alarm-options.h"
-
-
-
-typedef struct {
-	/* Whether the dialog was accepted or canceled */
-	gboolean canceled;
-
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Toplevel */
-	GtkWidget *toplevel;
-
-	/* Buttons */
-	GtkWidget *button_ok;
-	GtkWidget *button_cancel;
-
-	/* Alarm repeat widgets */
-	GtkWidget *repeat_toggle;
-	GtkWidget *repeat_group;
-	GtkWidget *repeat_quantity;
-	GtkWidget *repeat_value;
-	GtkWidget *repeat_unit;
-
-	/* Display alarm widgets */
-	GtkWidget *dalarm_group;
-	GtkWidget *dalarm_description;
-
-	/* Audio alarm widgets */
-	GtkWidget *aalarm_group;
-	GtkWidget *aalarm_attach;
-
-	/* FIXME: Mail alarm widgets */
-	GtkWidget *malarm_group;
-
-	/* Procedure alarm widgets */
-	GtkWidget *palarm_group;
-	GtkWidget *palarm_program;
-	GtkWidget *palarm_args;
-} Dialog;
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (Dialog *dialog)
-{
-#define GW(name) glade_xml_get_widget (dialog->xml, name)
-
-	dialog->toplevel = GW ("alarm-options-toplevel");
-
-	dialog->button_ok = GW ("button-ok");
-	dialog->button_cancel = GW ("button-cancel");
-
-	dialog->repeat_toggle = GW ("repeat-toggle");
-	dialog->repeat_group = GW ("repeat-group");
-	dialog->repeat_quantity = GW ("repeat-quantity");
-	dialog->repeat_value = GW ("repeat-value");
-	dialog->repeat_unit = GW ("repeat-unit");
-
-	dialog->dalarm_group = GW ("dalarm-group");
-	dialog->dalarm_description = GW ("dalarm-description");
-
-	dialog->aalarm_group = GW ("aalarm-group");
-	dialog->aalarm_attach = GW ("aalarm-attach");
-
-	dialog->malarm_group = GW ("malarm-group");
-
-	dialog->palarm_group = GW ("palarm-group");
-	dialog->palarm_program = GW ("palarm-program");
-	dialog->palarm_args = GW ("palarm-args");
-
-	return (dialog->toplevel
-		&& dialog->button_ok
-		&& dialog->button_cancel
-		&& dialog->repeat_toggle
-		&& dialog->repeat_group
-		&& dialog->repeat_quantity
-		&& dialog->repeat_value
-		&& dialog->repeat_unit
-		&& dialog->dalarm_group
-		&& dialog->dalarm_description
-		&& dialog->aalarm_group
-		&& dialog->aalarm_attach
-		&& dialog->malarm_group
-		&& dialog->palarm_group
-		&& dialog->palarm_program
-		&& dialog->palarm_args);
-}
-
-/* Closes the dialog by terminating its main loop */
-static void
-close_dialog (Dialog *dialog, gboolean canceled)
-{
-	dialog->canceled = canceled;
-	gtk_main_quit ();
-}
-
-/* Callback used when the toplevel window is deleted */
-static guint
-toplevel_delete_event_cb (GtkWidget *widget, GdkEventAny *event, gpointer data)
-{
-	Dialog *dialog;
-
-	dialog = data;
-	close_dialog (dialog, TRUE);
-	return TRUE;
-}
-
-/* Callback used when the OK button is clicked */
-static void
-button_ok_clicked_cb (GtkWidget *button, gpointer data)
-{
-	Dialog *dialog;
-
-	dialog = data;
-	close_dialog (dialog, FALSE);
-}
-
-/* Callback used when the Cancel button is clicked */
-static void
-button_cancel_clicked_cb (GtkWidget *button, gpointer data)
-{
-	Dialog *dialog;
-
-	dialog = data;
-	close_dialog (dialog, TRUE);
-}
-
-/* Callback used when the repeat toggle button is toggled.  We sensitize the
- * repeat group options as appropriate.
- */
-static void
-repeat_toggle_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	Dialog *dialog;
-	gboolean active;
-
-	dialog = data;
-
-	active = gtk_toggle_button_get_active (toggle);
-
-	gtk_widget_set_sensitive (dialog->repeat_group, active);
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (Dialog *dialog)
-{
-	/* Toplevel, buttons */
-
-	dialog->canceled = TRUE;
-
-	gtk_signal_connect (GTK_OBJECT (dialog->toplevel), "delete_event",
-			    GTK_SIGNAL_FUNC (toplevel_delete_event_cb), dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->button_ok), "clicked",
-			    GTK_SIGNAL_FUNC (button_ok_clicked_cb), dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->button_cancel), "clicked",
-			    GTK_SIGNAL_FUNC (button_cancel_clicked_cb), dialog);
-
-	/* Alarm repeat */
-
-	gtk_signal_connect (GTK_OBJECT (dialog->repeat_toggle), "toggled",
-			    GTK_SIGNAL_FUNC (repeat_toggle_toggled_cb), dialog);
-}
-
-/* Fills the audio alarm widgets with the values from the alarm component */
-static void
-alarm_to_aalarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	icalattach *attach;
-	const char *url;
-
-	cal_component_alarm_get_attach (alarm, &attach);
-
-	if (!attach) {
-		e_dialog_editable_set (dialog->aalarm_attach, NULL);
-		return;
-	}
-
-	/* FIXME: this does not support inline data */
-
-	url = NULL;
-
-	if (icalattach_get_is_url (attach))
-		url = icalattach_get_url (attach);
-	else
-		g_message ("alarm_to_aalarm_widgets(): FIXME: we don't support inline data yet");
-
-	e_dialog_editable_set (dialog->aalarm_attach, url);
-
-	icalattach_unref (attach);
-}
-
-/* Fills the display alarm widgets with the values from the alarm component */
-static void
-alarm_to_dalarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	CalComponentText description;
-
-	cal_component_alarm_get_description (alarm, &description);
-
-	e_dialog_editable_set (dialog->dalarm_description, description.value);
-}
-
-/* Fills the mail alarm widgets with the values from the alarm component */
-static void
-alarm_to_malarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	/* FIXME: nothing for now; we don't support mail alarms */
-}
-
-/* Fills the procedure alarm widgets with the values from the alarm component */
-static void
-alarm_to_palarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	icalattach *attach;
-	CalComponentText description;
-
-	cal_component_alarm_get_attach (alarm, &attach);
-	cal_component_alarm_get_description (alarm, &description);
-
-	if (attach) {
-		const char *url;
-
-		if (icalattach_get_is_url (attach)) {
-			url = icalattach_get_url (attach);
-			e_dialog_editable_set (dialog->palarm_program, url);
-		} else
-			g_message ("alarm_to_palarm_widgets(): Don't know what to do with non-URL "
-				   "attachments");
-
-		icalattach_unref (attach);
-	}
-
-	e_dialog_editable_set (dialog->palarm_args, description.value);
-}
-
-enum duration_units {
-	DUR_MINUTES,
-	DUR_HOURS,
-	DUR_DAYS
-};
-
-static const int duration_units_map[] = {
-	DUR_MINUTES,
-	DUR_HOURS,
-	DUR_DAYS,
-	-1
-};
-
-/* Sigh.  Takes an overcomplicated duration value and reduces it to its lowest
- * common denominator.
- */
-static void
-normalize_duration (struct icaldurationtype dur, int *value, enum duration_units *units)
-{
-	if (dur.seconds != 0 || dur.minutes != 0) {
-		*value = ((((dur.weeks * 7 + dur.days) * 24 + dur.hours) * 60) + dur.minutes
-			  + dur.seconds / 60 + ((dur.seconds % 60) >= 30 ? 1 : 0));
-		*units = DUR_MINUTES;
-	} else if (dur.hours) {
-		*value = ((dur.weeks * 7) + dur.days) * 24 + dur.hours;
-		*units = DUR_HOURS;
-	} else if (dur.days != 0 || dur.weeks != 0) {
-		*value = dur.weeks * 7 + dur.days;
-		*units = DUR_DAYS;
-	} else {
-		*value = 0;
-		*units = DUR_MINUTES;
-	}
-}
-
-/* Fills the repeat widgets with the values from the alarm component */
-static void
-alarm_to_repeat_widgets (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	CalAlarmRepeat repeat;
-	int value;
-	enum duration_units units;
-
-	cal_component_alarm_get_repeat (alarm, &repeat);
-
-	/* Sensitivity */
-
-	if (repeat.repetitions == 0) {
-		gtk_widget_set_sensitive (dialog->repeat_group, FALSE);
-		e_dialog_toggle_set (dialog->repeat_toggle, FALSE);
-		return;
-	}
-
-	gtk_widget_set_sensitive (dialog->repeat_group, TRUE);
-	e_dialog_toggle_set (dialog->repeat_toggle, TRUE);
-
-	/* Repetitions */
-	e_dialog_spin_set (dialog->repeat_quantity, repeat.repetitions);
-
-	/* Duration */
-
-	normalize_duration (repeat.duration, &value, &units);
-
-	e_dialog_spin_set (dialog->repeat_value, value);
-	e_dialog_option_menu_set (dialog->repeat_unit, units, duration_units_map);
-}
-
-/* Fills the widgets with the values from the alarm component */
-static void
-alarm_to_dialog (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	CalAlarmAction action;
-
-	alarm_to_repeat_widgets (dialog, alarm);
-
-	cal_component_alarm_get_action (alarm, &action);
-
-	switch (action) {
-	case CAL_ALARM_NONE:
-		g_assert_not_reached ();
-		return;
-
-	case CAL_ALARM_AUDIO:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Audio Alarm Options"));
-		gtk_widget_show (dialog->aalarm_group);
-		gtk_widget_hide (dialog->dalarm_group);
-		gtk_widget_hide (dialog->malarm_group);
-		gtk_widget_hide (dialog->palarm_group);
-		alarm_to_aalarm_widgets (dialog, alarm);
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Message Alarm Options"));
-		gtk_widget_hide (dialog->aalarm_group);
-		gtk_widget_show (dialog->dalarm_group);
-		gtk_widget_hide (dialog->malarm_group);
-		gtk_widget_hide (dialog->palarm_group);
-		alarm_to_dalarm_widgets (dialog, alarm);
-		break;
-
-	case CAL_ALARM_EMAIL:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Mail Alarm Options"));
-		gtk_widget_hide (dialog->aalarm_group);
-		gtk_widget_hide (dialog->dalarm_group);
-		gtk_widget_show (dialog->malarm_group);
-		gtk_widget_hide (dialog->palarm_group);
-		alarm_to_malarm_widgets (dialog, alarm);
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Program Alarm Options"));
-		gtk_widget_hide (dialog->aalarm_group);
-		gtk_widget_hide (dialog->dalarm_group);
-		gtk_widget_hide (dialog->malarm_group);
-		gtk_widget_show (dialog->palarm_group);
-		alarm_to_palarm_widgets (dialog, alarm);
-		break;
-
-	case CAL_ALARM_UNKNOWN:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Unknown Alarm Options"));
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-}
-
-
-
-/* Fills the alarm data with the values from the repeat/duration widgets */
-static void
-repeat_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	CalAlarmRepeat repeat;
-
-	if (!e_dialog_toggle_get (dialog->repeat_toggle)) {
-		repeat.repetitions = 0;
-
-		cal_component_alarm_set_repeat (alarm, repeat);
-		return;
-	}
-
-	repeat.repetitions = e_dialog_spin_get_int (dialog->repeat_quantity);
-
-	memset (&repeat.duration, 0, sizeof (repeat.duration));
-	switch (e_dialog_option_menu_get (dialog->repeat_unit, duration_units_map)) {
-	case DUR_MINUTES:
-		repeat.duration.minutes = e_dialog_spin_get_int (dialog->repeat_value);
-		break;
-
-	case DUR_HOURS:
-		repeat.duration.hours = e_dialog_spin_get_int (dialog->repeat_value);
-		break;
-
-	case DUR_DAYS:
-		repeat.duration.days = e_dialog_spin_get_int (dialog->repeat_value);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	cal_component_alarm_set_repeat (alarm, repeat);
-		
-}
-
-/* Fills the audio alarm data with the values from the widgets */
-static void
-aalarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	char *url;
-	icalattach *attach;
-
-	url = e_dialog_editable_get (dialog->aalarm_attach);
-	attach = icalattach_new_from_url (url ? url : "");
-	g_free (url);
-
-	cal_component_alarm_set_attach (alarm, attach);
-	icalattach_unref (attach);
-}
-
-/* Fills the display alarm data with the values from the widgets */
-static void
-dalarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	char *str;
-	CalComponentText description;
-
-	str = e_dialog_editable_get (dialog->dalarm_description);
-	description.value = str;
-	description.altrep = NULL;
-
-	cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-}
-
-/* Fills the mail alarm data with the values from the widgets */
-static void
-malarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	/* FIXME: nothing for now; we don't support mail alarms */
-}
-
-/* Fills the procedure alarm data with the values from the widgets */
-static void
-palarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	char *program;
-	icalattach *attach;
-	char *str;
-	CalComponentText description;
-
-	program = e_dialog_editable_get (dialog->palarm_program);
-	attach = icalattach_new_from_url (program ? program : "");
-	g_free (program);
-
-	cal_component_alarm_set_attach (alarm, attach);
-	icalattach_unref (attach);
-
-	str = e_dialog_editable_get (dialog->palarm_args);
-	description.value = str;
-	description.altrep = NULL;
-
-	cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-}
-
-/* Fills the alarm data with the values from the widgets */
-static void
-dialog_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)
-{
-	CalAlarmAction action;
-
-	repeat_widgets_to_alarm (dialog, alarm);
-
-	cal_component_alarm_get_action (alarm, &action);
-
-	switch (action) {
-	case CAL_ALARM_NONE:
-		g_assert_not_reached ();
-		break;
-
-	case CAL_ALARM_AUDIO:
-		aalarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		dalarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case CAL_ALARM_EMAIL:
-		malarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		palarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case CAL_ALARM_UNKNOWN:
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-
-
-/**
- * alarm_options_dialog_run:
- * @alarm: Alarm that is to be edited.
- * 
- * Runs an alarm options dialog modally.
- * 
- * Return value: TRUE if the dialog could be created, FALSE otherwise.
- **/
-gboolean
-alarm_options_dialog_run (CalComponentAlarm *alarm)
-{
-	Dialog dialog;
-
-	g_return_val_if_fail (alarm != NULL, FALSE);
-
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-options.glade", NULL);
-	if (!dialog.xml) {
-		g_message ("alarm_options_dialog_new(): Could not load the Glade XML file!");
-		return FALSE;
-	}
-
-	if (!get_widgets (&dialog)) {
-		gtk_object_unref (GTK_OBJECT (dialog.xml));
-		return FALSE;
-	}
-
-	init_widgets (&dialog);
-
-	alarm_to_dialog (&dialog, alarm);
-
-	gtk_widget_show (dialog.toplevel);
-	gtk_main ();
-
-	if (!dialog.canceled)
-		dialog_to_alarm (&dialog, alarm);
-
-	gtk_widget_destroy (dialog.toplevel);
-	gtk_object_unref (GTK_OBJECT (dialog.xml));
-
-	return TRUE;
-}
diff --git a/calendar/gui/dialogs/alarm-options.glade b/calendar/gui/dialogs/alarm-options.glade
deleted file mode 100644
index 00c38b9390..0000000000
--- a/calendar/gui/dialogs/alarm-options.glade
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Dialogs</name>
-  <program_name>dialogs</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>alarm-options-toplevel</name>
-  <title></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>True</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox1</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame1</name>
-      <label>Alarm Repeat</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>hbox1</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>repeat-toggle</name>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <label>Repeat the alarm</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>repeat-group</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>repeat-quantity</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>1</lower>
-	    <upper>999</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>label1</name>
-	    <label>extra times every</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>GtkSpinButton</class>
-	    <name>repeat-value</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>999</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>GtkOptionMenu</class>
-	    <name>repeat-unit</name>
-	    <can_focus>True</can_focus>
-	    <items>minutes
-hours
-days
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>dalarm-group</name>
-      <visible>False</visible>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>Message to Display</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_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>dalarm-description</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>aalarm-group</name>
-      <visible>False</visible>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Play sound:</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>GnomeFileEntry</class>
-	<name>file-entry1</name>
-	<max_saved>10</max_saved>
-	<directory>False</directory>
-	<modal>False</modal>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GnomeEntry:entry</child_name>
-	  <name>aalarm-attach</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>
-      <class>GtkLabel</class>
-      <name>malarm-group</name>
-      <visible>False</visible>
-      <label>This is an email reminder, but Evolution does not yet support this kind of reminders.  You will not be able to edit the options for this reminder.</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>True</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>GtkHBox</class>
-      <name>palarm-group</name>
-      <visible>False</visible>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>Run program:</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>palarm-program</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>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>With these arguments:</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>palarm-args</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>GtkHButtonBox</class>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</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>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button-ok</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-	<relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button-cancel</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-	<relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/alarm-options.h b/calendar/gui/dialogs/alarm-options.h
deleted file mode 100644
index 388b737541..0000000000
--- a/calendar/gui/dialogs/alarm-options.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Evolution calendar - Alarm options dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_OPTIONS_H
-#define ALARM_OPTIONS_H
-
-#include <cal-util/cal-component.h>
-
-gboolean alarm_options_dialog_run (CalComponentAlarm *alarm);
-
-#endif
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
deleted file mode 100644
index c06e975ed7..0000000000
--- a/calendar/gui/dialogs/alarm-page.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
-#include "cal-util/cal-util.h"
-#include "cal-util/timeutil.h"
-#include "../calendar-config.h"
-#include "comp-editor-util.h"
-#include "alarm-options.h"
-#include "alarm-page.h"
-
-
-
-/* Private part of the AlarmPage structure */
-struct _AlarmPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *main;
-
-	GtkWidget *summary;
-	GtkWidget *date_time;
-
-	GtkWidget *list;
-	GtkWidget *add;
-	GtkWidget *delete;
-
-	GtkWidget *action;
-	GtkWidget *interval_value;
-	GtkWidget *value_units;
-	GtkWidget *relative;
-	GtkWidget *time;
-
-	GtkWidget *button_options;
-
-	/* Alarm options dialog and the alarm we maintain */
-	CalComponentAlarm *alarm;
-
-	gboolean updating;
-};
-
-/* "relative" types */
-enum {
-	BEFORE,
-	AFTER
-};
-
-/* Time units */
-enum {
-	MINUTES,
-	HOURS,
-	DAYS
-};
-
-/* Option menu maps */
-static const int action_map[] = {
-	CAL_ALARM_DISPLAY,
-	CAL_ALARM_AUDIO,
-	CAL_ALARM_PROCEDURE,
-	-1
-};
-
-static const int value_map[] = {
-	MINUTES,
-	HOURS,
-	DAYS,
-	-1
-};
-
-static const int relative_map[] = {
-	BEFORE,
-	AFTER,
-	-1
-};
-
-static const int time_map[] = {
-	CAL_ALARM_TRIGGER_RELATIVE_START,
-	CAL_ALARM_TRIGGER_RELATIVE_END,
-	-1
-};
-
-
-
-static void alarm_page_class_init (AlarmPageClass *class);
-static void alarm_page_init (AlarmPage *apage);
-static void alarm_page_destroy (GtkObject *object);
-
-static GtkWidget *alarm_page_get_widget (CompEditorPage *page);
-static void alarm_page_focus_main_widget (CompEditorPage *page);
-static void alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean alarm_page_fill_component (CompEditorPage *page, CalComponent *comp);
-static void alarm_page_set_summary (CompEditorPage *page, const char *summary);
-static void alarm_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * alarm_page_get_type:
- *
- * Registers the #AlarmPage class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #AlarmPage class.
- **/
-GtkType
-alarm_page_get_type (void)
-{
-	static GtkType alarm_page_type;
-
-	if (!alarm_page_type) {
-		static const GtkTypeInfo alarm_page_info = {
-			"AlarmPage",
-			sizeof (AlarmPage),
-			sizeof (AlarmPageClass),
-			(GtkClassInitFunc) alarm_page_class_init,
-			(GtkObjectInitFunc) alarm_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		alarm_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-						   &alarm_page_info);
-	}
-
-	return alarm_page_type;
-}
-
-/* Class initialization function for the alarm page */
-static void
-alarm_page_class_init (AlarmPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = alarm_page_get_widget;
-	editor_page_class->focus_main_widget = alarm_page_focus_main_widget;
-	editor_page_class->fill_widgets = alarm_page_fill_widgets;
-	editor_page_class->fill_component = alarm_page_fill_component;
-	editor_page_class->set_summary = alarm_page_set_summary;
-	editor_page_class->set_dates = alarm_page_set_dates;
-
-	object_class->destroy = alarm_page_destroy;
-}
-
-/* Object initialization function for the alarm page */
-static void
-alarm_page_init (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-
-	priv = g_new0 (AlarmPagePrivate, 1);
-	apage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->summary = NULL;
-	priv->date_time = NULL;
-	priv->list = NULL;
-	priv->add = NULL;
-	priv->delete = NULL;
-	priv->action = NULL;
-	priv->interval_value = NULL;
-	priv->value_units = NULL;
-	priv->relative = NULL;
-	priv->time = NULL;
-	priv->button_options = NULL;
-
-	priv->alarm = cal_component_alarm_new ();
-
-	priv->updating = FALSE;
-}
-
-/* Destroy handler for the alarm page */
-static void
-alarm_page_destroy (GtkObject *object)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_ALARM_PAGE (object));
-
-	apage = ALARM_PAGE (object);
-	priv = apage->priv;
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	if (priv->alarm) {
-		cal_component_alarm_free (priv->alarm);
-		priv->alarm = NULL;
-	}
-
-	g_free (priv);
-	apage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_widget handler for the alarm page */
-static GtkWidget *
-alarm_page_get_widget (CompEditorPage *page)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the alarm page */
-static void
-alarm_page_focus_main_widget (CompEditorPage *page)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	gtk_widget_grab_focus (priv->action);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-
-	priv = apage->priv;
-
-	/* Summary */
-	gtk_label_set_text (GTK_LABEL (priv->summary), "");
-
-	/* Start date */
-	gtk_label_set_text (GTK_LABEL (priv->date_time), "");
-
-	/* Sane defaults */
-	e_dialog_option_menu_set (priv->action, CAL_ALARM_DISPLAY, action_map);
-	e_dialog_spin_set (priv->interval_value, 15);
-	e_dialog_option_menu_set (priv->value_units, MINUTES, value_map);
-	e_dialog_option_menu_set (priv->relative, BEFORE, relative_map);
-	e_dialog_option_menu_set (priv->time, CAL_ALARM_TRIGGER_RELATIVE_START, time_map);
-
-	/* List data */
-	gtk_clist_clear (GTK_CLIST (priv->list));
-}
-
-/* Builds a string for the duration of the alarm.  If the duration is zero, returns NULL. */
-static char *
-get_alarm_duration_string (struct icaldurationtype *duration)
-{
-	GString *string = g_string_new (NULL);
-	char *ret;
-	gboolean have_something;
-
-	have_something = FALSE;
-
-	if (duration->days > 1) {
-		g_string_sprintf (string, _("%d days"), duration->days);
-		have_something = TRUE;
-	} else if (duration->days == 1) {
-		g_string_append (string, _("1 day"));
-		have_something = TRUE;
-	}
-
-	if (duration->weeks > 1) {
-		g_string_sprintf (string, _("%d weeks"), duration->weeks);
-		have_something = TRUE;
-	} else if (duration->weeks == 1) {
-		g_string_append (string, _("1 week"));
-		have_something = TRUE;
-	}
-
-	if (duration->hours > 1) {
-		g_string_sprintf (string, _("%d hours"), duration->hours);
-		have_something = TRUE;
-	} else if (duration->hours == 1) {
-		g_string_append (string, _("1 hour"));
-		have_something = TRUE;
-	}
-
-	if (duration->minutes > 1) {
-		g_string_sprintf (string, _("%d minutes"), duration->minutes);
-		have_something = TRUE;
-	} else if (duration->minutes == 1) {
-		g_string_append (string, _("1 minute"));
-		have_something = TRUE;
-	}
-
-	if (duration->seconds > 1) {
-		g_string_sprintf (string, _("%d seconds"), duration->seconds);
-		have_something = TRUE;
-	} else if (duration->seconds == 1) {
-		g_string_append (string, _("1 second"));
-		have_something = TRUE;
-	}
-
-	if (have_something) {
-		ret = string->str;
-		g_string_free (string, FALSE);
-		return ret;
-	} else {
-		g_string_free (string, TRUE);
-		return NULL;
-	}
-}
-
-static char *
-get_alarm_string (CalComponentAlarm *alarm)
-{
-	CalAlarmAction action;
-	CalAlarmTrigger trigger;
-	char string[256];
-	char *base, *str = NULL, *dur;
-
-	string [0] = '\0';
-
-	cal_component_alarm_get_action (alarm, &action);
-	cal_component_alarm_get_trigger (alarm, &trigger);
-
-	switch (action) {
-	case CAL_ALARM_AUDIO:
-		base = _("Play a sound");
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		base = _("Display a message");
-		break;
-
-	case CAL_ALARM_EMAIL:
-		base = _("Send an email");
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		base = _("Run a program");
-		break;
-
-	case CAL_ALARM_NONE:
-	case CAL_ALARM_UNKNOWN:
-	default:
-		base = _("Unknown action to be performed");
-		break;
-	}
-
-	/* FIXME: This does not look like it will localize correctly. */
-
-	switch (trigger.type) {
-	case CAL_ALARM_TRIGGER_RELATIVE_START:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-
-		if (dur) {
-			if (trigger.u.rel_duration.is_neg)
-				str = g_strdup_printf (_("%s %s before the start of the appointment"),
-						       base, dur);
-			else
-				str = g_strdup_printf (_("%s %s after the start of the appointment"),
-						       base, dur);
-
-			g_free (dur);
-		} else
-			str = g_strdup_printf (_("%s at the start of the appointment"), base);
-
-		break;
-
-	case CAL_ALARM_TRIGGER_RELATIVE_END:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-
-		if (dur) {
-			if (trigger.u.rel_duration.is_neg)
-				str = g_strdup_printf (_("%s %s before the end of the appointment"),
-						       base, dur);
-			else
-				str = g_strdup_printf (_("%s %s after the end of the appointment"),
-						       base, dur);
-
-			g_free (dur);
-		} else
-			str = g_strdup_printf (_("%s at the end of the appointment"), base);
-
-		break;
-
-	case CAL_ALARM_TRIGGER_ABSOLUTE: {
-		struct icaltimetype itt;
-		icaltimezone *utc_zone, *current_zone;
-		char *location;
-		struct tm tm;
-		char buf[256];
-
-		/* Absolute triggers come in UTC, so convert them to the local timezone */
-
-		itt = trigger.u.abs_time;
-
-		utc_zone = icaltimezone_get_utc_timezone ();
-		location = calendar_config_get_timezone ();
-		current_zone = icaltimezone_get_builtin_timezone (location);
-
-		tm = icaltimetype_to_tm_with_zone (&itt, utc_zone, current_zone);
-
-		e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
-					     FALSE, FALSE, buf, sizeof (buf));
-
-		str = g_strdup_printf (_("%s at %s"), base, buf);
-
-		break; }
-
-	case CAL_ALARM_TRIGGER_NONE:
-	default:
-		str = g_strdup_printf (_("%s for an unknown trigger type"), base);
-		break;
-	}
-
-	return str;
-}
-
-/* Appends an alarm to the list */
-static void
-append_reminder (AlarmPage *apage, CalComponentAlarm *alarm)
-{
-	AlarmPagePrivate *priv;
-	GtkCList *clist;
-	char *c[1];
-	int i;
-
-	priv = apage->priv;
-
-	clist = GTK_CLIST (priv->list);
-
-	c[0] = get_alarm_string (alarm);
-	i = gtk_clist_append (clist, c);
-
-	gtk_clist_set_row_data_full (clist, i, alarm, (GtkDestroyNotify) cal_component_alarm_free);
-	gtk_clist_select_row (clist, i, 0);
-	g_free (c[0]);
-
-	gtk_widget_set_sensitive (priv->delete, TRUE);
-}
-
-/* fill_widgets handler for the alarm page */
-static void
-alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	CalComponentText text;
-	GList *alarms, *l;
-	GtkCList *clist;
-	CompEditorPageDates dates;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	/* Don't send off changes during this time */
-	priv->updating = TRUE;
-
-	/* Clean the page */
-	clear_widgets (apage);
-
-	/* Summary */
-	cal_component_get_summary (comp, &text);
-	alarm_page_set_summary (page, text.value);
-
-	/* Dates */
-	comp_editor_dates (&dates, comp);
-	alarm_page_set_dates (page, &dates);
-	comp_editor_free_dates (&dates);
-
-	/* List */
-	if (!cal_component_has_alarms (comp))
-		goto out;
-
-	alarms = cal_component_get_alarm_uids (comp);
-
-	clist = GTK_CLIST (priv->list);
-	for (l = alarms; l != NULL; l = l->next) {
-		CalComponentAlarm *ca, *ca_copy;
-		const char *auid;
-
-		auid = l->data;
-		ca = cal_component_get_alarm (comp, auid);
-		g_assert (ca != NULL);
-
-		ca_copy = cal_component_alarm_clone (ca);
-		cal_component_alarm_free (ca);
-
-		append_reminder (apage, ca_copy);
-	}
-	cal_obj_uid_list_free (alarms);
-
- out:
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the alarm page */
-static gboolean
-alarm_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	GList *list, *l;
-	GtkCList *clist;
-	int i;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	/* Remove all the alarms from the component */
-
-	list = cal_component_get_alarm_uids (comp);
-	for (l = list; l; l = l->next) {
-		const char *auid;
-
-		auid = l->data;
-		cal_component_remove_alarm (comp, auid);
-	}
-	cal_obj_uid_list_free (list);
-
-	/* Add the new alarms */
-
-	clist = GTK_CLIST (priv->list);
-	for (i = 0; i < clist->rows; i++) {
-		CalComponentAlarm *alarm, *alarm_copy;
-
-		alarm = gtk_clist_get_row_data (clist, i);
-		g_assert (alarm != NULL);
-
-		/* We clone the alarm to maintain the invariant that the alarm
-		 * structures in the list did *not* come from the component.
-		 */
-
-		alarm_copy = cal_component_alarm_clone (alarm);
-		cal_component_add_alarm (comp, alarm_copy);
-		cal_component_alarm_free (alarm_copy);
-	}
-
-	return TRUE;
-}
-
-/* set_summary handler for the alarm page */
-static void
-alarm_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	gchar *s;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	s = e_utf8_to_gtk_string (priv->summary, summary);
-	gtk_label_set_text (GTK_LABEL (priv->summary), s);
-	g_free (s);
-}
-
-/* set_dates handler for the alarm page */
-static void
-alarm_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	comp_editor_date_label (dates, priv->date_time);
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (AlarmPage *apage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (apage);
-	AlarmPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = apage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("alarm-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->summary = GW ("summary");
-	priv->date_time = GW ("date-time");
-
-	priv->list = GW ("list");
-	priv->add = GW ("add");
-	priv->delete = GW ("delete");
-
-	priv->action = GW ("action");
-	priv->interval_value = GW ("interval-value");
-	priv->value_units = GW ("value-units");
-	priv->relative = GW ("relative");
-	priv->time = GW ("time");
-
-	priv->button_options = GW ("button-options");
-
-#undef GW
-
-	return (priv->summary
-		&& priv->date_time
-		&& priv->list
-		&& priv->add
-		&& priv->delete
-		&& priv->action
-		&& priv->interval_value
-		&& priv->value_units
-		&& priv->relative
-		&& priv->time
-		&& priv->button_options);
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (apage));
-}
-
-/* Callback used for the "add reminder" button */
-static void
-add_clicked_cb (GtkButton *button, gpointer data)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	CalComponentAlarm *alarm;
-	CalAlarmTrigger trigger;
-
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	alarm = cal_component_alarm_clone (priv->alarm);
-
-	memset (&trigger, 0, sizeof (CalAlarmTrigger));
-	trigger.type = e_dialog_option_menu_get (priv->time, time_map);
-	if (e_dialog_option_menu_get (priv->relative, relative_map) == BEFORE)
-		trigger.u.rel_duration.is_neg = 1;
-	else
-		trigger.u.rel_duration.is_neg = 0;
-
-	switch (e_dialog_option_menu_get (priv->value_units, value_map)) {
-	case MINUTES:
-		trigger.u.rel_duration.minutes =
-			e_dialog_spin_get_int (priv->interval_value);
-		break;
-
-	case HOURS:
-		trigger.u.rel_duration.hours =
-			e_dialog_spin_get_int (priv->interval_value);
-		break;
-
-	case DAYS:
-		trigger.u.rel_duration.days =
-			e_dialog_spin_get_int (priv->interval_value);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-	cal_component_alarm_set_trigger (alarm, trigger);
-
-	cal_component_alarm_set_action (alarm, e_dialog_option_menu_get (priv->action, action_map));
-
-	append_reminder (apage, alarm);
-}
-
-/* Callback used for the "delete reminder" button */
-static void
-delete_clicked_cb (GtkButton *button, gpointer data)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	GtkCList *clist;
-	int sel;
-
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	clist = GTK_CLIST (priv->list);
-	if (!clist->selection)
-		return;
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	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->delete, FALSE);
-}
-
-/* Callback used when the alarm options button is clicked */
-static void
-button_options_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	cal_component_alarm_set_action (priv->alarm,
-					e_dialog_option_menu_get (priv->action, action_map));
-
-	if (!alarm_options_dialog_run (priv->alarm))
-		g_message ("button_options_clicked_cb(): Could not create the alarm options dialog");
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-
-	priv = apage->priv;
-
-	/* Reminder buttons */
-	gtk_signal_connect (GTK_OBJECT (priv->add), "clicked",
-			    GTK_SIGNAL_FUNC (add_clicked_cb), apage);
-	gtk_signal_connect (GTK_OBJECT (priv->delete), "clicked",
-			    GTK_SIGNAL_FUNC (delete_clicked_cb), apage);
-
-	/* Connect the default signal handler to use to make sure we notify
-	 * upstream of changes to the widget values.
-	 */
-	gtk_signal_connect (GTK_OBJECT (priv->add), "clicked",
-			    GTK_SIGNAL_FUNC (field_changed_cb), apage);
-	gtk_signal_connect (GTK_OBJECT (priv->delete), "clicked",
-			    GTK_SIGNAL_FUNC (field_changed_cb), apage);
-
-	/* Options button */
-	gtk_signal_connect (GTK_OBJECT (priv->button_options), "clicked",
-			    GTK_SIGNAL_FUNC (button_options_clicked_cb), apage);
-}
-
-
-
-/**
- * alarm_page_construct:
- * @apage: An alarm page.
- *
- * Constructs an alarm page by loading its Glade data.
- *
- * Return value: The same object as @apage, or NULL if the widgets could not be
- * created.
- **/
-AlarmPage *
-alarm_page_construct (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-
-	priv = apage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-page.glade",
-				   NULL);
-	if (!priv->xml) {
-		g_message ("alarm_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (apage)) {
-		g_message ("alarm_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (apage);
-
-	return apage;
-}
-
-/**
- * alarm_page_new:
- *
- * Creates a new alarm page.
- *
- * Return value: A newly-created alarm page, or NULL if the page could not be
- * created.
- **/
-AlarmPage *
-alarm_page_new (void)
-{
-	AlarmPage *apage;
-
-	apage = gtk_type_new (TYPE_ALARM_PAGE);
-	if (!alarm_page_construct (apage)) {
-		gtk_object_unref (GTK_OBJECT (apage));
-		return NULL;
-	}
-
-	return apage;
-}
diff --git a/calendar/gui/dialogs/alarm-page.glade b/calendar/gui/dialogs/alarm-page.glade
deleted file mode 100644
index 56c6f6ada1..0000000000
--- a/calendar/gui/dialogs/alarm-page.glade
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>alarm-page</name>
-  <program_name>alarm-page</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>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-toplevel</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>GtkVBox</class>
-    <name>alarm-page</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame33</name>
-      <label>Basics</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>table13</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>label62</name>
-	  <label>Summary:</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>label63</name>
-	  <label>Date/Time:</label>
-	  <justify>GTK_JUSTIFY_CENTER</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>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>summary</name>
-	  <width>10</width>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>4</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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>date-time</name>
-	  <width>10</width>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>4</xpad>
-	  <ypad>0</ypad>
-	  <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>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame34</name>
-      <label>Reminders</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>vbox53</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox54</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>action</name>
-	    <can_focus>True</can_focus>
-	    <items>Display a message
-Play a sound
-Run a program
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>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>0</lower>
-	    <upper>999</upper>
-	    <step>1</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>value-units</name>
-	    <can_focus>True</can_focus>
-	    <items>minute(s)
-hour(s)
-day(s)
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>relative</name>
-	    <can_focus>True</can_focus>
-	    <items>before
-after
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>time</name>
-	    <can_focus>True</can_focus>
-	    <items>start of appointment
-end of appointment
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-options</name>
-	    <can_focus>True</can_focus>
-	    <label>_Options...</label>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox55</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow13</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>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>label64</name>
-		<label>label55</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>GtkVButtonBox</class>
-	    <name>vbuttonbox2</name>
-	    <layout_style>GTK_BUTTONBOX_START</layout_style>
-	    <spacing>10</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>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>_Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>delete</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>_Delete</label>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/alarm-page.h b/calendar/gui/dialogs/alarm-page.h
deleted file mode 100644
index aa1a6be26b..0000000000
--- a/calendar/gui/dialogs/alarm-page.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_PAGE_H
-#define ALARM_PAGE_H
-
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_ALARM_PAGE            (alarm_page_get_type ())
-#define ALARM_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_ALARM_PAGE, AlarmPage))
-#define ALARM_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_ALARM_PAGE, AlarmPageClass))
-#define IS_ALARM_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_ALARM_PAGE))
-#define IS_ALARM_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_ALARM_PAGE))
-
-typedef struct _AlarmPagePrivate AlarmPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	AlarmPagePrivate *priv;
-} AlarmPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} AlarmPageClass;
-
-
-GtkType    alarm_page_get_type  (void);
-AlarmPage *alarm_page_construct (AlarmPage *apage);
-AlarmPage *alarm_page_new       (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
deleted file mode 100644
index 639738c3bc..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,629 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "../e-timezone-entry.h"
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-#include "../calendar-commands.h"
-#include "../e-tasks.h"
-
-#include <libgnomeui/gnome-color-picker.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-
-
-struct _DialogData {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	GtkWidget *page;
-
-	GtkWidget *timezone;
-	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;
-
-	/* Widgets for the task list options */
-	GtkWidget *tasks_due_today_color;
-	GtkWidget *tasks_overdue_color;
-
-	GtkWidget *tasks_hide_completed_checkbutton;
-	GtkWidget *tasks_hide_completed_spinbutton;
-	GtkWidget *tasks_hide_completed_optionmenu;
-
-	/* Other page options */
-	GtkWidget *confirm_delete;
-	GtkWidget *default_reminder;
-	GtkWidget *default_reminder_interval;
-	GtkWidget *default_reminder_units;
-};
-typedef struct _DialogData DialogData;
-
-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
-};
-
-/* The following two are kept separate in case we need to re-order each menu individually */
-static const int hide_completed_units_map[] = {
-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
-};
-
-static const int default_reminder_units_map[] = {
-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
-};
-
-
-static gboolean get_widgets (DialogData *data);
-
-static void widget_changed_callback (GtkWidget *, void *data);
-static void connect_changed (GtkWidget *widget, const char *signal_name, EvolutionConfigControl *config_control);
-static void setup_changes (DialogData *data, EvolutionConfigControl *config_control);
-
-static void init_widgets (DialogData *data);
-static void show_config (DialogData *data);
-static void update_config (DialogData *dialog_data);
-
-static void config_control_apply_callback (EvolutionConfigControl *config_control, void *data);
-static void config_control_destroy_callback (GtkObject *object, void *data);
-
-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget *button, void *data);
-static void cal_prefs_dialog_hide_completed_tasks_toggled (GtkWidget *button, void *data);
-
-GtkWidget *cal_prefs_dialog_create_time_edit (void);
-
-
-/**
- * cal_prefs_dialog_new:
- *
- * Creates a new #CalPrefsDialog.
- *
- * Return value: a new #CalPrefsDialog.
- **/
-EvolutionConfigControl *
-cal_prefs_dialog_new (void)
-{
-	DialogData *dialog_data;
-	EvolutionConfigControl *config_control;
-
-	dialog_data = g_new0 (DialogData, 1);
-
-	/* Load the content widgets */
-
-	dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL);
-	if (!dialog_data->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (dialog_data)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (dialog_data);
-	show_config (dialog_data);
-
-	gtk_widget_ref (dialog_data->page);
-	gtk_container_remove (GTK_CONTAINER (dialog_data->page->parent), dialog_data->page);
-	config_control = evolution_config_control_new (dialog_data->page);
-	gtk_widget_unref (dialog_data->page);
-
-	gtk_signal_connect (GTK_OBJECT (config_control), "apply",
-			    GTK_SIGNAL_FUNC (config_control_apply_callback), dialog_data);
-	gtk_signal_connect (GTK_OBJECT (config_control), "destroy",
-			    GTK_SIGNAL_FUNC (config_control_destroy_callback), dialog_data);
-
-	setup_changes (dialog_data, config_control);
-
-	return config_control;
-}
-
-static void
-widget_changed_callback (GtkWidget *widget,
-			 void *data)
-{
-	EvolutionConfigControl *config_control;
-
-	config_control = EVOLUTION_CONFIG_CONTROL (data);
-
-	evolution_config_control_changed (config_control);
-}
-
-/* ^*&%!!#! GnomeColorPicker.  */
-static void
-color_set_callback (GnomeColorPicker *cp,
-		    guint r,
-		    guint g,
-		    guint b,
-		    guint a,
-		    void *data)
-{
-	EvolutionConfigControl *config_control;
-
-	config_control = EVOLUTION_CONFIG_CONTROL (data);
-
-	evolution_config_control_changed (config_control);
-}
-
-static void
-connect_changed (GtkWidget *widget,
-		 const char *signal_name,
-		 EvolutionConfigControl *config_control)
-{
-	gtk_signal_connect (GTK_OBJECT (widget), signal_name,
-			    GTK_SIGNAL_FUNC (widget_changed_callback), config_control);
-}
-
-static void
-setup_changes (DialogData *dialog_data,
-	       EvolutionConfigControl *config_control)
-{
-	int i;
-
-	for (i = 0; i < 7; i ++)
-		connect_changed (dialog_data->working_days[i], "toggled", config_control);
-
-	connect_changed (dialog_data->timezone, "changed", config_control);
-
-	connect_changed (dialog_data->start_of_day, "changed", config_control);
-	connect_changed (dialog_data->end_of_day, "changed", config_control);
-
-	connect_changed (GTK_OPTION_MENU (dialog_data->week_start_day)->menu, "selection_done", config_control);
-
-	connect_changed (dialog_data->use_12_hour, "toggled", config_control);
-
-	connect_changed (GTK_OPTION_MENU (dialog_data->time_divisions)->menu, "selection_done", config_control);
-
-	connect_changed (dialog_data->show_end_times, "toggled", config_control);
-	connect_changed (dialog_data->compress_weekend, "toggled", config_control);
-	connect_changed (dialog_data->dnav_show_week_no, "toggled", config_control);
-
-	connect_changed (dialog_data->tasks_hide_completed_checkbutton, "toggled", config_control);
-	connect_changed (dialog_data->tasks_hide_completed_spinbutton, "changed", config_control);
-	connect_changed (GTK_OPTION_MENU (dialog_data->tasks_hide_completed_spinbutton)->menu, "selection_done", config_control);
-
-	connect_changed (dialog_data->confirm_delete, "toggled", config_control);
-	connect_changed (dialog_data->default_reminder, "toggled", config_control);
-	connect_changed (dialog_data->default_reminder_interval, "changed", config_control);
-	connect_changed (GTK_OPTION_MENU (dialog_data->default_reminder_units)->menu, "selection_done", config_control);
-
-	/* These use GnomeColorPicker so we have to use a different signal.  */
-	gtk_signal_connect (GTK_OBJECT (dialog_data->tasks_due_today_color), "color_set",
-			    GTK_SIGNAL_FUNC (color_set_callback), config_control);
-	gtk_signal_connect (GTK_OBJECT (dialog_data->tasks_overdue_color), "color_set",
-			    GTK_SIGNAL_FUNC (color_set_callback), config_control);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (DialogData *data)
-{
-#define GW(name) glade_xml_get_widget (data->xml, name)
-
-	data->page = GW ("toplevel-notebook");
-
-	/* The indices must be 0 (Sun) to 6 (Sat). */
-	data->working_days[0] = GW ("sun_button");
-	data->working_days[1] = GW ("mon_button");
-	data->working_days[2] = GW ("tue_button");
-	data->working_days[3] = GW ("wed_button");
-	data->working_days[4] = GW ("thu_button");
-	data->working_days[5] = GW ("fri_button");
-	data->working_days[6] = GW ("sat_button");
-
-	data->timezone = GW ("timezone");
-	data->week_start_day = GW ("first_day_of_week");
-	data->start_of_day = GW ("start_of_day");
-	data->end_of_day = GW ("end_of_day");
-	data->use_12_hour = GW ("use_12_hour");
-	data->use_24_hour = GW ("use_24_hour");
-	data->time_divisions = GW ("time_divisions");
-	data->show_end_times = GW ("show_end_times");
-	data->compress_weekend = GW ("compress_weekend");
-	data->dnav_show_week_no = GW ("dnav_show_week_no");
-
-	data->tasks_due_today_color = GW ("tasks_due_today_color");
-	data->tasks_overdue_color = GW ("tasks_overdue_color");
-
-	data->tasks_hide_completed_checkbutton = GW ("tasks-hide-completed-checkbutton");
-	data->tasks_hide_completed_spinbutton = GW ("tasks-hide-completed-spinbutton");
-	data->tasks_hide_completed_optionmenu = GW ("tasks-hide-completed-optionmenu");
-
-	data->confirm_delete = GW ("confirm-delete");
-	data->default_reminder = GW ("default-reminder");
-	data->default_reminder_interval = GW ("default-reminder-interval");
-	data->default_reminder_units = GW ("default-reminder-units");
-
-#undef GW
-
-	return (data->page
-		&& data->timezone
-		&& data->working_days[0]
-		&& data->working_days[1]
-		&& data->working_days[2]
-		&& data->working_days[3]
-		&& data->working_days[4]
-		&& data->working_days[5]
-		&& data->working_days[6]
-		&& data->week_start_day
-		&& data->start_of_day
-		&& data->end_of_day
-		&& data->use_12_hour
-		&& data->use_24_hour
-		&& data->time_divisions
-		&& data->show_end_times
-		&& data->compress_weekend
-		&& data->dnav_show_week_no
-		&& data->tasks_due_today_color
-		&& data->tasks_overdue_color
-		&& data->tasks_hide_completed_checkbutton
-		&& data->tasks_hide_completed_spinbutton
-		&& data->tasks_hide_completed_optionmenu
-		&& data->confirm_delete
-		&& data->default_reminder
-		&& data->default_reminder_interval
-		&& data->default_reminder_units);
-}
-
-
-static void
-config_control_destroy_callback (GtkObject *object,
-				 void *data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-
-	gtk_object_unref (GTK_OBJECT (dialog_data->xml));
-	
-	g_free (dialog_data);
-}
-
-
-static void
-config_control_apply_callback (EvolutionConfigControl *control,
-			       void *data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-
-	update_config (dialog_data);
-}
-
-
-/* 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;
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-init_widgets (DialogData *dialog_data)
-{
-	gtk_signal_connect (GTK_OBJECT (dialog_data->use_24_hour), "toggled",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),
-			    dialog_data);
-
-	gtk_signal_connect (GTK_OBJECT (dialog_data->tasks_hide_completed_checkbutton),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_hide_completed_tasks_toggled),
-			    dialog_data);
-}
-
-
-static void
-cal_prefs_dialog_use_24_hour_toggled (GtkWidget	*button,
-				      void *data)
-{
-	DialogData *dialog_data;
-	gboolean use_24_hour;
-
-	dialog_data = (DialogData *) data;
-
-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog_data->use_24_hour));
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data->start_of_day), use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data->end_of_day), use_24_hour);
-}
-
-static void
-cal_prefs_dialog_hide_completed_tasks_toggled	(GtkWidget *button,
-						 void *data)
-{
-	DialogData *dialog_data;
-	gboolean hide_completed_tasks;
-
-	dialog_data = (DialogData *) data;
-
-	hide_completed_tasks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog_data->tasks_hide_completed_checkbutton));
-
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_spinbutton, hide_completed_tasks);
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_optionmenu, hide_completed_tasks);
-}
-
-/* Sets the color in a color picker from an X color spec */
-static void
-set_color_picker (GtkWidget *picker, const char *spec)
-{
-	GdkColor color;
-
-	g_assert (spec != NULL);
-
-	if (!gdk_color_parse (spec, &color)) {
-		color.red = color.green = color.blue = 0;
-		return;
-	}
-
-	gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker),
-				    color.red,
-				    color.green,
-				    color.blue,
-				    65535);
-}
-
-/* Shows the current task list settings in the dialog */
-static void
-show_task_list_config (DialogData *dialog_data)
-{
-	CalUnits units;
-	gboolean hide_completed_tasks;
-
-	set_color_picker (dialog_data->tasks_due_today_color, calendar_config_get_tasks_due_today_color ());
-	set_color_picker (dialog_data->tasks_overdue_color, calendar_config_get_tasks_overdue_color ());
-
-	/* Hide Completed Tasks. */
-	hide_completed_tasks = calendar_config_get_hide_completed_tasks ();
-	e_dialog_toggle_set (dialog_data->tasks_hide_completed_checkbutton,
-			     hide_completed_tasks);
-
-	/* Hide Completed Tasks Units. */
-	units = calendar_config_get_hide_completed_tasks_units ();
-	e_dialog_option_menu_set (dialog_data->tasks_hide_completed_optionmenu,
-				  units, hide_completed_units_map);
-
-	/* Hide Completed Tasks Value. */
-	e_dialog_spin_set (dialog_data->tasks_hide_completed_spinbutton,
-			   calendar_config_get_hide_completed_tasks_value ());
-
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_spinbutton,
-				  hide_completed_tasks);
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_optionmenu,
-				  hide_completed_tasks);
-}
-
-/* Shows the current config settings in the dialog. */
-static void
-show_config (DialogData *dialog_data)
-{
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-	char *zone_name;
-	icaltimezone *zone;
-	gboolean sensitive;
-
-	/* Timezone. */
-	zone_name = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (zone_name);
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (dialog_data->timezone),
-				       zone);
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		e_dialog_toggle_set (dialog_data->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 (dialog_data->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data->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 (dialog_data->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 ())
-		e_dialog_toggle_set (dialog_data->use_24_hour, TRUE);
-	else
-		e_dialog_toggle_set (dialog_data->use_12_hour, TRUE);
-
-	sensitive = calendar_config_locale_supports_12_hour_format ();
-	gtk_widget_set_sensitive (dialog_data->use_12_hour, sensitive);
-	gtk_widget_set_sensitive (dialog_data->use_24_hour, sensitive);
-
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (dialog_data->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	e_dialog_toggle_set (dialog_data->show_end_times, calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	e_dialog_toggle_set (dialog_data->compress_weekend, calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	e_dialog_toggle_set (dialog_data->dnav_show_week_no, calendar_config_get_dnav_show_week_no ());
-
-	/* Task list */
-
-	show_task_list_config (dialog_data);
-
-	/* Other page */
-
-	e_dialog_toggle_set (dialog_data->confirm_delete, calendar_config_get_confirm_delete ());
-
-	e_dialog_toggle_set (dialog_data->default_reminder,
-			     calendar_config_get_use_default_reminder ());
-	e_dialog_spin_set (dialog_data->default_reminder_interval,
-			   calendar_config_get_default_reminder_interval ());
-	e_dialog_option_menu_set (dialog_data->default_reminder_units,
-				  calendar_config_get_default_reminder_units (),
-				  default_reminder_units_map);
-}
-
-/* Returns a pointer to a static string with an X color spec for the current
- * value of a color picker.
- */
-static const char *
-spec_from_picker (GtkWidget *picker)
-{
-	static char spec[8];
-	guint8 r, g, b;
-
-	gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL);
-	g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b);
-
-	return spec;
-}
-
-/* Updates the task list config values from the settings in the dialog */
-static void
-update_task_list_config (DialogData *dialog_data)
-{
-	calendar_config_set_tasks_due_today_color (spec_from_picker (dialog_data->tasks_due_today_color));
-	calendar_config_set_tasks_overdue_color (spec_from_picker (dialog_data->tasks_overdue_color));
-
-	calendar_config_set_hide_completed_tasks (e_dialog_toggle_get (dialog_data->tasks_hide_completed_checkbutton));
-	calendar_config_set_hide_completed_tasks_units (e_dialog_option_menu_get (dialog_data->tasks_hide_completed_optionmenu, hide_completed_units_map));
-	calendar_config_set_hide_completed_tasks_value (e_dialog_spin_get_int (dialog_data->tasks_hide_completed_spinbutton));
-}
-
-/* Updates the config values based on the settings in the dialog. */
-static void
-update_config (DialogData *dialog_data)
-{
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions, hour, minute;
-	icaltimezone *zone;
-
-	/* Timezone. */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (dialog_data->timezone));
-	calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-	/* Working Days. */
-	working_days = 0;
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		if (e_dialog_toggle_get (dialog_data->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 (dialog_data->week_start_day, week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-
-	/* Start of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (dialog_data->start_of_day), &hour, &minute);
-	calendar_config_set_day_start_hour (hour);
-	calendar_config_set_day_start_minute (minute);
-
-	/* End of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (dialog_data->end_of_day), &hour, &minute);
-	calendar_config_set_day_end_hour (hour);
-	calendar_config_set_day_end_minute (minute);
-
-	/* 12/24 Hour Format. */
-	calendar_config_set_24_hour_format (e_dialog_toggle_get (dialog_data->use_24_hour));
-
-	/* Time Divisions. */
-	time_divisions = e_dialog_option_menu_get (dialog_data->time_divisions, time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-
-	/* Show Appointment End Times. */
-	calendar_config_set_show_event_end (e_dialog_toggle_get (dialog_data->show_end_times));
-
-	/* Compress Weekend. */
-	calendar_config_set_compress_weekend (e_dialog_toggle_get (dialog_data->compress_weekend));
-
-	/* Date Navigator - Show Week Numbers. */
-	calendar_config_set_dnav_show_week_no (e_dialog_toggle_get (dialog_data->dnav_show_week_no));
-
-	/* Task list */
-	update_task_list_config (dialog_data);
-
-	/* Other page */
-
-	calendar_config_set_confirm_delete (e_dialog_toggle_get (dialog_data->confirm_delete));
-
-	calendar_config_set_use_default_reminder (e_dialog_toggle_get (dialog_data->default_reminder));
-
-	calendar_config_set_default_reminder_interval (
-		e_dialog_spin_get_int (dialog_data->default_reminder_interval));
-
-	calendar_config_set_default_reminder_units (
-		e_dialog_option_menu_get (dialog_data->default_reminder_units, default_reminder_units_map));
-
-	/* Done */
-
-	calendar_config_write ();
-	update_all_config_settings ();
-	e_tasks_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 311e378826..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,949 +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>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>cal-prefs-dialog</name>
-  <visible>False</visible>
-  <title>Calendar and Tasks Settings</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>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>toplevel-notebook</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>vbox10</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame12</name>
-	  <border_width>3</border_width>
-	  <label>Time</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>table5</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>label22</name>
-	      <label>Time _zone:</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>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>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>GtkHBox</class>
-	      <name>hbox10</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>4</spacing>
-	      <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>GtkAlignment</class>
-		<name>alignment2</name>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xscale>3.35276e-08</xscale>
-		<yscale>1</yscale>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</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>
-		</widget>
-	      </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>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>timezone</name>
-	      <creation_function>make_timezone_entry</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Wed, 20 Jun 2001 02:22:46 GMT</last_modification_time>
-	      <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>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame9</name>
-	  <border_width>3</border_width>
-	  <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>T_ue</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>T_hu</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>Su_n</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></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>Sta_rt 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>GtkCheckButton</class>
-	  <name>confirm-delete</name>
-	  <border_width>3</border_width>
-	  <can_focus>True</can_focus>
-	  <label>_Ask for confirmation when deleting items</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox16</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>default-reminder</name>
-	    <can_focus>True</can_focus>
-	    <label>Sh_ow a default reminder</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>default-reminder-interval</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>9999</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>default-reminder-units</name>
-	    <can_focus>True</can_focus>
-	    <items>Minutes
-Hours
-Days
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label30</name>
-	    <label>before the start of the appointment</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>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label21</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>GtkVBox</class>
-	<name>vbox8</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox12</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label25</name>
-	    <label>_Time divisions:</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>time_divisions</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <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>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>show_end_times</name>
-	  <can_focus>True</can_focus>
-	  <label>_Show appointment end times in week and month views</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>compress_weekend</name>
-	  <can_focus>True</can_focus>
-	  <label>_Compress weekends in month view</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>dnav_show_week_no</name>
-	  <can_focus>True</can_focus>
-	  <label>Show week _numbers in date navigator</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame13</name>
-	  <label>Task List</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>vbox12</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GtkTable</class>
-	      <name>table7</name>
-	      <rows>2</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>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label28</name>
-		<label>T_asks due today:</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>tasks_due_today_color</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>label29</name>
-		<label>_Overdue tasks:</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>tasks_overdue_color</default_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>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GnomeColorPicker</class>
-		<name>tasks_overdue_color</name>
-		<can_focus>True</can_focus>
-		<dither>True</dither>
-		<use_alpha>False</use_alpha>
-		<title>Color for overdue tasks</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>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GnomeColorPicker</class>
-		<name>tasks_due_today_color</name>
-		<can_focus>True</can_focus>
-		<dither>True</dither>
-		<use_alpha>False</use_alpha>
-		<title>Color for tasks due today</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>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox15</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>tasks-hide-completed-checkbutton</name>
-		<can_focus>True</can_focus>
-		<label>_Hide completed tasks 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>tasks-hide-completed-spinbutton</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>9999</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>tasks-hide-completed-optionmenu</name>
-		<can_focus>True</can_focus>
-		<items>Minutes
-Hours
-Days
-</items>
-		<initial_choice>0</initial_choice>
-		<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>label7</name>
-	<label>_Display</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.h b/calendar/gui/dialogs/cal-prefs-dialog.h
deleted file mode 100644
index ce3f46736c..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "evolution-config-control.h"
-
-EvolutionConfigControl *cal_prefs_dialog_new (void);
-
-END_GNOME_DECLS
-
-#endif /* _CAL_PREFS_DIALOG_H_ */
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
deleted file mode 100644
index 92590cfa40..0000000000
--- a/calendar/gui/dialogs/cancel-comp.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
-#include "cancel-comp.h"
-
-
-
-/**
- * cancel_component_dialog:
- * 
- * Pops up a dialog box asking the user whether he wants to send a
- * cancel and delete an iTip/iMip message
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-cancel_component_dialog (CalComponent *comp)
-{
-	GtkWidget *dialog;
-	CalComponentVType vtype;
-	char *str;
-
-	str = _("The meeting status has changed. Send an updated version?");
-
-	vtype = cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		str = g_strdup_printf (_("Are you sure you want to cancel "
-					 "and delete this meeting?"));
-		break;
-
-	case CAL_COMPONENT_TODO:
-		str = g_strdup_printf (_("Are you sure you want to cancel "
-					 "and delete this task?"));
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		str = g_strdup_printf (_("Are you sure you want to cancel "
-					 "and delete this journal entry?"));
-		break;
-
-	default:
-		g_message ("send_component_dialog(): "
-			   "Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-	
-	dialog = gnome_question_dialog_modal (str, NULL, NULL);
-
-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
deleted file mode 100644
index d12466ffa1..0000000000
--- a/calendar/gui/dialogs/cancel-comp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 CANCEL_COMP_H
-#define CANCEL_COMP_H
-
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-gboolean cancel_component_dialog (CalComponent *comp);
-
-#endif
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
deleted file mode 100644
index 4282307859..0000000000
--- a/calendar/gui/dialogs/changed-comp.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
-#include "changed-comp.h"
-
-
-
-/**
- * changed_component_dialog:
- * @comp: A calendar component
- * @deleted: Whether the object is being deleted or updated
- * @changed: Whether or not the user has made changes
- * 
- * Pops up a dialog box asking the user whether changes made (if any)
- * should be thrown away because the item has been updated elsewhere
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed)
-{
-	GtkWidget *dialog;
-	CalComponentVType vtype;
-	char *str;
-
-	vtype = cal_component_get_vtype (comp);
-
-	if (deleted) {
-		switch (vtype) {
-		case CAL_COMPONENT_EVENT:
-			str = _("This event has been deleted.");
-			break;
-
-		case CAL_COMPONENT_TODO:
-			str = _("This task has been deleted.");
-			break;
-
-		case CAL_COMPONENT_JOURNAL:
-			str = _("This journal entry has been deleted.");
-			break;
-
-		default:
-			g_message ("changed_component_dialog(): "
-				   "Cannot handle object of type %d", vtype);
-			return FALSE;
-		}
-		if (changed)
-			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and close the editor?"), str);
-		else
-			str = g_strdup_printf (_("%s  You have made no changes, close the editor?"), str); 
-
-	} else {
-		switch (vtype) {
-		case CAL_COMPONENT_EVENT:
-			str = _("This event has been changed.");
-			break;
-
-		case CAL_COMPONENT_TODO:
-			str = _("This task has been changed.");
-			break;
-
-		case CAL_COMPONENT_JOURNAL:
-			str = _("This journal entry has been changed.");
-			break;
-
-		default:
-			g_message ("changed_component_dialog(): "
-				   "Cannot handle object of type %d", vtype);
-			return FALSE;
-		}
-		if (changed)
-			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and update the editor?"), str);
-		else
-			str = g_strdup_printf (_("%s  You have made no changes, update the editor?"), str); 
-	}
-	
-	dialog = gnome_question_dialog_modal (str, NULL, NULL);
-
-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
deleted file mode 100644
index 915d7a5372..0000000000
--- a/calendar/gui/dialogs/changed-comp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Changed calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 CHANGED_COMP_H
-#define CHANGED_COMP_H
-
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-gboolean changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed);
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
deleted file mode 100644
index 0d7f315837..0000000000
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Evolution calendar - Base class for calendar component editor pages
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "comp-editor-page.h"
-
-
-
-static void comp_editor_page_class_init (CompEditorPageClass *class);
-static void comp_editor_page_init (CompEditorPage *page);
-static void comp_editor_page_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class = NULL;
-
-/* Signal IDs */
-
-enum {
-	CHANGED,
-	SUMMARY_CHANGED,
-	DATES_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint comp_editor_page_signals[LAST_SIGNAL];
-
-#define CLASS(page) (COMP_EDITOR_PAGE_CLASS (GTK_OBJECT (page)->klass))
-
-
-
-/**
- * comp_editor_page_get_type:
- * 
- * Registers the #CompEditorPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CompEditorPage class.
- **/
-GtkType
-comp_editor_page_get_type (void)
-{
-	static GtkType comp_editor_page_type = 0;
-
-	if (!comp_editor_page_type) {
-		static const GtkTypeInfo comp_editor_page_info = {
-			"CompEditorPage",
-			sizeof (CompEditorPage),
-			sizeof (CompEditorPageClass),
-			(GtkClassInitFunc) comp_editor_page_class_init,
-			(GtkObjectInitFunc) comp_editor_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		comp_editor_page_type =
-			gtk_type_unique (GTK_TYPE_OBJECT,
-					 &comp_editor_page_info);
-	}
-
-	return comp_editor_page_type;
-}
-
-/* Class initialization function for the abstract editor page */
-static void
-comp_editor_page_class_init (CompEditorPageClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	comp_editor_page_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	comp_editor_page_signals[SUMMARY_CHANGED] =
-		gtk_signal_new ("summary_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   summary_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	comp_editor_page_signals[DATES_CHANGED] =
-		gtk_signal_new ("dates_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   dates_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class,
-				      comp_editor_page_signals,
-				      LAST_SIGNAL);
-
-	class->changed = NULL;
-	class->summary_changed = NULL;
-	class->dates_changed = NULL;
-
-	class->get_widget = NULL;
-	class->focus_main_widget = NULL;
-	class->fill_widgets = NULL;
-	class->fill_component = NULL;
-	class->set_summary = NULL;
-	class->set_dates = NULL;
-
-	object_class->destroy = comp_editor_page_destroy;
-}
-
-
-
-static void
-comp_editor_page_init (CompEditorPage *page)
-{
-	page->client = NULL;
-	page->accel_group = NULL;
-}
-
-
-static void
-comp_editor_page_destroy (GtkObject *object)
-{
-	CompEditorPage *page;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (object));
-
-	page = COMP_EDITOR_PAGE (object);
-
-	if (page->client) {
-		gtk_object_ref (GTK_OBJECT (page->client));
-		page->client = NULL;
-	}
-
-	if (page->accel_group) {
-		gtk_accel_group_unref (page->accel_group);
-		page->accel_group = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/**
- * comp_editor_page_get_widget:
- * @page: An editor page.
- * 
- * Queries the main widget of an editor page.
- * 
- * Return value: The widget that is the page's upper container.  It should
- * normally be inserted in a notebook widget.
- **/
-GtkWidget *
-comp_editor_page_get_widget (CompEditorPage *page)
-{
-	g_return_val_if_fail (page != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), NULL);
-
-	g_assert (CLASS (page)->get_widget != NULL);
-	return (* CLASS (page)->get_widget) (page);
-}
-
-/**
- * comp_editor_page_focus_main_widget:
- * @page: An editor page.
- * 
- * Makes an editor page focus its main widget.  This is used by the component
- * editor when it first pops up so that it can focus the main widget in the
- * first page.
- **/
-void
-comp_editor_page_focus_main_widget (CompEditorPage *page)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	g_assert (CLASS (page)->focus_main_widget != NULL);
-	(* CLASS (page)->focus_main_widget) (page);
-}
-
-/**
- * comp_editor_page_fill_widgets:
- * @page: An editor page.
- * @comp: A calendar component.
- * 
- * Fills the widgets of an editor page with the data from a calendar component.
- **/
-void
-comp_editor_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-	g_return_if_fail (comp != NULL);
-
-	g_assert (CLASS (page)->fill_widgets != NULL);
-	(* CLASS (page)->fill_widgets) (page, comp);
-}
-
-/**
- * comp_editor_page_fill_component:
- * @page: An editor page.
- * @comp: A calendar component.
- * 
- * Takes the data from the widgets of an editor page and sets it on a calendar
- * component, replacing the contents of the properties that the editor page
- * knows how to manipulate.
- *
- * Returns: TRUE if the component could be filled, FALSE otherwise
- **/
-gboolean
-comp_editor_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	g_return_val_if_fail (page != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-
-	if (CLASS (page)->fill_component != NULL)
-		return (* CLASS (page)->fill_component) (page, comp);
-
-	return TRUE;
-}
-
-/**
- * comp_editor_page_set_cal_client:
- * @page: An editor page
- * @client: A #CalClient object
- *
- * Sets the #CalClient for the dialog page to use.
- **/
-void
-comp_editor_page_set_cal_client (CompEditorPage *page, CalClient *client)
-{
-	g_return_if_fail (page != NULL);
-        g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	if (page->client)
-		gtk_object_unref (GTK_OBJECT (client));
-
-	page->client = client;
-	if (page->client)
-		gtk_object_ref (GTK_OBJECT (client));
-}
-
-/**
- * comp_editor_page_set_summary:
- * @page: An editor page
- * @summary: The text of the new summary value
- * 
- * Sets the summary value for this group of widgets
- **/
-void
-comp_editor_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	if (CLASS (page)->set_summary != NULL)
-		(* CLASS (page)->set_summary) (page, summary);
-}
-
-/**
- * comp_editor_page_set_dates:
- * @page: An editor page
- * @dates: A collection of various dates in time_t format
- * 
- * Sets the date values for this group of widgets
- **/
-void
-comp_editor_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	if (CLASS (page)->set_dates != NULL)
-		(* CLASS (page)->set_dates) (page, dates);
-}
-
-/**
- * comp_editor_page_notify_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_changed (CompEditorPage *page)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[CHANGED]);
-}
-
-/**
- * comp_editor_page_notify_summary_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "summary_changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_summary_changed (CompEditorPage *page,
-					 const char *summary)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	
-	gtk_signal_emit (GTK_OBJECT (page),
-			 comp_editor_page_signals[SUMMARY_CHANGED],
-			 summary);
-}
-
-/**
- * comp_editor_page_notify_dates_changed:
- * @page: An editor page.
- * 
- * Makes an editor page emit the "dates_changed" signal.  This is meant to be
- * used only by page implementations.
- **/
-void
-comp_editor_page_notify_dates_changed (CompEditorPage *page,
-				       CompEditorPageDates *dates)
-{
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	gtk_signal_emit (GTK_OBJECT (page),
-			 comp_editor_page_signals[DATES_CHANGED],
-			 dates);
-}
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
deleted file mode 100644
index 6ef5549219..0000000000
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Evolution calendar - Base class for calendar component editor pages
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 COMP_EDITOR_PAGE_H
-#define COMP_EDITOR_PAGE_H
-
-#include <time.h>
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-#include <cal-util/cal-component.h>
-#include "cal-client.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_COMP_EDITOR_PAGE            (comp_editor_page_get_type ())
-#define COMP_EDITOR_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_PAGE, CompEditorPage))
-#define COMP_EDITOR_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR_PAGE,	CompEditorPageClass))
-#define IS_COMP_EDITOR_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_PAGE))
-#define IS_COMP_EDITOR_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_COMP_EDITOR_PAGE))
-
-typedef struct {
-	CalComponentDateTime *start;
-	CalComponentDateTime *end;
-	CalComponentDateTime *due;
-	struct icaltimetype *complete;
-} CompEditorPageDates;
-
-typedef struct {
-	GtkObject object;
-
-	/* Some of the pages need the CalClient to access timezone data. */
-	CalClient *client;
-
-	/* The GtkAccelGroup for the page. We install this when the page is
-	   mapped, and uninstall when it is unmapped. libglade would do this
-	   normally, but we create our pages individually so have to do it
-	   ourselves. */
-	GtkAccelGroup *accel_group;
-} CompEditorPage;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* changed)    (CompEditorPage *page);
-	void (* needs_send) (CompEditorPage *page);
-
-	void (* summary_changed) (CompEditorPage *page, const char *summary);
-	void (* dates_changed)   (CompEditorPage *page, const char *dates);
-
-	/* Virtual methods */
-
-	GtkWidget *(* get_widget) (CompEditorPage *page);
-	void (* focus_main_widget) (CompEditorPage *page);
-
-	void     (* fill_widgets) (CompEditorPage *page, CalComponent *comp);
-	gboolean (* fill_component) (CompEditorPage *page, CalComponent *comp);
-
-	void (* set_summary) (CompEditorPage *page, const char *summary);
-	void (* set_dates) (CompEditorPage *page, CompEditorPageDates *dates);
-} CompEditorPageClass;
-
-
-GtkType    comp_editor_page_get_type               (void);
-GtkWidget *comp_editor_page_get_widget             (CompEditorPage      *page);
-void       comp_editor_page_focus_main_widget      (CompEditorPage      *page);
-void       comp_editor_page_fill_widgets           (CompEditorPage      *page,
-						    CalComponent        *comp);
-gboolean   comp_editor_page_fill_component         (CompEditorPage      *page,
-						    CalComponent        *comp);
-void       comp_editor_page_set_cal_client         (CompEditorPage      *page,
-						    CalClient           *client);
-void       comp_editor_page_set_summary            (CompEditorPage      *page,
-						    const char          *summary);
-void       comp_editor_page_set_dates              (CompEditorPage      *page,
-						    CompEditorPageDates *dates);
-void       comp_editor_page_notify_changed         (CompEditorPage      *page);
-void       comp_editor_page_notify_summary_changed (CompEditorPage      *page,
-						    const char          *summary);
-void       comp_editor_page_notify_dates_changed   (CompEditorPage      *page,
-						    CompEditorPageDates *dates);
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
deleted file mode 100644
index 34d4e71e81..0000000000
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ctype.h>
-#include <string.h>
-#include <ical.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-#include <gal/unicode/gunicode.h>
-#include <e-destination.h>
-#include <e-util/e-time-utils.h>
-#include <cal-util/timeutil.h>
-#include "../calendar-config.h"
-#include "comp-editor-util.h"
-
-
-
-/**
- * comp_editor_dates:
- * @dates: A structure to be filled out with dates of a component
- * @comp: The component to extract the dates from
- * 
- * Extracts the dates from the calendar component into the
- * CompEditorPageDates structure. Call comp_editor_free_dates() to free the
- * results.
- **/
-void
-comp_editor_dates (CompEditorPageDates *dates, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	dates->start = NULL;
-	dates->end = NULL;
-	dates->due = NULL;
-	dates->complete = NULL;
-	
-	/* Note that the CalComponentDateTime's returned contain allocated
-	   icaltimetype and tzid values, so we just take over ownership of
-	   those. */
-	cal_component_get_dtstart (comp, &dt);
-	if (dt.value) {
-		dates->start = g_new (CalComponentDateTime, 1);
-		*dates->start = dt;
-	}
-
-	cal_component_get_dtend (comp, &dt);
-	if (dt.value) {
-		dates->end = g_new (CalComponentDateTime, 1);
-		*dates->end = dt;
-	}
-
-	cal_component_get_due (comp, &dt);
-	if (dt.value) {
-		dates->due = g_new (CalComponentDateTime, 1);
-		*dates->due = dt;
-	}
-
-	cal_component_get_completed (comp, &dates->complete);
-}
-
-
-/* This frees the dates in the CompEditorPageDates struct. But it doesn't free
- * the struct (as that is usually static).
- */
-void
-comp_editor_free_dates (CompEditorPageDates *dates)
-{
-	/* Note that cal_component_free_datetime() only frees the fields in
-	   the struct. It doesn't free the struct itself, so we do that. */
-	if (dates->start) {
-		cal_component_free_datetime (dates->start);
-		g_free (dates->start);
-	}
-
-	if (dates->end) {
-		cal_component_free_datetime (dates->end);
-		g_free (dates->end);
-	}
-
-	if (dates->due) {
-		cal_component_free_datetime (dates->due);
-		g_free (dates->due);
-	}
-
-	if (dates->complete)
-		cal_component_free_icaltimetype (dates->complete);
-}
-
-
-/* dtstart is only passed in if tt is the dtend. */
-static void
-write_label_piece (struct icaltimetype *tt, char *buffer, int size,
-		   char *stext, char *etext, struct icaltimetype *dtstart)
-{
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt_copy = *tt;
-	int len;
-	
-	/* FIXME: May want to convert the time to an appropriate zone. */
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	/* If we are writing the DTEND (i.e. DTSTART is set), and
-	   DTEND > DTSTART, subtract 1 day. The DTEND date is not inclusive. */
-	if (tt_copy.is_date && dtstart
-	    && icaltime_compare_date_only (tt_copy, *dtstart) > 0) {
-		icaltime_adjust (&tt_copy, -1, 0, 0, 0);
-	}
-
-	tmp_tm.tm_year = tt_copy.year - 1900;
-	tmp_tm.tm_mon = tt_copy.month - 1;
-	tmp_tm.tm_mday = tt_copy.day;
-	tmp_tm.tm_hour = tt_copy.hour;
-	tmp_tm.tm_min = tt_copy.minute;
-	tmp_tm.tm_sec = tt_copy.second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (tt_copy.day, tt_copy.month - 1,
-					   tt_copy.year);
-
-	len = strlen (buffer);
-	e_time_format_date_and_time (&tmp_tm,
-				     calendar_config_get_24_hour_format (), 
-				     !tt_copy.is_date, FALSE,
-				     &buffer[len], size - len);
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-/**
- * comp_editor_date_label:
- * @dates: The dates to use in constructing a label
- * @label: The label whose text is to be set
- * 
- * Set the text of a label based on the dates available and the user's
- * formatting preferences
- **/
-void
-comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label)
-{
-	char buffer[1024];
-	gboolean start_set = FALSE, end_set = FALSE;
-	gboolean complete_set = FALSE, due_set = FALSE;
-
-	buffer[0] = '\0';
-
-	if (dates->start && !icaltime_is_null_time (*dates->start->value))
-		start_set = TRUE;
-	if (dates->end && !icaltime_is_null_time (*dates->end->value))
-		end_set = TRUE;
-	if (dates->complete && !icaltime_is_null_time (*dates->complete))
-		complete_set = TRUE;
-	if (dates->due && !icaltime_is_null_time (*dates->due->value))
-		due_set = TRUE;
-
-	if (start_set)
-		write_label_piece (dates->start->value, buffer, 1024,
-				   NULL, NULL, NULL);
-
-	if (start_set && end_set)
-		write_label_piece (dates->end->value, buffer, 1024,
-				   _(" to "), NULL, dates->start->value);
-
-	if (complete_set) {
-		if (start_set)
-			write_label_piece (dates->complete, buffer, 1024, _(" (Completed "), ")", NULL);
-		else
-			write_label_piece (dates->complete, buffer, 1024, _("Completed "), NULL, NULL);
-	}
-	
-	if (due_set && dates->complete == NULL) {
-		if (start_set)
-			write_label_piece (dates->due->value, buffer, 1024, _(" (Due "), ")", NULL);
-		else
-			write_label_piece (dates->due->value, buffer, 1024, _("Due "), NULL, NULL);
-	}
-
-	gtk_label_set_text (GTK_LABEL (label), buffer);
-}
-
-/**
- * comp_editor_new_date_edit:
- * @show_date: Whether to show a date picker in the widget.
- * @show_time: Whether to show a time picker in the widget.
- * @make_time_insensitive: Whether the time field is made insensitive rather
- * than hiding it. This is useful if you want to preserve the layout of the
- * widgets.
- * 
- * Creates a new #EDateEdit widget, configured using the calendar's preferences.
- * 
- * Return value: A newly-created #EDateEdit widget.
- **/
-GtkWidget *
-comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
-			   gboolean make_time_insensitive)
-{
-	EDateEdit *dedit;
-
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-
-	e_date_edit_set_show_date (dedit, show_date);
-	e_date_edit_set_show_time (dedit, show_time);
-#if 0
-	e_date_edit_set_make_time_insensitive (dedit, make_time_insensitive);
-#else
-	e_date_edit_set_make_time_insensitive (dedit, FALSE);
-#endif
-	calendar_config_configure_e_date_edit (dedit);
-
-	return GTK_WIDGET (dedit);
-}
-
-
-/* Returns the current time, for EDateEdit widgets and ECalendar items in the
-   dialogs.
-   FIXME: Should probably use the timezone from somewhere in the component
-   rather than the current timezone. */
-struct tm
-comp_editor_get_current_time (GtkObject *object, gpointer data)
-{
-	char *location;
-	icaltimezone *zone;
-	struct icaltimetype tt;
-	struct tm tmp_tm = { 0 };
-
-	/* Get the current timezone. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-
-
-/*
- * These are utility functions to handle the SelectNames control we use
- * for the contacts field, and its related dialog.
- */
-
-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-
-GNOME_Evolution_Addressbook_SelectNames
-comp_editor_create_contacts_component (void)
-{
-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	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
-	    || corba_select_names == CORBA_OBJECT_NIL) {
-		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return corba_select_names;
-}
-
-
-GtkWidget *
-comp_editor_create_contacts_control (GNOME_Evolution_Addressbook_SelectNames corba_select_names)
-{
-	Bonobo_Control corba_control;
-	GtkWidget *control_widget;
-	CORBA_Environment ev;
-	char *name = _("Contacts");
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_addSection (
-		corba_select_names, name, name, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	corba_control =
-		GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (
-			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);
-
-	gtk_widget_show (control_widget);
-
-	return control_widget;
-}
-
-
-Bonobo_EventSource_ListenerId
-comp_editor_connect_contacts_changed (GtkWidget *contacts_entry,
-				      BonoboListenerCallbackFn changed_cb,
-				      gpointer changed_cb_data)
-{
-	BonoboControlFrame *cf;
-	Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;
-
-	cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (contacts_entry));
-	pb = bonobo_control_frame_get_control_property_bag (cf, NULL);
-
-	return bonobo_event_source_client_add_listener (
-		pb, changed_cb,
-		"Bonobo/Property:change:entry_changed",
-		NULL, changed_cb_data);
-}
-
-
-void
-comp_editor_show_contacts_dialog (GNOME_Evolution_Addressbook_SelectNames corba_select_names)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (
-		corba_select_names, _("Contacts"), &ev);
-	CORBA_exception_free (&ev);
-}
-
-
-/* A simple 'name <email>' parser. Input should be UTF8.
-   FIXME: Should probably use camel functions or something. */
-static void
-parse_contact_string (const char *value, char **name, char **email)
-{
-	char *lbracket, *rbracket, *name_end, *tmp_name, *tmp_email;
-
-	if (!value) {
-		*name = g_strdup ("");
-		*email = g_strdup ("");
-		return;
-	}
-
-	lbracket = g_utf8_strchr (value, '<');
-	rbracket = g_utf8_strchr (value, '>');
-
-	if (!lbracket || !rbracket || rbracket < lbracket) {
-		*name = g_strdup (value);
-		*email = g_strdup ("");
-		return;
-	}
-
-	name_end = g_utf8_prev_char (lbracket);
-	while (name_end > value && g_unichar_isspace (g_utf8_get_char (name_end)))
-		name_end = g_utf8_prev_char (name_end);
-
-	tmp_name = g_malloc (name_end - value + 2);
-	strncpy (tmp_name, value, name_end - value + 1);
-	tmp_name[name_end - value + 1] = '\0';
-	*name = tmp_name;
-
-	tmp_email = g_malloc (rbracket - lbracket);
-	strncpy (tmp_email, lbracket + 1, rbracket - lbracket - 1);
-	tmp_email[rbracket - lbracket - 1] = '\0';
-	*email = tmp_email;
-
-#if 0
-	g_print ("Parsed: %s\n  Name:'%s'\nEmail:'%s'\n",
-		 value, *name, *email);
-#endif
-}
-
-
-void
-comp_editor_contacts_to_widget (GtkWidget *contacts_entry,
-				CalComponent *comp)
-{
-	GPtrArray *dest_array;
-	EDestination *dest;
-	GSList *contact_list, *elem;
-	char *contacts_string;
-	int i;
-
-	cal_component_get_contact_list (comp, &contact_list);
-	dest_array = g_ptr_array_new ();
-	for (elem = contact_list; elem; elem = elem->next) {
-		CalComponentText *t = elem->data;
-		char *name, *email;
-
-		parse_contact_string (t->value, &name, &email);
-
-		dest = e_destination_new ();
-		e_destination_set_name (dest, name);
-		e_destination_set_email (dest, email);
-		g_ptr_array_add (dest_array, dest);
-		g_free (name);
-		g_free (email);
-	}
-	cal_component_free_text_list (contact_list);
-
-	/* we need destv to be NULL terminated */
-	g_ptr_array_add (dest_array, NULL);
-
-	contacts_string = e_destination_exportv ((EDestination**) dest_array->pdata);
-#if 0
-	g_print ("Destinations: %s\n", contacts_string ? contacts_string : "");
-#endif
-
-	bonobo_widget_set_property (BONOBO_WIDGET (contacts_entry),
-				    "destinations", contacts_string, NULL);
-
-	g_free (contacts_string);
-
-	/* We free all dest_array except the last NULL we added. */
-	for (i = 0; i < dest_array->len - 1; i++) {
-		dest = g_ptr_array_index (dest_array, i);
-		gtk_object_unref (GTK_OBJECT (dest));
-	}
-	g_ptr_array_free (dest_array, TRUE);
-}
-
-
-void
-comp_editor_contacts_to_component (GtkWidget *contacts_entry,
-				   CalComponent *comp)
-{
-	EDestination **contact_destv;
-	GSList *contact_list = NULL, *elem;
-	char *contacts_string = NULL;
-	CalComponentText *t;
-	const char *name, *email;
-	int i;
-
-	bonobo_widget_get_property (BONOBO_WIDGET (contacts_entry),
-				    "destinations", &contacts_string, NULL);
-#if 0
-	g_print ("Contacts string: %s\n", contacts_string ? contacts_string : "");
-#endif
-
-	contact_destv = e_destination_importv (contacts_string);
-	if (contact_destv) {
-		for (i = 0; contact_destv[i] != NULL; i++) {
-			name = e_destination_get_name (contact_destv[i]);
-			email = e_destination_get_email (contact_destv[i]);
-
-			t = g_new0 (CalComponentText, 1);
-			t->altrep = NULL;
-
-			/* If both name and email are given, use the standard
-			   '"name" <email>' form, otherwise use just the name
-			   or the email address.
-			   FIXME: I'm not sure this is correct syntax etc. */
-			if (name && name[0] && email && email[0])
-				t->value = g_strdup_printf ("\"%s\" <%s>",
-							    name, email);
-			else if (name && name[0])
-				t->value = g_strdup_printf ("\"%s\"",
-							    name);
-			else
-				t->value = g_strdup_printf ("<%s>",
-							    email);
-
-			contact_list = g_slist_prepend (contact_list, t);
-
-			gtk_object_unref (GTK_OBJECT (contact_destv[i]));
-		}
-	}
-	g_free (contact_destv);
-
-	contact_list = g_slist_reverse (contact_list);
-	cal_component_set_contact_list (comp, contact_list);
-
-	for (elem = contact_list; elem; elem = elem->next) {
-		t = elem->data;
-		g_free ((char*)t->value);
-		g_free (t);
-	}
-	g_slist_free (contact_list);
-}
-
-/**
- * comp_editor_strip_categories:
- * @categories: A string of category names entered by the user.
- * 
- * Takes a string of the form "categ, categ, categ, ..." and removes the
- * whitespace between categories to result in "categ,categ,categ,..."
- * 
- * Return value: The category names stripped of surrounding whitespace
- * and separated with commas.
- **/
-char *
-comp_editor_strip_categories (const char *categories)
-{
-	char *new_categories;
-	const char *start, *end;
-	const char *p;
-	char *new_p;
-
-	if (!categories)
-		return NULL;
-
-	new_categories = g_new (char, strlen (categories) + 1);
-
-	start = end = NULL;
-	new_p = new_categories;
-
-	for (p = categories; *p; p++) {
-		int c;
-
-		c = *p;
-
-		if (isspace (c))
-			continue;
-		else if (c == ',') {
-			int len;
-
-			if (!start)
-				continue;
-
-			g_assert (start <= end);
-
-			len = end - start + 1;
-			strncpy (new_p, start, len);
-			new_p[len] = ',';
-			new_p += len + 1;
-
-			start = end = NULL;
-		} else {
-			if (!start) {
-				start = p;
-				end = p;
-			} else
-				end = p;
-		}
-	}
-
-	if (start) {
-		int len;
-
-		g_assert (start <= end);
-
-		len = end - start + 1;
-		strncpy (new_p, start, len);
-		new_p += len;
-	}
-
-	*new_p = '\0';
-
-	return new_categories;
-}
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
deleted file mode 100644
index 948b34221c..0000000000
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 _COMP_EDITOR_UTIL_H_
-#define _COMP_EDITOR_UTIL_H_
-
-#include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-control.h>
-#include "Evolution-Addressbook-SelectNames.h"
-#include "comp-editor-page.h"
-
-void comp_editor_dates (CompEditorPageDates *date, CalComponent *comp);
-void comp_editor_free_dates (CompEditorPageDates *dates);
-
-void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label);
-
-GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
-				      gboolean make_time_insensitive);
-
-struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);
-
-
-GNOME_Evolution_Addressbook_SelectNames comp_editor_create_contacts_component (void);
-GtkWidget * comp_editor_create_contacts_control (GNOME_Evolution_Addressbook_SelectNames corba_select_names);
-Bonobo_EventSource_ListenerId comp_editor_connect_contacts_changed (GtkWidget *contacts_entry,
-								    BonoboListenerCallbackFn changed_cb,
-								    gpointer changed_cb_data);
-void comp_editor_show_contacts_dialog (GNOME_Evolution_Addressbook_SelectNames corba_select_names);
-
-void comp_editor_contacts_to_widget (GtkWidget *contacts_entry,
-				     CalComponent *comp);
-void comp_editor_contacts_to_component (GtkWidget *contacts_entry,
-					CalComponent *comp);
-
-char *comp_editor_strip_categories (const char *categories);
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
deleted file mode 100644
index cad55ebf08..0000000000
--- a/calendar/gui/dialogs/comp-editor.c
+++ /dev/null
@@ -1,1259 +0,0 @@
-/* Evolution calendar - Framework for a calendar component editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-dialog-utils.h>
-#include <evolution-shell-component-utils.h>
-#include "../print.h"
-#include "save-comp.h"
-#include "delete-comp.h"
-#include "send-comp.h"
-#include "changed-comp.h"
-#include "comp-editor.h"
-
-
-
-/* Private part of the CompEditor structure */
-struct _CompEditorPrivate {
-	/* Client to use */
-	CalClient *client;
-
-	/* Calendar object/uid we are editing; this is an internal copy */
-	CalComponent *comp;
-
-	/* The pages we have */
-	GList *pages;
-
-	/* UI Component for the dialog */
-	BonoboUIComponent *uic;
-
-	/* Notebook to hold the pages */
-	GtkNotebook *notebook;
-
-	GtkWidget *filesel;
-
-	gboolean changed;
-	gboolean needs_send;
-	gboolean needs_send_new;
-	gboolean updating;
-};
-
-
-
-static void comp_editor_class_init (CompEditorClass *class);
-static void comp_editor_init (CompEditor *editor);
-static gint comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e);
-static void comp_editor_destroy (GtkObject *object);
-
-static void real_set_cal_client (CompEditor *editor, CalClient *client);
-static void real_edit_comp (CompEditor *editor, CalComponent *comp);
-static void real_send_comp (CompEditor *editor, CalComponentItipMethod method);
-static gboolean prompt_to_save_changes (CompEditor *editor, gboolean send);
-static void delete_comp (CompEditor *editor);
-static void close_dialog (CompEditor *editor);
-
-static void page_changed_cb (GtkObject *obj, gpointer data);
-static void page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data);
-static void page_dates_changed_cb (GtkObject *obj, CompEditorPageDates *dates, gpointer data);
-
-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 save_cmd (GtkWidget *widget, gpointer data);
-static void save_close_cmd (GtkWidget *widget, gpointer data);
-static void save_as_cmd (GtkWidget *widget, gpointer data);
-static void delete_cmd (GtkWidget *widget, gpointer data);
-static void print_cmd (GtkWidget *widget, gpointer data);
-static void print_preview_cmd (GtkWidget *widget, gpointer data);
-static void print_setup_cmd (GtkWidget *widget, gpointer data);
-static void close_cmd (GtkWidget *widget, gpointer data);
-
-static gint delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
-
-static EPixmap pixmaps [] =
-{
-	E_PIXMAP ("/menu/File/FileSave",			"save-16.png"),
-	E_PIXMAP ("/menu/File/FileSaveAndClose",		"save-16.png"),
-	E_PIXMAP ("/menu/File/FileSaveAs",			"save-as-16.png"),
-
-	E_PIXMAP ("/menu/File/FileDelete",			"evolution-trash-mini.png"),
-
-	E_PIXMAP ("/menu/File/FilePrint",			"print.xpm"),
-	E_PIXMAP ("/menu/File/FilePrintPreview",		"print-preview.xpm"),
-
-	E_PIXMAP ("/Toolbar/FileSaveAndClose",		        "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/FilePrint",			        "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/FileDelete",			"buttons/delete-message.png"),
-
-	E_PIXMAP_END
-};
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("FileSave", save_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", save_close_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAs", save_as_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FileDelete", delete_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FilePrint", print_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FilePrintPreview", print_preview_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FilePrintSetup", print_setup_cmd),
-	BONOBO_UI_UNSAFE_VERB ("FileClose", close_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static GtkObjectClass *parent_class;
-
-
-
-GtkType
-comp_editor_get_type (void)
-{
-	static GtkType comp_editor_type = 0;
-
-	if (!comp_editor_type) {
-		static const GtkTypeInfo comp_editor_info = {
-			"CompEditor",
-			sizeof (CompEditor),
-			sizeof (CompEditorClass),
-			(GtkClassInitFunc) comp_editor_class_init,
-			(GtkObjectInitFunc) comp_editor_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		comp_editor_type = gtk_type_unique (BONOBO_TYPE_WINDOW,
-						    &comp_editor_info);
-	}
-
-	return comp_editor_type;
-}
-
-/* Class initialization function for the calendar component editor */
-static void
-comp_editor_class_init (CompEditorClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	parent_class = gtk_type_class (BONOBO_TYPE_WINDOW);
-
-	klass->set_cal_client = real_set_cal_client;
-	klass->edit_comp = real_edit_comp;
-	klass->send_comp = real_send_comp;
-
-	widget_class->key_press_event = comp_editor_key_press_event;
-	object_class->destroy = comp_editor_destroy;
-}
-
-/* Creates the basic in the editor */
-static void
-setup_widgets (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	BonoboUIContainer *container;
-	GtkWidget *vbox;
-
-	priv = editor->priv;
-
-	/* Window and basic vbox */
-	bonobo_window_construct (BONOBO_WINDOW (editor),
-				 "event-editor", "iCalendar Editor");
-	gtk_signal_connect (GTK_OBJECT (editor), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), editor);
-
-	priv->uic = bonobo_ui_component_new_default ();
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor));
-	bonobo_ui_component_set_container (priv->uic, BONOBO_OBJREF (container));
-	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (editor)),
-					  "/evolution/UIConf/kvps");
-
-	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
-			       "evolution-comp-editor.xml",
-			       "evolution-calendar");
-	e_pixmaps_update (priv->uic, pixmaps);
-
-	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (vbox);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
-	bonobo_window_set_contents (BONOBO_WINDOW (editor), vbox);
-
-	/* Notebook */
-	priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
-	gtk_widget_show (GTK_WIDGET (priv->notebook));
-	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->notebook),
-			    TRUE, TRUE, 0);
-}
-
-/* Object initialization function for the calendar component editor */
-static void
-comp_editor_init (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = g_new0 (CompEditorPrivate, 1);
-	editor->priv = priv;
-
-	setup_widgets (editor);
-
-	priv->pages = NULL;
-	priv->changed = FALSE;
-	priv->needs_send = FALSE;
-	priv->needs_send_new = FALSE;
-}
-
-
-static gint
-comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e)
-{
-	if (e->keyval == GDK_Escape) {
-		if (prompt_to_save_changes (COMP_EDITOR (d), TRUE))
-			close_dialog (COMP_EDITOR (d));
-		return TRUE;
-	}
-
-	if (GTK_WIDGET_CLASS (parent_class)->key_press_event)
-		return (* GTK_WIDGET_CLASS (parent_class)->key_press_event) (d, e);
-
-	return FALSE;
-}
-
-/* Destroy handler for the calendar component editor */
-static void
-comp_editor_destroy (GtkObject *object)
-{
-	CompEditor *editor;
-	CompEditorPrivate *priv;
-	GList *l;
-
-	editor = COMP_EDITOR (object);
-	priv = editor->priv;
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), editor);
-
-	/* We want to destroy the pages after the widgets get destroyed,
-	   since they have lots of signal handlers connected to the widgets
-	   with the pages as the data. */
-	for (l = priv->pages; l != NULL; l = l->next)
-		gtk_object_unref (GTK_OBJECT (l->data));
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	g_free (priv);
-	editor->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static gboolean
-save_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	CalComponent *clone;
-	GList *l;
-
-	priv = editor->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	clone = cal_component_clone (priv->comp);
-	for (l = priv->pages; l != NULL; l = l->next) {
-		if (!comp_editor_page_fill_component (l->data, clone)) {
-			gtk_object_unref (GTK_OBJECT (clone));
-			return FALSE;
-		}
-	}
-	cal_component_commit_sequence (clone);
-	gtk_object_unref (GTK_OBJECT (priv->comp));
-	priv->comp = clone;
-
-	priv->updating = TRUE;
-
-	if (!cal_client_update_object (priv->client, priv->comp)) {
-		GtkWidget *dlg;
-
-		dlg = gnome_error_dialog (_("Could not update object!"));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-
-		return FALSE;
-	} else {
-		priv->changed = FALSE;
-	}
-
-	priv->updating = FALSE;
-
-	return TRUE;
-}
-
-static gboolean
-save_comp_with_send (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	gboolean send;
-
-	priv = editor->priv;
-
-	send = priv->changed && priv->needs_send;
-
-	if (!save_comp (editor))
-		return FALSE;
-
-	if (send && send_component_dialog (priv->comp, priv->needs_send_new))
-		comp_editor_send_comp (editor, CAL_COMPONENT_METHOD_REQUEST);
-
-	return TRUE;
-}
-
-static void
-delete_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	const char *uid;
-
-	priv = editor->priv;
-
-	cal_component_get_uid (priv->comp, &uid);
-	priv->updating = TRUE;
-	cal_client_remove_object (priv->client, uid);
-	priv->updating = FALSE;
-	close_dialog (editor);
-}
-
-static gboolean
-prompt_to_save_changes (CompEditor *editor, gboolean send)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	switch (save_component_dialog (GTK_WINDOW (editor))) {
-	case 0: /* Save */
-		if (send && save_comp_with_send (editor))
-			return TRUE;
-		else if (!send && save_comp (editor))
-			return TRUE;
-		else
-			return FALSE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-	}
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	gtk_object_destroy (GTK_OBJECT (editor));
-}
-
-
-
-/**
- * comp_editor_set_changed:
- * @editor: A component editor
- * @changed: Value to set the changed state to
- *
- * Set the dialog changed state to the given value
- **/
-void
-comp_editor_set_changed (CompEditor *editor, gboolean changed)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	priv->changed = changed;
-}
-
-/**
- * comp_editor_get_changed:
- * @editor: A component editor
- *
- * Gets the changed state of the dialog
- *
- * Return value: A boolean indicating if the dialog is in a changed
- * state
- **/
-gboolean
-comp_editor_get_changed (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	return priv->changed;
-}
-
-/**
- * comp_editor_set_needs_send:
- * @editor: A component editor
- * @needs_send: Value to set the needs send state to
- *
- * Set the dialog needs send state to the given value
- **/
-void
-comp_editor_set_needs_send (CompEditor *editor, gboolean needs_send)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	priv->needs_send = needs_send;
-}
-
-/**
- * comp_editor_get_needs_send:
- * @editor: A component editor
- *
- * Gets the needs send state of the dialog
- *
- * Return value: A boolean indicating if the dialog is in a needs send
- * state
- **/
-gboolean
-comp_editor_get_needs_send (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	return priv->needs_send;
-}
-
-static void page_mapped_cb (GtkWidget *page_widget,
-			    CompEditorPage *page)
-{
-	GtkWidget *toplevel;
-
-	toplevel = gtk_widget_get_toplevel (page_widget);
-	if (!GTK_IS_WINDOW (toplevel))
-		return;
-
-	if (page->accel_group) {
-		gtk_window_add_accel_group (GTK_WINDOW (toplevel),
-					    page->accel_group);
-	}
-}
-
-static void page_unmapped_cb (GtkWidget *page_widget,
-			      CompEditorPage *page)
-{
-	GtkWidget *toplevel;
-
-	toplevel = gtk_widget_get_toplevel (page_widget);
-	if (!GTK_IS_WINDOW (toplevel))
-		return;
-
-	if (page->accel_group) {
-		gtk_window_remove_accel_group (GTK_WINDOW (toplevel),
-					       page->accel_group);
-	}
-}
-
-/**
- * comp_editor_append_page:
- * @editor: A component editor
- * @page: A component editor page
- * @label: Label of the page
- *
- * Appends a page to the editor notebook with the given label
- **/
-void
-comp_editor_append_page (CompEditor *editor,
-			 CompEditorPage *page,
-			 const char *label)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *page_widget;
-	GtkWidget *label_widget;
-	gboolean is_first_page;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-	g_return_if_fail (label != NULL);
-
-	priv = editor->priv;
-
-	gtk_object_ref (GTK_OBJECT (page));
-
-	/* If we are editing something, fill the widgets with current info */
-	if (priv->comp != NULL) {
-		CalComponent *comp;
-
-		comp = comp_editor_get_current_comp (editor);
-		comp_editor_page_fill_widgets (page, comp);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	page_widget = comp_editor_page_get_widget (page);
-	g_assert (page_widget != NULL);
-
-	label_widget = gtk_label_new (label);
-
-	is_first_page = (priv->pages == NULL);
-
-	priv->pages = g_list_append (priv->pages, page);
-	gtk_notebook_append_page (priv->notebook, page_widget, label_widget);
-
-	/* Listen for things happening on the page */
-	gtk_signal_connect (GTK_OBJECT (page), "changed",
-			    GTK_SIGNAL_FUNC (page_changed_cb), editor);
-	gtk_signal_connect (GTK_OBJECT (page), "summary_changed",
-			    GTK_SIGNAL_FUNC (page_summary_changed_cb), editor);
-	gtk_signal_connect (GTK_OBJECT (page), "dates_changed",
-			    GTK_SIGNAL_FUNC (page_dates_changed_cb), editor);
-
-	/* Listen for when the page is mapped/unmapped so we can
-	   install/uninstall the appropriate GtkAccelGroup. */
-	gtk_signal_connect (GTK_OBJECT (page_widget), "map",
-			    GTK_SIGNAL_FUNC (page_mapped_cb), page);
-	gtk_signal_connect (GTK_OBJECT (page_widget), "unmap",
-			    GTK_SIGNAL_FUNC (page_unmapped_cb), page);
-
-	/* The first page is the main page of the editor, so we ask it to focus
-	 * its main widget.
-	 */
-	if (is_first_page)
-		comp_editor_page_focus_main_widget (page);
-}
-
-/**
- * comp_editor_remove_page:
- * @editor: A component editor
- * @page: A component editor page
- *
- * Removes the page from the component editor
- **/
-void
-comp_editor_remove_page (CompEditor *editor, CompEditorPage *page)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *page_widget;
-	gint page_num;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	priv = editor->priv;
-
-	page_widget = comp_editor_page_get_widget (page);
-	page_num = gtk_notebook_page_num (priv->notebook, page_widget);
-	if (page_num == -1)
-		return;
-	
-	/* Disconnect all the signals added in append_page(). */
-	gtk_signal_disconnect_by_data (GTK_OBJECT (page), editor);
-	gtk_signal_disconnect_by_data (GTK_OBJECT (page_widget), page);
-
-	gtk_notebook_remove_page (priv->notebook, page_num);
-
-	priv->pages = g_list_remove (priv->pages, page);
-	gtk_object_unref (GTK_OBJECT (page));
-}
-
-/**
- * comp_editor_show_page:
- * @editor:
- * @page:
- *
- *
- **/
-void
-comp_editor_show_page (CompEditor *editor, CompEditorPage *page)
-{
-	CompEditorPrivate *priv;
-	GtkWidget *page_widget;
-	gint page_num;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (page != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
-
-	priv = editor->priv;
-
-	page_widget = comp_editor_page_get_widget (page);
-	page_num = gtk_notebook_page_num (priv->notebook, page_widget);
-	gtk_notebook_set_page (priv->notebook, page_num);
-}
-
-/**
- * comp_editor_set_cal_client:
- * @editor: A component editor
- * @client: The calendar client to use
- *
- * Sets the calendar client used by the editor to update components
- **/
-void
-comp_editor_set_cal_client (CompEditor *editor, CalClient *client)
-{
-	CompEditorClass *klass;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)->klass);
-
-	if (klass->set_cal_client)
-		klass->set_cal_client (editor, client);
-}
-
-/**
- * comp_editor_get_cal_client:
- * @editor: A component editor
- *
- * Returns the calendar client of the editor
- *
- * Return value: The calendar client of the editor
- **/
-CalClient *
-comp_editor_get_cal_client (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
-
-	priv = editor->priv;
-
-	return priv->client;
-}
-
-/* Creates an appropriate title for the event editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	char *title;
-	const char *type_string;
-	CalComponentVType type;
-	CalComponentText text;
-
-	if (!comp)
-		return g_strdup (_("Edit Appointment"));
-
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		type_string = _("Appointment - %s");
-		break;
-	case CAL_COMPONENT_TODO:
-		type_string = _("Task - %s");
-		break;
-	case CAL_COMPONENT_JOURNAL:
-		type_string = _("Journal entry - %s");
-		break;
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-
-	cal_component_get_summary (comp, &text);
-	if (text.value) {
-		char *summary;
-		summary = e_utf8_to_locale_string (text.value);
-		title = g_strdup_printf (type_string, summary);
-		g_free (summary);
-	} else
-		title = g_strdup_printf (type_string, _("No summary"));
-
-	return title;
-}
-
-static const char *
-make_icon_from_comp (CalComponent *comp)
-{
-	CalComponentVType type;
-
-	if (!comp)
-		return EVOLUTION_ICONSDIR "/evolution-calendar-mini.png";
-
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return EVOLUTION_ICONSDIR "/buttons/new_appointment.png";
-		break;
-	case CAL_COMPONENT_TODO:
-		return EVOLUTION_ICONSDIR "/buttons/new_task.png";
-		break;
-	default:
-		return EVOLUTION_ICONSDIR "/evolution-calendar-mini.png";
-	}
-}
-
-/* Sets the event editor's window title from a calendar component */
-static void
-set_title_from_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	char *title;
-
-	priv = editor->priv;
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (editor), title);
-	g_free (title);
-}
-
-static void
-set_icon_from_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	const char *file;
-
-	priv = editor->priv;
-	file = make_icon_from_comp (priv->comp);
-	gnome_window_icon_set_from_file (GTK_WINDOW (editor), file);
-}
-
-static void
-fill_widgets (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	GList *l;
-
-	priv = editor->priv;
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		comp_editor_page_fill_widgets (l->data, priv->comp);
-}
-
-static void
-real_set_cal_client (CompEditor *editor, CalClient *client)
-{
-	CompEditorPrivate *priv;
-	GList *elem;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client) {
-		g_return_if_fail (IS_CAL_CLIENT (client));
-		g_return_if_fail (cal_client_get_load_state (client) ==
-				  CAL_CLIENT_LOAD_LOADED);
-		gtk_object_ref (GTK_OBJECT (client));
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       editor);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	/* Pass the client to any pages that need it. */
-	for (elem = priv->pages; elem; elem = elem->next)
-		comp_editor_page_set_cal_client (elem->data, client);
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), editor);
-}
-
-static void
-real_edit_comp (CompEditor *editor, CalComponent *comp)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp)
-		priv->comp = cal_component_clone (comp);
-
-	priv->needs_send_new = !priv->needs_send;
-	
-	set_title_from_comp (editor);
-	set_icon_from_comp (editor);
-	fill_widgets (editor);
-}
-
-
-static void
-real_send_comp (CompEditor *editor, CalComponentItipMethod method)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	itip_send_comp (method, priv->comp, priv->client, NULL);
-}
-
-
-/**
- * comp_editor_edit_comp:
- * @editor: A component editor
- * @comp: A calendar component
- *
- * Starts the editor editing the given component
- **/
-void
-comp_editor_edit_comp (CompEditor *editor, CalComponent *comp)
-{
-	CompEditorClass *klass;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)->klass);
-
-	if (klass->edit_comp)
-		klass->edit_comp (editor, comp);
-}
-
-CalComponent *
-comp_editor_get_current_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-	CalComponent *comp;
-	GList *l;
-
-	g_return_val_if_fail (editor != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
-
-	priv = editor->priv;
-
-	comp = cal_component_clone (priv->comp);
-	if (priv->changed) {
-		for (l = priv->pages; l != NULL; l = l->next)
-			comp_editor_page_fill_component (l->data, comp);
-	}
-
-	return comp;
-}
-
-/**
- * comp_editor_save_comp:
- * @editor:
- *
- *
- **/
-gboolean
-comp_editor_save_comp (CompEditor *editor, gboolean send)
-{
-	return prompt_to_save_changes (editor, send);
-}
-
-/**
- * comp_editor_delete_comp:
- * @editor:
- *
- *
- **/
-void
-comp_editor_delete_comp (CompEditor *editor)
-{
-	delete_comp (editor);
-}
-
-/**
- * comp_editor_send_comp:
- * @editor:
- * @method:
- *
- *
- **/
-void
-comp_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)
-{
-	CompEditorClass *klass;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)->klass);
-
-	if (klass->send_comp)
-		klass->send_comp (editor, method);
-}
-
-/**
- * comp_editor_merge_ui:
- * @editor:
- * @filename:
- * @verbs:
- *
- *
- **/
-void
-comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *verbs)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar");
-	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
-}
-
-/**
- * comp_editor_set_ui_prop:
- * @editor:
- * @path:
- * @attr:
- * @val:
- *
- *
- **/
-void
-comp_editor_set_ui_prop (CompEditor *editor,
-			 const char *path,
-			 const char *attr,
-			 const char *val)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	bonobo_ui_component_set_prop (priv->uic, path, attr, val, NULL);
-}
-
-
-/* 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);
-}
-
-/**
- * comp_editor_focus:
- * @editor: A component editor
- *
- * Brings the editor window to the front and gives it focus
- **/
-void
-comp_editor_focus (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-
-	priv = editor->priv;
-
-	gtk_widget_show (GTK_WIDGET (editor));
-	raise_and_focus (GTK_WIDGET (editor));
-}
-
-/* This sets the focus to the toplevel, so any field being edited is committed.
-   FIXME: In future we may also want to check some of the fields are valid,
-   e.g. the EDateEdit fields. */
-static void
-commit_all_fields (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	gtk_window_set_focus (GTK_WINDOW (editor), NULL);
-}
-
-/* Menu Commands */
-static void
-save_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-
-	commit_all_fields (editor);
-
-	save_comp_with_send (editor);
-}
-
-static void
-save_close_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-
-	commit_all_fields (editor);
-
-	if (save_comp_with_send (editor))
-		close_dialog (editor);
-}
-
-static void
-save_as_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-	
-	priv = editor->priv;
-
-	commit_all_fields (editor);
-
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	ical_string = cal_client_get_component_as_string (priv->client, priv->comp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
-	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
-	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
-}
-
-static void
-delete_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	CalComponentVType vtype;
-
-	priv = editor->priv;
-
-	vtype = cal_component_get_vtype (priv->comp);
-
-	if (delete_component_dialog (priv->comp, FALSE, 1, vtype, GTK_WIDGET (editor)))
-		delete_comp (editor);
-}
-
-static void
-print_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CalComponent *comp;
-
-	commit_all_fields (editor);
-
-	comp = comp_editor_get_current_comp (editor);
-	print_comp (comp, editor->priv->client, FALSE);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-static void
-print_preview_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CalComponent *comp;
-
-	commit_all_fields (editor);
-
-	comp = comp_editor_get_current_comp (editor);
-	print_comp (comp, editor->priv->client, TRUE);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-static void
-print_setup_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	print_setup ();
-}
-
-static void
-close_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-
-	commit_all_fields (editor);
-
-	if (prompt_to_save_changes (editor, TRUE))
-		close_dialog (editor);
-}
-
-static void
-page_changed_cb (GtkObject *obj, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	priv->changed = TRUE;
-}
-
-/* Page signal callbacks */
-static void
-page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	GList *l;
-
-	priv = editor->priv;
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		if (obj != l->data)
-			comp_editor_page_set_summary (l->data, summary);
-
-	priv->changed = TRUE;
-}
-
-static void
-page_dates_changed_cb (GtkObject *obj,
-		       CompEditorPageDates *dates,
-		       gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	GList *l;
-
-	priv = editor->priv;
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		if (obj != l->data)
-			comp_editor_page_set_dates (l->data, dates);
-
-	priv->changed = TRUE;
-}
-
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	CalComponent *comp = NULL;
-	CalClientGetStatus status;
-	const char *edit_uid;
-
-	priv = editor->priv;
-
-	cal_component_get_uid (priv->comp, &edit_uid);
-
-	if (!strcmp (uid, edit_uid) && !priv->updating) {
-		if (changed_component_dialog (priv->comp, FALSE, priv->changed)) {
-			status = cal_client_get_object (priv->client, uid, &comp);
-			if (status == CAL_CLIENT_GET_SUCCESS) {
-				comp_editor_edit_comp (editor, comp);
-				gtk_object_unref (GTK_OBJECT (comp));
-			} else {
-				GtkWidget *dlg;
-
-				dlg = gnome_error_dialog (_("Unable to obtain current version!"));
-				gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-			}
-		}
-	}
-}
-
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	const char *edit_uid;
-
-	priv = editor->priv;
-
-	cal_component_get_uid (priv->comp, &edit_uid);
-
-	if (!strcmp (uid, edit_uid) && !priv->updating) {
-		if (changed_component_dialog (priv->comp, TRUE, priv->changed))
-			close_dialog (editor);
-	}
-}
-
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-
-	if (prompt_to_save_changes (editor, TRUE))
-		close_dialog (editor);
-
-	return TRUE;
-}
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
deleted file mode 100644
index f789515ab1..0000000000
--- a/calendar/gui/dialogs/comp-editor.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Evolution calendar - Framework for a calendar component editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 COMP_EDITOR_H
-#define COMP_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <bonobo/bonobo-win.h>
-#include <bonobo/bonobo-ui-engine.h>
-#include <bonobo/bonobo-ui-component.h>
-#include "cal-client.h"
-#include "../itip-utils.h"
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_COMP_EDITOR            (comp_editor_get_type ())
-#define COMP_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR, CompEditor))
-#define COMP_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR, CompEditorClass))
-#define IS_COMP_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR))
-#define IS_COMP_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR))
-
-typedef struct _CompEditorPrivate CompEditorPrivate;
-
-typedef struct {
-	BonoboWindow object;
-
-	/* Private data */
-	CompEditorPrivate *priv;
-} CompEditor;
-
-typedef struct {
-	BonoboWindowClass parent_class;
-
-	/* Virtual functions */
-	void (* set_cal_client) (CompEditor *page, CalClient *client);
-	void (* edit_comp) (CompEditor *page, CalComponent *comp);
-	void (* send_comp) (CompEditor *page, CalComponentItipMethod method);
-} CompEditorClass;
-
-GtkType       comp_editor_get_type         (void);
-void          comp_editor_set_changed      (CompEditor             *editor,
-					    gboolean                changed);
-gboolean      comp_editor_get_changed      (CompEditor             *editor);
-void          comp_editor_set_needs_send   (CompEditor             *editor,
-					    gboolean                needs_send);
-gboolean      comp_editor_get_needs_send   (CompEditor             *editor);
-void          comp_editor_append_page      (CompEditor             *editor,
-					    CompEditorPage         *page,
-					    const char             *label);
-void          comp_editor_remove_page      (CompEditor             *editor,
-					    CompEditorPage         *page);
-void          comp_editor_show_page        (CompEditor             *editor,
-					    CompEditorPage         *page);
-void          comp_editor_set_cal_client   (CompEditor             *editor,
-					    CalClient              *client);
-CalClient    *comp_editor_get_cal_client   (CompEditor             *editor);
-void          comp_editor_edit_comp        (CompEditor             *ee,
-					    CalComponent           *comp);
-CalComponent *comp_editor_get_current_comp (CompEditor             *editor);
-gboolean      comp_editor_save_comp        (CompEditor             *editor,
-					    gboolean                send);
-void          comp_editor_delete_comp      (CompEditor             *editor);
-void          comp_editor_send_comp        (CompEditor             *editor,
-					    CalComponentItipMethod  method);
-void          comp_editor_merge_ui         (CompEditor             *editor,
-					    const char             *filename,
-					    BonoboUIVerb           *verbs);
-void          comp_editor_set_ui_prop      (CompEditor             *editor,
-					    const char             *path,
-					    const char             *attr,
-					    const char             *val);
-void          comp_editor_focus            (CompEditor             *editor);
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
deleted file mode 100644
index 405a9445b4..0000000000
--- a/calendar/gui/dialogs/delete-comp.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include "widgets/misc/e-messagebox.h"
-#include "../calendar-config.h"
-#include "delete-comp.h"
-
-
-
-/**
- * delete_component_dialog:
- * @comp: A calendar component if a single component is to be deleted, or NULL
- * if more that one component is to be deleted.
- * @consider_as_untitled: If deleting more than one component, this is ignored.
- * Otherwise, whether to consider the component as not having a summary; if
- * FALSE then the component's summary string will be used.
- * @n_comps: Number of components that are to be deleted.
- * @vtype: Type of the components that are to be deleted.  This is ignored
- * if only one component is to be deleted, and the vtype is extracted from
- * the component instead.
- * @widget: A widget to use as a basis for conversion from UTF8 into font
- * encoding.
- * 
- * Pops up a dialog box asking the user whether he wants to delete a number of
- * calendar components.  The dialog will not appear, however, if the
- * configuration option for confirmation is turned off.
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.  If the
- * configuration option for confirmation is turned off, this function will
- * unconditionally return TRUE.
- **/
-gboolean
-delete_component_dialog (CalComponent *comp,
-			 gboolean consider_as_untitled,
-			 int n_comps, CalComponentVType vtype,
-			 GtkWidget *widget)
-{
-	char *str;
-	GtkWidget *dialog;
-
-	if (comp) {
-		g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-		g_return_val_if_fail (n_comps == 1, FALSE);
-	} else {
-		g_return_val_if_fail (n_comps > 1, FALSE);
-		g_return_val_if_fail (vtype != CAL_COMPONENT_NO_TYPE, FALSE);
-	}
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	if (!calendar_config_get_confirm_delete ())
-		return TRUE;
-
-	if (comp) {
-		CalComponentText summary;
-		char *tmp;
-
-		vtype = cal_component_get_vtype (comp);
-
-		if (!consider_as_untitled) {
-			cal_component_get_summary (comp, &summary);
-			tmp = e_utf8_to_gtk_string (widget, summary.value);
-		} else
-			tmp = NULL;
-
-		switch (vtype) {
-		case CAL_COMPONENT_EVENT:
-			if (tmp)
-				str = g_strdup_printf (_("Are you sure you want to delete "
-							 "the appointment `%s'?"), tmp);
-			else
-				str = g_strdup (_("Are you sure you want to delete this "
-						  "untitled appointment?"));
-			break;
-
-		case CAL_COMPONENT_TODO:
-			if (tmp)
-				str = g_strdup_printf (_("Are you sure you want to delete "
-							 "the task `%s'?"), tmp);
-			else
-				str = g_strdup (_("Are you sure you want to delete this "
-						  "untitled task?"));
-			break;
-
-		case CAL_COMPONENT_JOURNAL:
-			if (tmp)
-				str = g_strdup_printf (_("Are you sure you want to delete "
-							 "the journal entry `%s'?"), tmp);
-			else
-				str = g_strdup (_("Are you sure want to delete this "
-						  "untitled journal entry?"));
-			break;
-
-		default:
-			g_message ("delete_component_dialog(): Cannot handle object of type %d",
-				   vtype);
-			g_free (tmp);
-			return FALSE;
-		}
-
-		g_free (tmp);
-	} else {
-		switch (vtype) {
-		case CAL_COMPONENT_EVENT:
-			str = g_strdup_printf (_("Are you sure you want to delete "
-						 "%d appointments?"), n_comps);
-			break;
-
-		case CAL_COMPONENT_TODO:
-			str = g_strdup_printf (_("Are you sure you want to delete "
-						 "%d tasks?"), n_comps);
-			break;
-
-		case CAL_COMPONENT_JOURNAL:
-			str = g_strdup_printf (_("Are you sure you want to delete "
-						 "%d journal entries?"), n_comps);
-			break;
-
-		default:
-			g_message ("delete_component_dialog(): Cannot handle objects of type %d",
-				   vtype);
-			return FALSE;
-		}
-	}
-
-	dialog = e_message_box_new (str, E_MESSAGE_BOX_QUESTION,
-				    GNOME_STOCK_BUTTON_YES,
-				    GNOME_STOCK_BUTTON_NO,
-				    NULL);
-	g_free (str);
-
-	gtk_widget_hide (e_message_box_get_checkbox (E_MESSAGE_BOX (dialog)));
-
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
deleted file mode 100644
index 64945b5bee..0000000000
--- a/calendar/gui/dialogs/delete-comp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 DELETE_COMP_H
-#define DELETE_COMP_H
-
-#include <gtk/gtkwidget.h>
-#include <cal-util/cal-component.h>
-
-gboolean delete_component_dialog (CalComponent *comp,
-				  gboolean consider_as_untitled,
-				  int n_comps, CalComponentVType vtype,
-				  GtkWidget *widget);
-
-#endif
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
deleted file mode 100644
index 159d27e6a3..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Delegate selector dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <liboaf/liboaf.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-widget.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gnome.h>
-#include <ical.h>
-#include <glade/glade.h>
-#include <widgets/misc/e-map.h>
-#include <e-destination.h>
-#include "Evolution-Addressbook-SelectNames.h"
-#include "e-delegate-dialog.h"
-
-struct _EDelegateDialogPrivate {
-	char *name;
-	char *address;
-
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *app;
-	GtkWidget *hbox;
-	GtkWidget *addressbook;
-
-        GNOME_Evolution_Addressbook_SelectNames corba_select_names;	
-	GtkWidget *entry;	
-};
-
-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-static const char *section_name = "Delegate To";
-
-static void e_delegate_dialog_class_init	(EDelegateDialogClass *class);
-static void e_delegate_dialog_init		(EDelegateDialog      *edd);
-static void e_delegate_dialog_destroy		(GtkObject	*object);
-
-static gboolean get_widgets			(EDelegateDialog *edd);
-static void addressbook_clicked_cb              (GtkWidget *widget, gpointer data);
-
-static GtkObjectClass *parent_class;
-
-
-GtkType
-e_delegate_dialog_get_type (void)
-{
-	static GtkType e_delegate_dialog_type = 0;
-
-	if (!e_delegate_dialog_type) {
-		static const GtkTypeInfo e_delegate_dialog_info = {
-			"EDelegateDialog",
-			sizeof (EDelegateDialog),
-			sizeof (EDelegateDialogClass),
-			(GtkClassInitFunc) e_delegate_dialog_class_init,
-			(GtkObjectInitFunc) e_delegate_dialog_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_delegate_dialog_type = gtk_type_unique (GTK_TYPE_OBJECT,
-							  &e_delegate_dialog_info);
-	}
-
-	return e_delegate_dialog_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-e_delegate_dialog_class_init (EDelegateDialogClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = e_delegate_dialog_destroy;
-}
-
-/* Object initialization function for the event editor */
-static void
-e_delegate_dialog_init (EDelegateDialog *edd)
-{
-	EDelegateDialogPrivate *priv;
-
-	priv = g_new0 (EDelegateDialogPrivate, 1);
-	edd->priv = priv;
-
-	priv->address = NULL;
-}
-
-/* Destroy handler for the event editor */
-static void
-e_delegate_dialog_destroy (GtkObject *object)
-{
-	EDelegateDialog *edd;
-	EDelegateDialogPrivate *priv;
-	GtkWidget *dialog;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_DELEGATE_DIALOG (object));
-
-	edd = E_DELEGATE_DIALOG (object);
-	priv = edd->priv;
-
-	/* Destroy the actual dialog. */
-	dialog = e_delegate_dialog_get_toplevel (edd);
-	gtk_widget_destroy (dialog);
-
-	g_free (priv->address);
-	priv->address = NULL;
-
-	g_free (priv);
-	edd->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-EDelegateDialog *
-e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address)
-{
-	EDelegateDialogPrivate *priv;
-	EDestination *dest;
-	EDestination *destv[2] = {NULL, NULL};
-	Bonobo_Control corba_control;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-delegate-dialog.glade",
-				   NULL);
-	if (!priv->xml) {
-		g_message ("e_delegate_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (edd)) {
-		g_message ("e_delegate_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-	
-	CORBA_exception_init (&ev);
-	
-	priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
-	GNOME_Evolution_Addressbook_SelectNames_addSectionWithLimit (priv->corba_select_names, 
-								     section_name, 
-								     section_name,
-								     1, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("e_delegate_dialog_construct(): Unable to add section!");
-		goto error;
-	}
-
-	corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (priv->corba_select_names, 
-										   section_name, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("e_delegate_dialog_construct(): Unable to get addressbook entry!");
-		goto error;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	priv->entry = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
-	gtk_widget_show (priv->entry);
-	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->entry, TRUE, TRUE, 0);
-
-	dest = e_destination_new ();
-	destv[0] = dest;
-	if (name != NULL && *name)
-		e_destination_set_name (dest, name);
-	if (address != NULL && *address)
-		e_destination_set_email (dest, address);
-	bonobo_widget_set_property (BONOBO_WIDGET (priv->entry), "destinations", e_destination_exportv (destv), NULL);
-	gtk_object_unref (GTK_OBJECT (dest));
-		
-	gtk_signal_connect (GTK_OBJECT (priv->addressbook), "clicked",
-			    GTK_SIGNAL_FUNC (addressbook_clicked_cb), edd);
-
-	return edd;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (edd));
-	return NULL;
-}
-
-static gboolean
-get_widgets (EDelegateDialog *edd)
-{
-	EDelegateDialogPrivate *priv;
-
-	priv = edd->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app		= GW ("delegate-dialog");
-	priv->hbox              = GW ("delegate-hbox");
-	priv->addressbook	= GW ("addressbook");	
-
-	return (priv->app
-		&& priv->hbox
-		&& priv->addressbook);
-}
-
-static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EDelegateDialog *edd = data;
-	EDelegateDialogPrivate *priv;
-	CORBA_Environment ev;
-	
-	priv = edd->priv;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (priv->corba_select_names, section_name, &ev);
-	
-	CORBA_exception_free (&ev);
-}
-
-
-/**
- * e_delegate_dialog_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.
- **/
-EDelegateDialog *
-e_delegate_dialog_new (const char *name, const char *address)
-{
-	EDelegateDialog *edd;
-
-	edd = E_DELEGATE_DIALOG (gtk_type_new (E_TYPE_DELEGATE_DIALOG));
-	return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address);
-}
-
-char *
-e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
-{
-	EDelegateDialogPrivate *priv;
-	EDestination **destv;
-	char *string = NULL;
-	
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-	
-	bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", &string, NULL);
-	destv = e_destination_importv (string);
-	
-	if (destv && destv[0] != NULL) {
-		g_free (priv->address);
-		priv->address = g_strdup (e_destination_get_email (destv[0]));
-		g_free (destv);
-	}
-	
-	g_free (string);
-	
-	return g_strdup (priv->address);
-}
-
-
-char *
-e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
-{
-	EDelegateDialogPrivate *priv;
-	EDestination **destv;
-	char *string = NULL;
-	
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", &string, NULL);
-	destv = e_destination_importv (string);
-	
-	g_message ("importv: [%s]", string);
-	
-	if (destv && destv[0] != NULL) {
-		g_free (priv->name);
-		priv->name = g_strdup (e_destination_get_name (destv[0]));
-		g_free (destv);
-	}
-	
-	g_free (string);
-	
-	return g_strdup (priv->name);
-}
-
-GtkWidget*
-e_delegate_dialog_get_toplevel	(EDelegateDialog  *edd)
-{
-	EDelegateDialogPrivate *priv;
-
-	g_return_val_if_fail (edd != NULL, NULL);
-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
-
-	priv = edd->priv;
-
-	return priv->app;
-}
-
diff --git a/calendar/gui/dialogs/e-delegate-dialog.glade b/calendar/gui/dialogs/e-delegate-dialog.glade
deleted file mode 100644
index 394c191682..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.glade
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>timezone-dialog</name>
-  <program_name>timezone-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>GnomeDialog</class>
-  <name>delegate-dialog</name>
-  <visible>False</visible>
-  <title>Enter Delegate</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>True</auto_close>
-  <hide_on_close>True</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>cancel-button</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>delegate-hbox</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Delegate To:</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>GtkButton</class>
-	<name>addressbook</name>
-	<can_focus>True</can_focus>
-	<label>Addressbook...</label>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	  <pack>GTK_PACK_END</pack>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
deleted file mode 100644
index 311d22b4c7..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Evolution calendar - Delegate selector dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_DELEGATE_DIALOG_H__
-#define __E_DELEGATE_DIALOG_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-
-
-
-#define E_TYPE_DELEGATE_DIALOG       (e_delegate_dialog_get_type ())
-#define E_DELEGATE_DIALOG(obj)       (GTK_CHECK_CAST ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog))
-#define E_DELEGATE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DELEGATE_DIALOG,	\
-				      EDelegateDialogClass))
-#define E_IS_DELEGATE_DIALOG(obj)    (GTK_CHECK_TYPE ((obj), E_TYPE_DELEGATE_DIALOG))
-#define E_IS_DELEGATE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG))
-
-
-typedef struct _EDelegateDialog		EDelegateDialog;
-typedef struct _EDelegateDialogClass	EDelegateDialogClass;
-typedef struct _EDelegateDialogPrivate	EDelegateDialogPrivate;
-
-struct _EDelegateDialog {
-	GtkObject object;
-
-	/* Private data */
-	EDelegateDialogPrivate *priv;
-};
-
-struct _EDelegateDialogClass {
-	GtkObjectClass parent_class;
-};
-
-GtkType          e_delegate_dialog_get_type          (void);
-
-EDelegateDialog* e_delegate_dialog_construct         (EDelegateDialog *etd,
-						      const char      *name,
-						      const char      *address);
-
-EDelegateDialog* e_delegate_dialog_new               (const char      *name,
-						      const char      *address);
-
-char*            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);
-
-char*            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);
-
-void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
-						      const char      *address);
-
-GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
-
-
-
-
-#endif /* __E_DELEGATE_DIALOG_H__ */
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
deleted file mode 100644
index 4c0862c9f7..0000000000
--- a/calendar/gui/dialogs/event-editor.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnome/gnome-i18n.h>
-#include <widgets/misc/e-dateedit.h>
-
-#include "event-page.h"
-#include "alarm-page.h"
-#include "recurrence-page.h"
-#include "meeting-page.h"
-#include "schedule-page.h"
-#include "cancel-comp.h"
-#include "event-editor.h"
-
-struct _EventEditorPrivate {
-	EventPage *event_page;
-	AlarmPage *alarm_page;
-	RecurrencePage *recur_page;
-	MeetingPage *meet_page;
-	SchedulePage *sched_page;
-
-	EMeetingModel *model;
-
-	gboolean meeting_shown;
-	gboolean existing_org;
-	gboolean updating;	
-};
-
-
-
-static void event_editor_class_init (EventEditorClass *class);
-static void event_editor_init (EventEditor *ee);
-static void event_editor_set_cal_client (CompEditor *editor, CalClient *client);
-static void event_editor_edit_comp (CompEditor *editor, CalComponent *comp);
-static void event_editor_send_comp (CompEditor *editor, CalComponentItipMethod method);
-static void event_editor_destroy (GtkObject *object);
-
-static void schedule_meeting_cmd (GtkWidget *widget, gpointer data);
-static void refresh_meeting_cmd (GtkWidget *widget, gpointer data);
-static void cancel_meeting_cmd (GtkWidget *widget, gpointer data);
-static void forward_cmd (GtkWidget *widget, gpointer data);
-
-static void model_row_changed_cb (ETableModel *etm, int row, gpointer data);
-static void row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data);
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cmd),
-	BONOBO_UI_UNSAFE_VERB ("ActionRefreshMeeting", refresh_meeting_cmd),
-	BONOBO_UI_UNSAFE_VERB ("ActionCancelMeeting", cancel_meeting_cmd),
-	BONOBO_UI_UNSAFE_VERB ("ActionForward", forward_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static CompEditorClass *parent_class;
-
-
-
-/**
- * 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 (TYPE_COMP_EDITOR,
-						     &event_editor_info);
-	}
-
-	return event_editor_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-event_editor_class_init (EventEditorClass *klass)
-{
-	GtkObjectClass *object_class;
-	CompEditorClass *editor_class;
-	
-	object_class = (GtkObjectClass *) klass;
-	editor_class = (CompEditorClass *) klass;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR);
-
-	editor_class->set_cal_client = event_editor_set_cal_client;
-	editor_class->edit_comp = event_editor_edit_comp;
-	editor_class->send_comp = event_editor_send_comp;
-	
-	object_class->destroy = event_editor_destroy;
-}
-
-static void
-set_menu_sens (EventEditor *ee) 
-{
-	EventEditorPrivate *priv;
-	gboolean sens;
-	
-	priv = ee->priv;
-
-	sens = priv->meeting_shown;
-	comp_editor_set_ui_prop (COMP_EDITOR (ee), 
-				 "/commands/ActionScheduleMeeting", 
-				 "sensitive", sens ? "0" : "1");
-
-	sens = sens && priv->existing_org;
-	comp_editor_set_ui_prop (COMP_EDITOR (ee), 
-				 "/commands/ActionRefreshMeeting", 
-				 "sensitive", sens ? "1" : "0");
-	comp_editor_set_ui_prop (COMP_EDITOR (ee), 
-				 "/commands/ActionCancelMeeting", 
-				 "sensitive", sens ? "1" : "0");
-}
-
-static void
-init_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->model), "model_row_changed",
-			    GTK_SIGNAL_FUNC (model_row_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_inserted",
-			    GTK_SIGNAL_FUNC (row_count_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_deleted",
-			    GTK_SIGNAL_FUNC (row_count_changed_cb), ee);
-}
-
-/* Object initialization function for the event editor */
-static void
-event_editor_init (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	
-	priv = g_new0 (EventEditorPrivate, 1);
-	ee->priv = priv;
-
-	priv->event_page = event_page_new ();
-	comp_editor_append_page (COMP_EDITOR (ee), 
-				 COMP_EDITOR_PAGE (priv->event_page),
-				 _("Appointment"));
-
-	priv->alarm_page = alarm_page_new ();
-	comp_editor_append_page (COMP_EDITOR (ee),
-				 COMP_EDITOR_PAGE (priv->alarm_page),
-				 _("Reminder"));
-
-	priv->recur_page = recurrence_page_new ();
-	comp_editor_append_page (COMP_EDITOR (ee),
-				 COMP_EDITOR_PAGE (priv->recur_page),
-				 _("Recurrence"));
-	
-	priv->model = E_MEETING_MODEL (e_meeting_model_new ());
-	
-	priv->sched_page = schedule_page_new (priv->model);
-	comp_editor_append_page (COMP_EDITOR (ee),
-				 COMP_EDITOR_PAGE (priv->sched_page),
-				 _("Scheduling"));
-
-	priv->meet_page = meeting_page_new (priv->model);
-	comp_editor_append_page (COMP_EDITOR (ee),
-				 COMP_EDITOR_PAGE (priv->meet_page),
-				 _("Meeting"));
-
- 	comp_editor_merge_ui (COMP_EDITOR (ee), "evolution-event-editor.xml", verbs);
-
-	priv->meeting_shown = TRUE;
-	priv->existing_org = FALSE;
-	priv->updating = FALSE;	
-
-	init_widgets (ee);
-	set_menu_sens (ee);	
-}
-
-static void
-event_editor_set_cal_client (CompEditor *editor, CalClient *client)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	
-	ee = EVENT_EDITOR (editor);
-	priv = ee->priv;
-
-	e_meeting_model_set_cal_client (priv->model, client);
-	
-	if (parent_class->set_cal_client)
-		parent_class->set_cal_client (editor, client);	
-}
-
-static void
-event_editor_edit_comp (CompEditor *editor, CalComponent *comp)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	GSList *attendees = NULL;
-	
-	ee = EVENT_EDITOR (editor);
-	priv = ee->priv;
-	
-	priv->updating = TRUE;
-
-	priv->existing_org = cal_component_has_organizer (comp);
-	cal_component_get_attendee_list (comp, &attendees);
-
-	e_meeting_model_remove_all_attendees (priv->model);
-	if (attendees == NULL) {
-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->sched_page));
-		priv->meeting_shown = FALSE;
-	} else {
-		GSList *l;
-
-		if (!priv->meeting_shown) {
-			comp_editor_append_page (COMP_EDITOR (ee),
-						 COMP_EDITOR_PAGE (priv->sched_page),
-						 _("Scheduling"));
-			comp_editor_append_page (COMP_EDITOR (ee),
-						 COMP_EDITOR_PAGE (priv->meet_page),
-						 _("Meeting"));
-		}
-		
-		for (l = attendees; l != NULL; l = l->next) {
-			CalComponentAttendee *ca = l->data;
-			EMeetingAttendee *ia;
-
-			ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca));
-			e_meeting_model_add_attendee (priv->model, ia);
-			gtk_object_unref (GTK_OBJECT (ia));
-		}
-		priv->meeting_shown = TRUE;
-	}	
-	cal_component_free_attendee_list (attendees);
-
-	set_menu_sens (ee);
-	comp_editor_set_needs_send (COMP_EDITOR (ee), priv->meeting_shown);
-	
-	priv->updating = FALSE;
-	
-	if (parent_class->edit_comp)
-		parent_class->edit_comp (editor, comp);
-}
-
-static void
-event_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)
-{
-	EventEditor *ee = EVENT_EDITOR (editor);
-	EventEditorPrivate *priv;
-	CalComponent *comp = NULL;
-
-	priv = ee->priv;
-
-	/* Don't cancel more than once or when just publishing */
-	if (method == CAL_COMPONENT_METHOD_PUBLISH ||
-	    method == CAL_COMPONENT_METHOD_CANCEL)
-		goto parent;
-	
-	comp = meeting_page_get_cancel_comp (priv->meet_page);
-	if (comp != NULL) {
-		CalClient *client;
-		
-		client = e_meeting_model_get_cal_client (priv->model);
-		itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
- parent:
-	if (parent_class->send_comp)
-		parent_class->send_comp (editor, method);
-}
-
-/* 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;
-
-	gtk_object_unref (GTK_OBJECT (priv->event_page));
-	gtk_object_unref (GTK_OBJECT (priv->alarm_page));
-	gtk_object_unref (GTK_OBJECT (priv->recur_page));
-	gtk_object_unref (GTK_OBJECT (priv->meet_page));
-	gtk_object_unref (GTK_OBJECT (priv->sched_page));
-
-	gtk_object_destroy (GTK_OBJECT (priv->model));
-	gtk_object_unref (GTK_OBJECT (priv->model));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/**
- * 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)
-{
-	return EVENT_EDITOR (gtk_type_new (TYPE_EVENT_EDITOR));
-}
-
-static void
-show_meeting (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	if (!priv->meeting_shown) {
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->sched_page),
-					 _("Scheduling"));
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Meeting"));
-		priv->meeting_shown = TRUE;
-
-		set_menu_sens (ee);
- 		comp_editor_set_changed (COMP_EDITOR (ee), priv->meeting_shown);
-		comp_editor_set_needs_send (COMP_EDITOR (ee), priv->meeting_shown);
-	}
-	
-	comp_editor_show_page (COMP_EDITOR (ee),
-			       COMP_EDITOR_PAGE (priv->meet_page));
-}
-
-void
-event_editor_show_meeting (EventEditor *ee)
-{
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-
-	show_meeting (ee);
-}
-
-static void
-schedule_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-
-	show_meeting (ee);
-}
-
-static void
-refresh_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	
-	comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_REFRESH);
-}
-
-static void
-cancel_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	CalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (COMP_EDITOR (ee));
-	if (cancel_component_dialog (comp)) {
-		comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_CANCEL);
-		comp_editor_delete_comp (COMP_EDITOR (ee));
-	}
-}
-
-static void
-forward_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-
-	if (comp_editor_save_comp (COMP_EDITOR (ee), TRUE))
-		comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_PUBLISH);
-}
-
-static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	EventEditorPrivate *priv;
-	
-	priv = ee->priv;
-	
-	if (!priv->updating)
-		comp_editor_set_changed (COMP_EDITOR (ee), TRUE);
-}
-
-static void
-row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	EventEditorPrivate *priv;
-	
-	priv = ee->priv;
-	
-	if (!priv->updating)
-		comp_editor_set_changed (COMP_EDITOR (ee), TRUE);
-}
diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h
deleted file mode 100644
index d27bb8e52d..0000000000
--- a/calendar/gui/dialogs/event-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_H__
-#define __EVENT_EDITOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include "comp-editor.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 {
-	CompEditor parent;
-
-	/* Private data */
-	EventEditorPrivate *priv;
-};
-
-struct _EventEditorClass {
-	CompEditorClass parent_class;
-};
-
-GtkType      event_editor_get_type     (void);
-EventEditor *event_editor_construct    (EventEditor *ee);
-EventEditor *event_editor_new          (void);
-void         event_editor_show_meeting (EventEditor *ee);
-
-
-
-#endif /* __EVENT_EDITOR_H__ */
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
deleted file mode 100644
index a12bce2c47..0000000000
--- a/calendar/gui/dialogs/event-page.c
+++ /dev/null
@@ -1,1439 +0,0 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtktogglebutton.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-categories.h>
-#include "e-util/e-categories-config.h"
-#include "e-util/e-dialog-widgets.h"
-#include "widgets/misc/e-dateedit.h"
-#include "cal-util/timeutil.h"
-#include "../calendar-config.h"
-#include "../e-timezone-entry.h"
-#include "comp-editor-util.h"
-#include "event-page.h"
-
-
-
-/* Private part of the EventPage structure */
-struct _EventPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *main;
-
-	GtkWidget *summary;
-	GtkWidget *location;
-
-	GtkWidget *start_time;
-	GtkWidget *end_time;
-	GtkWidget *start_timezone;
-	GtkWidget *end_timezone;
-	GtkWidget *all_day_event;
-
-	GtkWidget *description;
-
-	GtkWidget *classification_public;
-	GtkWidget *classification_private;
-	GtkWidget *classification_confidential;
-
-	GtkWidget *show_time_as_free;
-	GtkWidget *show_time_as_busy;
-
-	GtkWidget *contacts_btn;
-	GtkWidget *contacts_box;
-
-	GtkWidget *categories_btn;
-	GtkWidget *categories;
-
-	gboolean updating;
-
-	/* This is TRUE if both the start & end timezone are the same. If the
-	   start timezone is then changed, we updated the end timezone to the
-	   same value, since 99% of events start and end in one timezone. */
-	gboolean sync_timezones;
-
-	/* The Corba component for selecting contacts, and the entry field
-	   which we place in the dialog. */
-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-	GtkWidget *contacts_entry;
-};
-
-
-
-static void event_page_class_init (EventPageClass *class);
-static void event_page_init (EventPage *epage);
-static void event_page_destroy (GtkObject *object);
-
-static GtkWidget *event_page_get_widget (CompEditorPage *page);
-static void event_page_focus_main_widget (CompEditorPage *page);
-static void event_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean event_page_fill_component (CompEditorPage *page, CalComponent *comp);
-static void event_page_set_summary (CompEditorPage *page, const char *summary);
-static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * event_page_get_type:
- * 
- * Registers the #EventPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #EventPage class.
- **/
-GtkType
-event_page_get_type (void)
-{
-	static GtkType event_page_type;
-
-	if (!event_page_type) {
-		static const GtkTypeInfo event_page_info = {
-			"EventPage",
-			sizeof (EventPage),
-			sizeof (EventPageClass),
-			(GtkClassInitFunc) event_page_class_init,
-			(GtkObjectInitFunc) event_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		event_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE, 
-						   &event_page_info);
-	}
-
-	return event_page_type;
-}
-
-/* Class initialization function for the event page */
-static void
-event_page_class_init (EventPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = event_page_get_widget;
-	editor_page_class->focus_main_widget = event_page_focus_main_widget;
-	editor_page_class->fill_widgets = event_page_fill_widgets;
-	editor_page_class->fill_component = event_page_fill_component;
-	editor_page_class->set_summary = event_page_set_summary;
-	editor_page_class->set_dates = event_page_set_dates;
-
-	object_class->destroy = event_page_destroy;
-}
-
-/* Object initialization function for the event page */
-static void
-event_page_init (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = g_new0 (EventPagePrivate, 1);
-	epage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->summary = NULL;
-	priv->location = NULL;
-	priv->start_time = NULL;
-	priv->end_time = NULL;
-	priv->start_timezone = NULL;
-	priv->end_timezone = NULL;
-	priv->all_day_event = NULL;
-	priv->description = NULL;
-	priv->classification_public = NULL;
-	priv->classification_private = NULL;
-	priv->classification_confidential = NULL;
-	priv->show_time_as_free = NULL;
-	priv->show_time_as_busy = NULL;
-	priv->contacts_btn = NULL;
-	priv->contacts_box = NULL;
-	priv->categories_btn = NULL;
-	priv->categories = NULL;
-
-	priv->updating = FALSE;
-	priv->sync_timezones = FALSE;
-
-	priv->corba_select_names = CORBA_OBJECT_NIL;
-	priv->contacts_entry = NULL;
-}
-
-/* Destroy handler for the event page */
-static void
-event_page_destroy (GtkObject *object)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_EVENT_PAGE (object));
-
-	epage = EVENT_PAGE (object);
-	priv = epage->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);
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	epage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-static const int transparency_map[] = {
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	-1
-};
-
-/* get_widget handler for the event page */
-static GtkWidget *
-event_page_get_widget (CompEditorPage *page)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the event page */
-static void
-event_page_focus_main_widget (CompEditorPage *page)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	gtk_widget_grab_focus (priv->summary);
-}
-
-/* Sets the 'All Day Event' flag to the given value (without emitting signals),
- * and shows or hides the widgets as appropriate. */
-static void
-set_all_day (EventPage *epage, gboolean all_day)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->all_day_event),
-					  epage);
-	e_dialog_toggle_set (priv->all_day_event, all_day);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->all_day_event),
-					    epage);
-
-	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);
-
-	/* DATE values do not have timezones, so we hide the fields. */
-	if (all_day) {
-		gtk_widget_hide (priv->start_timezone);
-		gtk_widget_hide (priv->end_timezone);
-	} else {
-		gtk_widget_show (priv->start_timezone);
-		gtk_widget_show (priv->end_timezone);
-	}
-}
-
-static void
-update_time (EventPage *epage, CalComponentDateTime *start_date, CalComponentDateTime *end_date)
-{
-	EventPagePrivate *priv;
-	struct icaltimetype *start_tt, *end_tt;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-	CalClientGetStatus status;
-	gboolean all_day_event;
-
-	priv = epage->priv;
-
-	/* Note that if we are creating a new event, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
-	start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date->tzid);
-	if (!start_zone) {
-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (epage)->client,
-						  start_date->tzid,
-						  &start_zone);
-		/* FIXME: Handle error better. */
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			g_warning ("Couldn't get timezone from server: %s",
-				   start_date->tzid ? start_date->tzid : "");
-	}
-
-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date->tzid);
-	if (!end_zone) {
-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (epage)->client,
-						  end_date->tzid,
-						  &end_zone);
-		/* FIXME: Handle error better. */
-		if (status != CAL_CLIENT_GET_SUCCESS)
-		  g_warning ("Couldn't get timezone from server: %s",
-			     end_date->tzid ? end_date->tzid : "");
-	}
-
-	/* If both times are DATE values, we set the 'All Day Event' checkbox.
-	   Also, if DTEND is after DTSTART, we subtract 1 day from it. */
-	all_day_event = FALSE;
-	start_tt = start_date->value;
-	end_tt = end_date->value;
-	if (start_tt->is_date && end_tt->is_date) {
-		all_day_event = TRUE;
-		if (icaltime_compare_date_only (*end_tt, *start_tt) > 0) {
-			icaltime_adjust (end_tt, -1, 0, 0, 0);
-		}
-	}
-
-	set_all_day (epage, all_day_event);
-
-	/* If it is an all day event, we set both timezones to the current
-	   timezone, so that if the user toggles the 'All Day Event' checkbox
-	   the event uses the current timezone rather than none at all. */
-	if (all_day_event) {
-		char *location = calendar_config_get_timezone ();
-		start_zone = end_zone = icaltimezone_get_builtin_timezone (location);
-	}
-
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), epage);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt->year,
-			      start_tt->month, start_tt->day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-				     start_tt->hour, start_tt->minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->end_time), end_tt->year,
-			      end_tt->month, end_tt->day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-				     end_tt->hour, end_tt->minute);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	/* Set the timezones, and set sync_timezones to TRUE if both timezones
-	   are the same. */
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_timezone),
-					  epage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_timezone), epage);
-	
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
-				       start_zone);
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone),
-				       end_zone);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_timezone),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_timezone),
-					    epage);
-
-	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
-
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-	/* Summary, description */
-	e_dialog_editable_set (priv->summary, NULL);
-	e_dialog_editable_set (priv->location, NULL);
-	e_dialog_editable_set (priv->description, NULL);
-
-	/* Start and end times */
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), epage);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), 0);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), 0);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	set_all_day (epage, FALSE);
-
-	/* Classification */
-	e_dialog_radio_set (priv->classification_public,
-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Show Time As (Transparency) */
-	e_dialog_radio_set (priv->show_time_as_free,
-			    CAL_COMPONENT_TRANSP_OPAQUE, transparency_map);
-
-	/* Categories */
-	e_dialog_editable_set (priv->categories, NULL);
-}
-
-
-static void
-contacts_changed_cb (BonoboListener    *listener,
-		     char              *event_name,
-		     CORBA_any         *arg,
-		     CORBA_Environment *ev,
-		     gpointer           data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-	
-#if 0
-	g_print ("In contacts_changed_cb\n");
-#endif
-
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
-}
-
-
-/* fill_widgets handler for the event page */
-static void
-event_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	CalComponentText text;
-	CalComponentClassification cl;
-	CalComponentTransparency transparency;
-	CalComponentDateTime start_date, end_date;
-	const char *location;
-	const char *categories;
-	GSList *l;
-
-	g_return_if_fail (page->client != NULL);
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	/* Don't send off changes during this time */
-	priv->updating = TRUE;
-
-	/* Clean the page */
-	clear_widgets (epage);
-
-	/* Summary, location, description(s) */
-
-	cal_component_get_summary (comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-
-	cal_component_get_location (comp, &location);
-	e_dialog_editable_set (priv->location, location);
-
-	cal_component_get_description_list (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 */
-
-	cal_component_get_dtstart (comp, &start_date);
-	cal_component_get_dtend (comp, &end_date);
-
-	update_time (epage, &start_date, &end_date);
-	
-	cal_component_free_datetime (&start_date);
-	cal_component_free_datetime (&end_date);
-
-	/* Classification */
-
-	cal_component_get_classification (comp, &cl);
-
-	switch (cl) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-		break;
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-		break;
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-		break;
-
-	default:
-		/* default to PUBLIC */
-		e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-		break;
-	}
-
-
-	/* Show Time As (Transparency) */
-	cal_component_get_transparency (comp, &transparency);
-	switch (transparency) {
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-	    	e_dialog_radio_set (priv->show_time_as_free,
-				    CAL_COMPONENT_TRANSP_TRANSPARENT,
-				    transparency_map);
-		break;
-
-	default:
-	    	e_dialog_radio_set (priv->show_time_as_free,
-				    CAL_COMPONENT_TRANSP_OPAQUE,
-				    transparency_map);
-		break;
-	}
-
-
-
-	/* Categories */
-	cal_component_get_categories (comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	/* Contacts */
-	comp_editor_contacts_to_widget (priv->contacts_entry, comp);
-
-	/* We connect the contacts changed signal here, as we have to be a bit
-	   more careful with it due to the use of Corba. The priv->updating
-	   flag won't work as we won't get the changed event immediately.
-	   FIXME: Unfortunately this doesn't work either. We never get the
-	   changed event now. */
-	comp_editor_connect_contacts_changed (priv->contacts_entry,
-					      contacts_changed_cb, epage);
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the event page */
-static gboolean
-event_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	CalComponentDateTime start_date, end_date;
-	struct icaltimetype start_tt, end_tt;
-	gboolean all_day_event, start_date_set, end_date_set;
-	char *cat, *str;
-	CalComponentClassification classif;
-	CalComponentTransparency transparency;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	/* Summary */
-
-	str = e_dialog_editable_get (priv->summary);
-	if (!str || strlen (str) == 0)
-		cal_component_set_summary (comp, NULL);
-	else {
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		cal_component_set_summary (comp, &text);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Location */
-
-	str = e_dialog_editable_get (priv->location);
-	if (!str || strlen (str) == 0)
-		cal_component_set_location (comp, NULL);
-	else
-		cal_component_set_location (comp, str);
-
-	if (str)
-		g_free (str);
-
-	/* Description */
-
-	str = e_dialog_editable_get (priv->description);
-	if (!str || 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);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Dates */
-
-	start_tt = icaltime_null_time ();
-	start_date.value = &start_tt;
-	start_date.tzid = NULL;
-
-	end_tt = icaltime_null_time ();
-	end_date.value = &end_tt;
-	end_date.tzid = NULL;
-
-	start_date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					       &start_tt.year,
-					       &start_tt.month,
-					       &start_tt.day);
-	g_assert (start_date_set);
-
-	end_date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					     &end_tt.year,
-					     &end_tt.month,
-					     &end_tt.day);
-	g_assert (end_date_set);
-
-	/* If the all_day toggle is set, we use DATE values for DTSTART and
-	   DTEND. If not, we fetch the hour & minute from the widgets. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	if (all_day_event) {
-		start_tt.is_date = TRUE;
-		end_tt.is_date = TRUE;
-
-		/* We have to add 1 day to DTEND, as it is not inclusive. */
-		icaltime_adjust (&end_tt, 1, 0, 0, 0);
-	} else {
-		icaltimezone *start_zone, *end_zone;
-
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-					     &start_tt.hour,
-					     &start_tt.minute);
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-					     &end_tt.hour,
-					     &end_tt.minute);
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		start_date.tzid = icaltimezone_get_tzid (start_zone);
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-		end_date.tzid = icaltimezone_get_tzid (end_zone);
-	}
-
-	cal_component_set_dtstart (comp, &start_date);
-	cal_component_set_dtend (comp, &end_date);
-
-
-	/* Categories */
-
-	cat = e_dialog_editable_get (priv->categories);
-	str = comp_editor_strip_categories (cat);
-	if (cat)
-		g_free (cat);
-
-	cal_component_set_categories (comp, str);
-
-	if (str)
-		g_free (str);
-
-	/* Classification */
-
-	classif = e_dialog_radio_get (priv->classification_public,
-				      classification_map);
-	cal_component_set_classification (comp, classif);
-
-	/* Show Time As (Transparency) */
-
-	transparency = e_dialog_radio_get (priv->show_time_as_free,
-					   transparency_map);
-	cal_component_set_transparency (comp, transparency);
-
-	/* Contacts */
-
-	comp_editor_contacts_to_component (priv->contacts_entry, comp);
-
-	return TRUE;
-}
-
-/* set_summary handler for the event page */
-static void
-event_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	/* nothing */
-}
-
-static void
-event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{	
-	update_time (EVENT_PAGE (page), dates->start, dates->end);
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (EventPage *epage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (epage);
-	EventPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = epage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("event-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->summary = GW ("general-summary");
-	priv->location = GW ("location");
-
-	priv->start_time = GW ("start-time");
-	priv->end_time = GW ("end-time");
-	priv->start_timezone = GW ("start-timezone");
-	priv->end_timezone = GW ("end-timezone");
-	priv->all_day_event = GW ("all-day-event");
-
-	priv->description = GW ("description");
-
-	priv->classification_public = GW ("classification-public");
-	priv->classification_private = GW ("classification-private");
-	priv->classification_confidential = GW ("classification-confidential");
-
-	priv->show_time_as_free = GW ("show-time-as-free");
-	priv->show_time_as_busy = GW ("show-time-as-busy");
-
-	priv->contacts_btn = GW ("contacts-button");
-	priv->contacts_box = GW ("contacts-box");
-
-	priv->categories_btn = GW ("categories-button");
-	priv->categories = GW ("categories");
-
-#undef GW
-
-	return (priv->summary
-		&& priv->location
-		&& priv->start_time
-		&& priv->end_time
-		&& priv->start_timezone
-		&& priv->end_timezone
-		&& priv->all_day_event
-		&& priv->description
-		&& priv->classification_public
-		&& priv->classification_private
-		&& priv->classification_confidential
-		&& priv->show_time_as_free
-		&& priv->show_time_as_busy
-		&& priv->contacts_btn
-		&& priv->contacts_box
-		&& priv->categories_btn
-		&& priv->categories);
-}
-
-/* Callback used when the summary changes; we emit the notification signal. */
-static void
-summary_changed_cb (GtkEditable *editable, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	gchar *summary;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-	
-	if (priv->updating)
-		return;
-	
-	summary = e_dialog_editable_get (GTK_WIDGET (editable));
-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (epage),
-						 summary);
-	g_free (summary);
-}
-
-
-/* Note that this assumes that the start_tt and end_tt passed to it are the
-   dates visible to the user. For DATE values, we have to add 1 day to the
-   end_tt before emitting the signal. */
-static void
-notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
-		      struct icaltimetype *end_tt)
-{
-	EventPagePrivate *priv;
-	CompEditorPageDates dates;
-	CalComponentDateTime start_dt, end_dt;
-	gboolean all_day_event;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-
-	priv = epage->priv;
-	
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	start_dt.value = start_tt;
-	end_dt.value = end_tt;
-
-	if (all_day_event) {
-		/* The actual DTEND is 1 day after the displayed date for
-		   DATE values. */
-		icaltime_adjust (end_tt, 1, 0, 0, 0);
-	} else {
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-	}
-
-	start_dt.tzid = start_zone ? icaltimezone_get_tzid (start_zone) : NULL;
-	end_dt.tzid = end_zone ? icaltimezone_get_tzid (end_zone) : NULL;
-
-	dates.start = &start_dt;
-	dates.end = &end_dt;
-
-	dates.due = NULL;
-	dates.complete = NULL;
-
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (epage),
-					       &dates);
-}
-
-
-static gboolean
-check_start_before_end (struct icaltimetype *start_tt,
-			icaltimezone *start_zone,
-			struct icaltimetype *end_tt,
-			icaltimezone *end_zone,
-			gboolean adjust_end_time)
-{
-	struct icaltimetype end_tt_copy;
-	int cmp;
-
-	/* Convert the end time to the same timezone as the start time. */
-	end_tt_copy = *end_tt;
-	icaltimezone_convert_time (&end_tt_copy, end_zone, start_zone);
-
-	/* Now check if the start time is after the end time. If it is,
-	   we need to modify one of the times. */
-	cmp = icaltime_compare (*start_tt, end_tt_copy);
-	if (cmp > 0) {
-		if (adjust_end_time) {
-			/* Modify the end time, to be the start + 1 hour. */
-			*end_tt = *start_tt;
-			icaltime_adjust (end_tt, 0, 1, 0, 0);
-			icaltimezone_convert_time (end_tt, start_zone,
-						   end_zone);
-		} else {
-			/* Modify the start time, to be the end - 1 hour. */
-			*start_tt = *end_tt;
-			icaltime_adjust (start_tt, 0, -1, 0, 0);
-			icaltimezone_convert_time (start_tt, end_zone,
-						   start_zone);
-		}
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-/*
- * This is called whenever the start or end dates or timezones is changed.
- * It makes sure that the start date < end date. It also emits the notification
- * signals so the other event editor pages update their labels etc.
- *
- * If adjust_end_time is TRUE, if the start time < end time it will adjust
- * the end time. If FALSE it will adjust the start time. If the user sets the
- * start or end time, the other time is adjusted to make it valid.
- */
-static void
-times_updated (EventPage *epage, gboolean adjust_end_time)
-{
-	EventPagePrivate *priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
-	gboolean date_set, all_day_event;
-	gboolean set_start_date = FALSE, set_end_date = FALSE;
-	icaltimezone *start_zone, *end_zone;
-	
-	priv = epage->priv;
-
-	if (priv->updating)
-		return;
-
-	/* Fetch the start and end times and timezones from the widgets. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	g_assert (date_set);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					 &end_tt.year,
-					 &end_tt.month,
-					 &end_tt.day);
-	g_assert (date_set);
-
-	if (all_day_event) {
-		/* All Day Events are simple. We just compare the dates and if
-		   start > end we copy one of them to the other. */
-		int cmp = icaltime_compare_date_only (start_tt, end_tt);
-		if (cmp > 0) {
-			if (adjust_end_time) {
-				end_tt = start_tt;
-				set_end_date = TRUE;
-			} else {
-				start_tt = end_tt;
-				set_start_date = TRUE;
-			}
-		}
-
-		start_tt.is_date = TRUE;
-		end_tt.is_date = TRUE;
-	} else {
-		/* For DATE-TIME events, we have to convert to the same
-		   timezone before comparing. */
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-					     &start_tt.hour,
-					     &start_tt.minute);
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-					     &end_tt.hour,
-					     &end_tt.minute);
-
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-
-		if (check_start_before_end (&start_tt, start_zone,
-					    &end_tt, end_zone,
-					    adjust_end_time)) {
-			if (adjust_end_time)
-				set_end_date = TRUE;
-			else
-				set_start_date = TRUE;
-		}
-	}
-
-
-	if (set_start_date) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), epage);
-		e_date_edit_set_date (E_DATE_EDIT (priv->start_time),
-				      start_tt.year, start_tt.month,
-				      start_tt.day);
-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-					     start_tt.hour, start_tt.minute);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), epage);
-	}
-
-	if (set_end_date) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), epage);
-		e_date_edit_set_date (E_DATE_EDIT (priv->end_time),
-				      end_tt.year, end_tt.month, end_tt.day);
-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-					     end_tt.hour, end_tt.minute);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), epage);
-	}
-
-	/* Notify upstream */
-	notify_dates_changed (epage, &start_tt, &end_tt);
-}
-
-/* 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 (GtkWidget *dedit, gpointer data)
-{
-	EventPage *epage;
-	
-	epage = EVENT_PAGE (data);
-
-	times_updated (epage, dedit == epage->priv->start_time);
-}
-
-
-/* Callback used when the start timezone is changed. If sync_timezones is set,
- * we set the end timezone to the same value. It also updates the start time
- * labels on the other notebook pages.
- */
-static void
-start_timezone_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	icaltimezone *zone;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	if (priv->sync_timezones) {
-		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		priv->updating = TRUE;
-		e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
-		priv->updating = FALSE;
-	}
-
-	times_updated (epage, TRUE);
-}
-
-
-/* Callback used when the end timezone is changed. It checks if the end
- * timezone is the same as the start timezone and sets sync_timezones if so.
- */
-static void
-end_timezone_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	icaltimezone *start_zone, *end_zone;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-	end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-
-	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
-
-	times_updated (epage, TRUE);
-}
-
-/* Callback: all day event button toggled.
- * Note that this should only be called when the user explicitly toggles the
- * button. Be sure to block this handler when the toggle button's state is set
- * within the code.
- */
-static void
-all_day_event_toggled_cb (GtkWidget *toggle, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	gboolean all_day;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
-	gboolean date_set;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	/* When the all_day toggle is turned on, the start date is
-	 * rounded down to the start of the day, and end date is
-	 * rounded down to the start of the day on which the event
-	 * ends. The event is then taken to be inclusive of the days
-	 * between the start and end days.  Note that if the event end
-	 * is at midnight, we round it down to the previous day, so the
-	 * event times stay the same.
-	 *
-	 * When the all_day_toggle is turned off, then if the event is within
-	 * one day, we set the event start to the start of the working day,
-	 * and set the event end to one hour after it. If the event is longer
-	 * than one day, we set the event end to the end of the day it is on,
-	 * so that the actual event times remain the same.
-	 *
-	 * This may need tweaking to work well with different timezones used
-	 * in the event start & end.
-	 */
-	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	set_all_day (epage, all_day);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-				     &start_tt.hour,
-				     &start_tt.minute);
-	g_assert (date_set);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					 &end_tt.year,
-					 &end_tt.month,
-					 &end_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-				     &end_tt.hour,
-				     &end_tt.minute);
-	g_assert (date_set);
-
-	if (all_day) {
-		/* Round down to the start of the day. */
-		start_tt.hour = 0;
-		start_tt.minute  = 0;
-		start_tt.second  = 0;
-		start_tt.is_date = TRUE;
-
-		/* Round down to the start of the day, or the start of the
-		   previous day if it is midnight. */
-		icaltime_adjust (&end_tt, 0, 0, 0, -1);
-		end_tt.hour = 0;
-		end_tt.minute  = 0;
-		end_tt.second  = 0;
-		end_tt.is_date = TRUE;
-	} else {
-		icaltimezone *start_zone, *end_zone;
-
-		if (end_tt.year == start_tt.year
-		    && end_tt.month == start_tt.month
-		    && end_tt.day == start_tt.day) {
-			/* The event is within one day, so we set the event
-			   start to the start of the working day, and the end
-			   to one hour later. */
-			start_tt.hour = calendar_config_get_day_start_hour ();
-			start_tt.minute  = calendar_config_get_day_start_minute ();
-			start_tt.second  = 0;
-
-			end_tt = start_tt;
-			icaltime_adjust (&end_tt, 0, 1, 0, 0);
-		} else {
-			/* The event is longer than 1 day, so we keep exactly
-			   the same times, just using DATE-TIME rather than
-			   DATE. */
-			icaltime_adjust (&end_tt, 1, 0, 0, 0);
-		}
-
-		/* Make sure that end > start using the timezones. */
-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-		check_start_before_end (&start_tt, start_zone,
-					&end_tt, end_zone,
-					TRUE);
-	}
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
-					  epage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time),
-					  epage);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt.year,
-			      start_tt.month, start_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_time),
-				     start_tt.hour, start_tt.minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->end_time), end_tt.year,
-			      end_tt.month, end_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
-				     end_tt.hour, end_tt.minute);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
-					    epage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
-					    epage);
-
-	/* Notify upstream */
-	notify_dates_changed (epage, &start_tt, &end_tt);
-}
-
-/* Callback used when the contacts button is clicked; we must bring up the
- * contact list dialog.
- */
-static void
-contacts_clicked_cb (GtkWidget *button, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	comp_editor_show_contacts_dialog (priv->corba_select_names);
-
-	/* FIXME: Currently we aren't getting the changed event from the
-	   SelectNames component correctly, so we aren't saving the event
-	   if just the contacts are changed. To work around that, we assume
-	   that if the contacts button is clicked it is changed. */
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
-}
-
-/* Callback used when the categories button is clicked; we must bring up the
- * category list dialog.
- */
-static void
-categories_clicked_cb (GtkWidget *button, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	GtkWidget *entry;
-
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	entry = priv->categories;
-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
-}
-
-/* Hooks the widget signals */
-static gboolean
-init_widgets (EventPage *epage)
-{
-	EventPagePrivate *priv;
-	char *location;
-	icaltimezone *zone;
-
-	priv = epage->priv;
-
-	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->start_time),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   epage, NULL);
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->end_time),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   epage, NULL);
-
-	/* Summary */
-	gtk_signal_connect (GTK_OBJECT (priv->summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), epage);
-
-	/* Description - turn on word wrap. */
-	gtk_text_set_word_wrap (GTK_TEXT (priv->description), TRUE);
-
-	/* Start and end times */
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), epage);
-
-	gtk_signal_connect (GTK_OBJECT (priv->start_timezone), "changed",
-			    GTK_SIGNAL_FUNC (start_timezone_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->end_timezone), "changed",
-			    GTK_SIGNAL_FUNC (end_timezone_changed_cb), epage);
-
-	gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled",
-			    GTK_SIGNAL_FUNC (all_day_event_toggled_cb), epage);
-
-	/* Contacts button */
-	gtk_signal_connect (GTK_OBJECT (priv->contacts_btn), "clicked",
-			    GTK_SIGNAL_FUNC (contacts_clicked_cb), epage);
-
-	/* Categories button */
-	gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked",
-			    GTK_SIGNAL_FUNC (categories_clicked_cb), epage);
-
-	/* Connect the default signal handler to use to make sure we notify
-	 * upstream of changes to the widget values.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (priv->summary), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->location), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->start_timezone), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->end_timezone), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_public),
-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),
-			    epage);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_private),
-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),
-			    epage);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_confidential),
-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),
-			    epage);
-	gtk_signal_connect (GTK_OBJECT (priv->show_time_as_free),
-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),
-			    epage);
-	gtk_signal_connect (GTK_OBJECT (priv->show_time_as_busy),
-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),
-			    epage);
-	gtk_signal_connect (GTK_OBJECT (priv->categories), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-
-	/* Create the contacts entry, a corba control from the address book. */
-	priv->corba_select_names = comp_editor_create_contacts_component ();
-	if (priv->corba_select_names == CORBA_OBJECT_NIL)
-		return FALSE;
-
-	priv->contacts_entry = comp_editor_create_contacts_control (priv->corba_select_names);
-	if (priv->contacts_entry == NULL)
-		return FALSE;
-
-	gtk_container_add (GTK_CONTAINER (priv->contacts_box),
-			   priv->contacts_entry);
-
-	/* Set the default timezone, so the timezone entry may be hidden. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone);
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
-
-	return TRUE;
-}
-
-
-
-/**
- * event_page_construct:
- * @epage: An event page.
- * 
- * Constructs an event page by loading its Glade data.
- * 
- * Return value: The same object as @epage, or NULL if the widgets could not be
- * created.
- **/
-EventPage *
-event_page_construct (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-page.glade", 
-				   NULL);
-	if (!priv->xml) {
-		g_message ("event_page_construct(): " 
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (epage)) {
-		g_message ("event_page_construct(): " 
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	if (!init_widgets (epage)) {
-		g_message ("event_page_construct(): " 
-			   "Could not initialize the widgets!");
-		return NULL;
-	}
-
-	return epage;
-}
-
-/**
- * event_page_new:
- * 
- * Creates a new event page.
- * 
- * Return value: A newly-created event page, or NULL if the page could
- * not be created.
- **/
-EventPage *
-event_page_new (void)
-{
-	EventPage *epage;
-
-	epage = gtk_type_new (TYPE_EVENT_PAGE);
-	if (!event_page_construct (epage)) {
-		gtk_object_unref (GTK_OBJECT (epage));
-		return NULL;
-	}
-
-	return epage;
-}
-
-GtkWidget *make_date_edit (void);
-
-GtkWidget *
-make_date_edit (void)
-{
-	return comp_editor_new_date_edit (TRUE, TRUE, TRUE);
-}
-
-GtkWidget *make_timezone_entry (void);
-
-GtkWidget *
-make_timezone_entry (void)
-{
-	return e_timezone_entry_new ();
-}
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
deleted file mode 100644
index 6be310448a..0000000000
--- a/calendar/gui/dialogs/event-page.glade
+++ /dev/null
@@ -1,601 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>event-page</name>
-  <program_name>event-page</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>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>event-toplevel</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>GtkVBox</class>
-    <name>event-page</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>6</spacing>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table11</name>
-      <rows>2</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>label56</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>
-	<class>GtkLabel</class>
-	<name>label61</name>
-	<label>L_ocation:</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>location</default_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>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>location</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>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame31</name>
-      <label>Date &amp; 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>table12</name>
-	<border_width>4</border_width>
-	<rows>2</rows>
-	<columns>4</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label57</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>
-	  <focus_target>start-time</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>label58</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>
-	  <focus_target>end-time</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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>start-time</name>
-	  <can_focus>True</can_focus>
-	  <creation_function>make_date_edit</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>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>end-time</name>
-	  <can_focus>True</can_focus>
-	  <creation_function>make_date_edit</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>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>end-timezone</name>
-	  <creation_function>make_timezone_entry</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Mon, 18 Jun 2001 23:51:40 GMT</last_modification_time>
-	  <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>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>start-timezone</name>
-	  <creation_function>make_timezone_entry</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Mon, 18 Jun 2001 23:51:34 GMT</last_modification_time>
-	  <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>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment1</name>
-	  <xalign>1</xalign>
-	  <yalign>7.45058e-09</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</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>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>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow12</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>GtkHBox</class>
-      <name>hbox54</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame32</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>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox52</name>
-	  <border_width>2</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-public</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>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-private</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>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-confidential</name>
-	    <can_focus>True</can_focus>
-	    <label>Con_fidential</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame33</name>
-	<label>Show Time As</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>GtkHBox</class>
-	  <name>hbox55</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>show-time-as-free</name>
-	    <can_focus>True</can_focus>
-	    <label>F_ree</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>show_time_as_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>show-time-as-busy</name>
-	    <can_focus>True</can_focus>
-	    <label>B_usy</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>show_time_as_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox53</name>
-      <homogeneous>False</homogeneous>
-      <spacing>2</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>contacts-button</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>label59</name>
-	  <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>GtkEventBox</class>
-	<name>contacts-box</name>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>categories-button</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>label60</name>
-	  <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>
-	<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>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
deleted file mode 100644
index 3da59f4ada..0000000000
--- a/calendar/gui/dialogs/event-page.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_PAGE_H
-#define EVENT_PAGE_H
-
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_EVENT_PAGE            (event_page_get_type ())
-#define EVENT_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_EVENT_PAGE, EventPage))
-#define EVENT_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_PAGE, EventPageClass))
-#define IS_EVENT_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_EVENT_PAGE))
-#define IS_EVENT_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_EVENT_PAGE))
-
-typedef struct _EventPagePrivate EventPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	EventPagePrivate *priv;
-} EventPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} EventPageClass;
-
-
-GtkType    event_page_get_type  (void);
-EventPage *event_page_construct (EventPage *epage);
-EventPage *event_page_new       (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
deleted file mode 100644
index 2504ed3993..0000000000
--- a/calendar/gui/dialogs/meeting-page.c
+++ /dev/null
@@ -1,862 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <widgets/misc/e-dateedit.h>
-#include <e-util/e-dialog-widgets.h>
-#include "../component-factory.h"
-#include "../e-meeting-attendee.h"
-#include "../e-meeting-model.h"
-#include "../itip-utils.h"
-#include "comp-editor-util.h"
-#include "e-delegate-dialog.h"
-#include "meeting-page.h"
-
-
-
-enum columns {
-	MEETING_ATTENDEE_COL,
-	MEETING_MEMBER_COL,
-	MEETING_TYPE_COL,
-	MEETING_ROLE_COL,
-	MEETING_RSVP_COL,
-	MEETING_DELTO_COL,
-	MEETING_DELFROM_COL,
-	MEETING_STATUS_COL,
-	MEETING_CN_COL,
-	MEETING_LANG_COL,
-	MEETING_COLUMN_COUNT
-};
-
-/* Private part of the MeetingPage structure */
-struct _MeetingPagePrivate {
-	/* Lists of attendees */
-	GPtrArray *deleted_attendees;
-
-	/* To use in case of cancellation */
-	CalComponent *comp;
-	
-	/* List of identities */
-	GList *addresses;
-	GList *address_strings;
-	gchar *default_address;
-	
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-	GtkWidget *organizer_table;
-	GtkWidget *organizer;
-	GtkWidget *organizer_lbl;
-	GtkWidget *other_organizer;
-	GtkWidget *other_organizer_lbl;
-	GtkWidget *other_organizer_btn;
-	GtkWidget *existing_organizer_table;
-	GtkWidget *existing_organizer;
-	GtkWidget *existing_organizer_btn;
-	GtkWidget *invite;
-	
-	/* E Table stuff */
-	EMeetingModel *model;
-	ETableScrolled *etable;
-	gint row;
-	
-	/* For handling who the organizer is */
-	gboolean other;
-	gboolean existing;
-        gboolean updating;
-};
-
-
-
-static void meeting_page_class_init (MeetingPageClass *class);
-static void meeting_page_init (MeetingPage *mpage);
-static void meeting_page_destroy (GtkObject *object);
-
-static GtkWidget *meeting_page_get_widget (CompEditorPage *page);
-static void meeting_page_focus_main_widget (CompEditorPage *page);
-static void meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean meeting_page_fill_component (CompEditorPage *page, CalComponent *comp);
-
-static gint right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer data);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * meeting_page_get_type:
- * 
- * Registers the #MeetingPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #MeetingPage class.
- **/
-GtkType
-meeting_page_get_type (void)
-{
-	static GtkType meeting_page_type;
-
-	if (!meeting_page_type) {
-		static const GtkTypeInfo meeting_page_info = {
-			"MeetingPage",
-			sizeof (MeetingPage),
-			sizeof (MeetingPageClass),
-			(GtkClassInitFunc) meeting_page_class_init,
-			(GtkObjectInitFunc) meeting_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		meeting_page_type = 
-			gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-					 &meeting_page_info);
-	}
-
-	return meeting_page_type;
-}
-
-/* Class initialization function for the task page */
-static void
-meeting_page_class_init (MeetingPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = meeting_page_get_widget;
-	editor_page_class->focus_main_widget = meeting_page_focus_main_widget;
-	editor_page_class->fill_widgets = meeting_page_fill_widgets;
-	editor_page_class->fill_component = meeting_page_fill_component;
-	editor_page_class->set_summary = NULL;
-	editor_page_class->set_dates = NULL;
-
-	object_class->destroy = meeting_page_destroy;
-}
-
-/* Object initialization function for the task page */
-static void
-meeting_page_init (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	priv = g_new0 (MeetingPagePrivate, 1);
-	mpage->priv = priv;
-
-	priv->deleted_attendees = g_ptr_array_new ();
-
-	priv->comp = NULL;
-	
-	priv->xml = NULL;
-	priv->main = NULL;
-	priv->invite = NULL;
-	
-	priv->model = NULL;
-	priv->etable = NULL;
-	
-	priv->updating = FALSE;
-}
-
-static void
-set_attendees (CalComponent *comp, const GPtrArray *attendees)
-{
-	GSList *comp_attendees = NULL, *l;
-	int i;
-	
-	for (i = 0; i < attendees->len; i++) {
-		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
-		CalComponentAttendee *ca;
-		
-		ca = e_meeting_attendee_as_cal_component_attendee (ia);
-		
-		comp_attendees = g_slist_prepend (comp_attendees, ca);
-		
-	}
-	comp_attendees = g_slist_reverse (comp_attendees);
-	cal_component_set_attendee_list (comp, comp_attendees);
-	
-	for (l = comp_attendees; l != NULL; l = l->next)
-		g_free (l->data);	
-	g_slist_free (comp_attendees);
-}
-
-static void
-cleanup_attendees (GPtrArray *attendees)
-{
-	int i;
-	
-	for (i = 0; i < attendees->len; i++)
-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (attendees, i)));
-}
-
-/* Destroy handler for the task page */
-static void
-meeting_page_destroy (GtkObject *object)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_MEETING_PAGE (object));
-
-	mpage = MEETING_PAGE (object);
-	priv = mpage->priv;
-
-	if (priv->comp != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-	
-	cleanup_attendees (priv->deleted_attendees);
-	g_ptr_array_free (priv->deleted_attendees, FALSE);
-	
-	itip_addresses_free (priv->addresses);
-	g_list_foreach (priv->address_strings, (GFunc) g_free, NULL);
-	g_list_free (priv->address_strings);
-
-	gtk_object_unref (GTK_OBJECT (priv->model));
-	
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	mpage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_widget handler for the task page */
-static GtkWidget *
-meeting_page_get_widget (CompEditorPage *page)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the task page */
-static void
-meeting_page_focus_main_widget (CompEditorPage *page)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	gtk_widget_grab_focus (priv->organizer);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	priv = mpage->priv;
-
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), "");
-	gtk_entry_set_text (GTK_ENTRY (priv->other_organizer), "");
-	gtk_label_set_text (GTK_LABEL (priv->existing_organizer), _("None"));
-
-	gtk_widget_show (priv->organizer_table);
-	gtk_widget_hide (priv->existing_organizer_table);	
-
-	gtk_widget_hide (priv->other_organizer_lbl);
-	gtk_widget_hide (priv->other_organizer);
-
-	priv->existing = FALSE;
-	priv->other = FALSE;
-}
-
-/* fill_widgets handler for the meeting page */
-static void
-meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	CalComponentOrganizer organizer;
-	GList *l;
-	
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean out old data */
-	if (priv->comp != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-	priv->comp = NULL;
-	
-	cleanup_attendees (priv->deleted_attendees);
-
-	/* Clean the screen */
-	clear_widgets (mpage);
-
-	/* Component for cancellation */
-	priv->comp = cal_component_clone (comp);
-	
-	/* Organizer */
-	cal_component_get_organizer (comp, &organizer);
-	priv->addresses = itip_addresses_get ();
-	for (l = priv->addresses; l != NULL; l = l->next) {
-		ItipAddress *a = l->data;
-		char *s;
-		
-		s = e_utf8_to_gtk_string (GTK_COMBO (priv->organizer)->entry, a->full);
-		priv->address_strings = g_list_append (priv->address_strings, s);
-		if (a->default_address)
-			priv->default_address = s;
-	}
-	gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), priv->address_strings);
-
-	if (organizer.value != NULL) {
-		const gchar *strip = itip_strip_mailto (organizer.value);
-		gchar *s, *string;
-
-		gtk_widget_hide (priv->organizer_table);
-		gtk_widget_show (priv->existing_organizer_table);
-		gtk_widget_hide (priv->invite);
-		
-		if (organizer.cn != NULL)
-			string = g_strdup_printf ("%s <%s>", organizer.cn, strip);
-		else
-			string = g_strdup (strip);
-		s = e_utf8_to_gtk_string (priv->existing_organizer, string);
-		gtk_label_set_text (GTK_LABEL (priv->existing_organizer), s);
-		g_free (s);
-		g_free (string);
-
-		priv->existing = TRUE;
-	} else {
-		gtk_widget_hide (priv->other_organizer_lbl);
-		gtk_widget_hide (priv->other_organizer);
-
-		e_dialog_editable_set (GTK_COMBO (priv->organizer)->entry, priv->default_address);
-	}
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the meeting page */
-static gboolean
-meeting_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	CalComponentOrganizer organizer = {NULL, NULL, NULL, NULL};
-
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	if (!priv->existing) {
-		gchar *addr = NULL, *cn = NULL;
-		GList *l;
-		
-		if (priv->other) {
-			addr = e_dialog_editable_get (priv->other_organizer);
-		} else {
-			gchar *str = e_dialog_editable_get (GTK_COMBO (priv->organizer)->entry);
-			for (l = priv->addresses; l != NULL; l = l->next) {
-				ItipAddress *a = l->data;
-				
-				if (!strcmp (a->full, str)) {
-					addr = g_strdup (a->address);
-					cn = g_strdup (a->name);
-				}
-			}
-			g_free (str);
-		}
-		
-		if (addr == NULL || strlen (addr) == 0) {
-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("An organizer is required."));
-			g_free (addr);
-			g_free (cn);
-			return FALSE;
-		} else {
-			gchar *tmp;
-			
-			tmp = addr;
-			addr = g_strdup_printf ("MAILTO:%s", addr);
-			g_free (tmp);
-		}
-	
-		organizer.value = addr;
-		organizer.cn = cn;
-		cal_component_set_organizer (comp, &organizer);
-		g_free (addr);
-		g_free (cn);
-	}
-
-	if (e_meeting_model_count_actual_attendees (priv->model) < 1) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("At least one attendee is required."));
-		return FALSE;
-	}
-	set_attendees (comp, e_meeting_model_get_attendees (priv->model));
-	
-	return TRUE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (MeetingPage *mpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (mpage);
-	MeetingPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = mpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("meeting-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->organizer_table = GW ("organizer-table");
-	priv->organizer = GW ("organizer");
-	priv->organizer_lbl = GW ("organizer-label");
-	priv->other_organizer = GW ("other-organizer");
-	priv->other_organizer_lbl = GW ("other-organizer-label");
-	priv->other_organizer_btn = GW ("other-organizer-button");
-	priv->existing_organizer_table = GW ("existing-organizer-table");
-	priv->existing_organizer = GW ("existing-organizer");
-	priv->existing_organizer_btn = GW ("existing-organizer-button");
-	priv->invite = GW ("invite");
-	
-#undef GW
-
-	return (priv->invite
-		&& priv->organizer_table
-		&& priv->organizer
-		&& priv->organizer_lbl
-		&& priv->other_organizer
-		&& priv->other_organizer_lbl
-		&& priv->other_organizer_btn
-		&& priv->existing_organizer_table
-		&& priv->existing_organizer
-		&& priv->existing_organizer_btn);
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));
-}
-
-/* Function called to make the organizer other than the user */
-static void
-other_clicked_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	gtk_widget_hide (priv->organizer_lbl);
-	gtk_widget_hide (priv->organizer);
-	gtk_widget_hide (priv->other_organizer_btn);
-	gtk_widget_show (priv->other_organizer_lbl);
-	gtk_widget_show (priv->other_organizer);
-
-	priv->other = TRUE;
-}
-
-/* Function called to change the organizer */
-static void
-change_clicked_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	gtk_widget_show (priv->organizer_table);
-	gtk_widget_hide (priv->existing_organizer_table);
-	gtk_widget_show (priv->invite);
-
-	gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), priv->address_strings);
-	e_dialog_editable_set (GTK_COMBO (priv->organizer)->entry, priv->default_address);
-
-	priv->existing = FALSE;
-}
-
-/* Function called to invite more people */
-static void
-invite_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	e_meeting_model_invite_others_dialog (priv->model);
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	priv = mpage->priv;
-
-	/* Organizer */
-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO (priv->organizer)->entry), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), mpage);
-
-	gtk_signal_connect (GTK_OBJECT (priv->other_organizer_btn), "clicked",
-			    GTK_SIGNAL_FUNC (other_clicked_cb), mpage);
-	gtk_signal_connect (GTK_OBJECT (priv->existing_organizer_btn), "clicked",
-			    GTK_SIGNAL_FUNC (change_clicked_cb), mpage);
-
-	/* Invite button */
-	gtk_signal_connect (GTK_OBJECT (priv->invite), "clicked", 
-			    GTK_SIGNAL_FUNC (invite_cb), mpage);
-}
-
-#if 0
-static void
-popup_delegate_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage = MEETING_PAGE (data);
-	MeetingPagePrivate *priv;
-	EDelegateDialog *edd;
-	GtkWidget *dialog;
-	EMeetingAttendee *ia;
-	char *address = NULL, *name = NULL;
-	
-	priv = mpage->priv;
-
-	ia = e_meeting_model_find_attendee_at_row (priv->model, priv->row);
-
-	/* Show dialog. */
-	edd = e_delegate_dialog_new (NULL, itip_strip_mailto (e_meeting_attendee_get_delto (ia)));
-	dialog = e_delegate_dialog_get_toplevel (edd);
-
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0){
-		EMeetingAttendee *ic;
-		
-		name = e_delegate_dialog_get_delegate_name (edd);
-		address = e_delegate_dialog_get_delegate (edd);
-
-		/* Make sure we can add the new delegatee person */
-		if (e_meeting_model_find_attendee (priv->model, address, NULL) != NULL) {
-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("That person is already attending the meeting!"));
-			goto cleanup;
-		}
-		
-		/* Update information for attendee */
-		if (e_meeting_attendee_is_set_delto (ia)) {
-			EMeetingAttendee *ib;
-			
-			ib = e_meeting_model_find_attendee (priv->model, itip_strip_mailto (e_meeting_attendee_get_delto (ia)), NULL);
-			if (ib != NULL) {
-				gtk_object_ref (GTK_OBJECT (ib));
-				g_ptr_array_add (priv->deleted_attendees, ib);
-				
-				e_meeting_model_remove_attendee (priv->model, ib);
-			}			
-		}
-		e_meeting_attendee_set_delto (ia, g_strdup_printf ("MAILTO:%s", address));
-
-		/* Construct delegatee information */
-		ic = e_meeting_model_add_attendee_with_defaults (priv->model);
-		
- 		e_meeting_attendee_set_address (ic, g_strdup_printf ("MAILTO:%s", address));
-		e_meeting_attendee_set_delfrom (ic, g_strdup (e_meeting_attendee_get_address (ia)));
-		e_meeting_attendee_set_cn (ic, g_strdup (name));
-	}
-
- cleanup:
-	g_free (name);
-	g_free (address);
-	gtk_object_unref (GTK_OBJECT (edd));
-}
-#endif
-
-static void
-popup_delete_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage = MEETING_PAGE (data);
-	MeetingPagePrivate *priv;
-	EMeetingAttendee *ia;
-	int pos = 0;
-	
-	priv = mpage->priv;
-
-	ia = e_meeting_model_find_attendee_at_row (priv->model, priv->row);
-
-	/* If this was a delegatee, no longer delegate */
-	if (e_meeting_attendee_is_set_delfrom (ia)) {
-		EMeetingAttendee *ib;
-		
-		ib = e_meeting_model_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos);
-		if (ib != NULL)
-			e_meeting_attendee_set_delto (ib, NULL);
-	}
-	
-	/* Handle deleting all attendees in the delegation chain */	
-	while (ia != NULL) {
-		EMeetingAttendee *ib = NULL;
-
-		gtk_object_ref (GTK_OBJECT (ia));
-		g_ptr_array_add (priv->deleted_attendees, ia);
-		e_meeting_model_remove_attendee (priv->model, ia);
-
-		if (e_meeting_attendee_get_delto (ia) != NULL)
-			ib = e_meeting_model_find_attendee (priv->model, e_meeting_attendee_get_delto (ia), NULL);
-		ia = ib;
-	}
-}
-
-enum {
-	CAN_DELEGATE = 2,
-	CAN_DELETE = 4
-};
-
-static EPopupMenu context_menu[] = {
-#if 0
-	E_POPUP_ITEM (N_("_Delegate To..."), GTK_SIGNAL_FUNC (popup_delegate_cb),  CAN_DELEGATE),
-
-	E_POPUP_SEPARATOR,
-#endif
-
-	E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (popup_delete_cb),   CAN_DELETE),
-	
-	E_POPUP_TERMINATOR
-};
-
-/* handle context menu over message-list */
-static gint
-right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer data)
-{
-	MeetingPage *mpage = MEETING_PAGE (data);
-	MeetingPagePrivate *priv;
-	GtkMenu *menu;
-	int enable_mask = 0, hide_mask = 0, view_row;
-
-	priv = mpage->priv;
-
-	view_row = e_table_model_to_view_row (etable, row);
-	priv->row = e_meeting_model_etable_view_to_model_row (etable, priv->model, view_row);
-	
-	/* FIXME: if you enable Delegate, then change index to '1' */
-	context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH);
-	
-	menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data);
-	e_auto_kill_popup_menu_on_hide (menu);
-	
-	gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
-			event->button.button, event->button.time);
-
-	return TRUE;
-}
-
-
-
-/* Callback used when the ETable gets a focus-out event.  We have to commit any
- * pending click-to-add state for if the event editor is being destroyed.
- */
-static gint
-table_canvas_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	ETable *etable;
-
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-
-	etable = e_table_scrolled_get_table (priv->etable);
-
-	e_table_commit_click_to_add (etable);
-	return TRUE;
-}
-
-/**
- * meeting_page_construct:
- * @mpage: An task details page.
- * 
- * Constructs an task page by loading its Glade data.
- * 
- * Return value: The same object as @mpage, or NULL if the widgets could not 
- * be created.
- **/
-MeetingPage *
-meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm)
-{
-	MeetingPagePrivate *priv;
-	ETable *real_table;
-	gchar *filename;
-	
-	priv = mpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/meeting-page.glade", NULL);
-	if (!priv->xml) {
-		g_message ("meeting_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (mpage)) {
-		g_message ("meeting_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-	
-	/* The etable displaying attendees and their status */
-	gtk_object_ref (GTK_OBJECT (emm));
-	priv->model = emm;
-
-	filename = g_strdup_printf ("%s/config/et-header-meeting-page", evolution_dir);
-	priv->etable = e_meeting_model_etable_from_model (priv->model, 
-							  EVOLUTION_ETSPECDIR "/meeting-page.etspec", 
-							  filename);
-	g_free (filename);
-
-	real_table = e_table_scrolled_get_table (priv->etable);
-	gtk_signal_connect (GTK_OBJECT (real_table),
-			    "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage);
-
-	gtk_signal_connect (GTK_OBJECT (real_table->table_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (table_canvas_focus_out_cb), mpage);
-
-	gtk_widget_show (GTK_WIDGET (priv->etable));
-	gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->etable), TRUE, TRUE, 2);
-	
-	/* Init the widget signals */
-	init_widgets (mpage);
-
-	return mpage;
-}
-
-/**
- * meeting_page_new:
- * 
- * Creates a new task details page.
- * 
- * Return value: A newly-created task details page, or NULL if the page could
- * not be created.
- **/
-MeetingPage *
-meeting_page_new (EMeetingModel *emm)
-{
-	MeetingPage *mpage;
-
-	mpage = gtk_type_new (TYPE_MEETING_PAGE);
-	if (!meeting_page_construct (mpage, emm)) {
-		gtk_object_unref (GTK_OBJECT (mpage));
-		return NULL;
-	}
-
-	return mpage;
-}
-
-/**
- * meeting_page_get_cancel_comp:
- * @mpage: 
- * 
- * 
- * 
- * Return value: 
- **/
-CalComponent *
-meeting_page_get_cancel_comp (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	g_return_val_if_fail (mpage != NULL, NULL);
-	g_return_val_if_fail (IS_MEETING_PAGE (mpage), NULL);
-
-	priv = mpage->priv;
-
-	if (priv->deleted_attendees->len == 0)
-		return NULL;
-	
-	set_attendees (priv->comp, priv->deleted_attendees);
-	
-	return cal_component_clone (priv->comp);
-}
diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec
deleted file mode 100644
index 96bc480fe9..0000000000
--- a/calendar/gui/dialogs/meeting-page.etspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-
-  <ETableState>
-     <column source="0"/>
-     <column source="2"/>
-     <column source="3"/>
-     <column source="4"/>
-     <column source="7"/>
-     <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/dialogs/meeting-page.glade b/calendar/gui/dialogs/meeting-page.glade
deleted file mode 100644
index f06f457d16..0000000000
--- a/calendar/gui/dialogs/meeting-page.glade
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-details-page</name>
-  <program_name>task-details-page</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-toplevel</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>GtkVBox</class>
-    <name>meeting-page</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <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>GtkTable</class>
-	<name>organizer-table</name>
-	<border_width>4</border_width>
-	<rows>2</rows>
-	<columns>3</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>0</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>organizer</name>
-	  <value_in_list>True</value_in_list>
-	  <ok_if_empty>False</ok_if_empty>
-	  <case_sensitive>False</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items></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>entry2</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>GtkButton</class>
-	  <name>other-organizer-button</name>
-	  <can_focus>True</can_focus>
-	  <label>_Other Organizer</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <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>GtkEntry</class>
-	  <name>other-organizer</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>GtkLabel</class>
-	  <name>organizer-label</name>
-	  <label>Organizer:</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>other-organizer-label</name>
-	  <label>Organizer:</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>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>existing-organizer-table</name>
-	<border_width>4</border_width>
-	<rows>1</rows>
-	<columns>3</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>0</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label1</name>
-	  <label>Organizer:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</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>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>existing-organizer-button</name>
-	  <can_focus>True</can_focus>
-	  <label>_Change Organizer</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <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>GtkLabel</class>
-	  <name>existing-organizer</name>
-	  <label>None</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>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>Placeholder</class>
-    </widget>
-
-    <widget>
-      <class>GtkButton</class>
-      <name>invite</name>
-      <can_focus>True</can_focus>
-      <label>_Invite Others...</label>
-      <relief>GTK_RELIEF_NORMAL</relief>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/meeting-page.h b/calendar/gui/dialogs/meeting-page.h
deleted file mode 100644
index b7c8571b44..0000000000
--- a/calendar/gui/dialogs/meeting-page.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 MEETING_PAGE_H
-#define MEETING_PAGE_H
-
-#include "../e-meeting-model.h"
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_MEETING_PAGE            (meeting_page_get_type ())
-#define MEETING_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_MEETING_PAGE, MeetingPage))
-#define MEETING_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_MEETING_PAGE, MeetingPageClass))
-#define IS_MEETING_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_MEETING_PAGE))
-#define IS_MEETING_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_MEETING_PAGE))
-
-typedef struct _MeetingPagePrivate MeetingPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	MeetingPagePrivate *priv;
-} MeetingPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} MeetingPageClass;
-
-
-GtkType       meeting_page_get_type          (void);
-MeetingPage  *meeting_page_construct         (MeetingPage   *mpage,
-					      EMeetingModel *emm);
-MeetingPage  *meeting_page_new               (EMeetingModel *emm);
-CalComponent *meeting_page_get_cancel_comp   (MeetingPage   *mpage);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
deleted file mode 100644
index a096e403a8..0000000000
--- a/calendar/gui/dialogs/recurrence-page.c
+++ /dev/null
@@ -1,2446 +0,0 @@
-/* Evolution calendar - Recurrence page of the calendar component dialogs
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
-#include <widgets/misc/e-dateedit.h>
-#include <cal-util/timeutil.h>
-#include "../calendar-config.h"
-#include "../tag-calendar.h"
-#include "../weekday-picker.h"
-#include "comp-editor-util.h"
-#include "recurrence-page.h"
-
-
-
-enum month_num_options {
-	MONTH_NUM_FIRST,
-	MONTH_NUM_SECOND,
-	MONTH_NUM_THIRD,
-	MONTH_NUM_FOURTH,
-	MONTH_NUM_LAST,
-	MONTH_NUM_DAY,
-	MONTH_NUM_OTHER
-};
-
-static const int month_num_options_map[] = {
-	MONTH_NUM_FIRST,
-	MONTH_NUM_SECOND,
-	MONTH_NUM_THIRD,
-	MONTH_NUM_FOURTH,
-	MONTH_NUM_LAST,
-	MONTH_NUM_DAY,
-	MONTH_NUM_OTHER,
-	-1
-};
-
-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
-};
-
-enum recur_type {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM
-};
-
-static const int type_map[] = {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM,
-	-1
-};
-
-static const int freq_map[] = {
-	ICAL_DAILY_RECURRENCE,
-	ICAL_WEEKLY_RECURRENCE,
-	ICAL_MONTHLY_RECURRENCE,
-	ICAL_YEARLY_RECURRENCE,
-	-1
-};
-
-enum ending_type {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER
-};
-
-static const int ending_types_map[] = {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER,
-	-1
-};
-
-static const char *date_suffix[] = {
-	N_("st"),
-	N_("nd"),
-	N_("rd"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("st"),
-	N_("nd"),
-	N_("rd"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("th"),
-	N_("st")
-};
-
-/* Private part of the RecurrencePage structure */
-struct _RecurrencePagePrivate {
-	/* Component we use to expand the recurrence rules for the preview */
-	CalComponent *comp;
-
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *main;
-
-	GtkWidget *summary;
-	GtkWidget *date_time;
-		   
-	GtkWidget *none;
-	GtkWidget *simple;
-	GtkWidget *custom;
-		   
-	GtkWidget *params;
-	GtkWidget *interval_value;
-	GtkWidget *interval_unit;
-	GtkWidget *special;
-	GtkWidget *ending_menu;
-	GtkWidget *ending_special;
-	GtkWidget *custom_warning_bin;
-
-	/* For weekly recurrences, created by hand */
-	GtkWidget *weekday_picker;
-	guint8 weekday_day_mask;
-	guint8 weekday_blocked_day_mask;
-
-	/* For monthly recurrences, created by hand */
-	int month_index;
-
-	GtkWidget *month_day_menu;
-	enum month_day_options month_day;
-
-	GtkWidget *month_num_menu;
-	enum month_num_options month_num;
-	
-	/* For ending date, created by hand */
-	GtkWidget *ending_date_edit;
-	struct icaltimetype ending_date_tt;
-
-	/* For ending count of occurrences, created by hand */
-	GtkWidget *ending_count_spin;
-	int ending_count;
-
-	/* More widgets from the Glade file */
-
-	GtkWidget *exception_date;
-	GtkWidget *exception_list;
-	GtkWidget *exception_add;
-	GtkWidget *exception_modify;
-	GtkWidget *exception_delete;
-
-	GtkWidget *preview_bin;
-
-	/* For the recurrence preview, the actual widget */
-	GtkWidget *preview_calendar;
-
-	gboolean updating;
-};
-
-
-
-static void recurrence_page_class_init (RecurrencePageClass *class);
-static void recurrence_page_init (RecurrencePage *rpage);
-static void recurrence_page_destroy (GtkObject *object);
-
-static GtkWidget *recurrence_page_get_widget (CompEditorPage *page);
-static void recurrence_page_focus_main_widget (CompEditorPage *page);
-static void recurrence_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean recurrence_page_fill_component (CompEditorPage *page, CalComponent *comp);
-static void recurrence_page_set_summary (CompEditorPage *page, const char *summary);
-static void recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static void field_changed (RecurrencePage *apage);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * recurrence_page_get_type:
- * 
- * Registers the #RecurrencePage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #RecurrencePage class.
- **/
-GtkType
-recurrence_page_get_type (void)
-{
-	static GtkType recurrence_page_type;
-
-	if (!recurrence_page_type) {
-		static const GtkTypeInfo recurrence_page_info = {
-			"RecurrencePage",
-			sizeof (RecurrencePage),
-			sizeof (RecurrencePageClass),
-			(GtkClassInitFunc) recurrence_page_class_init,
-			(GtkObjectInitFunc) recurrence_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		recurrence_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-							&recurrence_page_info);
-	}
-
-	return recurrence_page_type;
-}
-
-/* Class initialization function for the recurrence page */
-static void
-recurrence_page_class_init (RecurrencePageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = recurrence_page_get_widget;
-	editor_page_class->focus_main_widget = recurrence_page_focus_main_widget;
-	editor_page_class->fill_widgets = recurrence_page_fill_widgets;
-	editor_page_class->fill_component = recurrence_page_fill_component;
-	editor_page_class->set_summary = recurrence_page_set_summary;
-	editor_page_class->set_dates = recurrence_page_set_dates;
-
-	object_class->destroy = recurrence_page_destroy;
-}
-
-/* Object initialization function for the recurrence page */
-static void
-recurrence_page_init (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = g_new0 (RecurrencePagePrivate, 1);
-	rpage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->summary = NULL;
-	priv->date_time = NULL;
-	priv->none = NULL;
-	priv->simple = NULL;
-	priv->custom = NULL;
-	priv->params = NULL;
-	priv->interval_value = NULL;
-	priv->interval_unit = NULL;
-	priv->special = NULL;
-	priv->ending_menu = NULL;
-	priv->ending_special = NULL;
-	priv->custom_warning_bin = NULL;
-	priv->weekday_picker = NULL;
-	priv->month_day_menu = NULL;
-	priv->month_num_menu = NULL;
-	priv->ending_date_edit = NULL;
-	priv->ending_count_spin = NULL;
-	priv->exception_date = NULL;
-	priv->exception_list = NULL;
-	priv->exception_add = NULL;
-	priv->exception_modify = NULL;
-	priv->exception_delete = NULL;
-	priv->preview_bin = NULL;
-	priv->preview_calendar = NULL;
-
-	priv->comp = NULL;
-}
-
-/* Frees the CalComponentDateTime stored in the GtkCList */
-static void
-free_exception_date_time (CalComponentDateTime *dt)
-{
-	g_free (dt->value);
-	g_free ((char*)dt->tzid);
-	g_free (dt);
-}
-
-/* Destroy handler for the recurrence page */
-static void
-recurrence_page_destroy (GtkObject *object)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_RECURRENCE_PAGE (object));
-
-	rpage = RECURRENCE_PAGE (object);
-	priv = rpage->priv;
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	g_free (priv);
-	rpage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_widget handler for the recurrence page */
-static GtkWidget *
-recurrence_page_get_widget (CompEditorPage *page)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the recurrence page */
-static void
-recurrence_page_focus_main_widget (CompEditorPage *page)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	if (e_dialog_toggle_get (priv->none))
-		gtk_widget_grab_focus (priv->none);
-	else if (e_dialog_toggle_get (priv->simple))
-		gtk_widget_grab_focus (priv->simple);
-	else if (e_dialog_toggle_get (priv->custom))
-		gtk_widget_grab_focus (priv->custom);
-	else
-		g_assert_not_reached ();
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	priv->weekday_day_mask = 0;
-
-	priv->month_index = 1;
-	priv->month_num = MONTH_NUM_DAY;
-	priv->month_day = MONTH_DAY_NTH;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->none), rpage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->simple), rpage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->custom), rpage);
-	e_dialog_radio_set (priv->none, RECUR_NONE, type_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->none), rpage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->simple), rpage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->custom), rpage);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (adj), rpage);
-	e_dialog_spin_set (priv->interval_value, 1);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (adj), rpage);
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-	e_dialog_option_menu_set (priv->interval_unit,
-				  ICAL_DAILY_RECURRENCE,
-				  freq_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-
-	priv->ending_date_tt = icaltime_today ();
-	priv->ending_count = 1;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-	e_dialog_option_menu_set (priv->ending_menu, 
-				  ENDING_FOREVER,
-				  ending_types_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-
-	/* Exceptions list */
-	gtk_clist_clear (GTK_CLIST (priv->exception_list));
-}
-
-/* Builds a static string out of an exception date */
-static char *
-get_exception_string (CalComponentDateTime *dt)
-{
-	static char buf[256];
-	struct tm tmp_tm;
-
-	tmp_tm.tm_year = dt->value->year - 1900;
-	tmp_tm.tm_mon = dt->value->month - 1;
-	tmp_tm.tm_mday = dt->value->day;
-	tmp_tm.tm_hour = dt->value->hour;
-	tmp_tm.tm_min = dt->value->minute;
-	tmp_tm.tm_sec = dt->value->second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (dt->value->day,
-					   dt->value->month - 1,
-					   dt->value->year);
-
-	e_time_format_date_and_time (&tmp_tm, calendar_config_get_24_hour_format(), FALSE, FALSE, buf, sizeof (buf));
-
-	return buf;
-}
-
-/* Appends an exception date to the list */
-static void
-append_exception (RecurrencePage *rpage, CalComponentDateTime *datetime)
-{
-	RecurrencePagePrivate *priv;
-	CalComponentDateTime *dt;
-	char *c[1];
-	int i;
-	GtkCList *clist;
-	struct icaltimetype *tt;
-
-	priv = rpage->priv;
-
-	dt = g_new (CalComponentDateTime, 1);
-	dt->value = g_new (struct icaltimetype, 1);
-	*dt->value = *datetime->value;
-	dt->tzid = g_strdup (datetime->tzid);
-
-	clist = GTK_CLIST (priv->exception_list);
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (clist), rpage);
-
-	c[0] = get_exception_string (dt);
-	i = gtk_clist_append (clist, c);
-
-	gtk_clist_set_row_data_full (clist, i, dt, (GtkDestroyNotify) free_exception_date_time);
-
-	gtk_clist_select_row (clist, i, 0);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (clist), rpage);
-
-	tt = dt->value;
-	e_date_edit_set_date (E_DATE_EDIT (priv->exception_date), 
-			      tt->year, tt->month, tt->day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->exception_date), 
-				     tt->hour, tt->minute);
-
-	gtk_widget_set_sensitive (priv->exception_modify, TRUE);
-	gtk_widget_set_sensitive (priv->exception_delete, TRUE);
-}
-
-/* Fills in the exception widgets with the data from the calendar component */
-static void
-fill_exception_widgets (RecurrencePage *rpage, CalComponent *comp)
-{
-	RecurrencePagePrivate *priv;
-	GSList *list, *l;
-	gboolean added;
-
-	priv = rpage->priv;
-
-	cal_component_get_exdate_list (comp, &list);
-
-	added = FALSE;
-
-	for (l = list; l; l = l->next) {
-		CalComponentDateTime *cdt;
-
-		added = TRUE;
-
-		cdt = l->data;
-		append_exception (rpage, cdt);
-	}
-
-	cal_component_free_exdate_list (list);
-
-	if (added)
-		gtk_clist_select_row (GTK_CLIST (priv->exception_list), 0, 0);
-}
-
-/* Computes a weekday mask for the start day of a calendar component,
- * for use in a WeekdayPicker widget.
- */
-static guint8
-get_start_weekday_mask (CalComponent *comp)
-{
-	CalComponentDateTime dt;
-	guint8 retval;
-
-	cal_component_get_dtstart (comp, &dt);
-
-	if (dt.value) {
-		short weekday;
-
-		weekday = icaltime_day_of_week (*dt.value);
-		retval = 0x1 << (weekday - 1);
-	} else
-		retval = 0;
-
-	cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-/* Sets some sane defaults for the data sources for the recurrence special
- * widgets, even if they will not be used immediately.
- */
-static void
-set_special_defaults (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	guint8 mask;
-
-	priv = rpage->priv;
-
-	mask = get_start_weekday_mask (priv->comp);
-
-	priv->weekday_day_mask = mask;
-	priv->weekday_blocked_day_mask = mask;
-}
-
-/* Sensitizes the recurrence widgets based on the state of the recurrence type
- * radio group.
- */
-static void
-sensitize_recur_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	enum recur_type type;
-	GtkWidget *label;
-
-	priv = rpage->priv;
-
-	type = e_dialog_radio_get (priv->none, type_map);
-
-	if (GTK_BIN (priv->custom_warning_bin)->child)
-		gtk_widget_destroy (GTK_BIN (priv->custom_warning_bin)->child);
-
-	switch (type) {
-	case RECUR_NONE:
-		gtk_widget_set_sensitive (priv->params, FALSE);
-		gtk_widget_show (priv->params);
-		gtk_widget_hide (priv->custom_warning_bin);
-		break;
-
-	case RECUR_SIMPLE:
-		gtk_widget_set_sensitive (priv->params, TRUE);
-		gtk_widget_show (priv->params);
-		gtk_widget_hide (priv->custom_warning_bin);
-		break;
-
-	case RECUR_CUSTOM:
-		gtk_widget_set_sensitive (priv->params, FALSE);
-		gtk_widget_hide (priv->params);
-
-		label = gtk_label_new (_("This appointment contains "
-					 "recurrences that Evolution "
-					 "cannot edit."));
-		gtk_container_add (GTK_CONTAINER (priv->custom_warning_bin),
-				   label);
-		gtk_widget_show_all (priv->custom_warning_bin);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-#if 0
-/* Encondes a position/weekday pair into the proper format for
- * icalrecurrencetype.by_day. Not needed at present.
- */
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (int) weekday;
-}
-#endif
-
-/* Gets the simple recurrence data from the recurrence widgets and stores it in
- * the calendar component.
- */
-static void
-simple_recur_to_comp (RecurrencePage *rpage, CalComponent *comp)
-{
-	RecurrencePagePrivate *priv;
-	struct icalrecurrencetype r;
-	GSList l;
-	enum ending_type ending_type;
-	gboolean date_set;
-
-	priv = rpage->priv;
-
-	icalrecurrencetype_clear (&r);
-
-	/* Frequency, interval, week start */
-
-	r.freq = e_dialog_option_menu_get (priv->interval_unit, freq_map);
-	r.interval = e_dialog_spin_get_int (priv->interval_value);
-	r.week_start = ICAL_SUNDAY_WEEKDAY
-		+ calendar_config_get_week_start_day ();
-
-	/* 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->special)->child != NULL);
-		g_assert (priv->weekday_picker != NULL);
-		g_assert (IS_WEEKDAY_PICKER (priv->weekday_picker));
-
-		day_mask = weekday_picker_get_days (WEEKDAY_PICKER (priv->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: {
-		enum month_num_options month_num;
-		enum month_day_options month_day;
-		
-		g_assert (GTK_BIN (priv->special)->child != NULL);
-		g_assert (priv->month_day_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->month_day_menu));
-		g_assert (priv->month_num_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->month_num_menu));
-
-		month_num = e_dialog_option_menu_get (priv->month_num_menu,
-						      month_num_options_map );
-		month_day = e_dialog_option_menu_get (priv->month_day_menu,
-						      month_day_options_map);
-
-		if (month_num == MONTH_NUM_LAST)
-			month_num = -1;
-
-		switch (month_day) {
-		case MONTH_DAY_NTH:
-			if (month_num == -1)
-				r.by_month_day[0] = -1;
-			else
-				r.by_month_day[0] = priv->month_index;
-			break;
-
-		/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-		   accept BYDAY=2TU. So we now use the same as Outlook
-		   by default. */
-		case MONTH_DAY_MON:
-			r.by_day[0] = ICAL_MONDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_TUE:
-			r.by_day[0] = ICAL_TUESDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_WED:
-			r.by_day[0] = ICAL_WEDNESDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_THU:
-			r.by_day[0] = ICAL_THURSDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_FRI:
-			r.by_day[0] = ICAL_FRIDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_SAT:
-			r.by_day[0] = ICAL_SATURDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			break;
-
-		case MONTH_DAY_SUN:
-			r.by_day[0] = ICAL_SUNDAY_WEEKDAY;
-			r.by_set_pos[0] = month_num;
-			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->ending_menu,
-						ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		g_assert (priv->ending_count_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->ending_count_spin));
-
-		r.count = e_dialog_spin_get_int (priv->ending_count_spin);
-		break;
-
-	case ENDING_UNTIL:
-		g_assert (priv->ending_date_edit != NULL);
-		g_assert (E_IS_DATE_EDIT (priv->ending_date_edit));
-
-		/* We only allow a DATE value to be set for the UNTIL property,
-		   since we don't support sub-day recurrences. */
-		date_set = e_date_edit_get_date (E_DATE_EDIT (priv->ending_date_edit),
-						 &r.until.year,
-						 &r.until.month,
-						 &r.until.day);
-		g_assert (date_set);
-
-		r.until.is_date = 1;
-
-		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);
-}
-
-/* Fills a component with the data from the recurrence page; in the case of a
- * custom recurrence, it leaves it intact.
- */
-static void
-fill_component (RecurrencePage *rpage, CalComponent *comp)
-{
-	RecurrencePagePrivate *priv;
-	enum recur_type recur_type;
-	GtkCList *exception_list;
-	GSList *list;
-	int i;
-
-	priv = rpage->priv;
-
-	recur_type = e_dialog_radio_get (priv->none, 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:
-		cal_component_set_rdate_list (comp, NULL);
-		cal_component_set_exrule_list (comp, NULL);
-		simple_recur_to_comp (rpage, comp);
-		break;
-
-	case RECUR_CUSTOM:
-		/* We just keep whatever the component has currently */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Set exceptions */
-
-	list = NULL;
-	exception_list = GTK_CLIST (priv->exception_list);
-	for (i = 0; i < exception_list->rows; i++) {
-		CalComponentDateTime *cdt, *dt;
-
-		cdt = g_new (CalComponentDateTime, 1);
-		cdt->value = g_new (struct icaltimetype, 1);
-
-		dt = gtk_clist_get_row_data (exception_list, i);
-		g_assert (dt != NULL);
-
-		*cdt->value = *dt->value;
-		cdt->tzid = g_strdup (dt->tzid);
-
-#if 0
-		g_print ("Adding exception is_date: %i\n", cdt->value->is_date);
-#endif
-
-		list = g_slist_prepend (list, cdt);
-	}
-
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-}
-
-/* Re-tags the recurrence preview calendar based on the current information of
- * the widgets in the recurrence page.
- */
-static void
-preview_recur (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	CalComponent *comp;
-	CalComponentDateTime cdt;
-	GSList *l;
-
-	priv = rpage->priv;
-
-	/* If our component has not been set yet through ::fill_widgets(), we
-	 * cannot preview the recurrence.
-	 */
-	if (!priv->comp)
-		return;
-
-	/* Create a scratch component with the start/end and
-	 * recurrence/exception information from the one we are editing.
-	 */
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	cal_component_get_dtstart (priv->comp, &cdt);
-	cal_component_set_dtstart (comp, &cdt);
-	cal_component_free_datetime (&cdt);
-
-	cal_component_get_dtend (priv->comp, &cdt);
-	cal_component_set_dtend (comp, &cdt);
-	cal_component_free_datetime (&cdt);
-
-	cal_component_get_exdate_list (priv->comp, &l);
-	cal_component_set_exdate_list (comp, l);
-	cal_component_free_exdate_list (l);
-
-	cal_component_get_exrule_list (priv->comp, &l);
-	cal_component_set_exrule_list (comp, l);
-	cal_component_free_recur_list (l);
-
-	cal_component_get_rdate_list (priv->comp, &l);
-	cal_component_set_rdate_list (comp, l);
-	cal_component_free_period_list (l);
-
-	cal_component_get_rrule_list (priv->comp, &l);
-	cal_component_set_rrule_list (comp, l);
-	cal_component_free_recur_list (l);
-
-	fill_component (rpage, comp);
-
-	tag_calendar_by_comp (E_CALENDAR (priv->preview_calendar), comp,
-			      COMP_EDITOR_PAGE (rpage)->client, TRUE, FALSE);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Callback used when the recurrence weekday picker changes */
-static void
-weekday_picker_changed_cb (WeekdayPicker *wp, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for weekly recurrences */
-static void
-make_weekly_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	WeekdayPicker *wp;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->special)->child == NULL);
-	g_assert (priv->weekday_picker == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->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->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_start_day (wp, calendar_config_get_week_start_day ());
-	weekday_picker_set_days (wp, priv->weekday_day_mask);
-	weekday_picker_set_blocked_days (wp, priv->weekday_blocked_day_mask);
-
-	gtk_signal_connect (GTK_OBJECT (wp), "changed",
-			    GTK_SIGNAL_FUNC (weekday_picker_changed_cb),
-			    rpage);
-}
-
-
-static void
-month_num_submenu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	GtkWidget *item;
-	int month_index;
-	
-	item = gtk_menu_get_active (GTK_MENU (menu_shell));
-	item = gtk_menu_get_active (GTK_MENU (GTK_MENU_ITEM (item)->submenu));
-
-	month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));
-	gtk_object_set_user_data (GTK_OBJECT (data), GINT_TO_POINTER (month_index));
-}
-
-/* Creates the option menu for the monthly recurrence number */
-static GtkWidget *
-make_recur_month_num_submenu (const char *title, int start, int end)
-{
-	GtkWidget *submenu, *item;
-	int i;
-	
-	submenu = gtk_menu_new ();
-	for (i = start; i < end; i++) {
-		char *date;
-		
-		date = g_strdup_printf ("%d%s", i + 1, _(date_suffix[i]));
-		item = gtk_menu_item_new_with_label (date);
-		g_free (date);
-		gtk_menu_append (GTK_MENU (submenu), item);
-		gtk_object_set_user_data (GTK_OBJECT (item), GINT_TO_POINTER (i + 1));
-		gtk_widget_show (item);
-	}	
-
-	item = gtk_menu_item_new_with_label (_(title));
-	gtk_widget_show (item);
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
-
-	return item;
-}
-
-static GtkWidget *
-make_recur_month_num_menu (int month_index)
-{
-	static const char *options[] = {
-		N_("first"),
-		N_("second"),
-		N_("third"),
-		N_("fourth"),
-		N_("last")
-	};
-
-	GtkWidget *menu, *submenu, *item, *submenu_item;
-	GtkWidget *omenu;
-	char *date;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	/* Relation */
-	for (i = 0; i < sizeof (options) / sizeof (options[0]); i++) {
-		item = gtk_menu_item_new_with_label (_(options[i]));
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-	}
-
-	/* Current date */
-	date = g_strdup_printf ("%d%s", month_index, _(date_suffix[month_index - 1]));
-	item = gtk_menu_item_new_with_label (date);
-	g_free (date);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_widget_show (item);
-
-	/* Other Submenu */
-	submenu = gtk_menu_new ();
-	submenu_item = gtk_menu_item_new_with_label (_("Other Date"));
-	gtk_menu_append (GTK_MENU (menu), submenu_item);
-	gtk_widget_show (submenu_item);
-
-	item = make_recur_month_num_submenu ("1st to 10th", 0, 10);
-	gtk_menu_append (GTK_MENU (submenu), item);
-	item = make_recur_month_num_submenu ("11th to 20th", 10, 20);
-	gtk_menu_append (GTK_MENU (submenu), item);
-	item = make_recur_month_num_submenu ("21st to 31st", 20, 31);
-	gtk_menu_append (GTK_MENU (submenu), item);
-
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (submenu_item), submenu);
-	gtk_object_set_user_data (GTK_OBJECT (submenu_item), GINT_TO_POINTER (month_index));
-	gtk_signal_connect (GTK_OBJECT (submenu), "selection_done",
-			    GTK_SIGNAL_FUNC (month_num_submenu_selection_done_cb),
-			    submenu_item);
-
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-
-	return omenu;
-}
-
-/* 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;
-}
-
-static void
-month_num_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	enum month_num_options month_num;
-	enum month_day_options month_day;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	month_num = e_dialog_option_menu_get (priv->month_num_menu,
-					      month_num_options_map);
-	month_day = e_dialog_option_menu_get (priv->month_day_menu,
-					      month_day_options_map);
-
-	if (month_num == MONTH_NUM_OTHER) {
-		GtkWidget *label, *item;
-		char *date;
-
-		item = gtk_menu_get_active (GTK_MENU (menu_shell));
-		priv->month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));
-
-		month_num = MONTH_NUM_DAY;
-		e_dialog_option_menu_set (priv->month_num_menu, month_num, month_num_options_map);
-
-		label = GTK_BIN (priv->month_num_menu)->child;
-		date = g_strdup_printf ("%d%s", priv->month_index, _(date_suffix[priv->month_index - 1]));
-		gtk_label_set_text (GTK_LABEL (label), date);
-		g_free (date);
-
-		e_dialog_option_menu_set (priv->month_num_menu, 0, month_num_options_map);
-		e_dialog_option_menu_set (priv->month_num_menu, month_num, month_num_options_map);
-	}
-	
-	if (month_num == MONTH_NUM_DAY && month_day != MONTH_DAY_NTH)
-		e_dialog_option_menu_set (priv->month_day_menu,
-					  MONTH_DAY_NTH,
-					  month_day_options_map);
-	else if (month_num != MONTH_NUM_DAY && month_num != MONTH_NUM_LAST && month_day == MONTH_DAY_NTH)
-		e_dialog_option_menu_set (priv->month_day_menu,
-					  MONTH_DAY_MON,
-					  month_num_options_map);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the monthly day selection menu changes.  We need
- * to change the valid range of the day index spin button; e.g. days
- * are 1-31 while a Sunday is the 1st through 5th.
- */
-static void
-month_day_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	enum month_num_options month_num;
-	enum month_day_options month_day;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-	
-	month_num = e_dialog_option_menu_get (priv->month_num_menu,
-					      month_num_options_map);
-	month_day = e_dialog_option_menu_get (priv->month_day_menu,
-					      month_day_options_map);
-	if (month_day == MONTH_DAY_NTH && month_num != MONTH_NUM_LAST && month_num != MONTH_NUM_DAY)
-		e_dialog_option_menu_set (priv->month_num_menu,
-					  MONTH_NUM_DAY,
-					  month_num_options_map);
-	else if (month_day != MONTH_DAY_NTH && month_num == MONTH_NUM_DAY)
-		e_dialog_option_menu_set (priv->month_num_menu,
-					  MONTH_NUM_FIRST,
-					  month_num_options_map);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the month index value changes. */
-static void
-month_index_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for monthly recurrences */
-static void
-make_monthly_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->special)->child == NULL);
-	g_assert (priv->month_day_menu == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->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->month_num_menu = make_recur_month_num_menu (priv->month_index);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->month_num_menu,
-			    FALSE, FALSE, 0);
-
-	priv->month_day_menu = make_recur_month_menu ();
-	gtk_box_pack_start (GTK_BOX (hbox), priv->month_day_menu,
-			    FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the options */
-	e_dialog_option_menu_set (priv->month_num_menu,
-				  priv->month_num,
-				  month_num_options_map);
-	e_dialog_option_menu_set (priv->month_day_menu,
-				  priv->month_day,
-				  month_day_options_map);
-
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",			    GTK_SIGNAL_FUNC (month_index_value_changed_cb),
-			    rpage);
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->month_num_menu));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (month_num_menu_selection_done_cb),
-			    rpage);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->month_day_menu));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (month_day_menu_selection_done_cb),
-			    rpage);
-}
-
-/* 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 (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	icalrecurrencetype_frequency frequency;
-
-	priv = rpage->priv;
-
-	if (GTK_BIN (priv->special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->special)->child);
-
-		priv->weekday_picker = NULL;
-		priv->month_day_menu = NULL;
-	}
-	if (priv->month_num_menu != NULL) {
-		gtk_widget_destroy (priv->month_num_menu);
-		priv->month_num_menu = NULL;
-	}
-
-	frequency = e_dialog_option_menu_get (priv->interval_unit, freq_map);
-
-	switch (frequency) {
-	case ICAL_DAILY_RECURRENCE:
-		gtk_widget_hide (priv->special);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE:
-		make_weekly_special (rpage);
-		gtk_widget_show (priv->special);
-		break;
-
-	case ICAL_MONTHLY_RECURRENCE:
-		make_monthly_special (rpage);
-		gtk_widget_show (priv->special);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		gtk_widget_hide (priv->special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Counts the 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;
-}
-
-/* Callback used when the ending-until date editor changes */
-static void
-ending_until_changed_cb (EDateEdit *de, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for "ending until" (end date) recurrences */
-static void
-make_ending_until_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	EDateEdit *de;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->ending_special)->child == NULL);
-	g_assert (priv->ending_date_edit == NULL);
-
-	/* Create the widget */
-
-	priv->ending_date_edit = comp_editor_new_date_edit (TRUE, FALSE,
-							    FALSE);
-	de = E_DATE_EDIT (priv->ending_date_edit);
-
-	gtk_container_add (GTK_CONTAINER (priv->ending_special),
-			   GTK_WIDGET (de));
-	gtk_widget_show_all (GTK_WIDGET (de));
-
-	/* Set the value */
-
-	e_date_edit_set_date (de, priv->ending_date_tt.year,
-			      priv->ending_date_tt.month,
-			      priv->ending_date_tt.day);
-
-	gtk_signal_connect (GTK_OBJECT (de), "changed",
-			    GTK_SIGNAL_FUNC (ending_until_changed_cb), rpage);
-
-	/* Make sure the EDateEdit widget uses our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (de,
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   rpage, NULL);
-}
-
-/* Callback used when the ending-count value changes */
-static void
-ending_count_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Creates the special contents for the occurrence count case */
-static void
-make_ending_count_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-
-	priv = rpage->priv;
-
-	g_assert (GTK_BIN (priv->ending_special)->child == NULL);
-	g_assert (priv->ending_count_spin == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->ending_special), hbox);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
-	priv->ending_count_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->ending_count_spin,
-			    FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("occurrences"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the values */
-
-	e_dialog_spin_set (priv->ending_count_spin, priv->ending_count);
-
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    GTK_SIGNAL_FUNC (ending_count_value_changed_cb),
-			    rpage);
-}
-
-/* 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_ending_special (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	enum ending_type ending_type;
-
-	priv = rpage->priv;
-
-	if (GTK_BIN (priv->ending_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->ending_special)->child);
-
-		priv->ending_date_edit = NULL;
-		priv->ending_count_spin = NULL;
-	}
-
-	ending_type = e_dialog_option_menu_get (priv->ending_menu,
-						ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		make_ending_count_special (rpage);
-		gtk_widget_show (priv->ending_special);
-		break;
-
-	case ENDING_UNTIL:
-		make_ending_until_special (rpage);
-		gtk_widget_show (priv->ending_special);
-		break;
-
-	case ENDING_FOREVER:
-		gtk_widget_hide (priv->ending_special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Fills the recurrence ending date widgets with the values from the calendar
- * component.
- */
-static void
-fill_ending_date (RecurrencePage *rpage, struct icalrecurrencetype *r)
-{
-	RecurrencePagePrivate *priv;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-
-	if (r->count == 0) {
-		if (r->until.year == 0) {
-			/* Forever */
-
-			e_dialog_option_menu_set (priv->ending_menu,
-						  ENDING_FOREVER,
-						  ending_types_map);
-		} else {
-			/* Ending date */
-
-			priv->ending_date_tt = r->until;
-			e_dialog_option_menu_set (priv->ending_menu,
-						  ENDING_UNTIL,
-						  ending_types_map);
-		}
-	} else {
-		/* Count of occurrences */
-
-		priv->ending_count = r->count;
-		e_dialog_option_menu_set (priv->ending_menu,
-					  ENDING_FOR,
-					  ending_types_map);
-	}
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-
-	make_ending_special (rpage);
-}
-
-/* fill_widgets handler for the recurrence page.  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
-recurrence_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	CalComponentText text;
-	CompEditorPageDates dates;	
-	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;
-	GtkWidget *menu;
-	GtkAdjustment *adj;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	/* Keep a copy of the component so that we can expand the recurrence 
-	 * set for the preview.
-	 */
-
-	if (priv->comp)
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-
-	priv->comp = cal_component_clone (comp);
-
-	/* Don't send off changes during this time */
-	priv->updating = TRUE;
-
-	/* Clean the page */
-	clear_widgets (rpage);
-
-	/* Summary */
-	cal_component_get_summary (comp, &text);
-	recurrence_page_set_summary (page, text.value);
-
-	/* Dates */
-	comp_editor_dates (&dates, comp);
-	recurrence_page_set_dates (page, &dates);
-	comp_editor_free_dates (&dates);
-
-	/* Exceptions */
-	fill_exception_widgets (rpage, comp);
-
-	/* Set up defaults for the special widgets */
-	set_special_defaults (rpage);
-
-	/* No recurrences? */
-
-	if (!cal_component_has_rdates (comp)
-	    && !cal_component_has_rrules (comp)
-	    && !cal_component_has_exrules (comp)) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->none),
-						  rpage);
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->simple),
-						  rpage);
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->custom),
-						  rpage);
-		e_dialog_radio_set (priv->none, RECUR_NONE, type_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->none),
-						    rpage);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->simple),
-						    rpage);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->custom),
-						    rpage);
-
-		gtk_widget_set_sensitive (priv->custom, FALSE);
-
-		sensitize_recur_widgets (rpage);
-		preview_recur (rpage);
-
-		priv->updating = FALSE;
-		return;
-	}
-
-	/* See if it is a custom set we don't support */
-
-	cal_component_get_rrule_list (comp, &rrule_list);
-	len = g_slist_length (rrule_list);
-	if (len > 1
-	    || cal_component_has_rdates (comp)
-	    || cal_component_has_exrules (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;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_DAILY_RECURRENCE,
-					  freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-		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->weekday_day_mask = day_mask;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_WEEKLY_RECURRENCE,
-					  freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-		break;
-	}
-
-	case ICAL_MONTHLY_RECURRENCE:
-		if (n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos > 1)
-			goto custom;
-
-		if (n_by_month_day == 1) {
-			int nth;
-
-			if (n_by_set_pos != 0)
-				goto custom;
-
-			nth = r->by_month_day[0];
-			if (nth < 1 && nth != -1)
-				goto custom;
-
-			if (nth == -1) {
-				CalComponentDateTime dt;
-				
-				cal_component_get_dtstart (comp, &dt);
-				priv->month_index = dt.value->day;
-				priv->month_num = MONTH_NUM_LAST;
-			} else {
-				priv->month_index = nth;
-				priv->month_num = MONTH_NUM_DAY;
-			}
-			priv->month_day = MONTH_DAY_NTH;
-			
-		} else if (n_by_day == 1) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-			enum month_day_options month_day;
-
-			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-			   accept BYDAY=2TU. So we now use the same as Outlook
-			   by default. */
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[0]);
-			pos = icalrecurrencetype_day_position (r->by_day[0]);
-
-			if (pos == 0) {
-				if (n_by_set_pos != 1)
-					goto custom;
-				pos = r->by_set_pos[0];
-			} else if (pos < 0) {
-				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;
-			}
-
-			if (pos == -1)
-				priv->month_num = MONTH_NUM_LAST;
-			else 
-				priv->month_num = pos;
-			priv->month_day = month_day;
-		} else
-			goto custom;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_MONTHLY_RECURRENCE,
-					  freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-		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;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);
-		e_dialog_option_menu_set (priv->interval_unit,
-					  ICAL_YEARLY_RECURRENCE,
-					  freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);
-		break;
-
-	default:
-		goto custom;
-	}
-
-	/* If we got here it means it is a simple recurrence */
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->none), rpage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->simple), rpage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->custom), rpage);
-	e_dialog_radio_set (priv->simple, RECUR_SIMPLE, type_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->none), rpage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->simple), rpage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->custom), rpage);
-
-	gtk_widget_set_sensitive (priv->custom, FALSE);
-
-	sensitize_recur_widgets (rpage);
-	make_recurrence_special (rpage);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (adj), rpage);
-	e_dialog_spin_set (priv->interval_value, r->interval);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (adj), rpage);
-
-	fill_ending_date (rpage, r);
-
-	goto out;
-
- custom:
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->none), rpage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->simple), rpage);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->custom), rpage);
-	e_dialog_radio_set (priv->custom, RECUR_CUSTOM, type_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->none), rpage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->simple), rpage);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->custom), rpage);
-
-	gtk_widget_set_sensitive (priv->custom, TRUE);
-	sensitize_recur_widgets (rpage);
-
- out:
-
-	cal_component_free_recur_list (rrule_list);
-	preview_recur (rpage);
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the recurrence page */
-static gboolean
-recurrence_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (page);
-	fill_component (rpage, comp);
-
-	return TRUE;
-}
-
-/* set_summary handler for the recurrence page */
-static void
-recurrence_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	gchar *s;
-	
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	s = e_utf8_to_gtk_string (priv->summary, summary);
-	gtk_label_set_text (GTK_LABEL (priv->summary), s);
-	g_free (s);
-}
-
-/* set_dates handler for the recurrence page */
-static void
-recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	CalComponentDateTime dt;
-	struct icaltimetype icaltime;
-	guint8 mask;
-
-	rpage = RECURRENCE_PAGE (page);
-	priv = rpage->priv;
-
-	comp_editor_date_label (dates, priv->date_time);
-
-	/* Copy the dates to our component */
-
-	if (!priv->comp)
-		return;
-
-	dt.value = &icaltime;
-
-	if (dates->start) {
-		icaltime = *dates->start->value;
-		dt.tzid = dates->start->tzid;
-		cal_component_set_dtstart (priv->comp, &dt);
-	}
-	
-	if (dates->end) {
-		icaltime = *dates->end->value;
-		dt.tzid = dates->end->tzid;
-		cal_component_set_dtend (priv->comp, &dt);
-	}
-
-	/* Update the weekday picker if necessary */
-	mask = get_start_weekday_mask (priv->comp);
-	if (mask == priv->weekday_blocked_day_mask)
-		return;
-
-	priv->weekday_day_mask = priv->weekday_day_mask | mask;
-	priv->weekday_blocked_day_mask = mask;
-
-	if (priv->weekday_picker != NULL) {
-		weekday_picker_set_days (WEEKDAY_PICKER (priv->weekday_picker),
-					 priv->weekday_day_mask);
-		weekday_picker_set_blocked_days (WEEKDAY_PICKER (priv->weekday_picker),
-						 priv->weekday_blocked_day_mask);
-	}
-
-	/* Make sure the preview gets updated. */
-	preview_recur (rpage);
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (RecurrencePage *rpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (rpage);
-	RecurrencePagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = rpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("recurrence-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->summary = GW ("summary");
-	priv->date_time = GW ("date-time");
-	      
-	priv->none = GW ("none");
-	priv->simple = GW ("simple");
-	priv->custom = GW ("custom");
-	priv->params = GW ("params");
-	      
-	priv->interval_value = GW ("interval-value");
-	priv->interval_unit = GW ("interval-unit");
-	priv->special = GW ("special");
-	priv->ending_menu = GW ("ending-menu");
-	priv->ending_special = GW ("ending-special");
-	priv->custom_warning_bin = GW ("custom-warning-bin");
-	      
-	priv->exception_date = GW ("exception-date");
-	priv->exception_list = GW ("exception-list");
-	priv->exception_add = GW ("exception-add");
-	priv->exception_modify = GW ("exception-modify");
-	priv->exception_delete = GW ("exception-delete");
-	      
-	priv->preview_bin = GW ("preview-bin");
-
-#undef GW
-	
-	return (priv->summary
-		&& priv->date_time
-		&& priv->none
-		&& priv->simple
-		&& priv->custom
-		&& priv->params
-		&& priv->interval_value
-		&& priv->interval_unit
-		&& priv->special
-		&& priv->ending_menu
-		&& priv->ending_special
-		&& priv->custom_warning_bin
-		&& priv->exception_date
-		&& priv->exception_list
-		&& priv->exception_add
-		&& priv->exception_modify
-		&& priv->exception_delete
-		&& priv->preview_bin);
-}
-
-/* Callback used when the displayed date range in the recurrence preview
- * calendar changes.
- */
-static void
-preview_date_range_changed_cb (ECalendarItem *item, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-	preview_recur (rpage);
-}
-
-/* Callback used when one of the recurrence type radio buttons is toggled.  We
- * enable or disable the recurrence parameters.
- */
-static void
-type_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-
-	if (toggle->active) {
-		sensitize_recur_widgets (rpage);
-		preview_recur (rpage);
-	}
-}
-
-/* Callback used when the recurrence interval value spin button changes. */
-static void
-interval_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the recurrence interval option menu changes.  We need to
- * change the contents of the recurrence special widget.
- */
-static void
-interval_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	make_recurrence_special (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback used when the recurrence ending option menu changes.  We need to
- * change the contents of the ending special widget.
- */
-static void
-ending_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	field_changed (rpage);
-	make_ending_special (rpage);
-	preview_recur (rpage);
-}
-
-/* Callback for the "add exception" button */
-static void
-exception_add_cb (GtkWidget *widget, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	CalComponentDateTime dt;
-	struct icaltimetype icaltime = icaltime_null_time ();
-	gboolean date_set;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	field_changed (rpage);
-
-	dt.value = &icaltime;
-
-	/* We use DATE values for exceptions, so we don't need a TZID. */
-	dt.tzid = NULL;
-	icaltime.is_date = 1;
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->exception_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	g_assert (date_set);
-
-	append_exception (rpage, &dt);
-	preview_recur (rpage);
-}
-
-/* Callback for the "modify exception" button */
-static void
-exception_modify_cb (GtkWidget *widget, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	GtkCList *clist;
-	CalComponentDateTime *dt;
-	struct icaltimetype *tt;
-	int sel;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	clist = GTK_CLIST (priv->exception_list);
-	if (!clist->selection)
-		return;
-
-	field_changed (rpage);
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	dt = gtk_clist_get_row_data (clist, sel);
-	tt = dt->value;
-	e_date_edit_get_date (E_DATE_EDIT (priv->exception_date), 
-			      &tt->year, &tt->month, &tt->day);
-	tt->hour = 0;
-	tt->minute = 0;
-	tt->second = 0;
-	tt->is_date = 1;
-
-	/* We get rid of any old TZID, since we are using a DATE value now. */
-	g_free ((char*)dt->tzid);
-	dt->tzid = NULL;
-
-	gtk_clist_set_text (clist, sel, 0, get_exception_string (dt));
-
-	preview_recur (rpage);
-}
-
-/* Callback for the "delete exception" button */
-static void
-exception_delete_cb (GtkWidget *widget, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	GtkCList *clist;
-	int sel;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	clist = GTK_CLIST (priv->exception_list);
-	if (!clist->selection)
-		return;
-
-	field_changed (rpage);
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	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->exception_modify, FALSE);
-		gtk_widget_set_sensitive (priv->exception_delete, FALSE);
-	}
-
-	preview_recur (rpage);
-}
-
-/* Callback used when a row is selected in the list of exception
- * dates.  We must update the date/time widgets to reflect the
- * exception's value.
- */
-static void
-exception_select_row_cb (GtkCList *clist, gint row, gint col,
-			 GdkEvent *event, gpointer data)
-{
-	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
-	CalComponentDateTime *dt;
-	struct icaltimetype *t;
-
-	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
-
-	/* Sometimes GtkCList emits a 'row-selected' signal for row 0 when
-	   there are 0 rows in the list (after you delete the last row).
-	   So we check that the row is valid here. */
-	if (row >= clist->rows)
-		return;
-
-	dt = gtk_clist_get_row_data (clist, row);
-	g_assert (dt != NULL);
-
-	t = dt->value;
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->exception_date), 
-			      t->year, t->month, t->day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->exception_date), 
-				     t->hour, t->minute);
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = rpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (rpage));
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	ECalendar *ecal;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = rpage->priv;
-
-	/* Recurrence preview */
-
-	priv->preview_calendar = e_calendar_new ();
-	ecal = E_CALENDAR (priv->preview_calendar);
-	gtk_signal_connect (GTK_OBJECT (ecal->calitem), "date_range_changed",
-			    GTK_SIGNAL_FUNC (preview_date_range_changed_cb),
-			    rpage);
-	calendar_config_configure_e_calendar (ecal);
-	e_calendar_item_set_max_days_sel (ecal->calitem, 0);
-	gtk_container_add (GTK_CONTAINER (priv->preview_bin),
-			   priv->preview_calendar);
-	gtk_widget_show (priv->preview_calendar);
-
-	/* Make sure the EDateEdit widgets and ECalendarItem use our timezones
-	   to get the current time. */
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->exception_date), FALSE);
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->exception_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   rpage, NULL);
-	e_calendar_item_set_get_time_callback (ecal->calitem,
-					       (ECalendarItemGetTimeCallback) comp_editor_get_current_time,
-					       rpage, NULL);
-
-	/* Recurrence types */
-
-	gtk_signal_connect (GTK_OBJECT (priv->none), "toggled",
-			    GTK_SIGNAL_FUNC (type_toggled_cb), rpage);
-	gtk_signal_connect (GTK_OBJECT (priv->simple), "toggled",
-			    GTK_SIGNAL_FUNC (type_toggled_cb), rpage);
-	gtk_signal_connect (GTK_OBJECT (priv->custom), "toggled",
-			    GTK_SIGNAL_FUNC (type_toggled_cb), rpage);
-
-	/* Recurrence interval */
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    GTK_SIGNAL_FUNC (interval_value_changed_cb),
-			    rpage);
-
-	/* Recurrence units */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (interval_selection_done_cb),
-			    rpage);
-
-	/* Recurrence ending */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (ending_selection_done_cb), rpage);
-
-	/* Exception buttons */
-
-	gtk_signal_connect (GTK_OBJECT (priv->exception_add), "clicked",
-			    GTK_SIGNAL_FUNC (exception_add_cb), rpage);
-	gtk_signal_connect (GTK_OBJECT (priv->exception_modify), "clicked",
-			    GTK_SIGNAL_FUNC (exception_modify_cb), rpage);
-	gtk_signal_connect (GTK_OBJECT (priv->exception_delete), "clicked",
-			    GTK_SIGNAL_FUNC (exception_delete_cb), rpage);
-
-	/* Selections in the exceptions list */
-
-	gtk_signal_connect (GTK_OBJECT (priv->exception_list), "select_row",
-			    GTK_SIGNAL_FUNC (exception_select_row_cb), rpage);
-}
-
-
-
-/**
- * recurrence_page_construct:
- * @rpage: A recurrence page.
- *
- * Constructs a recurrence page by loading its Glade data.
- *
- * Return value: The same object as @rpage, or NULL if the widgets could not be
- * created.
- **/
-RecurrencePage *
-recurrence_page_construct (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = rpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/recurrence-page.glade", NULL);
-	if (!priv->xml) {
-		g_message ("recurrence_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (rpage)) {
-		g_message ("recurrence_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (rpage);
-
-	return rpage;
-}
-
-/**
- * recurrence_page_new:
- *
- * Creates a new recurrence page.
- *
- * Return value: A newly-created recurrence page, or NULL if the page could not
- * be created.
- **/
-RecurrencePage *
-recurrence_page_new (void)
-{
-	RecurrencePage *rpage;
-
-	rpage = gtk_type_new (TYPE_RECURRENCE_PAGE);
-	if (!recurrence_page_construct (rpage)) {
-		gtk_object_unref (GTK_OBJECT (rpage));
-		return NULL;
-	}
-
-	return rpage;
-}
-
-
-GtkWidget *make_exdate_date_edit (void);
-
-GtkWidget *
-make_exdate_date_edit (void)
-{
-	return comp_editor_new_date_edit (TRUE, TRUE, FALSE);
-}
-
diff --git a/calendar/gui/dialogs/recurrence-page.glade b/calendar/gui/dialogs/recurrence-page.glade
deleted file mode 100644
index a044a771aa..0000000000
--- a/calendar/gui/dialogs/recurrence-page.glade
+++ /dev/null
@@ -1,602 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>recurrence-page</name>
-  <program_name>recurrence-page</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>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>recurrence-toplevel</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>GtkVBox</class>
-    <name>recurrence-page</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame35</name>
-      <label>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>table14</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>label66</name>
-	  <label>Summary:</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>label67</name>
-	  <label>Date/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>GtkLabel</class>
-	  <name>summary</name>
-	  <width>10</width>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>4</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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>date-time</name>
-	  <width>10</width>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>4</xpad>
-	  <ypad>0</ypad>
-	  <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>GtkVBox</class>
-      <name>vbox55</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame36</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>vbox56</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox56</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>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>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>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>hbox57</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>params</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>2</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label68</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>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>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>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>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>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>
-	      <class>GtkAlignment</class>
-	      <name>custom-warning-bin</name>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox59</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame37</name>
-	  <label>Exceptions</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>hbox60</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox57</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>exception-add</name>
-		<can_focus>True</can_focus>
-		<label>A_dd</label>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>exception-modify</name>
-		<can_focus>True</can_focus>
-		<label>_Modify</label>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>exception-delete</name>
-		<can_focus>True</can_focus>
-		<label>_Remove</label>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox58</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>exception-date</name>
-		<creation_function>make_exdate_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>scrolledwindow14</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>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>label69</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>GtkVBox</class>
-	  <name>vbox59</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label70</name>
-	    <label>Preview</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>GtkAlignment</class>
-	    <name>preview-bin</name>
-	    <xalign>0</xalign>
-	    <yalign>0</yalign>
-	    <xscale>1</xscale>
-	    <yscale>1</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h
deleted file mode 100644
index 29395f586f..0000000000
--- a/calendar/gui/dialogs/recurrence-page.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Recurrence page of the calendar component dialogs
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 RECURRENCE_PAGE_H
-#define RECURRENCE_PAGE_H
-
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_RECURRENCE_PAGE            (recurrence_page_get_type ())
-#define RECURRENCE_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_RECURRENCE_PAGE, RecurrencePage))
-#define RECURRENCE_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_RECURRENCE_PAGE, RecurrencePageClass))
-#define IS_RECURRENCE_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_RECURRENCE_PAGE))
-#define IS_RECURRENCE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_RECURRENCE_PAGE))
-
-typedef struct _RecurrencePagePrivate RecurrencePagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	RecurrencePagePrivate *priv;
-} RecurrencePage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} RecurrencePageClass;
-
-
-GtkType         recurrence_page_get_type  (void);
-RecurrencePage *recurrence_page_construct (RecurrencePage *rpage);
-RecurrencePage *recurrence_page_new       (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
deleted file mode 100644
index 67a43a7320..0000000000
--- a/calendar/gui/dialogs/save-comp.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include "save-comp.h"
-
-
-
-/**
- * save_component_dialog:
- * @parent: Window to use as the transient dialog's parent.
- * 
- * Pops up a dialog box asking the user whether he wants to save changes for
- * a calendar component.
- * 
- * Return value: TRUE if changes shold be saved, FALSE otherwise.
- **/
-gint
-save_component_dialog (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("Do you want to save changes?"),
-					GNOME_MESSAGE_BOX_QUESTION,
-					GNOME_STOCK_BUTTON_YES,
-					GNOME_STOCK_BUTTON_NO,
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_grab_focus (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);
-
-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
deleted file mode 100644
index 7090464a4e..0000000000
--- a/calendar/gui/dialogs/save-comp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 SAVE_COMP_H
-#define SAVE_COMP_H
-
-#include <gtk/gtkwindow.h>
-
-gint save_component_dialog (GtkWindow *parent);
-
-#endif
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
deleted file mode 100644
index 6ae7924355..0000000000
--- a/calendar/gui/dialogs/schedule-page.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/* Evolution calendar - Scheduling page
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <widgets/misc/e-dateedit.h>
-#include <e-util/e-dialog-widgets.h>
-#include "../calendar-config.h"
-#include "../e-meeting-time-sel.h"
-#include "../itip-utils.h"
-#include "comp-editor-util.h"
-#include "e-delegate-dialog.h"
-#include "schedule-page.h"
-
-
-
-/* Private part of the SchedulePage structure */
-struct _SchedulePagePrivate {	
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	/* Model */
-	EMeetingModel *model;
-	
-	/* Selector */
-	EMeetingTimeSelector *sel;
-	
-	/* The timezone we use. Note that we use the same timezone for the
-	   start and end date. We convert the end date if it is passed in in
-	   another timezone. */
-	icaltimezone *zone;
-
-	gboolean updating;
-};
-
-
-
-static void schedule_page_class_init (SchedulePageClass *class);
-static void schedule_page_init (SchedulePage *spage);
-static void schedule_page_destroy (GtkObject *object);
-
-static GtkWidget *schedule_page_get_widget (CompEditorPage *page);
-static void schedule_page_focus_main_widget (CompEditorPage *page);
-static void schedule_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean schedule_page_fill_component (CompEditorPage *page, CalComponent *comp);
-static void schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static void times_changed_cb (GtkWidget *widget, gpointer data);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * schedule_page_get_type:
- * 
- * Registers the #SchedulePage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #SchedulePage class.
- **/
-GtkType
-schedule_page_get_type (void)
-{
-	static GtkType schedule_page_type;
-
-	if (!schedule_page_type) {
-		static const GtkTypeInfo schedule_page_info = {
-			"SchedulePage",
-			sizeof (SchedulePage),
-			sizeof (SchedulePageClass),
-			(GtkClassInitFunc) schedule_page_class_init,
-			(GtkObjectInitFunc) schedule_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		schedule_page_type = 
-			gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-					 &schedule_page_info);
-	}
-
-	return schedule_page_type;
-}
-
-/* Class initialization function for the schedule page */
-static void
-schedule_page_class_init (SchedulePageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = schedule_page_get_widget;
-	editor_page_class->focus_main_widget = schedule_page_focus_main_widget;
-	editor_page_class->fill_widgets = schedule_page_fill_widgets;
-	editor_page_class->fill_component = schedule_page_fill_component;
-	editor_page_class->set_summary = NULL;
-	editor_page_class->set_dates = schedule_page_set_dates;
-
-	object_class->destroy = schedule_page_destroy;
-}
-
-/* Object initialization function for the schedule page */
-static void
-schedule_page_init (SchedulePage *spage)
-{
-	SchedulePagePrivate *priv;
-
-	priv = g_new0 (SchedulePagePrivate, 1);
-	spage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-
-	priv->zone = NULL;
-
-	priv->updating = FALSE;
-}
-
-/* Destroy handler for the schedule page */
-static void
-schedule_page_destroy (GtkObject *object)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_SCHEDULE_PAGE (object));
-
-	spage = SCHEDULE_PAGE (object);
-	priv = spage->priv;
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (priv->model));
-
-	g_free (priv);
-	spage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_widget handler for the schedule page */
-static GtkWidget *
-schedule_page_get_widget (CompEditorPage *page)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the schedule page */
-static void
-schedule_page_focus_main_widget (CompEditorPage *page)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	gtk_widget_grab_focus (GTK_WIDGET (priv->sel));
-}
-
-/* Set date/time */
-static void
-update_time (SchedulePage *spage, CalComponentDateTime *start_date, CalComponentDateTime *end_date) 
-{
-	SchedulePagePrivate *priv;
-	struct icaltimetype start_tt, end_tt;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-	CalClientGetStatus status;
-	gboolean all_day;
-
-	priv = spage->priv;
-	
-	/* Note that if we are creating a new event, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
-	start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date->tzid);
-	if (!start_zone) {
-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (spage)->client,
-						  start_date->tzid,
-						  &start_zone);
-		/* FIXME: Handle error better. */
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			g_warning ("Couldn't get timezone from server: %s",
-				   start_date->tzid ? start_date->tzid : "");
-	}
-
-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date->tzid);
-	if (!end_zone) {
-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (spage)->client,
-						  end_date->tzid,
-						  &end_zone);
-		/* FIXME: Handle error better. */
-		if (status != CAL_CLIENT_GET_SUCCESS)
-		  g_warning ("Couldn't get timezone from server: %s",
-			     end_date->tzid ? end_date->tzid : "");
-	}
-
-	start_tt = *start_date->value;
-	end_tt = *end_date->value;
-	
-	/* If the end zone is not the same as the start zone, we convert it. */
-	priv->zone = start_zone;
-	if (start_zone != end_zone) {
-		icaltimezone_convert_time (&end_tt, end_zone, start_zone);
-	}
-	e_meeting_model_set_zone (priv->model, priv->zone);
-	
-	all_day = (start_tt.is_date && end_tt.is_date) ? TRUE : FALSE;
-
-	/* For All Day Events, if DTEND is after DTSTART, we subtract 1 day
-	   from it. */
-	if (all_day) {
-		if (icaltime_compare_date_only (end_tt, start_tt) > 0) {
-			icaltime_adjust (&end_tt, -1, 0, 0, 0);
-		}
-	}
-
-	e_meeting_time_selector_set_all_day (priv->sel, all_day);
-	
-	e_date_edit_set_date (E_DATE_EDIT (priv->sel->start_date_edit), start_tt.year,
-			      start_tt.month, start_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->sel->start_date_edit),
-				     start_tt.hour, start_tt.minute);
-
-	e_date_edit_set_date (E_DATE_EDIT (priv->sel->end_date_edit), end_tt.year,
-			      end_tt.month, end_tt.day);
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->sel->end_date_edit),
-				     end_tt.hour, end_tt.minute);
-
-}
-
-		
-/* Fills the widgets with default values */
-static void
-clear_widgets (SchedulePage *spage)
-{
-	SchedulePagePrivate *priv;
-	
-	priv = spage->priv;
-}
-
-/* fill_widgets handler for the schedule page */
-static void
-schedule_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	CalComponentDateTime start_date, end_date;
-
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	priv->updating = TRUE;
-
-	/* Clean the screen */
-	clear_widgets (spage);
-
-	/* Start and end times */
-	cal_component_get_dtstart (comp, &start_date);
-	cal_component_get_dtend (comp, &end_date);
-	update_time (spage, &start_date, &end_date);
-	
-	cal_component_free_datetime (&start_date);
-	cal_component_free_datetime (&end_date);
-	
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the schedule page */
-static gboolean
-schedule_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	return TRUE;
-}
-
-static void
-schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
-	priv->updating = TRUE;
-	
-	update_time (spage, dates->start, dates->end);
-
-	priv->updating = FALSE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (SchedulePage *spage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (spage);
-	SchedulePagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = spage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("schedule-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-#undef GW
-
-	return TRUE;
-}
-
-static gboolean
-init_widgets (SchedulePage *spage) 
-{
-	SchedulePagePrivate *priv;
-
-	priv = spage->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->sel), 
-			    "changed", times_changed_cb, spage);
-
-	return TRUE;
-	
-}
-
-
-
-/**
- * schedule_page_construct:
- * @spage: An schedule page.
- * 
- * Constructs an schedule page by loading its Glade data.
- * 
- * Return value: The same object as @spage, or NULL if the widgets could not 
- * be created.
- **/
-SchedulePage *
-schedule_page_construct (SchedulePage *spage, EMeetingModel *emm)
-{
-	SchedulePagePrivate *priv;
-	
-	priv = spage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/schedule-page.glade", NULL);
-	if (!priv->xml) {
-		g_message ("schedule_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (spage)) {
-		g_message ("schedule_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	/* Model */
-	gtk_object_ref (GTK_OBJECT (emm));
-	priv->model = emm;
-	
-	/* Selector */
-	priv->sel = E_MEETING_TIME_SELECTOR (e_meeting_time_selector_new (emm));
-	e_meeting_time_selector_set_working_hours (priv->sel,
-						   calendar_config_get_day_start_hour (),
-						   calendar_config_get_day_start_minute (),
-						   calendar_config_get_day_end_hour (),
-						   calendar_config_get_day_end_minute ());
-	gtk_widget_show (GTK_WIDGET (priv->sel));
-	gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 2);
-
-	if (!init_widgets (spage)) {
-		g_message ("schedule_page_construct(): " 
-			   "Could not initialize the widgets!");
-		return NULL;
-	}
-
-	return spage;
-}
-
-/**
- * schedule_page_new:
- * 
- * Creates a new schedule page.
- * 
- * Return value: A newly-created schedule page, or NULL if the page could
- * not be created.
- **/
-SchedulePage *
-schedule_page_new (EMeetingModel *emm)
-{
-	SchedulePage *spage;
-
-	spage = gtk_type_new (TYPE_SCHEDULE_PAGE);
-	if (!schedule_page_construct (spage, emm)) {
-		gtk_object_unref (GTK_OBJECT (spage));
-		return NULL;
-	}
-
-	return spage;
-}
-
-static void
-times_changed_cb (GtkWidget *widget, gpointer data)
-{
-	SchedulePage *spage = data;
-	SchedulePagePrivate *priv;
-	CompEditorPageDates dates;
-	CalComponentDateTime start_dt, end_dt;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	struct icaltimetype end_tt = icaltime_null_time ();
-	
-	priv = spage->priv;
-
-	if (priv->updating)
-		return;
-	
-	e_date_edit_get_date (E_DATE_EDIT (priv->sel->start_date_edit),
-			      &start_tt.year,
-			      &start_tt.month,
-			      &start_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->sel->start_date_edit),
-				     &start_tt.hour,
-				     &start_tt.minute);
-	e_date_edit_get_date (E_DATE_EDIT (priv->sel->end_date_edit),
-			      &end_tt.year,
-			      &end_tt.month,
-			      &end_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->sel->end_date_edit),
-				     &end_tt.hour,
-				     &end_tt.minute);
-
-	start_dt.value = &start_tt;
-	end_dt.value = &end_tt;
-
-	if (e_date_edit_get_show_time (E_DATE_EDIT (priv->sel->start_date_edit))) {
-		/* We set the start and end to the same timezone. */
-		start_dt.tzid = icaltimezone_get_tzid (priv->zone);
-		end_dt.tzid = start_dt.tzid;
-	} else {
-		/* For All-Day Events, we set the timezone to NULL, and add
-		   1 day to DTEND. */
-		start_dt.value->is_date = TRUE;
-		start_dt.tzid = NULL;
-		end_dt.value->is_date = TRUE;
-		icaltime_adjust (&end_tt, 1, 0, 0, 0);
-		end_dt.tzid = NULL;
-	}
-
-	dates.start = &start_dt;
-	dates.end = &end_dt;	
-	dates.due = NULL;
-	dates.complete = NULL;
-
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (spage),
-					       &dates);
-}
diff --git a/calendar/gui/dialogs/schedule-page.glade b/calendar/gui/dialogs/schedule-page.glade
deleted file mode 100644
index 95a2147659..0000000000
--- a/calendar/gui/dialogs/schedule-page.glade
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-details-page</name>
-  <program_name>task-details-page</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>schedule-toplevel</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>GtkVBox</class>
-    <name>schedule-page</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
deleted file mode 100644
index c485ba0f9e..0000000000
--- a/calendar/gui/dialogs/schedule-page.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Evolution calendar - Scheduling page
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 SCHEDULE_PAGE_H
-#define SCHEDULE_PAGE_H
-
-#include "../e-meeting-model.h"
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_SCHEDULE_PAGE            (schedule_page_get_type ())
-#define SCHEDULE_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_SCHEDULE_PAGE, SchedulePage))
-#define SCHEDULE_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_SCHEDULE_PAGE, SchedulePageClass))
-#define IS_SCHEDULE_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_SCHEDULE_PAGE))
-#define IS_SCHEDULE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_SCHEDULE_PAGE))
-
-typedef struct _SchedulePagePrivate SchedulePagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	SchedulePagePrivate *priv;
-} SchedulePage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} SchedulePageClass;
-
-
-GtkType      schedule_page_get_type  (void);
-SchedulePage *schedule_page_construct (SchedulePage *mpage, EMeetingModel *emm);
-SchedulePage *schedule_page_new       (EMeetingModel *emm);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
deleted file mode 100644
index 2afd92320e..0000000000
--- a/calendar/gui/dialogs/send-comp.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
-#include "send-comp.h"
-
-
-
-/**
- * send_component_dialog:
- * 
- * Pops up a dialog box asking the user whether he wants to send a
- * iTip/iMip message
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-send_component_dialog (CalComponent *comp, gboolean new)
-{
-	GtkWidget *dialog;
-	CalComponentVType vtype;
-	char *str;
-
-	vtype = cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		if (new)
-			str = g_strdup_printf (_("The meeting information has "
-						 "been created. Send it?"));
-		else
-			str = g_strdup_printf (_("The meeting information has "
-						 "changed. Send an updated "
-						 "version?"));
-		break;
-
-	case CAL_COMPONENT_TODO:
-		if (new)
-			str = g_strdup_printf (_("The task assignment "
-						 "information has been "
-						 "created. Send it?"));
-		else
-			str = g_strdup_printf (_("The task information has "
-						 "changed. Send an updated "
-						 "version?"));
-		break;
-
-	default:
-		g_message ("send_component_dialog(): "
-			   "Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-	
-	dialog = gnome_question_dialog_modal (str, NULL, NULL);
-
-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
deleted file mode 100644
index 9a77d8bd4e..0000000000
--- a/calendar/gui/dialogs/send-comp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 SEND_COMP_H
-#define SEND_COMP_H
-
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-gboolean send_component_dialog (CalComponent *comp, gboolean new);
-
-#endif
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
deleted file mode 100644
index 84070ff541..0000000000
--- a/calendar/gui/dialogs/task-details-page.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/* Evolution calendar - task details page
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtktogglebutton.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <widgets/misc/e-dateedit.h>
-#include <widgets/misc/e-url-entry.h>
-#include "e-util/e-dialog-widgets.h"
-#include "../calendar-config.h"
-#include "../e-timezone-entry.h"
-#include "comp-editor-util.h"
-#include "task-details-page.h"
-
-
-
-/* Private part of the TaskDetailsPage structure */
-struct _TaskDetailsPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	GtkWidget *status;
-	GtkWidget *priority;
-	GtkWidget *percent_complete;
-
-	GtkWidget *completed_date;
-
-	GtkWidget *url_entry;
-	GtkWidget *url;
-
-	gboolean updating;
-};
-
-/* 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
-};
-
-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 void task_details_page_class_init (TaskDetailsPageClass *class);
-static void task_details_page_init (TaskDetailsPage *tdpage);
-static void task_details_page_destroy (GtkObject *object);
-
-static GtkWidget *task_details_page_get_widget (CompEditorPage *page);
-static void task_details_page_focus_main_widget (CompEditorPage *page);
-static void task_details_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean task_details_page_fill_component (CompEditorPage *page, CalComponent *comp);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * task_details_page_get_type:
- * 
- * Registers the #TaskDetailsPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #TaskDetailsPage class.
- **/
-GtkType
-task_details_page_get_type (void)
-{
-	static GtkType task_details_page_type;
-
-	if (!task_details_page_type) {
-		static const GtkTypeInfo task_details_page_info = {
-			"TaskDetailsPage",
-			sizeof (TaskDetailsPage),
-			sizeof (TaskDetailsPageClass),
-			(GtkClassInitFunc) task_details_page_class_init,
-			(GtkObjectInitFunc) task_details_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		task_details_page_type = 
-			gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-					 &task_details_page_info);
-	}
-
-	return task_details_page_type;
-}
-
-/* Class initialization function for the task page */
-static void
-task_details_page_class_init (TaskDetailsPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = task_details_page_get_widget;
-	editor_page_class->focus_main_widget = task_details_page_focus_main_widget;
-	editor_page_class->fill_widgets = task_details_page_fill_widgets;
-	editor_page_class->fill_component = task_details_page_fill_component;
-
-	object_class->destroy = task_details_page_destroy;
-}
-
-/* Object initialization function for the task page */
-static void
-task_details_page_init (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = g_new0 (TaskDetailsPagePrivate, 1);
-	tdpage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-
-	priv->status = NULL;
-	priv->priority = NULL;
-	priv->percent_complete = NULL;
-	
-	priv->completed_date = NULL;
-
-	priv->url_entry = NULL;
-	priv->url = NULL;
-
-	priv->updating = FALSE;
-}
-
-/* Destroy handler for the task page */
-static void
-task_details_page_destroy (GtkObject *object)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_DETAILS_PAGE (object));
-
-	tdpage = TASK_DETAILS_PAGE (object);
-	priv = tdpage->priv;
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	tdpage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_widget handler for the task page */
-static GtkWidget *
-task_details_page_get_widget (CompEditorPage *page)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the task page */
-static void
-task_details_page_focus_main_widget (CompEditorPage *page)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	gtk_widget_grab_focus (priv->status);
-}
-
-
-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;
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	/* Date completed */
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
-
-	/* URL */
-	e_dialog_editable_set (priv->url, NULL);
-}
-
-/* fill_widgets handler for the task page */
-static void
-task_details_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	int *priority_value, *percent;
-	TaskEditorPriority priority;
-	icalproperty_status status;
-	const char *url;
-	struct icaltimetype *completed = NULL;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean the screen */
-	clear_widgets (tdpage);
-	
-	/* Percent Complete. */
-	cal_component_get_percent (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 (comp, &status);
-	if (status == ICAL_STATUS_NONE) {
-		/* Try to use 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;
-	}
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	/* Completed Date. */
-	cal_component_get_completed (comp, &completed);
-	if (completed) {
-		icaltimezone *utc_zone, *zone;
-		char *location;
-
-		/* Completed is in UTC, but that would confuse the user, so
-		   we convert it to local time. */
-		utc_zone = icaltimezone_get_utc_timezone ();
-		location = calendar_config_get_timezone ();
-		zone = icaltimezone_get_builtin_timezone (location);
-
-		icaltimezone_convert_time (completed, utc_zone, zone);
-
-		e_date_edit_set_date (E_DATE_EDIT (priv->completed_date),
-				      completed->year, completed->month,
-				      completed->day);
-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv->completed_date),
-					     completed->hour,
-					     completed->minute);
-
-		cal_component_free_icaltimetype (completed);
-	}
-
-	/* Priority. */
-	cal_component_get_priority (comp, &priority_value);
-	if (priority_value) {
-		priority = priority_value_to_index (*priority_value);
-		cal_component_free_priority (priority_value);
-	} else {
-		priority = PRIORITY_UNDEFINED;
-	}
-	e_dialog_option_menu_set (priv->priority, priority, priority_map);
-
-	/* URL */
-	cal_component_get_url (comp, &url);
-	e_dialog_editable_set (priv->url, url);
-	
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the task page */
-static gboolean
-task_details_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	struct icaltimetype icaltime;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	int priority_value, percent;
-	char *url;
-	gboolean date_set;
-	
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	/* 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);
-	cal_component_set_status (comp, status);
-
-	/* 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);
-
-	icaltime = icaltime_null_time ();
-
-	/* COMPLETED must be in UTC. */
-	icaltime.is_utc = 1;
-
-	/* Completed Date. */
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->completed_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->completed_date),
-				     &icaltime.hour,
-				     &icaltime.minute);
-	if (date_set) {
-		/* COMPLETED must be in UTC, so we assume that the date in the
-		   dialog is in the current timezone, and we now convert it
-		   to UTC. FIXME: We should really use one timezone for the
-		   entire time the dialog is shown. Otherwise if the user
-		   changes the timezone, the COMPLETED date may get changed
-		   as well. */
-		char *location = calendar_config_get_timezone ();
-		icaltimezone *zone = icaltimezone_get_builtin_timezone (location);
-		icaltimezone_convert_time (&icaltime, zone,
-					   icaltimezone_get_utc_timezone ());
-		cal_component_set_completed (comp, &icaltime);
-	} else {
-		cal_component_set_completed (comp, NULL);
-	}
-
-	/* URL. */
-	url = e_dialog_editable_get (priv->url);
-	cal_component_set_url (comp, url);
-	if (url)
-		g_free (url);
-
-	return TRUE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (TaskDetailsPage *tdpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (tdpage);
-	TaskDetailsPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = tdpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("task-details-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->status = GW ("status");
-	priv->priority = GW ("priority");
-	priv->percent_complete = GW ("percent-complete");
-
-	priv->completed_date = GW ("completed-date");
-
-	priv->url_entry = GW ("url_entry");
-	priv->url = e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry));
-	
-#undef GW
-
-	return (priv->status
-		&& priv->priority
-		&& priv->percent_complete
-		&& priv->completed_date
-		&& priv->url);
-}
-
-
-static void
-complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
-{
-	TaskDetailsPagePrivate *priv;
-	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
-	icaltimezone *zone;
-	struct icaltimetype completed_tt = icaltime_null_time();
-
-	priv = tdpage->priv;
-
-	/* Get the current time in UTC. */
-	zone = icaltimezone_get_utc_timezone ();
-	completed_tt = icaltime_from_timet_with_zone (ctime, FALSE, zone);
-	completed_tt.is_utc = TRUE;
-
-	dates.start = NULL;
-	dates.end = NULL;
-	dates.due = NULL;	
-	if (complete)
-		dates.complete = &completed_tt;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage),
-					       &dates);
-}
-
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
-	struct icaltimetype completed_tt = icaltime_null_time ();
-	icalproperty_status status;
-	gboolean date_set;
-
-	tdpage = TASK_DETAILS_PAGE (data);
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-
-	priv->updating = TRUE;
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->completed_date),
-					 &completed_tt.year,
-					 &completed_tt.month,
-					 &completed_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->completed_date),
-				     &completed_tt.hour,
-				     &completed_tt.minute);
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-
-	if (!date_set) {
-		completed_tt = icaltime_null_time ();
-		if (status == ICAL_STATUS_COMPLETED) {
-			e_dialog_option_menu_set (priv->status,
-						  ICAL_STATUS_NEEDSACTION,
-						  status_map);
-			e_dialog_spin_set (priv->percent_complete, 0);
-		}
-	} else {
-		if (status != ICAL_STATUS_COMPLETED) {
-			e_dialog_option_menu_set (priv->status,
-						  ICAL_STATUS_COMPLETED,
-						  status_map);
-		}
-		e_dialog_spin_set (priv->percent_complete, 100);
-	}
-	
-	priv->updating = FALSE;
-
-	/* Notify upstream */
-	dates.complete = &completed_tt;
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage), &dates);
-}
-
-static void
-status_changed (GtkMenu	*menu, TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-	icalproperty_status status;
-	time_t ctime = -1;
-	
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-
-	priv->updating = TRUE;
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	if (status == ICAL_STATUS_NEEDSACTION) {
-		e_dialog_spin_set (priv->percent_complete, 0);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-		complete_date_changed (tdpage, 0, FALSE);
-	} else if (status == ICAL_STATUS_INPROCESS) {
-		e_dialog_spin_set (priv->percent_complete, 50);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-		complete_date_changed (tdpage, 0, FALSE);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		e_dialog_spin_set (priv->percent_complete, 100);
-		ctime = time (NULL);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-		complete_date_changed (tdpage, ctime, TRUE);
-	}
-
-	priv->updating = FALSE;
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));
-}
-
-static void
-percent_complete_changed (GtkAdjustment	*adj, TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-	gint percent;
-	icalproperty_status status;
-	gboolean complete;
-	time_t ctime = -1;
-	
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-	
-	priv->updating = TRUE;
-
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	if (percent == 100) {
-		complete = TRUE;
-		ctime = time (NULL);
-		status = ICAL_STATUS_COMPLETED;
-	} else {
-		complete = FALSE;
-
-		if (percent == 0)
-			status = ICAL_STATUS_NEEDSACTION;
-		else
-			status = ICAL_STATUS_INPROCESS;
-	}
-
-	e_dialog_option_menu_set (priv->status, status, status_map);
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), ctime);
-	complete_date_changed (tdpage, ctime, complete);
-
-	priv->updating = FALSE;
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	
-	tdpage = TASK_DETAILS_PAGE (data);
-	priv = tdpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->completed_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   tdpage, NULL);
-
-	/* 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 (GTK_OPTION_MENU (priv->status)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (status_changed), tdpage);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    GTK_SIGNAL_FUNC (percent_complete_changed), tdpage);
-
-	/* Priority */
-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->priority)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tdpage);
-
-	/* Completed Date */
-	gtk_signal_connect (GTK_OBJECT (priv->completed_date), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), tdpage);
-
-	/* URL */
-	gtk_signal_connect (GTK_OBJECT (priv->url), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tdpage);
-}
-
-
-
-/**
- * task_details_page_construct:
- * @tdpage: An task details page.
- * 
- * Constructs an task page by loading its Glade data.
- * 
- * Return value: The same object as @tdpage, or NULL if the widgets could not 
- * be created.
- **/
-TaskDetailsPage *
-task_details_page_construct (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/task-details-page.glade", NULL);
-	if (!priv->xml) {
-		g_message ("task_details_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (tdpage)) {
-		g_message ("task_details_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (tdpage);
-
-	return tdpage;
-}
-
-/**
- * task_details_page_new:
- * 
- * Creates a new task details page.
- * 
- * Return value: A newly-created task details page, or NULL if the page could
- * not be created.
- **/
-TaskDetailsPage *
-task_details_page_new (void)
-{
-	TaskDetailsPage *tdpage;
-
-	tdpage = gtk_type_new (TYPE_TASK_DETAILS_PAGE);
-	if (!task_details_page_construct (tdpage)) {
-		gtk_object_unref (GTK_OBJECT (tdpage));
-		return NULL;
-	}
-
-	return tdpage;
-}
-
-GtkWidget *task_details_page_create_date_edit (void);
-
-GtkWidget *
-task_details_page_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = comp_editor_new_date_edit (TRUE, TRUE, FALSE);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-
-	return dedit;
-}
-
diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade
deleted file mode 100644
index 28bf6a3bcc..0000000000
--- a/calendar/gui/dialogs/task-details-page.glade
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-details-page</name>
-  <program_name>task-details-page</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>task-details-toplevel</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>GtkVBox</class>
-    <name>task-details-page</name>
-    <border_width>4</border_width>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame2</name>
-      <label>Progress</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>vbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox1</name>
-	  <border_width>4</border_width>
-	  <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>_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>label18</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
-Undefined
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label19</name>
-	    <label>% Complete</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>GtkSpinButton</class>
-	    <name>percent-complete</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>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table1</name>
-	  <border_width>4</border_width>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>2</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <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>Custom</class>
-	    <name>completed-date</name>
-	    <creation_function>task_details_page_create_date_edit</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Fri, 01 Jun 2001 18:58:51 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>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <border_width>4</border_width>
-      <rows>1</rows>
-      <columns>2</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>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>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>url_entry</name>
-	<creation_function>e_url_entry_new</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Feb 2002 21:02:37 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>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h
deleted file mode 100644
index 580388cb8d..0000000000
--- a/calendar/gui/dialogs/task-details-page.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_DETAILS_PAGE_H
-#define TASK_DETAILS_PAGE_H
-
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_TASK_DETAILS_PAGE            (task_details_page_get_type ())
-#define TASK_DETAILS_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPage))
-#define TASK_DETAILS_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_DETAILS_PAGE, TaskDetailsPageClass))
-#define IS_TASK_DETAILS_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_TASK_DETAILS_PAGE))
-#define IS_TASK_DETAILS_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_TASK_DETAILS_PAGE))
-
-typedef struct _TaskDetailsPagePrivate TaskDetailsPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	TaskDetailsPagePrivate *priv;
-} TaskDetailsPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} TaskDetailsPageClass;
-
-
-GtkType          task_details_page_get_type        (void);
-TaskDetailsPage *task_details_page_construct       (TaskDetailsPage *tdpage);
-TaskDetailsPage *task_details_page_new             (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
deleted file mode 100644
index 1ede12fff3..0000000000
--- a/calendar/gui/dialogs/task-editor.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Task editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "task-page.h"
-#include "task-details-page.h"
-#include "meeting-page.h"
-#include "cancel-comp.h"
-#include "task-editor.h"
-
-struct _TaskEditorPrivate {
-	TaskPage *task_page;
-	TaskDetailsPage *task_details_page;
-	MeetingPage *meet_page;
-
-	EMeetingModel *model;
-	
-	gboolean assignment_shown;
-	gboolean existing_org;
-	gboolean updating;	
-};
-
-
-
-static void task_editor_class_init (TaskEditorClass *class);
-static void task_editor_init (TaskEditor *te);
-static void task_editor_edit_comp (CompEditor *editor, CalComponent *comp);
-static void task_editor_send_comp (CompEditor *editor, CalComponentItipMethod method);
-static void task_editor_destroy (GtkObject *object);
-
-static void assign_task_cmd (GtkWidget *widget, gpointer data);
-static void refresh_task_cmd (GtkWidget *widget, gpointer data);
-static void cancel_task_cmd (GtkWidget *widget, gpointer data);
-static void forward_cmd (GtkWidget *widget, gpointer data);
-
-static void model_row_changed_cb (ETableModel *etm, int row, gpointer data);
-static void row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data);
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ActionAssignTask", assign_task_cmd),
-	BONOBO_UI_UNSAFE_VERB ("ActionRefreshTask", refresh_task_cmd),
-	BONOBO_UI_UNSAFE_VERB ("ActionCancelTask", cancel_task_cmd),
-	BONOBO_UI_UNSAFE_VERB ("ActionForward", forward_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static CompEditorClass *parent_class;
-
-
-
-/**
- * task_editor_get_type:
- *
- * Registers the #TaskEditor class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #TaskEditor class.
- **/
-GtkType
-task_editor_get_type (void)
-{
-	static GtkType task_editor_type = 0;
-
-	if (!task_editor_type) {
-		static const GtkTypeInfo task_editor_info = {
-			"TaskEditor",
-			sizeof (TaskEditor),
-			sizeof (TaskEditorClass),
-			(GtkClassInitFunc) task_editor_class_init,
-			(GtkObjectInitFunc) task_editor_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		task_editor_type = gtk_type_unique (TYPE_COMP_EDITOR,
-						     &task_editor_info);
-	}
-
-	return task_editor_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-task_editor_class_init (TaskEditorClass *klass)
-{
-	GtkObjectClass *object_class;
-	CompEditorClass *editor_class;
-
-	object_class = (GtkObjectClass *) klass;
-	editor_class = (CompEditorClass *) klass;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR);
-
-	editor_class->edit_comp = task_editor_edit_comp;
-	editor_class->send_comp = task_editor_send_comp;
-
-	object_class->destroy = task_editor_destroy;
-}
-
-static void
-set_menu_sens (TaskEditor *te) 
-{
-	TaskEditorPrivate *priv;
-	gboolean sens;
-	
-	priv = te->priv;
-
-	sens = priv->assignment_shown;
-	comp_editor_set_ui_prop (COMP_EDITOR (te), 
-				 "/commands/ActionAssignTask", 
-				 "sensitive", sens ? "0" : "1");
-
-	sens = sens && priv->existing_org;
-	comp_editor_set_ui_prop (COMP_EDITOR (te), 
-				 "/commands/ActionRefreshTask", 
-				 "sensitive", sens ? "1" : "0");
-	comp_editor_set_ui_prop (COMP_EDITOR (te), 
-				 "/commands/ActionCancelTask", 
-				 "sensitive", sens ? "1" : "0");
-}
-
-static void
-init_widgets (TaskEditor *te)
-{
-	TaskEditorPrivate *priv;
-
-	priv = te->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->model), "model_row_changed",
-			    GTK_SIGNAL_FUNC (model_row_changed_cb), te);
-	gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_inserted",
-			    GTK_SIGNAL_FUNC (row_count_changed_cb), te);
-	gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_deleted",
-			    GTK_SIGNAL_FUNC (row_count_changed_cb), te);
-}
-
-/* Object initialization function for the task editor */
-static void
-task_editor_init (TaskEditor *te)
-{
-	TaskEditorPrivate *priv;
-	
-	priv = g_new0 (TaskEditorPrivate, 1);
-	te->priv = priv;
-
-	priv->task_page = task_page_new ();
-	comp_editor_append_page (COMP_EDITOR (te), 
-				 COMP_EDITOR_PAGE (priv->task_page),
-				 _("Basic"));
-
-	priv->task_details_page = task_details_page_new ();
-	comp_editor_append_page (COMP_EDITOR (te),
-				 COMP_EDITOR_PAGE (priv->task_details_page),
-				 _("Details"));
-
-	priv->model = E_MEETING_MODEL (e_meeting_model_new ());
-
-	priv->meet_page = meeting_page_new (priv->model);
-	comp_editor_append_page (COMP_EDITOR (te),
-				 COMP_EDITOR_PAGE (priv->meet_page),
-				 _("Assignment"));
-
-	comp_editor_merge_ui (COMP_EDITOR (te), "evolution-task-editor.xml", verbs);
-
-	priv->assignment_shown = TRUE;
-	priv->existing_org = FALSE;
-	priv->updating = FALSE;	
-
-	init_widgets (te);
-	set_menu_sens (te);
-}
-
-static void
-task_editor_edit_comp (CompEditor *editor, CalComponent *comp)
-{
-	TaskEditor *te;
-	TaskEditorPrivate *priv;
-	GSList *attendees = NULL;
-	
-	te = TASK_EDITOR (editor);
-	priv = te->priv;
-
-	priv->updating = TRUE;
-
-	priv->existing_org = cal_component_has_organizer (comp);
-	cal_component_get_attendee_list (comp, &attendees);
-
-	e_meeting_model_remove_all_attendees (priv->model);
-	if (attendees == NULL) {
-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
-		priv->assignment_shown = FALSE;
-	} else {
-		GSList *l;
-
-		if (!priv->assignment_shown)
-			comp_editor_append_page (COMP_EDITOR (te),
-						 COMP_EDITOR_PAGE (priv->meet_page),
-						 _("Assignment"));
-
-		for (l = attendees; l != NULL; l = l->next) {
-			CalComponentAttendee *ca = l->data;
-			EMeetingAttendee *ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca));
-			
-			e_meeting_model_add_attendee (priv->model, ia);
-			gtk_object_unref (GTK_OBJECT (ia));
-		}
-		priv->assignment_shown = TRUE;		
-	}
-	cal_component_free_attendee_list (attendees);
-
-	set_menu_sens (te);
-	comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown);
-
-	priv->updating = FALSE;
-	
-	if (parent_class->edit_comp)
-		parent_class->edit_comp (editor, comp);
-}
-
-static void
-task_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)
-{
-	TaskEditor *te = TASK_EDITOR (editor);
-	TaskEditorPrivate *priv;
-	CalComponent *comp = NULL;
-
-	priv = te->priv;
-
-	/* Don't cancel more than once or when just publishing */
-	if (method == CAL_COMPONENT_METHOD_PUBLISH ||
-	    method == CAL_COMPONENT_METHOD_CANCEL)
-		goto parent;
-	
-	comp = meeting_page_get_cancel_comp (priv->meet_page);
-	if (comp != NULL) {
-		CalClient *client;
-		
-		client = e_meeting_model_get_cal_client (priv->model);
-		itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
- parent:
-	if (parent_class->send_comp)
-		parent_class->send_comp (editor, method);
-}
-
-/* Destroy handler for the event editor */
-static void
-task_editor_destroy (GtkObject *object)
-{
-	TaskEditor *te;
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (object));
-
-	te = TASK_EDITOR (object);
-	priv = te->priv;
-
-	gtk_object_unref (GTK_OBJECT (priv->task_page));
-	gtk_object_unref (GTK_OBJECT (priv->task_details_page));
-	gtk_object_unref (GTK_OBJECT (priv->meet_page));
-	
-	gtk_object_unref (GTK_OBJECT (priv->model));
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/**
- * task_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.
- **/
-TaskEditor *
-task_editor_new (void)
-{
-	return TASK_EDITOR (gtk_type_new (TYPE_TASK_EDITOR));
-}
-
-static void
-show_assignment (TaskEditor *te)
-{
-	TaskEditorPrivate *priv;
-
-	priv = te->priv;
-
-	if (!priv->assignment_shown) {
-		comp_editor_append_page (COMP_EDITOR (te),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Assignment"));
-		priv->assignment_shown = TRUE;
-
-		set_menu_sens (te);
-		comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown);
-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);
-	}
-
-	comp_editor_show_page (COMP_EDITOR (te),
-			       COMP_EDITOR_PAGE (priv->meet_page));
-}
-
-void
-task_editor_show_assignment (TaskEditor *te)
-{
-	g_return_if_fail (te != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (te));
-
-	show_assignment (te);
-}
-
-static void
-assign_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-
-	show_assignment (te);
-}
-
-static void
-refresh_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-
-	comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_REFRESH);
-}
-
-static void
-cancel_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	CalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (COMP_EDITOR (te));
-	if (cancel_component_dialog (comp)) {
-		comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_CANCEL);
-		comp_editor_delete_comp (COMP_EDITOR (te));
-	}
-}
-
-static void
-forward_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	
-	if (comp_editor_save_comp (COMP_EDITOR (te), TRUE))
-		comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_PUBLISH);
-}
-
-static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	TaskEditorPrivate *priv;
-	
-	priv = te->priv;
-	
-	if (!priv->updating)
-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);
-}
-
-static void
-row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	TaskEditorPrivate *priv;
-	
-	priv = te->priv;
-	
-	if (!priv->updating)
-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);
-}
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
deleted file mode 100644
index e9888f446a..0000000000
--- a/calendar/gui/dialogs/task-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution calendar - Task editor dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include "comp-editor.h"
-
-
-
-#define TYPE_TASK_EDITOR            (task_editor_get_type ())
-#define TASK_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_TASK_EDITOR, TaskEditor))
-#define TASK_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_EDITOR,	\
-				      TaskEditorClass))
-#define IS_TASK_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_TASK_EDITOR))
-#define IS_TASK_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_TASK_EDITOR))
-
-typedef struct _TaskEditor TaskEditor;
-typedef struct _TaskEditorClass TaskEditorClass;
-typedef struct _TaskEditorPrivate TaskEditorPrivate;
-
-struct _TaskEditor {
-	CompEditor parent;
-
-	/* Private data */
-	TaskEditorPrivate *priv;
-};
-
-struct _TaskEditorClass {
-	CompEditorClass parent_class;
-};
-
-GtkType     task_editor_get_type       (void);
-TaskEditor *task_editor_construct      (TaskEditor *te);
-TaskEditor *task_editor_new            (void);
-void        task_editor_show_assignment(TaskEditor *te);
-
-
-#endif /* __TASK_EDITOR_H__ */
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
deleted file mode 100644
index 6b55b58c84..0000000000
--- a/calendar/gui/dialogs/task-page.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-categories.h>
-#include <widgets/misc/e-dateedit.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-categories-config.h"
-#include "../e-timezone-entry.h"
-#include "../calendar-config.h"
-#include "comp-editor-util.h"
-#include "task-page.h"
-
-
-
-/* Private part of the TaskPage structure */
-struct _TaskPagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Widgets from the Glade file */
-	GtkWidget *main;
-
-	GtkWidget *summary;
-
-	GtkWidget *due_date;
-	GtkWidget *start_date;
-	GtkWidget *due_timezone;
-	GtkWidget *start_timezone;
-
-	GtkWidget *description;
-
-	GtkWidget *classification_public;
-	GtkWidget *classification_private;
-	GtkWidget *classification_confidential;
-
-	GtkWidget *contacts_btn;	
-	GtkWidget *contacts_box;
-
-	GtkWidget *categories_btn;
-	GtkWidget *categories;
-
-	gboolean updating;
-
-	/* The Corba component for selecting contacts, and the entry field
-	   which we place in the dialog. */
-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-	GtkWidget *contacts_entry;
-};
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-
-
-static void task_page_class_init (TaskPageClass *class);
-static void task_page_init (TaskPage *tpage);
-static void task_page_destroy (GtkObject *object);
-
-static GtkWidget *task_page_get_widget (CompEditorPage *page);
-static void task_page_focus_main_widget (CompEditorPage *page);
-static void task_page_fill_widgets (CompEditorPage *page, CalComponent *comp);
-static gboolean task_page_fill_component (CompEditorPage *page, CalComponent *comp);
-static void task_page_set_summary (CompEditorPage *page, const char *summary);
-static void task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * task_page_get_type:
- * 
- * Registers the #TaskPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #TaskPage class.
- **/
-GtkType
-task_page_get_type (void)
-{
-	static GtkType task_page_type;
-
-	if (!task_page_type) {
-		static const GtkTypeInfo task_page_info = {
-			"TaskPage",
-			sizeof (TaskPage),
-			sizeof (TaskPageClass),
-			(GtkClassInitFunc) task_page_class_init,
-			(GtkObjectInitFunc) task_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		task_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-						  &task_page_info);
-	}
-
-	return task_page_type;
-}
-
-/* Class initialization function for the task page */
-static void
-task_page_class_init (TaskPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);
-
-	editor_page_class->get_widget = task_page_get_widget;
-	editor_page_class->focus_main_widget = task_page_focus_main_widget;
-	editor_page_class->fill_widgets = task_page_fill_widgets;
-	editor_page_class->fill_component = task_page_fill_component;
-	editor_page_class->set_summary = task_page_set_summary;
-	editor_page_class->set_dates = task_page_set_dates;
-
-	object_class->destroy = task_page_destroy;
-}
-
-/* Object initialization function for the task page */
-static void
-task_page_init (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = g_new0 (TaskPagePrivate, 1);
-	tpage->priv = priv;
-
-	priv->xml = NULL;
-
-	priv->main = NULL;
-	priv->summary = NULL;
-	priv->due_date = NULL;
-	priv->start_date = NULL;
-	priv->due_timezone = NULL;
-	priv->start_timezone = NULL;
-	priv->description = NULL;
-	priv->classification_public = NULL;
-	priv->classification_private = NULL;
-	priv->classification_confidential = NULL;
-	priv->contacts_btn = NULL;
-	priv->contacts_box = NULL;
-	priv->categories_btn = NULL;
-	priv->categories = NULL;
-
-	priv->updating = FALSE;
-
-	priv->corba_select_names = CORBA_OBJECT_NIL;
-	priv->contacts_entry = NULL;
-}
-
-/* Destroy handler for the task page */
-static void
-task_page_destroy (GtkObject *object)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_PAGE (object));
-
-	tpage = TASK_PAGE (object);
-	priv = tpage->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);
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	tpage->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* get_widget handler for the task page */
-static GtkWidget *
-task_page_get_widget (CompEditorPage *page)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the task page */
-static void
-task_page_focus_main_widget (CompEditorPage *page)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	gtk_widget_grab_focus (priv->summary);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = tpage->priv;
-
-	/* Summary, description */
-	e_dialog_editable_set (priv->summary, NULL);
-	e_dialog_editable_set (priv->description, NULL);
-
-	/* Start, due times */
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), 0);
-	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), 0);
-
-	/* Classification */
-	e_dialog_radio_set (priv->classification_public,
-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Categories */
-	e_dialog_editable_set (priv->categories, NULL);
-}
-
-/* Decode the radio button group for classifications */
-static CalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, classification_map);
-}
-
-static void
-contacts_changed_cb (BonoboListener    *listener,
-		     char              *event_name,
-		     CORBA_any         *arg,
-		     CORBA_Environment *ev,
-		     gpointer           data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
-}
-
-/* fill_widgets handler for the task page */
-static void
-task_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	CalComponentText text;
-	CalComponentDateTime d;
-	CalComponentClassification cl;
-	CalClientGetStatus get_tz_status;
-	GSList *l;
-	const char *categories;
-	icaltimezone *zone, *default_zone;
-	char *location;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean the screen */
-	clear_widgets (tpage);
-
-        /* Summary, description(s) */
-	cal_component_get_summary (comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-
-	cal_component_get_description_list (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);
-
-	location = calendar_config_get_timezone ();
-	default_zone = icaltimezone_get_builtin_timezone (location);
-
-	/* Due Date. */
-	cal_component_get_due (comp, &d);
-	zone = NULL;
-	if (d.value) {
-		struct icaltimetype *due_tt = d.value;
-		e_date_edit_set_date (E_DATE_EDIT (priv->due_date),
-				      due_tt->year, due_tt->month,
-				      due_tt->day);
-		if (due_tt->is_date) {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
-						     -1, -1);
-			zone = default_zone;
-		} else {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->due_date),
-						     due_tt->hour,
-						     due_tt->minute);
-		}
-	} else {
-		e_date_edit_set_time (E_DATE_EDIT (priv->due_date), -1);
-
-		/* If no time is set, we use the default timezone, so the
-		   user usually doesn't have to set this when they set the
-		   date. */
-		zone = default_zone;
-	}
-
-	/* Note that if we are creating a new task, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
-	if (!zone)
-		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);
-	if (!zone) {
-		get_tz_status = cal_client_get_timezone (page->client, d.tzid,
-							 &zone);
-		/* FIXME: Handle error better. */
-		if (get_tz_status != CAL_CLIENT_GET_SUCCESS)
-		  g_warning ("Couldn't get timezone from server: %s",
-			     d.tzid ? d.tzid : "");
-	}
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->due_timezone),
-				       zone);
-
-	cal_component_free_datetime (&d);
-
-
-	/* Start Date. */
-	cal_component_get_dtstart (comp, &d);
-	zone = NULL;
-	if (d.value) {
-		struct icaltimetype *start_tt = d.value;
-		e_date_edit_set_date (E_DATE_EDIT (priv->start_date),
-				      start_tt->year, start_tt->month,
-				      start_tt->day);
-		if (start_tt->is_date) {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date),
-						     -1, -1);
-			zone = default_zone;
-		} else {
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_date),
-						     start_tt->hour,
-						     start_tt->minute);
-		}
-	} else {
-		e_date_edit_set_time (E_DATE_EDIT (priv->start_date), -1);
-
-		/* If no time is set, we use the default timezone, so the
-		   user usually doesn't have to set this when they set the
-		   date. */
-		zone = default_zone;
-	}
-
-	if (!zone)
-		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);
-	if (!zone) {
-		get_tz_status = cal_client_get_timezone (page->client, d.tzid,
-							 &zone);
-		/* FIXME: Handle error better. */
-		if (get_tz_status != CAL_CLIENT_GET_SUCCESS)
-			g_warning ("Couldn't get timezone from server: %s",
-				   d.tzid ? d.tzid : "");
-	}
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
-				       zone);
-
-	cal_component_free_datetime (&d);
-
-	/* Classification. */
-	cal_component_get_classification (comp, &cl);
-
-	switch (cl) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-		break;
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-		break;
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-		break;
-
-	default:
-		/* default to PUBLIC */
-                e_dialog_radio_set (priv->classification_public,
-                                    CAL_COMPONENT_CLASS_PUBLIC,
-                                    classification_map);
-                break;
-	}
-
-	/* Categories */
-	cal_component_get_categories (comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-
-	/* Contacts */
-	comp_editor_contacts_to_widget (priv->contacts_entry, comp);
-
-	/* We connect the contacts changed signal here, as we have to be a bit
-	   more careful with it due to the use or Corba. The priv->updating
-	   flag won't work as we won't get the changed event immediately.
-	   FIXME: Unfortunately this doesn't work either. We never get the
-	   changed event now. */
-	comp_editor_connect_contacts_changed (priv->contacts_entry,
-					      contacts_changed_cb, tpage);
-
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the task page */
-static gboolean
-task_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	CalComponentDateTime date;
-	struct icaltimetype icaltime;
-	char *cat, *str;
-	gboolean date_set, time_set;
-	icaltimezone *zone;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	/* Summary. */
-
-	str = e_dialog_editable_get (priv->summary);
-	if (!str || strlen (str) == 0)
-		cal_component_set_summary (comp, NULL);
-	else {
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		cal_component_set_summary (comp, &text);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Description */
-
-	str = e_dialog_editable_get (priv->description);
-	if (!str || 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);
-	}
-
-	if (!str)
-		g_free (str);
-
-	/* Dates */
-
-	icaltime = icaltime_null_time ();
-
-	date.value = &icaltime;
-	date.tzid = NULL;
-
-	/* Due Date. */
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
-						&icaltime.hour,
-						&icaltime.minute);
-	if (date_set) {
-		if (time_set) {
-			zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
-			date.tzid = icaltimezone_get_tzid (zone);
-		} else {
-			icaltime.is_date = TRUE;
-			date.tzid = NULL;
-		}
-		cal_component_set_due (comp, &date);
-	} else {
-		cal_component_set_due (comp, NULL);
-	}
-
-	/* Start Date. */
-	icaltime = icaltime_null_time ();
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
-						&icaltime.hour,
-						&icaltime.minute);
-	if (date_set) {
-		if (time_set) {
-			zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-			date.tzid = icaltimezone_get_tzid (zone);
-		} else {
-			icaltime.is_date = TRUE;
-			date.tzid = NULL;
-		}
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		cal_component_set_dtstart (comp, NULL);
-	}
-
-	/* Classification. */
-	cal_component_set_classification (comp, classification_get (priv->classification_public));
-
-	/* Categories */
-	cat = e_dialog_editable_get (priv->categories);
-	str = comp_editor_strip_categories (cat);
-	if (cat)
-		g_free (cat);
-
-	cal_component_set_categories (comp, str);
-
-	if (str)
-		g_free (str);
-
-	/* Contacts */
-	comp_editor_contacts_to_component (priv->contacts_entry, comp);
-
-	return TRUE;
-}
-
-/* set_summary handler for the task page */
-static void
-task_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	/* nothing */
-}
-
-static void
-task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	if (priv->updating)
-	        return;
-
-	priv->updating = TRUE;
-
-	priv->updating = FALSE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (TaskPage *tpage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (tpage);
-	TaskPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = tpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("task-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->summary = GW ("summary");
-
-	priv->due_date = GW ("due-date");
-	priv->start_date = GW ("start-date");
-	priv->due_timezone = GW ("due-timezone");
-	priv->start_timezone = GW ("start-timezone");
-
-	priv->description = GW ("description");
-
-	priv->classification_public = GW ("classification-public");
-	priv->classification_private = GW ("classification-private");
-	priv->classification_confidential = GW ("classification-confidential");
-
-	priv->contacts_btn = GW ("contacts-button");
-	priv->contacts_box = GW ("contacts-box");
-
-	priv->categories_btn = GW ("categories-button");
-	priv->categories = GW ("categories");
-
-#undef GW
-
-	return (priv->summary
-		&& priv->due_date
-		&& priv->start_date
-		&& priv->due_timezone
-		&& priv->start_timezone
-		&& priv->classification_public
-		&& priv->classification_private
-		&& priv->classification_confidential
-		&& priv->description
-		&& priv->contacts_btn
-		&& priv->contacts_box
-		&& priv->categories_btn
-		&& priv->categories);
-}
-
-/* Callback used when the summary changes; we emit the notification signal. */
-static void
-summary_changed_cb (GtkEditable *editable, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	gchar *summary;
-	
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-	
-	if (priv->updating)
-		return;
-	
-	summary = e_dialog_editable_get (GTK_WIDGET (editable));
-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (tpage), 
-						 summary);
-	g_free (summary);
-}
-
-/* Callback used when the start or due date widgets change.  We notify the
- * other pages in the task editor, so they can update any labels. 
- */
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	CompEditorPageDates dates;
-	gboolean date_set, time_set;
-	CalComponentDateTime start_dt, due_dt;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype due_tt = icaltime_null_time();
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	if (priv->updating)
-		return;
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_date),
-					 &start_tt.year,
-					 &start_tt.month,
-					 &start_tt.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
-						&start_tt.hour,
-						&start_tt.minute);
-	if (date_set) {
-		if (time_set) {
-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-			start_dt.tzid = icaltimezone_get_tzid (zone);
-		} else {
-			start_tt.is_date = TRUE;
-			start_dt.tzid = NULL;
-		}
-	} else {
-		start_tt = icaltime_null_time ();
-		start_dt.tzid = NULL;
-	}
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date),
-					 &due_tt.year,
-					 &due_tt.month,
-					 &due_tt.day);
-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
-						&due_tt.hour,
-						&due_tt.minute);
-	if (date_set) {
-		if (time_set) {
-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
-			due_dt.tzid = icaltimezone_get_tzid (zone);
-		} else {
-			due_tt.is_date = TRUE;
-			due_dt.tzid = NULL;
-		}
-	} else {
-		due_tt = icaltime_null_time ();
-		due_dt.tzid = NULL;
-	}
-
-	start_dt.value = &start_tt;
-	dates.start = &start_dt;
-	dates.end = NULL;
-	due_dt.value = &due_tt;
-	dates.due = &due_dt;
-	dates.complete = NULL;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tpage),
-					       &dates);
-}
-
-/* Callback used when the contacts button is clicked; we must bring up the
- * contact list dialog.
- */
-static void
-contacts_clicked_cb (GtkWidget *button, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	comp_editor_show_contacts_dialog (priv->corba_select_names);
-
-	/* FIXME: Currently we aren't getting the changed event from the
-	   SelectNames component correctly, so we aren't saving the event
-	   if just the contacts are changed. To work around that, we assume
-	   that if the contacts button is clicked it is changed. */
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
-}
-
-/* Callback used when the categories button is clicked; we must bring up the
- * category list dialog.
- */
-static void
-categories_clicked_cb (GtkWidget *button, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	GtkWidget *entry;
-
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-
-	entry = priv->categories;
-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
-}
-
-/* This is called when any field is changed; it notifies upstream. */
-static void
-field_changed_cb (GtkWidget *widget, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	
-	tpage = TASK_PAGE (data);
-	priv = tpage->priv;
-	
-	if (!priv->updating)
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
-}
-
-/* Hooks the widget signals */
-static gboolean
-init_widgets (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-	char *location;
-	icaltimezone *zone;
-
-	priv = tpage->priv;
-
-	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->start_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   tpage, NULL);
-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->due_date),
-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
-					   tpage, NULL);
-	
-	/* Summary */
-	gtk_signal_connect (GTK_OBJECT (priv->summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), tpage);
-
-	/* Description - turn on word wrap. */
-	gtk_text_set_word_wrap (GTK_TEXT (priv->description), TRUE);
-
-	/* Dates */
-	gtk_signal_connect (GTK_OBJECT (priv->start_date), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->due_date), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), tpage);
-
-	gtk_signal_connect (GTK_OBJECT (priv->due_timezone), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->start_timezone), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-
-	/* Classification */
-	gtk_signal_connect (GTK_OBJECT (priv->classification_public),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_private),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_confidential),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-
-	/* Connect the default signal handler to use to make sure the "changed"
-	   field gets set whenever a field is changed. */
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->categories), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-
-	/* Contacts button */
-	gtk_signal_connect (GTK_OBJECT (priv->contacts_btn), "clicked",
-			    GTK_SIGNAL_FUNC (contacts_clicked_cb), tpage);
-
-	/* Categories button */
-	gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked",
-			    GTK_SIGNAL_FUNC (categories_clicked_cb), tpage);
-
-
-	/* Create the contacts entry, a corba control from the address book. */
-	priv->corba_select_names = comp_editor_create_contacts_component ();
-	if (priv->corba_select_names == CORBA_OBJECT_NIL)
-		return FALSE;
-
-	priv->contacts_entry = comp_editor_create_contacts_control (priv->corba_select_names);
-	if (priv->contacts_entry == NULL)
-		return FALSE;
-
-	gtk_container_add (GTK_CONTAINER (priv->contacts_box),
-			   priv->contacts_entry);
-
-	/* Set the default timezone, so the timezone entry may be hidden. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone);
-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->due_timezone), zone);
-
-	return TRUE;
-}
-
-
-
-/**
- * task_page_construct:
- * @tpage: An task page.
- * 
- * Constructs an task page by loading its Glade data.
- * 
- * Return value: The same object as @tpage, or NULL if the widgets could not be
- * created.
- **/
-TaskPage *
-task_page_construct (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = tpage->priv;
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-page.glade",
-				   NULL);
-	if (!priv->xml) {
-		g_message ("task_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (tpage)) {
-		g_message ("task_page_construct(): "
-			   "Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	if (!init_widgets (tpage)) {
-		g_message ("event_page_construct(): " 
-			   "Could not initialize the widgets!");
-		return NULL;
-	}
-
-	return tpage;
-}
-
-/**
- * task_page_new:
- * 
- * Creates a new task page.
- * 
- * Return value: A newly-created task page, or NULL if the page could
- * not be created.
- **/
-TaskPage *
-task_page_new (void)
-{
-	TaskPage *tpage;
-
-	tpage = gtk_type_new (TYPE_TASK_PAGE);
-	if (!task_page_construct (tpage)) {
-		gtk_object_unref (GTK_OBJECT (tpage));
-		return NULL;
-	}
-
-	return tpage;
-}
-
-GtkWidget *task_page_create_date_edit (void);
-
-GtkWidget *
-task_page_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = comp_editor_new_date_edit (TRUE, TRUE, TRUE);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-
-	return dedit;
-}
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
deleted file mode 100644
index 31a7ba2cbe..0000000000
--- a/calendar/gui/dialogs/task-page.glade
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-page</name>
-  <program_name>task-page</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>task-toplevel</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>GtkVBox</class>
-    <name>task-page</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>Su_mmary:</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>GtkFrame</class>
-      <name>frame2</name>
-      <label>Date &amp; Time</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>GtkHBox</class>
-	<name>hbox4</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table1</name>
-	  <rows>2</rows>
-	  <columns>3</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>
-	    <focus_target>start-date</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>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>
-	    <focus_target>due-date</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>Custom</class>
-	    <name>due-date</name>
-	    <can_focus>True</can_focus>
-	    <creation_function>task_page_create_date_edit</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Fri, 01 Jun 2001 18:59:52 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>
-	    <can_focus>True</can_focus>
-	    <creation_function>task_page_create_date_edit</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Fri, 01 Jun 2001 18:59:57 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>
-	    <class>Custom</class>
-	    <name>due-timezone</name>
-	    <creation_function>make_timezone_entry</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Tue, 19 Jun 2001 04:43:54 GMT</last_modification_time>
-	    <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>True</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>start-timezone</name>
-	    <creation_function>make_timezone_entry</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Tue, 19 Jun 2001 04:43:46 GMT</last_modification_time>
-	    <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>
-      </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>GtkLabel</class>
-	<name>label18</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>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</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>
-	  <height>80</height>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame24</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>True</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-public</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>classification-private</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>classification-confidential</name>
-	  <can_focus>True</can_focus>
-	  <label>Con_fidential</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>
-      <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>contacts-button</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>
-	  <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>GtkEventBox</class>
-	<name>contacts-box</name>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>categories-button</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>
-	  <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>
-	<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>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
deleted file mode 100644
index 55c8ebc923..0000000000
--- a/calendar/gui/dialogs/task-page.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_PAGE_H
-#define TASK_PAGE_H
-
-#include "comp-editor-page.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_TASK_PAGE            (task_page_get_type ())
-#define TASK_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_TASK_PAGE, TaskPage))
-#define TASK_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_PAGE, TaskPageClass))
-#define IS_TASK_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_TASK_PAGE))
-#define IS_TASK_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_TASK_PAGE))
-
-typedef struct _TaskPagePrivate TaskPagePrivate;
-
-typedef struct {
-	CompEditorPage page;
-
-	/* Private data */
-	TaskPagePrivate *priv;
-} TaskPage;
-
-typedef struct {
-	CompEditorPageClass parent_class;
-} TaskPageClass;
-
-GtkType   task_page_get_type  (void);
-TaskPage *task_page_construct (TaskPage *epage);
-TaskPage *task_page_new       (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
deleted file mode 100644
index 8a7d3dd631..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,1345 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtkinvisible.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 <gal/e-table/e-cell-combo.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <e-util/e-dialog-utils.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include <widgets/misc/e-cell-percent.h>
-#include "e-calendar-table.h"
-#include "e-cell-date-edit-text.h"
-#include "calendar-config.h"
-#include "calendar-model.h"
-#include "print.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/task-editor.h"
-
-/* Pixmaps. */
-#include "art/task.xpm"
-#include "art/task-recurring.xpm"
-#include "art/task-assigned.xpm"
-#include "art/task-assigned-to.xpm"
-
-#include "art/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,
-						 gint		 col,
-						 GdkEvent	*event,
-						 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_save_as	        (GtkWidget	*menuitem,
-						 gpointer	 data);
-static void e_calendar_table_on_print_task      (GtkWidget	*menuitem,
-						 gpointer	 data);
-static void e_calendar_table_on_cut             (GtkWidget      *menuitem,
-						 gpointer        data);
-static void e_calendar_table_on_copy            (GtkWidget      *menuitem,
-						 gpointer        data);
-static void e_calendar_table_on_paste           (GtkWidget      *menuitem,
-						 gpointer        data);
-static void e_calendar_table_on_assign          (GtkWidget      *menuitem,
-						 gpointer        data);
-static void e_calendar_table_on_forward         (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 selection_clear_event               (GtkWidget *invisible,
-						 GdkEventSelection *event,
-						 ECalendarTable *cal_table);
-static void selection_received                  (GtkWidget *invisible,
-						 GtkSelectionData *selection_data,
-						 guint time,
-						 ECalendarTable *cal_table);
-static void selection_get                       (GtkWidget *invisible,
-						 GtkSelectionData *selection_data,
-						 guint info,
-						 guint time_stamp,
-						 ECalendarTable *cal_table);
-static void invisible_destroyed                 (GtkWidget *invisible,
-						 ECalendarTable *cal_table);
-static struct tm e_calendar_table_get_current_time (ECellDateEdit *ecde,
-						    gpointer data);
-static void mark_row_complete_cb (int model_row, gpointer data);
-
-
-/* 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;
-static GdkAtom clipboard_atom = GDK_NONE;
-
-
-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
-
-	/* clipboard atom */
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-/* Compares two priority values, which may not exist */
-static int
-compare_priorities (int *a, int *b)
-{
-	if (a && b) {
-		if (*a < *b)
-			return -1;
-		else if (*a > *b)
-			return 1;
-		else
-			return 0;
-	} else if (a)
-		return -1;
-	else if (b)
-		return 1;
-	else
-		return 0;
-}
-
-/* Comparison function for the task-sort column.  Sorts by due date and then by
- * priority.
- *
- * FIXME: Does this ever get called?? It doesn't seem to.
- * I specified that the table should be sorted by this column, but it still
- * never calls this function.
- * Also, this assumes it is passed pointers to CalComponents, but I think it
- * may just be passed pointers to the 2 cell values.
- */
-static gint
-task_compare_cb (gconstpointer a, gconstpointer b)
-{
-	CalComponent *ca, *cb;
-	CalComponentDateTime due_a, due_b;
-	int *prio_a, *prio_b;
-	int retval;
-
-	ca = CAL_COMPONENT (a);
-	cb = CAL_COMPONENT (b);
-
-	cal_component_get_due (ca, &due_a);
-	cal_component_get_due (cb, &due_b);
-	cal_component_get_priority (ca, &prio_a);
-	cal_component_get_priority (cb, &prio_b);
-
-	if (due_a.value && due_b.value) {
-		int v;
-
-		/* FIXME: TIMEZONES. But currently we have no way to get the
-		   CalClient, so we can't get the timezone. */
-		v = icaltime_compare (*due_a.value, *due_b.value);
-
-		if (v == 0)
-			retval = compare_priorities (prio_a, prio_b);
-		else
-			retval = v;
-	} else if (due_a.value)
-		retval = -1;
-	else if (due_b.value)
-		retval = 1;
-	else
-		retval = compare_priorities (prio_a, prio_b);
-
-	cal_component_free_datetime (&due_a);
-	cal_component_free_datetime (&due_b);
-
-	if (prio_a)
-		cal_component_free_priority (prio_a);
-
-	if (prio_b)
-		cal_component_free_priority (prio_b);
-
-	return retval;
-}
-
-static gint
-date_compare_cb (gconstpointer a, gconstpointer b)
-{
-	ECellDateEditValue *dv1 = (ECellDateEditValue *) a;
-	ECellDateEditValue *dv2 = (ECellDateEditValue *) b;
-	struct icaltimetype tt;
-
-	/* First check if either is NULL. NULL dates sort last. */
-	if (!dv1 || !dv2) {
-		if (dv1 == dv2)
-			return 0;
-		else if (dv1)
-			return -1;
-		else
-			return 1;
-	}
-
-	/* Copy the 2nd value and convert it to the same timezone as the
-	   first. */
-	tt = dv2->tt;
-
-	icaltimezone_convert_time (&tt, dv2->zone, dv1->zone);
-
-	/* Now we can compare them. */
-
-	return icaltime_compare (dv1->tt, tt);
-}
-
-static gint
-percent_compare_cb (gconstpointer a, gconstpointer b)
-{
-	int percent1 = GPOINTER_TO_INT (a);
-	int percent2 = GPOINTER_TO_INT (b);
-	int retval;
-
-	if (percent1 > percent2)
-		retval = 1;
-	else if (percent1 < percent2)
-		retval = -1;
-	else
-		retval = 0;
-
-	return retval;
-}
-
-static gint
-priority_compare_cb (gconstpointer a, gconstpointer b)
-{
-	int priority1, priority2;
-
-	priority1 = cal_util_priority_from_string ((const char*) a);
-	priority2 = cal_util_priority_from_string ((const char*) b);
-
-	/* We change undefined priorities so they appear after 'Low'. */
-	if (priority1 <= 0)
-		priority1 = 10;
-	if (priority2 <= 0)
-		priority2 = 10;
-
-	/* We'll just use the ordering of the priority values. */
-	if (priority1 < priority2)
-		return -1;
-	else if (priority1 > priority2)
-		return 1;
-	else
-		return 0;
-}
-
-static void
-e_calendar_table_init (ECalendarTable *cal_table)
-{
-	GtkWidget *table;
-	ETable *e_table;
-	ECell *cell, *popup_cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GList *strings;
-
-	/* Create the model */
-
-	cal_table->model = calendar_model_new ();
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new();
-
-	/*
-	 * Normal string fields.
-	 */
-	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, "calstring", cell);
-
-
-	/*
-	 * Date fields.
-	 */
-	cell = e_cell_date_edit_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);
-
-	popup_cell = e_cell_date_edit_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-	e_table_extras_add_cell (extras, "dateedit", popup_cell);
-	cal_table->dates_cell = E_CELL_DATE_EDIT (popup_cell);
-
-	e_cell_date_edit_set_get_time_callback (E_CELL_DATE_EDIT (popup_cell),
-						e_calendar_table_get_current_time,
-						cal_table, NULL);
-
-
-	/*
-	 * Combo fields.
-	 */
-
-	/* Classification field. */
-	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,
-			"editable", FALSE,
-			NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Public"));
-	strings = g_list_append (strings, (char*) U_("Private"));
-	strings = g_list_append (strings, (char*) U_("Confidential"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "classification", popup_cell);
-
-	/* Priority field. */
-	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,
-			"editable", FALSE,
-			NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("High"));
-	strings = g_list_append (strings, (char*) U_("Normal"));
-	strings = g_list_append (strings, (char*) U_("Low"));
-	strings = g_list_append (strings, (char*) U_("Undefined"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "priority", popup_cell);
-
-	/* Percent field. */
-	cell = e_cell_percent_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);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("0%"));
-	strings = g_list_append (strings, (char*) U_("10%"));
-	strings = g_list_append (strings, (char*) U_("20%"));
-	strings = g_list_append (strings, (char*) U_("30%"));
-	strings = g_list_append (strings, (char*) U_("40%"));
-	strings = g_list_append (strings, (char*) U_("50%"));
-	strings = g_list_append (strings, (char*) U_("60%"));
-	strings = g_list_append (strings, (char*) U_("70%"));
-	strings = g_list_append (strings, (char*) U_("80%"));
-	strings = g_list_append (strings, (char*) U_("90%"));
-	strings = g_list_append (strings, (char*) U_("100%"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "percent", popup_cell);
-
-	/* Transparency field. */
-	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,
-			"editable", FALSE,
-			NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Free"));
-	strings = g_list_append (strings, (char*) U_("Busy"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "transparency", popup_cell);
-
-	/* Status field. */
-	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,
-			"editable", FALSE,
-			NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Not Started"));
-	strings = g_list_append (strings, (char*) U_("In Progress"));
-	strings = g_list_append (strings, (char*) U_("Completed"));
-	strings = g_list_append (strings, (char*) U_("Cancelled"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "calstatus", popup_cell);
-
-	/* Task sorting field */
-	/* FIXME: This column should not be displayed, but ETableExtras requires
-	 * its shit to be visible columns listed in the XML spec.
-	 */
-	e_table_extras_add_compare (extras, "task-sort", task_compare_cb);
-
-	e_table_extras_add_compare (extras, "date-compare",
-				    date_compare_cb);
-	e_table_extras_add_compare (extras, "percent-compare",
-				    percent_compare_cb);
-	e_table_extras_add_compare (extras, "priority-compare",
-				    priority_compare_cb);
-
-	/* 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_from_spec_file (E_TABLE_MODEL (cal_table->model),
-						     extras,
-						     EVOLUTION_ETSPECDIR "/e-calendar-table.etspec",
-						     NULL);
-	gtk_object_unref (GTK_OBJECT (extras));
-
-	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);
-
-
-	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
-	gtk_signal_connect (GTK_OBJECT (e_table), "double_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (e_table), "right_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (e_table), "key_press",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),
-			    cal_table);
-
-	/* Set up the invisible widget for the clipboard selections */
-	cal_table->invisible = gtk_invisible_new ();
-	gtk_selection_add_target (cal_table->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    (gpointer) cal_table);
-	cal_table->clipboard_selection = NULL;
-}
-
-
-/**
- * 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;
-}
-
-
-/**
- * e_calendar_table_get_model:
- * @cal_table: A calendar table.
- * 
- * Queries the calendar data model that a calendar table is using.
- * 
- * Return value: A calendar model.
- **/
-CalendarModel *
-e_calendar_table_get_model (ECalendarTable *cal_table)
-{
-	g_return_val_if_fail (cal_table != NULL, NULL);
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);
-
-	return cal_table->model;
-}
-
-
-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;
-
-	if (cal_table->invisible)
-		gtk_widget_destroy (cal_table->invisible);
-	if (cal_table->clipboard_selection) {
-		g_free (cal_table->clipboard_selection);
-		cal_table->clipboard_selection = NULL;
-	}
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/**
- * e_calendar_table_get_table:
- * @cal_table: A calendar table.
- * 
- * Queries the #ETable widget that the calendar table is using.
- * 
- * Return value: The #ETable widget that the calendar table uses to display its
- * data.
- **/
-ETable *
-e_calendar_table_get_table (ECalendarTable *cal_table)
-{
-	g_return_val_if_fail (cal_table != NULL, NULL);
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);
-
-	return e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-}
-
-/**
- * e_calendar_table_complete_selected:
- * @cal_table: A calendar table
- * 
- * Marks the selected items as completed
- **/
-void
-e_calendar_table_complete_selected (ECalendarTable *cal_table)
-{
-	ETable *etable;
-
-	g_return_if_fail (cal_table != NULL);
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, mark_row_complete_cb, cal_table);
-}
-
-/* Used from e_table_selected_row_foreach(); puts the selected row number in an
- * int pointed to by the closure data.
- */
-static void
-get_selected_row_cb (int model_row, gpointer data)
-{
-	int *row;
-
-	row = data;
-	*row = model_row;
-}
-
-/* Returns the component that is selected in the table; only works if there is
- * one and only one selected row.
- */
-static CalComponent *
-get_selected_comp (ECalendarTable *cal_table)
-{
-	ETable *etable;
-	int row;
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	if (e_table_selected_count (etable) != 1)
-		return NULL;
-
-	row = -1;
-	e_table_selected_row_foreach (etable,
-				      get_selected_row_cb,
-				      &row);
-	g_assert (row != -1);
-
-	return calendar_model_get_component (cal_table->model, row);
-}
-
-struct get_selected_uids_closure {
-	ECalendarTable *cal_table;
-	GSList *uids;
-};
-
-/* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */
-static void
-add_uid_cb (int model_row, gpointer data)
-{
-	struct get_selected_uids_closure *closure;
-	CalComponent *comp;
-	const char *uid;
-
-	closure = data;
-
-	comp = calendar_model_get_component (closure->cal_table->model, model_row);
-	cal_component_get_uid (comp, &uid);
-
-	closure->uids = g_slist_prepend (closure->uids, (char *) uid);
-}
-
-static GSList *
-get_selected_uids (ECalendarTable *cal_table)
-{
-	struct get_selected_uids_closure closure;
-	ETable *etable;
-
-	closure.cal_table = cal_table;
-	closure.uids = NULL;
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, add_uid_cb, &closure);
-
-	return closure.uids;
-}
-
-/* Deletes all of the selected components in the table */
-static void
-delete_selected_components (ECalendarTable *cal_table)
-{
-	CalClient *client;
-	GSList *uids, *l;
-
-	uids = get_selected_uids (cal_table);
-
-	client = calendar_model_get_cal_client (cal_table->model);
-
-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table),
-					   _("Deleting selected objects"));
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-
-		uid = l->data;
-
-		/* We don't check the return value; FALSE can mean the object
-		 * was not in the server anyways.
-		 */
-		cal_client_remove_object (client, uid);
-	}
-
-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table), NULL);
-
-	g_slist_free (uids);
-}
-
-/**
- * e_calendar_table_delete_selected:
- * @cal_table: A calendar table.
- * 
- * Deletes the selected components in the table; asks the user first.
- **/
-void
-e_calendar_table_delete_selected (ECalendarTable *cal_table)
-{
-	ETable *etable;
-	int n_selected;
-	CalComponent *comp;
-
-	g_return_if_fail (cal_table != NULL);
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-
-	n_selected = e_table_selected_count (etable);
-	if (n_selected <= 0)
-		return;
-
-	if (n_selected == 1)
-		comp = get_selected_comp (cal_table);
-	else
-		comp = NULL;
-
-	/* FIXME: this may be something other than a TODO component */
-
-	if (delete_component_dialog (comp, FALSE, n_selected, CAL_COMPONENT_TODO,
-				     GTK_WIDGET (cal_table)))
-		delete_selected_components (cal_table);
-}
-
-/**
- * e_calendar_table_cut_clipboard:
- * @cal_table: A calendar table.
- *
- * Cuts selected tasks in the given calendar table
- */
-void
-e_calendar_table_cut_clipboard (ECalendarTable *cal_table)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	e_calendar_table_copy_clipboard (cal_table);
-	delete_selected_components (cal_table);
-}
-
-/* callback for e_table_selected_row_foreach */
-static void
-copy_row_cb (int model_row, gpointer data)
-{
-	ECalendarTable *cal_table;
-	CalComponent *comp;
-	gchar *comp_str;
-	icalcomponent *child;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	g_return_if_fail (cal_table->tmp_vcal != NULL);
-
-	comp = calendar_model_get_component (cal_table->model, model_row);
-	if (!comp)
-		return;
-
-	/* add the new component to the VCALENDAR component */
-	comp_str = cal_component_get_as_string (comp);
-	child = icalparser_parse_string (comp_str);
-	if (child) {
-		icalcomponent_add_component (cal_table->tmp_vcal,
-					     icalcomponent_new_clone (child));
-		icalcomponent_free (child);
-	}
-
-	g_free (comp_str);
-}
-
-/**
- * e_calendar_table_copy_clipboard:
- * @cal_table: A calendar table.
- *
- * Copies selected tasks into the clipboard
- */
-void
-e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
-{
-	ETable *etable;
-	char *comp_str;
-	
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (cal_table->clipboard_selection) {
-		g_free (cal_table->clipboard_selection);
-		cal_table->clipboard_selection = NULL;
-	}
-
-	/* create temporary VCALENDAR object */
-	cal_table->tmp_vcal = cal_util_new_top_level ();
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, copy_row_cb, cal_table);
-
-	comp_str = icalcomponent_as_ical_string (cal_table->tmp_vcal);
-	cal_table->clipboard_selection = g_strdup (comp_str);
-	icalcomponent_free (cal_table->tmp_vcal);
-	cal_table->tmp_vcal = NULL;
-
-	gtk_selection_owner_set (cal_table->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-/**
- * e_calendar_table_paste_clipboard:
- * @cal_table: A calendar table.
- *
- * Pastes tasks currently in the clipboard into the given calendar table
- */
-void
-e_calendar_table_paste_clipboard (ECalendarTable *cal_table)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	gtk_selection_convert (cal_table->invisible,
-			       clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-/* Opens a task in the task editor */
-static void
-open_task (ECalendarTable *cal_table, CalComponent *comp, gboolean assign)
-{
-	TaskEditor *tedit;
-
-	tedit = task_editor_new ();
-	comp_editor_set_cal_client (COMP_EDITOR (tedit), calendar_model_get_cal_client (cal_table->model));
-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);
-	if (assign)
-		task_editor_show_assignment (TASK_EDITOR (tedit));
-	comp_editor_focus (COMP_EDITOR (tedit));
-}
-
-/* Opens the task in the specified row */
-static void
-open_task_by_row (ECalendarTable *cal_table, int row)
-{
-	CalComponent *comp;
-
-	comp = calendar_model_get_component (cal_table->model, row);
-	open_task (cal_table, comp, FALSE);
-}
-
-static void
-e_calendar_table_on_double_click (ETable *table,
-				  gint row, 
-				  gint col,
-				  GdkEvent *event,
-				  ECalendarTable *cal_table)
-{
-	open_task_by_row (cal_table, row);
-}
-
-/* Used from e_table_selected_row_foreach() */
-static void
-mark_row_complete_cb (int model_row, gpointer data)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (data);
-	calendar_model_mark_task_complete (cal_table->model, model_row);
-}
-
-/* Callback used for the "mark tasks as complete" menu item */
-static void
-mark_as_complete_cb (GtkWidget *menuitem, gpointer data)
-{
-	ECalendarTable *cal_table;
-	ETable *etable;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
-	e_table_selected_row_foreach (etable, mark_row_complete_cb, cal_table);
-}
-
-/* Callback for the "delete tasks" menu item */
-static void
-delete_cb (GtkWidget *menuitem, gpointer data)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (data);
-	e_calendar_table_delete_selected (cal_table);
-}
-
-
-enum {
-	MASK_SINGLE	= 1 << 0,	/* For commands that work on 1 task. */
-	MASK_MULTIPLE	= 1 << 1,	/* For commands for multiple tasks. */
-};
-
-
-static EPopupMenu tasks_popup_menu [] = {
-	E_POPUP_ITEM (N_("_Open"), e_calendar_table_on_open_task, MASK_SINGLE),
-	E_POPUP_ITEM (N_("_Save as..."), e_calendar_table_on_save_as, MASK_SINGLE),
-	E_POPUP_ITEM (N_("_Print..."), e_calendar_table_on_print_task, MASK_SINGLE),
-
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("C_ut"), e_calendar_table_on_cut, 0),
-	E_POPUP_ITEM (N_("_Copy"), e_calendar_table_on_copy, 0),
-	E_POPUP_ITEM (N_("_Paste"), e_calendar_table_on_paste, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Assign Task"), e_calendar_table_on_assign, MASK_SINGLE),
-	E_POPUP_ITEM (N_("_Forward as iCalendar"), e_calendar_table_on_forward, MASK_SINGLE),
-	E_POPUP_ITEM (N_("_Mark as Complete"), mark_as_complete_cb, MASK_SINGLE),
-	E_POPUP_ITEM (N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, MASK_MULTIPLE),
-	
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Delete"), delete_cb, MASK_SINGLE),
-	E_POPUP_ITEM (N_("_Delete Selected Tasks"), delete_cb, MASK_MULTIPLE),
-
-	E_POPUP_TERMINATOR
-};
-
-static gint
-e_calendar_table_on_right_click (ETable *table,
-				 gint row,
-				 gint col,
-				 GdkEventButton *event,
-				 ECalendarTable *cal_table)
-{
-	int n_selected;
-	int hide_mask = 0;
-	int disable_mask = 0;
-
-	n_selected = e_table_selected_count (table);
-	if (n_selected <= 0)
-		return TRUE;
-
-	if (n_selected == 1)
-		hide_mask = MASK_MULTIPLE;
-	else
-		hide_mask = MASK_SINGLE;
-
-	e_popup_menu_run (tasks_popup_menu, (GdkEvent *) event,
-			  disable_mask, hide_mask, cal_table);
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_table_on_open_task (GtkWidget *menuitem,
-			       gpointer	  data)
-{
-	ECalendarTable *cal_table;
-	CalComponent *comp;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	comp = get_selected_comp (cal_table);
-	if (comp)
-		open_task (cal_table, comp, FALSE);
-}
-
-static void
-e_calendar_table_on_save_as (GtkWidget *widget, gpointer data)
-{
-	ECalendarTable *cal_table;
-	CalClient *client;
-	CalComponent *comp;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	client = calendar_model_get_cal_client (cal_table->model);
-	comp = get_selected_comp (cal_table);
-	if (comp == NULL)
-		return;
-	
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	ical_string = cal_client_get_component_as_string (client, comp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
-	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
-	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
-}
-
-static void
-e_calendar_table_on_print_task (GtkWidget *widget, gpointer data)
-{
-	ECalendarTable *cal_table;
-	CalClient *client;
-	CalComponent *comp;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	client = calendar_model_get_cal_client (cal_table->model);
-	comp = get_selected_comp (cal_table);
-	if (comp == NULL)
-		return;
-	
-	print_comp (comp, client, FALSE);
-}
-
-static void
-e_calendar_table_on_cut (GtkWidget *menuitem, gpointer data)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (data);
-	e_calendar_table_cut_clipboard (cal_table);
-}
-
-static void
-e_calendar_table_on_copy (GtkWidget *menuitem, gpointer data)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (data);
-	e_calendar_table_copy_clipboard (cal_table);
-}
-
-static void
-e_calendar_table_on_paste (GtkWidget *menuitem, gpointer data)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (data);
-	e_calendar_table_paste_clipboard (cal_table);
-}
-
-static void
-e_calendar_table_on_assign (GtkWidget *widget, gpointer data)
-{
-	ECalendarTable *cal_table;
-	CalComponent *comp;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	comp = get_selected_comp (cal_table);
-	if (comp)
-		open_task (cal_table, comp, TRUE);
-}
-
-static void
-e_calendar_table_on_forward (GtkWidget *widget, gpointer data)
-{
-	ECalendarTable *cal_table;
-	CalClient *client;
-	CalComponent *comp;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	client = calendar_model_get_cal_client (cal_table->model);
-	comp = get_selected_comp (cal_table);
-	if (comp)
-		itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp,
-				client, NULL);
-}
-
-static gint
-e_calendar_table_on_key_press (ETable *table,
-			       gint row,
-			       gint col,
-			       GdkEventKey *event,
-			       ECalendarTable *cal_table)
-{
-	if (event->keyval == GDK_Delete) {
-		delete_cb (NULL, cal_table);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/* 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_load_state (e_table_scrolled_get_table(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_save_state (e_table_scrolled_get_table(E_TABLE_SCROLLED (cal_table->etable)),
-			    filename);
-}
-
-
-static void
-invisible_destroyed (GtkWidget *invisible, ECalendarTable *cal_table)
-{
-	cal_table->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       ECalendarTable *cal_table)
-{
-	if (cal_table->clipboard_selection != NULL) {
-		gtk_selection_data_set (selection_data,
-					GDK_SELECTION_TYPE_STRING,
-					8,
-					cal_table->clipboard_selection,
-					strlen (cal_table->clipboard_selection));
-	}
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       ECalendarTable *cal_table)
-{
-	if (cal_table->clipboard_selection != NULL) {
-		g_free (cal_table->clipboard_selection);
-		cal_table->clipboard_selection = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    ECalendarTable *cal_table)
-{
-	char *comp_str;
-	icalcomponent *icalcomp;
-	char *uid;
-	CalComponent *comp;
-	icalcomponent_kind kind;
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (selection_data->length < 0 ||
-	    selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	}
-
-	comp_str = (char *) selection_data->data;
-	icalcomp = icalparser_parse_string ((const char *) comp_str);
-	if (!icalcomp)
-		return;
-
-	/* check the type of the component */
-	kind = icalcomponent_isa (icalcomp);
-	if (kind != ICAL_VCALENDAR_COMPONENT &&
-	    kind != ICAL_VEVENT_COMPONENT &&
-	    kind != ICAL_VTODO_COMPONENT &&
-	    kind != ICAL_VJOURNAL_COMPONENT) {
-		return;
-	}
-
-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table),
-					   _("Updating objects"));
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-		icalcomponent *vcal_comp;
-
-		vcal_comp = icalcomp;
-		subcomp = icalcomponent_get_first_component (
-			vcal_comp, ICAL_ANY_COMPONENT);
-		while (subcomp) {
-			child_kind = icalcomponent_isa (subcomp);
-			if (child_kind == ICAL_VEVENT_COMPONENT ||
-			    child_kind == ICAL_VTODO_COMPONENT ||
-			    child_kind == ICAL_VJOURNAL_COMPONENT) {
-				CalComponent *tmp_comp;
-
-				uid = cal_component_gen_uid ();
-				tmp_comp = cal_component_new ();
-				cal_component_set_icalcomponent (
-					tmp_comp, icalcomponent_new_clone (subcomp));
-				cal_component_set_uid (tmp_comp, uid);
-
-				cal_client_update_object (
-					calendar_model_get_cal_client (cal_table->model),
-					tmp_comp);
-				free (uid);
-				gtk_object_unref (GTK_OBJECT (tmp_comp));
-			}
-			subcomp = icalcomponent_get_next_component (
-				vcal_comp, ICAL_ANY_COMPONENT);
-		}
-	}
-	else {
-		comp = cal_component_new ();
-		cal_component_set_icalcomponent (comp, icalcomp);
-		uid = cal_component_gen_uid ();
-		cal_component_set_uid (comp, (const char *) uid);
-		free (uid);
-
-		cal_client_update_object (
-			calendar_model_get_cal_client (cal_table->model),
-			comp);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table), NULL);
-}
-
-
-/* Returns the current time, for the ECellDateEdit items.
-   FIXME: Should probably use the timezone of the item rather than the
-   current timezone, though that may be difficult to get from here. */
-static struct tm
-e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data)
-{
-	char *location;
-	icaltimezone *zone;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	/* Get the current timezone. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-
-#ifdef TRANSLATORS_ONLY
-
-static char *test[] = {
-    N_("Click to add a task")
-};
-
-#endif
diff --git a/calendar/gui/e-calendar-table.etspec b/calendar/gui/e-calendar-table.etspec
deleted file mode 100644
index 2e47b817d2..0000000000
--- a/calendar/gui/e-calendar-table.etspec
+++ /dev/null
@@ -1,26 +0,0 @@
-<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="calstring" compare="string"/>
-  <ETableColumn model_col= "1" _title="Classification" expansion="1.0" minimum_width="10" resizable="true" cell="classification" compare="string" priority="-1"/>
-  <ETableColumn model_col= "2" _title="Completion Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col= "3" _title="End Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2" disabled="true"/>
-  <ETableColumn model_col= "4" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col= "5" _title="Due Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col= "6" _title="Geographical Position" expansion="1.0" minimum_width="10" resizable="true" cell="calstring" compare="string"/>
-  <ETableColumn model_col= "7" _title="% Complete" expansion="1.0" minimum_width="10" resizable="true" cell="percent" compare="percent-compare" priority="-3"/>
-  <ETableColumn model_col= "8" _title="Priority" expansion="1.0" minimum_width="10" resizable="true" cell="priority" compare="priority-compare" priority="-3"/>
-  <ETableColumn model_col= "9" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/>
-  <ETableColumn model_col="10" _title="Show Time As" expansion="1.0" minimum_width="10" resizable="true" cell="transparency" compare="string" priority="-1" disabled="true"/>
-  <ETableColumn model_col="11" _title="URL" expansion="2.0" minimum_width="10" resizable="true" cell="calstring" compare="string"/>
-  <ETableColumn model_col="12" _title="Alarms" expansion="1.0" minimum_width="10" resizable="true" cell="calstring" compare="string" disabled="true"/>
-  <ETableColumn model_col="13" pixbuf="icon" _title="Type" expansion="1.0" minimum_width="16" resizable="false" cell="icon" compare="integer" priority="-4"/>
-  <ETableColumn model_col="14" pixbuf="complete" _title="Complete" expansion="1.0" minimum_width="16" resizable="false" cell="checkbox" compare="integer" priority="-4"/>
-  <ETableColumn model_col="18" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="calstatus" compare="string" priority="-1"/>
-  <ETableColumn model_col="19" _title="Task sort" cell="task-sort" compare="task-sort" priority="-4"/>
-
-  <ETableState>
-    <column source="13"/>
-    <column source="14"/>
-    <column source= "9"/>
-    <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
deleted file mode 100644
index fab3afd85d..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gal/e-table/e-table-scrolled.h>
-#include <widgets/misc/e-cell-date-edit.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.
- */
-
-
-#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;
-
-	/* The model that we use */
-	CalendarModel *model;
-
-	GtkWidget *etable;
-
-	/* The ECell used to view & edit dates. */
-	ECellDateEdit *dates_cell;
-
-	/* The invisible widget used for cut/copy/paste */
-	GtkWidget *invisible;
-	gchar *clipboard_selection;
-	icalcomponent *tmp_vcal;
-};
-
-struct _ECalendarTableClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_calendar_table_get_type		(void);
-GtkWidget* e_calendar_table_new			(void);
-
-CalendarModel *e_calendar_table_get_model	(ECalendarTable *cal_table);
-
-ETable *e_calendar_table_get_table (ECalendarTable *cal_table);
-
-void e_calendar_table_complete_selected (ECalendarTable *cal_table);
-void e_calendar_table_delete_selected (ECalendarTable *cal_table);
-
-/* Clipboard related functions */
-void       e_calendar_table_cut_clipboard       (ECalendarTable *cal_table);
-void       e_calendar_table_copy_clipboard      (ECalendarTable *cal_table);
-void       e_calendar_table_paste_clipboard     (ECalendarTable *cal_table);
-
-/* 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-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
deleted file mode 100644
index 96cf911a1a..0000000000
--- a/calendar/gui/e-cell-date-edit-text.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECellDateEditText - a subclass of ECellText used to show and edit the text
- * representation of the date, from a CalComponentDateTime* model value.
- */
-
-#include <config.h>
-
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <string.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-time-utils.h>
-#include <cal-util/timeutil.h>
-
-#include "e-cell-date-edit-text.h"
-
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-
-void
-e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
-				    icaltimezone *zone)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT_TEXT (ecd));
-
-	ecd->zone = zone;
-}
-
-
-void
-e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
-					      gboolean use_24_hour)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT_TEXT (ecd));
-
-	ecd->use_24_hour_format = use_24_hour;
-}
-
-
-static char *
-ecd_get_text (ECellText *cell, ETableModel *model, int col, int row)
-{
-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);
-	ECellDateEditValue *dv = e_table_model_value_at (model, col, row);
-	struct tm tmp_tm;
-	char buffer[64];
-
-	if (!dv)
-		return g_strdup ("");
-
-	/* Note that although the property may be in a different
-	   timezone, we convert it to the current timezone to display
-	   it in the table. If the user actually edits the value,
-	   it will be set to the current timezone. See set_value(). */
-	tmp_tm = icaltimetype_to_tm_with_zone (&dv->tt, dv->zone, ecd->zone);
-
-	e_time_format_date_and_time (&tmp_tm, ecd->use_24_hour_format,
-				     !dv->tt.is_date, FALSE,
-				     buffer, sizeof (buffer));
-	return e_utf8_from_locale_string (buffer);
-}
-
-
-static void
-ecd_free_text (ECellText *cell, char *text)
-{
-	g_free (text);
-}
-
-
-/* FIXME: We need to set the "transient_for" property for the dialog. */
-static void
-show_date_warning (ECellDateEditText *ecd)
-{
-	GtkWidget *dialog;
-	char buffer[64], message[256], *format;
-	time_t t;
-	struct tm *tmp_tm;
-
-	t = time (NULL);
-	/* We are only using this as an example, so the timezone doesn't
-	   matter. */
-	tmp_tm = localtime (&t);
-
-	if (ecd->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);
-}
-
-
-static void
-ecd_set_value (ECellText *cell, ETableModel *model, int col, int row,
-	       const char *text)
-{
-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);
-	ETimeParseStatus status;
-	struct tm tmp_tm;
-	ECellDateEditValue *value;
-	gboolean is_date = TRUE;
-
-	/* Try to parse just a date first. If the value is only a date, we
-	   use a DATE value. */
-	status = e_time_parse_date (text, &tmp_tm);
-	if (status == E_TIME_PARSE_INVALID) {
-		is_date = FALSE;
-		status = e_time_parse_date_and_time (text, &tmp_tm);
-
-		if (status == E_TIME_PARSE_INVALID) {
-			show_date_warning (ecd);
-			return;
-		}
-	}
-
-	if (status == E_TIME_PARSE_NONE) {
-		value = NULL;
-	} else {
-		ECellDateEditValue dv;
-
-		dv.tt = icaltime_null_time ();
-
-		dv.tt.year   = tmp_tm.tm_year + 1900;
-		dv.tt.month  = tmp_tm.tm_mon + 1;
-		dv.tt.day    = tmp_tm.tm_mday;
-		dv.tt.hour   = tmp_tm.tm_hour;
-		dv.tt.minute = tmp_tm.tm_min;
-		dv.tt.second = tmp_tm.tm_sec;
-		dv.tt.is_date = is_date;
-
-		/* FIXME: We assume it is being set to the current timezone.
-		   Is that OK? */
-		if (is_date) {
-			dv.zone = NULL;
-		} else {
-			dv.zone = ecd->zone;
-		}
-
-		value = &dv;
-	}
-
-	e_table_model_set_value_at (model, col, row, value);
-}
-
-
-static void
-e_cell_date_edit_text_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecd_get_text;
-	ectc->free_text = ecd_free_text;
-	ectc->set_value = ecd_set_value;
-}
-
-
-static void
-e_cell_date_edit_text_init (GtkObject *object)
-{
-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (object);
-
-	ecd->zone = icaltimezone_get_utc_timezone ();
-	ecd->use_24_hour_format = TRUE;
-}
-
-
-/**
- * e_cell_date_edit_text_new:
- *
- * Creates a new ECell renderer that can be used to render and edit dates that
- * that come from the model.  The value returned from the model is
- * interpreted as being a CalComponentDateTime*.
- *
- * Returns: an ECell object that can be used to render dates.
- */
-ECell *
-e_cell_date_edit_text_new (const char *fontname,
-			   GtkJustification justify)
-{
-	ECellDateEditText *ecd = gtk_type_new (e_cell_date_edit_text_get_type ());
-
-	e_cell_text_construct (E_CELL_TEXT (ecd), fontname, justify);
-      
-	return (ECell *) ecd;
-}
-
-
-E_MAKE_TYPE (e_cell_date_edit_text, "ECellDateEditText", ECellDateEditText,
-	     e_cell_date_edit_text_class_init, e_cell_date_edit_text_init,
-	     PARENT_TYPE);
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
deleted file mode 100644
index bb00590622..0000000000
--- a/calendar/gui/e-cell-date-edit-text.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECellDateEditText - a subclass of ECellText used to show and edit the text
- * representation of the date, from a CalComponentDateTime* model value.
- */
-
-#ifndef _E_CELL_DATE_EDIT_TEXT_H_
-#define _E_CELL_DATE_EDIT_TEXT_H_
-
-#include <ical.h>
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_DATE_EDIT_TEXT_TYPE        (e_cell_date_edit_text_get_type ())
-#define E_CELL_DATE_EDIT_TEXT(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditText))
-#define E_CELL_DATE_EDIT_TEXT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditTextClass))
-#define E_IS_CELL_DATE_EDIT_TEXT(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_EDIT_TEXT_TYPE))
-#define E_IS_CELL_DATE_EDIT_TEXT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TEXT_TYPE))
-
-typedef struct _ECellDateEditValue ECellDateEditValue;
-struct _ECellDateEditValue {
-	struct icaltimetype tt;
-	icaltimezone *zone;
-};
-
-typedef struct {
-	ECellText base;
-
-	/* The timezone to display the date in. */
-	icaltimezone *zone;
-
-	/* Whether to display in 24-hour format. */
-	gboolean use_24_hour_format;
-} ECellDateEditText;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellDateEditTextClass;
-
-GtkType    e_cell_date_edit_text_get_type (void);
-ECell     *e_cell_date_edit_text_new      (const char *fontname,
-					   GtkJustification justify);
-
-
-void	   e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
-					       icaltimezone *zone);
-void	   e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
-							 gboolean use_24_hour);
-END_GNOME_DECLS
-
-#endif /* _E_CELL_DATE_EDIT_TEXT_H_ */
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
deleted file mode 100644
index ba843b828c..0000000000
--- a/calendar/gui/e-day-view-layout.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * Lays out events for the Day & Work-Week views of the calendar. It is also
- * used for printing.
- */
-
-#include <config.h>
-
-#include "e-day-view-layout.h"
-
-static void e_day_view_layout_long_event (EDayViewEvent	  *event,
-					  guint8	  *grid,
-					  gint		   days_shown,
-					  time_t	  *day_starts,
-					  gint		  *rows_in_top_display);
-
-static void e_day_view_layout_day_event (EDayViewEvent    *event,
-					 guint8	          *grid,
-					 guint16	  *group_starts,
-					 gint8	          *cols_per_row,
-					 gint	           rows,
-					 gint	           mins_per_row);
-static void e_day_view_expand_day_event (EDayViewEvent    *event,
-					 guint8	          *grid,
-					 gint8	          *cols_per_row,
-					 gint	           mins_per_row);
-static void e_day_view_recalc_cols_per_row (gint           rows,
-					    gint8	  *cols_per_row,
-					    guint16       *group_starts);
-
-
-void
-e_day_view_layout_long_events (GArray	   *events,
-			       gint	   days_shown,
-			       time_t	  *day_starts,
-			       gint	   *rows_in_top_display)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	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, 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. */
-	*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 < events->len; event_num++) {
-		event = &g_array_index (events, EDayViewEvent, event_num);
-		e_day_view_layout_long_event (event, grid,
-					      days_shown, day_starts,
-					      rows_in_top_display);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-}
-
-
-static void
-e_day_view_layout_long_event (EDayViewEvent *event,
-			      guint8	   *grid,
-			      gint	    days_shown,
-			      time_t	   *day_starts,		
-			      gint	   *rows_in_top_display)
-{
-	gint start_day, end_day, free_row, day, row;
-
-	event->num_columns = 0;
-
-	if (!e_day_view_find_long_event_days (event,
-					      days_shown, day_starts,
-					      &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. */
-	*rows_in_top_display = MAX (*rows_in_top_display, free_row + 1);
-}
-
-
-void
-e_day_view_layout_day_events (GArray	   *events,
-			      gint	    rows,
-			      gint	    mins_per_row,
-			      gint8	   *cols_per_row)
-{
-	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 so
-	   that all rows are not connected - each row is the start of a new
-	   group. */
-	for (row = 0; row < rows; row++) {
-		cols_per_row[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, 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 < events->len; event_num++) {
-		event = &g_array_index (events, EDayViewEvent, event_num);
-
-		e_day_view_layout_day_event (event, grid, group_starts,
-					     cols_per_row, rows, mins_per_row);
-	}
-
-	/* Recalculate the number of columns needed in each row. */
-	e_day_view_recalc_cols_per_row (rows, cols_per_row, group_starts);
-
-	/* Iterate over the events again, trying to expand events horizontally
-	   if there is enough space. */
-	for (event_num = 0; event_num < events->len; event_num++) {
-		event = &g_array_index (events, EDayViewEvent, event_num);
-		e_day_view_expand_day_event (event, grid, cols_per_row,
-					     mins_per_row);
-	}
-
-	/* 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 (EDayViewEvent *event,
-			     guint8	   *grid,
-			     guint16	   *group_starts,
-			     gint8	   *cols_per_row,
-			     gint	    rows,
-			     gint	    mins_per_row)
-{
-	gint start_row, end_row, free_col, col, row, group_start;
-
-	start_row = event->start_minute / mins_per_row;
-	end_row = (event->end_minute - 1) / mins_per_row;
-	if (end_row < start_row)
-		end_row = start_row;
-
-	event->num_columns = 0;
-
-	/* If the event can't currently be seen, just return. */
-	if (start_row >= rows || end_row < 0)
-		return;
-
-	/* Make sure we don't go outside the visible times. */
-	start_row = CLAMP (start_row, 0, rows - 1);
-	end_row = CLAMP (end_row, 0, 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;
-		cols_per_row[row]++;
-		group_starts[row] = group_start;
-	}
-
-	/* If any following rows should be in the same group, add them. */
-	for (row = end_row + 1; row < 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 (gint      rows,
-				gint8	 *cols_per_row,
-				guint16  *group_starts)
-{
-	gint start_row = 0, row, next_start_row, max_events;
-
-	while (start_row < rows) {
-		max_events = 0;
-		for (row = start_row; row < rows && group_starts[row] == start_row; row++)
-			max_events = MAX (max_events, cols_per_row[row]);
-
-		next_start_row = row;
-
-		for (row = start_row; row < next_start_row; row++)
-			cols_per_row[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 (EDayViewEvent *event,
-			     guint8	   *grid,
-			     gint8	   *cols_per_row,
-			     gint	    mins_per_row)
-{
-	gint start_row, end_row, col, row;
-	gboolean clashed;
-
-	start_row = event->start_minute / mins_per_row;
-	end_row = (event->end_minute - 1) / mins_per_row;
-	if (end_row < start_row)
-		end_row = start_row;
-
-	/* Try each column until we find a free one. */
-	clashed = FALSE;
-	for (col = event->start_row_or_col + 1; col < cols_per_row[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++;
-	}
-}
-
-
-/* Find the start and end days for the event. */
-gboolean
-e_day_view_find_long_event_days (EDayViewEvent	*event,
-				 gint		 days_shown,
-				 time_t		*day_starts,		
-				 gint		*start_day_return,
-				 gint		*end_day_return)
-{
-	gint day, start_day, end_day;
-
-	start_day = -1;
-	end_day = -1;
-
-	for (day = 0; day < days_shown; day++) {
-		if (start_day == -1
-		    && event->start < day_starts[day + 1])
-			start_day = day;
-		if (event->end > day_starts[day])
-			end_day = day;
-	}
-
-	/* Sanity check. */
-	if (start_day < 0 || start_day >= days_shown
-	    || end_day < 0 || end_day >= 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;
-}
-
-
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
deleted file mode 100644
index 70d0dd6394..0000000000
--- a/calendar/gui/e-day-view-layout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_LAYOUT_H_
-#define _E_DAY_VIEW_LAYOUT_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* I've split these functions away from EDayView so we can use them for
-   printing. */
-
-void e_day_view_layout_long_events	(GArray	   *events,
-					 gint	    days_shown,
-					 time_t	   *day_starts,
-					 gint	   *rows_in_top_display);
-
-
-void e_day_view_layout_day_events	(GArray	   *events,
-					 gint	    rows,
-					 gint	    mins_per_row,
-					 gint8	   *cols_per_row);
-
-gboolean   e_day_view_find_long_event_days	(EDayViewEvent	*event,
-						 gint		 days_shown,
-						 time_t		*day_starts,
-						 gint		*start_day,
-						 gint		*end_day);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_LAYOUT_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 f7f86c6660..0000000000
--- a/calendar/gui/e-day-view-main-item.c
+++ /dev/null
@@ -1,756 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-util/e-categories-config.h"
-#include "e-day-view-layout.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 *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 icaltimetype day_start_tt;
-	gint weekday;
-
-#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;
-
-	/* 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_tt = icaltime_from_timet_with_zone (day_view->day_starts[day], FALSE, day_view->zone);
-		weekday = icaltime_day_of_week (day_start_tt) - 1;
-		
-		work_day = day_view->working_days & (1 << weekday);
-
-		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;
-
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_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;
-
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_GRID]);
-	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, 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, style->black_gc,
-			       grid_x1, grid_y1,
-			       grid_x1, grid_y2);
-		gdk_draw_line (drawable, style->black_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;
-	CalComponentTransparency transparency;
-
-	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);
-
-		/* If the event is TRANSPARENT, skip it. */
-		cal_component_get_transparency (event->comp, &transparency);
-		if (transparency == CAL_COMPONENT_TRANSP_TRANSPARENT)
-			continue;
-
-		/* 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;
-	CalComponentTransparency transparency;
-
-	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 the event is TRANSPARENT, skip it. */
-		cal_component_get_transparency (event->comp, &transparency);
-		if (transparency == CAL_COMPONENT_TRANSP_TRANSPARENT)
-			continue;
-
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &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, draw_timezone_icon;
-	GSList *categories_list, *elem;
-	CalComponentTransparency transparency;
-
-	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 1
-	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;
-	}
-
-	/* Only fill it in if the event isn't TRANSPARENT. */
-	cal_component_get_transparency (event->comp, &transparency);
-	if (transparency != CAL_COMPONENT_TRANSP_TRANSPARENT) {
-		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;
-	draw_timezone_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 the DTSTART or DTEND are in a different timezone to our current
-	   timezone, we display the timezone icon. */
-	if (event->different_timezone) {
-		draw_timezone_icon = TRUE;
-		num_icons++;
-	}
-
-
-	cal_component_get_categories_list (comp, &categories_list);
-	num_icons += g_slist_length (categories_list);
-
-	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));
-
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-
-		if (draw_timezone_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->timezone_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->timezone_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;
-		}
-
-		/* draw categories icons */
-		for (elem = categories_list; elem; elem = elem->next) {
-			char *category;
-			GdkPixmap *pixmap = NULL;
-			GdkBitmap *mask = NULL;
-
-			category = (char *) elem->data;
-			e_categories_config_get_icon_for (category, &pixmap, &mask);
-			if (pixmap == NULL)
-				continue;
-
-			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);
-			if (mask != NULL)
-				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
-					 pixmap,
-					 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_pixmap_unref (pixmap);
-			if (mask != NULL)
-				gdk_bitmap_unref (mask);
-
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-		
-		gdk_gc_set_clip_mask (gc, NULL);
-	}
-
-	/* free memory */
-	cal_component_free_categories_list (categories_list);
-}
-
-
-/* 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 be7f130606..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 94af4ee00c..0000000000
--- a/calendar/gui/e-day-view-time-item.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.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).
-   LARGE_HOUR_Y_PAD is the offset of the large hour string from the top of the
-   row.
-   SMALL_FONT_Y_PAD is the offset of the small time/minute string from the top
-   of the row. */
-#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
-#define E_DVTMI_LARGE_HOUR_Y_PAD	1
-#define E_DVTMI_SMALL_FONT_Y_PAD	1
-
-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_increment_time	(gint	*hour,
-						 gint	*minute,
-						 gint	 mins_per_row);
-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;
-	GtkStyle *style;
-	GdkFont *small_font, *large_font;
-	gint digit, large_digit_width, max_large_digit_width = 0;
-	gint max_suffix_width, max_minute_or_suffix_width;
-	gint column_width_default, column_width_60_min_rows;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, 0);
-
-	style = GTK_WIDGET (day_view)->style;
-	g_return_val_if_fail (style != NULL, 0);
-	small_font = style->font;
-	g_return_val_if_fail (small_font != NULL, 0);
-	large_font = day_view->large_font;
-	g_return_val_if_fail (large_font != NULL, 0);
-
-	for (digit = '0'; digit <= '9'; digit++) {
-		large_digit_width = gdk_char_width (large_font, digit);
-		max_large_digit_width = MAX (max_large_digit_width,
-					     large_digit_width);
-	}
-
-	/* Calculate the width of each time column, using the maximum of the
-	   default format with large hour numbers, and the 60-min divisions
-	   format which uses small text. */
-	max_suffix_width = MAX (day_view->am_string_width,
-				day_view->pm_string_width);
-
-	max_minute_or_suffix_width = MAX (max_suffix_width,
-					  day_view->max_minute_width);
-
-	column_width_default = max_large_digit_width * 2
-		+ max_minute_or_suffix_width
-		+ E_DVTMI_MIN_X_PAD * 2
-		+ E_DVTMI_HOUR_L_PAD
-		+ E_DVTMI_HOUR_R_PAD
-		+ E_DVTMI_TIME_GRID_X_PAD * 2;
-
-	column_width_60_min_rows = day_view->max_small_hour_width
-		+ day_view->colon_width
-		+ max_minute_or_suffix_width
-		+ E_DVTMI_60_MIN_X_PAD * 2
-		+ E_DVTMI_TIME_GRID_X_PAD * 2;
-
-	dvtmitem->column_width = MAX (column_width_default,
-				      column_width_60_min_rows);
-
-	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;
-	GtkStyle *style;
-	GdkFont *small_font, *large_font;
-	GdkGC *fg_gc, *dark_gc;
-	gchar buffer[64], *suffix;
-	gint hour, display_hour, minute, row;
-	gint row_y, start_y, large_hour_y_offset, small_font_y_offset;
-	gint long_line_x1, long_line_x2, short_line_x1;
-	gint large_hour_x2, minute_x2;
-	gint hour_width, minute_width, suffix_width;
-	gint max_suffix_width, max_minute_or_suffix_width;
-
-	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];
-
-	/* The start and end of the long horizontal line between hours. */
-	long_line_x1 = E_DVTMI_TIME_GRID_X_PAD - x;
-	long_line_x2 = dvtmitem->column_width - E_DVTMI_TIME_GRID_X_PAD - x;
-
-	if (day_view->mins_per_row == 60) {
-		/* The right edge of the complete time string in 60-min
-		   divisions, e.g. "14:00" or "2 pm". */
-		minute_x2 = long_line_x2 - E_DVTMI_60_MIN_X_PAD;
-
-		/* These aren't used for 60-minute divisions, but we initialize
-		   them to keep gcc happy. */
-		short_line_x1 = 0;
-		large_hour_x2 = 0;
-	} else {
-		max_suffix_width = MAX (day_view->am_string_width,
-					day_view->pm_string_width);
-
-		max_minute_or_suffix_width = MAX (max_suffix_width,
-						  day_view->max_minute_width);
-
-		/* The start of the short horizontal line between the periods
-		   within each hour. */
-		short_line_x1 = long_line_x2 - E_DVTMI_MIN_X_PAD * 2
-			- max_minute_or_suffix_width;
-
-		/* The right edge of the large hour string. */
-		large_hour_x2 = short_line_x1 - E_DVTMI_HOUR_R_PAD;
-
-		/* The right edge of the minute part of the time. */
-		minute_x2 = long_line_x2 - E_DVTMI_MIN_X_PAD;
-	}
-
-	/* Start with the first hour & minute shown in the EDayView. */
-	hour = day_view->first_hour_shown;
-	minute = day_view->first_minute_shown;
-
-	/* The offset of the large hour string from the top of the row. */
-	large_hour_y_offset = large_font->ascent + E_DVTMI_LARGE_HOUR_Y_PAD;
-
-	/* The offset of the small time/minute string from top of row. */
-	small_font_y_offset = small_font->ascent + E_DVTMI_SMALL_FONT_Y_PAD;
-
-	/* Calculate the minimum y position of the first row we need to draw.
-	   This is normally one row height above the 0 position, but if we
-	   are using the large font we may have to go back a bit further. */
-	start_y = 0 - MAX (day_view->row_height,
-			   large_hour_y_offset + large_font->descent);
-
-	/* Step through each row, drawing the times and the horizontal lines
-	   between them. */
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-
-		/* If the row is above the first row we want to draw just
-		   increment the time and skip to the next row. */
-		if (row_y < start_y) {
-			e_day_view_time_item_increment_time (&hour, &minute,
-							     day_view->mins_per_row);
-			continue;
-		}
-
-		/* Calculate the actual hour number to display. For 12-hour
-		   format we convert 0-23 to 12-11am/12-11pm. */
-		e_day_view_convert_time_to_display (day_view, hour,
-						    &display_hour,
-						    &suffix, &suffix_width);
-
-		if (day_view->mins_per_row == 60) {
-			/* 60 minute intervals - draw a long horizontal line
-			   between hours and display as one long string,
-			   e.g. "14:00" or "2 pm". */
-			gdk_draw_line (drawable, dark_gc,
-				       long_line_x1, row_y,
-				       long_line_x2, row_y);
-
-			if (day_view->use_24_hour_format) {
-				g_snprintf (buffer, sizeof (buffer), "%i:%02i",
-					    display_hour, minute);
-			} else {
-				g_snprintf (buffer, sizeof (buffer), "%i %s",
-					    display_hour, suffix);
-			}
-			minute_width = gdk_string_width (small_font, buffer);
-			gdk_draw_string (drawable, small_font, fg_gc,
-					 minute_x2 - minute_width,
-					 row_y + small_font_y_offset,
-					 buffer);
-		} else {
-			/* 5/10/15/30 minute intervals. */
-
-			if (minute == 0) {
-				/* On the hour - draw a long horizontal line
-				   before the hour and display the hour in the
-				   large font. */
-				gdk_draw_line (drawable, dark_gc,
-					       long_line_x1, row_y,
-					       long_line_x2, row_y);
-
-				g_snprintf (buffer, sizeof (buffer), "%i",
-					    display_hour);
-				hour_width = gdk_string_width (large_font,
-							       buffer);
-				gdk_draw_string (drawable, large_font, fg_gc,
-						 large_hour_x2 - hour_width,
-						 row_y + large_hour_y_offset,
-						 buffer);
-			} else {
-				/* Within the hour - draw a short line before
-				   the time. */
-				gdk_draw_line (drawable, dark_gc,
-					       short_line_x1, row_y,
-					       long_line_x2, row_y);
-			}
-
-			/* Normally we display the minute in each
-			   interval, but when using 30-minute intervals
-			   we don't display the '30'. */
-			if (day_view->mins_per_row != 30 || minute != 30) {
-				/* In 12-hour format we display 'am' or 'pm'
-				   instead of '00'. */
-				if (minute == 0
-				    && !day_view->use_24_hour_format) {
-					strcpy (buffer, suffix);
-				} else {
-					g_snprintf (buffer, sizeof (buffer),
-						    "%02i", minute);
-				}
-				minute_width = gdk_string_width (small_font,
-								 buffer);
-				gdk_draw_string (drawable, small_font, fg_gc,
-						 minute_x2 - minute_width,
-						 row_y + small_font_y_offset,
-						 buffer);
-			}
-		}
-
-		e_day_view_time_item_increment_time (&hour, &minute,
-						     day_view->mins_per_row);
-	}
-}
-
-
-/* Increment the time by the 5/10/15/30/60 minute interval.
-   Note that mins_per_row is never > 60, so we never have to
-   worry about adding more than 60 minutes. */
-static void
-e_day_view_time_item_increment_time	(gint	*hour,
-					 gint	*minute,
-					 gint	 mins_per_row)
-{
-	*minute += mins_per_row;
-	if (*minute >= 60) {
-		*minute -= 60;
-		/* Currently we never wrap around to the next day, but
-		   we may do if we display extra timezones. */
-		*hour = (*hour + 1) % 24;
-	}
-}
-
-
-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++) {
-		g_snprintf (buffer, sizeof (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 f425363c98..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 c2fd76f86a..0000000000
--- a/calendar/gui/e-day-view-top-item.c
+++ /dev/null
@@ -1,695 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-util/e-categories-config.h"
-#include "cal-util/timeutil.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 *gc, *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 = { 0 };
-	struct icaltimetype day_start_tt;
-
-#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;
-	gc = day_view->main_gc;
-	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;
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       left_edge - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       left_edge - x, 2 - y,
-		       left_edge - x, item_height - 2 - y);
-	gdk_draw_line (drawable, dark_gc,
-		       left_edge - x, item_height - 1 - y,
-		       canvas_width - 1 - x, item_height - 1 - y);
-	gdk_draw_line (drawable, dark_gc,
-		       canvas_width - 1 - x, 1 - y,
-		       canvas_width - 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);
-
-	/* Clear the main area background. */
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS]);
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    left_edge - x, item_height - y,
-			    canvas_width - left_edge,
-			    canvas_height - item_height);
-
-	/* 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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED]);
-			gdk_draw_rectangle (drawable, 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_tt = icaltime_from_timet_with_zone (day_view->day_starts[day], FALSE, day_view->zone);
-		day_start.tm_year = day_start_tt.year - 1900;
-		day_start.tm_mon = day_start_tt.month - 1;
-		day_start.tm_mday = day_start_tt.day;
-		day_start.tm_isdst = -1;
-
-		day_start.tm_wday = time_day_of_week (day_start_tt.day,
-						      day_start_tt.month - 1,
-						      day_start_tt.year);
-
-		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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID]);
-			gdk_draw_line (drawable, 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, display_hour, minute, offset, time_width, time_x;
-	gint min_end_time_x, suffix_width, max_icon_x;
-	gchar *suffix;
-	gboolean draw_start_triangle, draw_end_triangle;
-	GdkRectangle clip_rect;
-	GSList *categories_list, *elem;
-
-	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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-	gdk_draw_line (drawable, gc,
-		       item_x - x, item_y - y,
-		       item_x + item_w - 1 - x, item_y - y);
-	gdk_draw_line (drawable, 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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);
-	gdk_draw_rectangle (drawable, 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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-		gdk_draw_line (drawable, 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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-		gdk_draw_line (drawable, 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 start & end times, if necessary. */
-	min_end_time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
-
-	time_width = e_day_view_get_time_string_width (day_view);
-
-	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;
-		/* Calculate the actual hour number to display. For 12-hour
-		   format we convert 0-23 to 12-11am/12-11pm. */
-		e_day_view_convert_time_to_display (day_view, hour,
-						    &display_hour,
-						    &suffix, &suffix_width);
-		if (day_view->use_24_hour_format) {
-			g_snprintf (buffer, sizeof (buffer), "%i:%02i",
-				    display_hour, minute);
-		} else {
-			g_snprintf (buffer, sizeof (buffer), "%i:%02i%s",
-				    display_hour, minute, suffix);
-		}
-
-		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);
-
-		time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
-		if (display_hour < 10)
-			time_x += day_view->digit_width;
-
-		gdk_draw_string (drawable, font, fg_gc,
-				 time_x,
-				 item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT
-				 + E_DAY_VIEW_LONG_EVENT_Y_PAD
-				 + font->ascent - y,
-				 buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		min_end_time_x += time_width
-			+ E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-	}
-
-	max_icon_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD
-		- E_DAY_VIEW_ICON_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_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) {
-			/* Calculate the actual hour number to display. */
-			e_day_view_convert_time_to_display (day_view, hour,
-							    &display_hour,
-							    &suffix,
-							    &suffix_width);
-			if (day_view->use_24_hour_format) {
-				g_snprintf (buffer, sizeof (buffer),
-					    "%i:%02i", display_hour, minute);
-			} else {
-				g_snprintf (buffer, sizeof (buffer),
-					    "%i:%02i%s", display_hour, minute,
-					    suffix);
-			}
-
-			if (display_hour < 10)
-				time_x += day_view->digit_width;
-
-			gdk_draw_string (drawable, font, fg_gc,
-					 time_x,
-					 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD
-					 + font->ascent + 1 - y,
-					 buffer);
-
-			max_icon_x -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-		}
-	}
-
-	/* Draw the icons. */
-	icon_x_inc = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_x = text_x - E_DAY_VIEW_LONG_EVENT_ICON_R_PAD
-		- icon_x_inc - x;
-	icon_y = item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT
-		+ E_DAY_VIEW_ICON_Y_PAD - y;
-
-	if (icon_x <= max_icon_x && 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 (icon_x <= max_icon_x && 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;
-	}
-
-	/* draw categories icons */
-	cal_component_get_categories_list (comp, &categories_list);
-	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		GdkPixmap *pixmap = NULL;
-		GdkBitmap *mask = NULL;
-
-		category = (char *) elem->data;
-		e_categories_config_get_icon_for (category, &pixmap, &mask);
-		if (pixmap == NULL)
-			continue;
-
-		if (icon_x <= max_icon_x) {
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			if (mask != NULL)
-				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
-					 pixmap,
-					 0, 0, icon_x, icon_y,
-					 E_DAY_VIEW_ICON_WIDTH,
-					 E_DAY_VIEW_ICON_HEIGHT);
-			icon_x -= icon_x_inc;
-		}
-
-		gdk_pixmap_unref (pixmap);
-		if (mask != NULL)
-			gdk_bitmap_unref (mask);
-	}
-
-	cal_component_free_categories_list (categories_list);
-
-	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_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
-				   GdkDrawable	   *drawable,
-				   gint		    x,
-				   gint		    y,
-				   gint		    w,
-				   gint		    h)
-{
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *gc;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	day_view = dvtitem->day_view;
-
-	style = GTK_WIDGET (day_view)->style;
-	gc = day_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;
-
-	/* 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_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);
-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);
-
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);
-	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_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 daeb37aca7..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 2a346cdbf9..0000000000
--- a/calendar/gui/e-day-view.c
+++ /dev/null
@@ -1,7570 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "e-day-view.h"
-
-#include <math.h>
-#include <time.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
-#include <e-util/e-dialog-utils.h>
-
-#include "cal-util/timeutil.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/send-comp.h"
-#include "print.h"
-#include "comp-util.h"
-#include "itip-utils.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "goto.h"
-#include "e-day-view-time-item.h"
-#include "e-day-view-top-item.h"
-#include "e-day-view-layout.h"
-#include "e-day-view-main-item.h"
-#include "misc.h"
-
-/* Images */
-#include "art/bell.xpm"
-#include "art/recur.xpm"
-#include "art/timezone-16.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
-
-/* The amount we scroll the main canvas when the Page Up/Down keys are pressed,
-   as a fraction of the page size. */
-#define E_DAY_VIEW_PAGE_STEP		0.5
-
-/* The amount we scroll the main canvas when the mouse wheel buttons are
-   pressed, as a fraction of the page size. */
-#define E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE	0.25
-
-/* The timeout before we do a layout, so we don't do a layout for each event
-   we get from the server. */
-#define E_DAY_VIEW_LAYOUT_TIMEOUT	100
-
-/* Used for the status bar messages */
-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "evolution-calendar-mini.png"
-static GdkPixbuf *progress_icon[2] = { NULL, NULL };
-
-/* Signal IDs */
-enum {
-	SELECTION_CHANGED,
-	LAST_SIGNAL
-};
-static guint e_day_view_signals[LAST_SIGNAL] = { 0 };
-
-
-/* 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 void e_day_view_scroll	(EDayView	*day_view,
-				 gfloat		 pages_to_scroll);
-
-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		(EDayView	*day_view,
-						 EDayViewForeachEventCallback callback,
-						 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_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_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_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 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_new_event       (GtkWidget *widget,
-					   gpointer data);
-static void e_day_view_on_new_meeting (GtkWidget *widget,
-				       gpointer data);
-static void e_day_view_on_new_task (GtkWidget *widget,
-				    gpointer data);
-static void e_day_view_on_goto_today      (GtkWidget *widget,
-					   gpointer data);
-static void e_day_view_on_goto_date       (GtkWidget *widget,
-					   gpointer data);
-static void e_day_view_on_edit_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_day_view_on_save_as (GtkWidget *widget, 
-				   gpointer data);
-static void e_day_view_on_print (GtkWidget *widget,
-				 gpointer data);
-static void e_day_view_on_print_event (GtkWidget *widget, 
-				       gpointer data);
-static void e_day_view_on_meeting (GtkWidget *widget,
-				   gpointer data);
-static void e_day_view_on_forward (GtkWidget *widget,
-				   gpointer data);
-static void e_day_view_on_publish (GtkWidget *widget,
-				   gpointer data);
-static void e_day_view_on_settings (GtkWidget *widget,
-				    gpointer data);
-static void e_day_view_on_pilot_settings (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_cut (GtkWidget *widget, gpointer data);
-static void e_day_view_on_copy (GtkWidget *widget, gpointer data);
-static void e_day_view_on_paste (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);
-
-static gboolean e_day_view_update_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-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 gboolean e_day_view_set_show_times_cb	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gpointer	 data);
-static time_t e_day_view_find_work_week_start	(EDayView	*day_view,
-						 time_t		 start_time);
-static void e_day_view_recalc_work_week		(EDayView	*day_view);
-static void e_day_view_recalc_work_week_days_shown	(EDayView	*day_view);
-static gboolean e_day_view_set_event_font_cb	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gpointer	 data);
-
-static void selection_clear_event (GtkWidget *invisible,
-				   GdkEventSelection *event,
-				   EDayView *day_view);
-static void selection_received (GtkWidget *invisible,
-				GtkSelectionData *selection_data,
-				guint time,
-				EDayView *day_view);
-static void selection_get (GtkWidget *invisible,
-			   GtkSelectionData *selection_data,
-			   guint info,
-			   guint time_stamp,
-			   EDayView *day_view);
-static void invisible_destroyed (GtkWidget *invisible, EDayView *day_view);
-
-static void e_day_view_queue_layout (EDayView *day_view);
-static void e_day_view_cancel_layout (EDayView *day_view);
-static gboolean e_day_view_layout_timeout_cb (gpointer data);
-
-
-static GtkTableClass *parent_class;
-static GdkAtom clipboard_atom = GDK_NONE;
-
-
-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;
-
-	e_day_view_signals[SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EDayViewClass, selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_day_view_signals, LAST_SIGNAL);
-
-	/* 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;
-
-	class->selection_changed = NULL;
-
-	/* clipboard atom */
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-
-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->sexp = g_strdup ("#t"); /* match all by default */
-	day_view->query = 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->layout_timeout_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;
-
-	day_view->work_week_view = FALSE;
-	day_view->days_shown = 1;
-
-	day_view->zone = NULL;
-
-	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->show_event_end_times = TRUE;
-	day_view->week_start_day = 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;
-
-	day_view->default_category = NULL;
-
-	/* 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");
-
-	/* String to use in 12-hour time format for times in the morning. */
-	day_view->am_string = _("am");
-
-	/* String to use in 12-hour time format for times in the afternoon. */
-	day_view->pm_string = _("pm");
-
-
-	/*
-	 * 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,
-				       "draw_background", FALSE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-				       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,
-				       "draw_background", FALSE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-				       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_LEFT_PTR);
-	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 | GDK_ACTION_ASK);
-	gtk_drag_dest_set (day_view->main_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
-
-	/* Set up the invisible widget for the clipboard selections */
-	day_view->invisible = gtk_invisible_new ();
-	gtk_selection_add_target (day_view->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    (gpointer) day_view);
-	day_view->clipboard_selection = NULL;
-
-	day_view->activity = NULL;
-}
-
-
-/* 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_cancel_layout (day_view);
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	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->sexp) {
-		g_free (day_view->sexp);
-		day_view->sexp = NULL;
-	}
-
-	if (day_view->query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->query), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->query));
-		day_view->query = NULL;
-	}
-
-	if (day_view->large_font) {
-		gdk_font_unref (day_view->large_font);
-		day_view->large_font = NULL;
-	}
-
-	if (day_view->default_category) {
-		g_free (day_view->default_category);
-		day_view->default_category = NULL;
-	}
-
-	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);
-	day_view->long_events = NULL;
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) {
-		g_array_free (day_view->events[day], TRUE);
-		day_view->events[day] = NULL;
-	}
-
-	if (day_view->invisible)
-		gtk_widget_destroy (day_view->invisible);
-	if (day_view->clipboard_selection) {
-		g_free (day_view->clipboard_selection);
-		day_view->clipboard_selection = NULL;
-	}
-
-	if (day_view->activity) {
-		gtk_object_unref (GTK_OBJECT (day_view->activity));
-		day_view->activity = NULL;
-	}
-
-	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_BG_SELECTED].red   = 0 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED].green = 0 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED].blue  = 156 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].red   = 0x8000;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].green = 0x8000;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].blue  = 0x8000;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].red   = 0x8000;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].green = 0x8000;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].blue  = 0x8000;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].red   = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].green = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].blue  = 0;
-
-	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;
-
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].red   = 213 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].green = 213 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].blue  = 213 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_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);
-	day_view->timezone_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->timezone_mask, NULL, timezone_16_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);
-}
-
-
-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++) {
-		g_snprintf (buffer, sizeof (buffer), "%02i", hour);
-		day_view->small_hour_widths[hour] = gdk_string_width (font, buffer);
-		day_view->max_small_hour_width = MAX (day_view->max_small_hour_width, day_view->small_hour_widths[hour]);
-	}
-
-	max_minute_width = 0;
-	for (minute = 0, i = 0; minute < 60; minute += 5, i++) {
-		gint minute_width;
-
-		g_snprintf (buffer, sizeof (buffer), "%02i", minute);
-		minute_width = gdk_string_width (font, buffer);
-		max_minute_width = MAX (max_minute_width, minute_width);
-	}
-	day_view->max_minute_width = max_minute_width;
-	day_view->colon_width = gdk_string_width (font, ":");
-	day_view->digit_width = gdk_string_width (font, "0");
-
-	day_view->am_string_width = gdk_string_width (font,
-						      day_view->am_string);
-	day_view->pm_string_width = gdk_string_width (font,
-						      day_view->pm_string);
-
-	/* 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);
-
-	/* Set the font of all the EText items. */
-	e_day_view_foreach_event (day_view, e_day_view_set_event_font_cb,
-				  font);
-
-	/* 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 gboolean
-e_day_view_set_event_font_cb		(EDayView	*day_view,
-					 gint		 day,
-					 gint		 event_num,
-					 gpointer	 data)
-{
-	EDayViewEvent *event;
-	GdkFont *font = data;
-
-	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 (event->canvas_item)
-		gnome_canvas_item_set (event->canvas_item,
-				       "font_gdk", font,
-				       NULL);
-
-	return TRUE;
-}
-
-
-/* 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);
-
-	g_assert (GTK_WIDGET_REALIZED (day_view->main_canvas));
-	if (E_CANVAS (day_view->main_canvas)->ic)
-		gdk_im_begin (E_CANVAS (day_view->main_canvas)->ic,
-			      GTK_LAYOUT (day_view->main_canvas)->bin_window);
-
-	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);
-
-	g_assert (GTK_WIDGET_REALIZED (day_view->main_canvas));
-	if (E_CANVAS (day_view->main_canvas)->ic)
-		gdk_im_end ();
-
-	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;
-}
-
-
-/* Callback used when a component is updated in the live query */
-static void
-query_obj_updated_cb (CalQuery *query, const char *uid,
-		      gboolean query_in_progress, int n_scanned, int total,
-		      gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	gint day, event_num;
-
-	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 ("query_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;
-	}
-
-	/* 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);
-
-		if (!cal_component_has_recurrences (comp)
-		    && !cal_component_has_recurrences (event->comp)
-		    && cal_component_event_dates_match (comp, event->comp)) {
-#if 0
-			g_print ("updated object's dates unchanged\n");
-#endif
-			e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_update_event_cb, comp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			gtk_widget_queue_draw (day_view->top_canvas);
-			gtk_widget_queue_draw (day_view->main_canvas);
-			return;
-		}
-
-		/* 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,
-				      cal_client_resolve_tzid_cb, day_view->client,
-				      day_view->zone);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_day_view_queue_layout (day_view);
-}
-
-/* Callback used when a component is removed from the live query */
-static void
-query_obj_removed_cb (CalQuery *query, 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);
-}
-
-/* Callback used when a query ends */
-static void
-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	/* FIXME */
-
-	e_day_view_set_status_message (day_view, NULL);
-
-	if (status != CAL_QUERY_DONE_SUCCESS)
-		fprintf (stderr, "query done: %s\n", error_str);
-}
-
-/* Callback used when an evaluation error occurs when running a query */
-static void
-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	/* FIXME */
-
-	e_day_view_set_status_message (day_view, NULL);
-
-	fprintf (stderr, "eval error: %s\n", error_str);
-}
-
-
-/* Builds a complete query sexp for the day view by adding the predicates to
- * filter only for VEVENTS that fit in the day view's time range.
- */
-static char *
-adjust_query_sexp (EDayView *day_view, const char *sexp)
-{
-	char *start, *end;
-	char *new_sexp;
-
-	/* If the dates have not been set yet, we just want an empty query. */
-	if (day_view->lower == 0 || day_view->upper == 0)
-		return NULL;
-
-	start = isodate_from_time_t (day_view->lower);
-	end = isodate_from_time_t (day_view->upper);
-
-	new_sexp = g_strdup_printf ("(and (= (get-vtype) \"VEVENT\")"
-				    "     (occur-in-time-range? (make-time \"%s\")"
-				    "                           (make-time \"%s\"))"
-				    "     %s)",
-				    start, end,
-				    sexp);
-
-	g_free (start);
-	g_free (end);
-
-	return new_sexp;
-}
-
-
-/* Restarts a query for the day view */
-static void
-update_query (EDayView *day_view)
-{
-	CalQuery *old_query;
-	char *real_sexp;
-
-	e_day_view_stop_editing_event (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_free_events (day_view);
-	e_day_view_queue_layout (day_view);
-
-	if (!(day_view->client
-	      && cal_client_get_load_state (day_view->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	old_query = day_view->query;
-	day_view->query = NULL;
-
-	if (old_query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), day_view);
-		gtk_object_unref (GTK_OBJECT (old_query));
-	}
-
-	g_assert (day_view->sexp != NULL);
-
-	real_sexp = adjust_query_sexp (day_view, day_view->sexp);
-	if (!real_sexp)
-		return; /* No time range is set, so don't start a query */
-
-	e_day_view_set_status_message (day_view, _("Searching"));
-	day_view->query = cal_client_get_query (day_view->client, real_sexp);
-	g_free (real_sexp);
-
-	if (!day_view->query) {
-		g_message ("update_query(): Could not create the query");
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "obj_removed",
-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), day_view);
-}
-
-/* Callback used when the calendar client finishes opening */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	update_query (day_view);
-}
-
-/**
- * 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) {
-		if (cal_client_get_load_state (day_view->client) == CAL_CLIENT_LOAD_LOADED)
-			update_query (day_view);
-		else
-			gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), day_view);
-	}
-}
-
-/**
- * e_day_view_set_query:
- * @day_view: A day view.
- * @sexp: S-expression that defines the query.
- * 
- * Sets the query sexp that the day view will use for filtering the displayed
- * events.
- **/
-void
-e_day_view_set_query (EDayView *day_view, const char *sexp)
-{
-	g_return_if_fail (day_view != NULL);
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (sexp != NULL);
-
-	if (day_view->sexp)
-		g_free (day_view->sexp);
-
-	day_view->sexp = g_strdup (sexp);
-
-	update_query (day_view);
-}
-
-
-/**
- * e_day_view_set_default_category:
- * @day_view: A day view.
- * @category: Default category name or NULL for no category.
- * 
- * Sets the default category that will be used when creating new calendar
- * components from the day view.
- **/
-void
-e_day_view_set_default_category (EDayView *day_view, const char *category)
-{
-	g_return_if_fail (day_view != NULL);
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->default_category)
-		g_free (day_view->default_category);
-
-	day_view->default_category = g_strdup (category);
-}
-
-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;
-}
-
-
-/* This calls a given function for each event instance (in both views).
-   If the callback returns FALSE the iteration is stopped.
-   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		(EDayView	*day_view,
-					 EDayViewForeachEventCallback callback,
-					 gpointer	 data)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	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);
-
-			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);
-
-		if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT, event_num,
-				  data))
-			return;
-	}
-}
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. If the callback returns FALSE the iteration is stopped.
-   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_day 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, *start_suffix, *end_suffix;
-	gboolean free_text = FALSE, editing_event = FALSE;
-	gint offset;
-	gint start_hour, start_display_hour, start_minute, start_suffix_width;
-	gint end_hour, end_display_hour, end_minute, end_suffix_width;
-	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
-		|| (day_view->show_event_end_times
-		    && 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;
-
-		start_hour = start_minute / 60;
-		start_minute = start_minute % 60;
-
-		end_hour = end_minute / 60;
-		end_minute = end_minute % 60;
-
-		e_day_view_convert_time_to_display (day_view, start_hour,
-						    &start_display_hour,
-						    &start_suffix,
-						    &start_suffix_width);
-		e_day_view_convert_time_to_display (day_view, end_hour,
-						    &end_display_hour,
-						    &end_suffix,
-						    &end_suffix_width);
-
-		if (day_view->use_24_hour_format) {
-			if (day_view->show_event_end_times) {
-				/* 24 hour format with end time. */
-				text = g_strdup_printf
-					("%2i:%02i-%2i:%02i %s",
-					 start_display_hour, start_minute,
-					 end_display_hour, end_minute,
-					 text);
-			} else {
-				/* 24 hour format without end time. */
-				text = g_strdup_printf
-					("%2i:%02i %s",
-					 start_display_hour, start_minute,
-					 text);
-			}
-		} else {
-			if (day_view->show_event_end_times) {
-				/* 12 hour format with end time. */
-				text = g_strdup_printf
-					("%2i:%02i%s-%2i:%02i%s %s",
-					 start_display_hour, start_minute,
-					 start_suffix,
-					 end_display_hour, end_minute,
-					 end_suffix,
-					 text);
-			} else {
-				/* 12 hour format without end time. */
-				text = g_strdup_printf
-					("%2i:%02i%s %s",
-					 start_display_hour, start_minute,
-					 start_suffix,
-					 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)
-{
-	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
-	   work-week start day. */
-	if (!day_view->work_week_view) {
-		lower = time_day_begin_with_zone (start_time, day_view->zone);
-	} else {
-		lower = e_day_view_find_work_week_start (day_view, start_time);
-	}
-
-	/* See if we need to change the days shown. */
-	if (lower != day_view->lower) {
-		e_day_view_recalc_day_starts (day_view, lower);
-		update_query (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);
-	}
-}
-
-
-/* Finds the start of the working week which includes the given time. */
-static time_t
-e_day_view_find_work_week_start		(EDayView	*day_view,
-					 time_t		 start_time)
-{
-	GDate date;
-	gint weekday, day, i, offset;
-	struct icaltimetype tt = icaltime_null_time ();
-
-	time_to_gdate_with_zone (&date, start_time, day_view->zone);
-
-	/* The start of the work-week is the first working day after the
-	   week start day. */
-
-	/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-	weekday = g_date_weekday (&date) % 7;
-
-	/* Calculate the first working day of the week, 0 (Sun) to 6 (Sat).
-	   It will automatically default to the week start day if no days
-	   are set as working days. */
-	day = (day_view->week_start_day + 1) % 7;
-	for (i = 0; i < 7; i++) {
-		if (day_view->working_days & (1 << day))
-			break;
-		day = (day + 1) % 7;
-	}
-
-	/* Calculate how many days we need to go back to the first workday. */
-	offset = (weekday + 7 - day) % 7;
-
-	g_date_subtract_days (&date, offset);
-
-	tt.year = g_date_year (&date);
-	tt.month = g_date_month (&date);
-	tt.day = g_date_day (&date);
-
-	return icaltime_as_timet_with_zone (tt, day_view->zone);
-}
-
-
-/* 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_with_zone (day_view->day_starts[day - 1], 1, day_view->zone);
-	}
-
-#if 0
-	for (day = 0; day <= day_view->days_shown; day++)
-		g_print ("Day Starts %i: %s", day, ctime (&day_view->day_starts[day]));
-#endif
-
-	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;
-
-	if (day_view->work_week_view)
-		e_day_view_recalc_work_week (day_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)
-		return;
-
-	day_view->days_shown = days_shown;
-
-	/* If the date isn't set, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	e_day_view_recalc_day_starts (day_view, day_view->lower);
-	e_day_view_recalc_cell_sizes (day_view);
-
-	update_query (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 need to update all the day event labels since the start & end
-	   times may or may not be on row boundaries any more. */
-	e_day_view_foreach_event (day_view,
-				  e_day_view_set_show_times_cb, NULL);
-
-	/* 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)
-		return;
-
-	day_view->working_days = days;
-
-	if (day_view->work_week_view)
-		e_day_view_recalc_work_week (day_view);
-
-	/* We have to do this, as the new working days may have no effect on
-	   the days shown, but we still want the background color to change. */
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)
-{
-	gint first_day, last_day, i, days_shown;
-	gboolean has_working_days = FALSE;
-
-	/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */
-	first_day = (day_view->week_start_day + 1) % 7;
-	for (i = 0; i < 7; i++) {
-		if (day_view->working_days & (1 << first_day)) {
-			has_working_days = TRUE;
-			break;
-		}
-		first_day = (first_day + 1) % 7;
-	}
-
-	if (has_working_days) {
-		/* Now find the last working day of the week, backwards. */
-		last_day = day_view->week_start_day % 7;
-		for (i = 0; i < 7; i++) {
-			if (day_view->working_days & (1 << last_day))
-				break;
-			last_day = (last_day + 6) % 7;
-		}
-		/* Now calculate the days we need to show to include all the
-		   working days in the week. Add 1 to make it inclusive. */
-		days_shown = (last_day + 7 - first_day) % 7 + 1;
-	} else {
-		/* If no working days are set, just use 7. */
-		days_shown = 7;
-	}
-
-	e_day_view_set_days_shown (day_view, days_shown);
-}
-
-
-/* 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)
-		return;
-
-	day_view->use_24_hour_format = use_24_hour;
-
-	/* We need to update all the text in the events since they may contain
-	   the time in the old format. */
-	e_day_view_foreach_event (day_view, e_day_view_set_show_times_cb,
-				  NULL);
-
-	/* FIXME: We need to re-layout the top canvas since the time
-	   format affects the sizes. */
-	gtk_widget_queue_draw (day_view->time_canvas);
-	gtk_widget_queue_draw (day_view->top_canvas);
-}
-
-
-/* Whether we display event end times in the main canvas. */
-gboolean
-e_day_view_get_show_event_end_times	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), TRUE);
-
-	return day_view->show_event_end_times;
-}
-
-
-void
-e_day_view_set_show_event_end_times	(EDayView	*day_view,
-					 gboolean	 show)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->show_event_end_times != show) {
-		day_view->show_event_end_times = show;
-		e_day_view_foreach_event (day_view,
-					  e_day_view_set_show_times_cb, NULL);
-	}
-}
-
-
-/* The current timezone. */
-icaltimezone*
-e_day_view_get_timezone			(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
-
-	return day_view->zone;
-}
-
-
-void
-e_day_view_set_timezone			(EDayView	*day_view,
-					 icaltimezone	*zone)
-{
-	icaltimezone *old_zone;
-	struct icaltimetype tt;
-	time_t lower;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	old_zone = day_view->zone;
-	if (old_zone == zone)
-		return;
-
-	day_view->zone = zone;
-
-	/* If our time hasn't been set yet, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	/* Recalculate the new start of the first day. We just use exactly
-	   the same time, but with the new timezone. */
-	tt = icaltime_from_timet_with_zone (day_view->lower, FALSE,
-					    old_zone);
-
-	lower = icaltime_as_timet_with_zone (tt, zone);
-
-	e_day_view_recalc_day_starts (day_view, lower);
-	update_query (day_view);
-}
-
-
-/* This is a callback used to update all day event labels. */
-static gboolean
-e_day_view_set_show_times_cb		(EDayView	*day_view,
-					 gint		 day,
-					 gint		 event_num,
-					 gpointer	 data)
-{
-	if (day != E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_update_event_label (day_view, day, event_num);
-	}
-
-	return TRUE;
-}
-
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint
-e_day_view_get_week_start_day	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return day_view->week_start_day;
-}
-
-
-void
-e_day_view_set_week_start_day	(EDayView	*day_view,
-				 gint		 week_start_day)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (week_start_day >= 0);
-	g_return_if_fail (week_start_day < 7);
-
-	if (day_view->week_start_day == week_start_day)
-		return;
-
-	day_view->week_start_day = week_start_day;
-
-	if (day_view->work_week_view)
-		e_day_view_recalc_work_week (day_view);
-}
-
-static EDayViewEvent *
-get_current_event (EDayView *day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
-
-	if (day_view->editing_event_day == -1)
-		return NULL;
-
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT)
-		return &g_array_index (day_view->long_events,
-				       EDayViewEvent,
-				       day_view->editing_event_num);
-	else
-		return &g_array_index (day_view->events[day_view->editing_event_day],
-				       EDayViewEvent,
-				       day_view->editing_event_num);
-}
-
-void
-e_day_view_cut_clipboard (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	const char *uid;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	event = get_current_event (day_view);
-	if (event == NULL)
-		return;
-
-	e_day_view_set_status_message (day_view, _("Deleting selected objects"));
-
-	e_day_view_copy_clipboard (day_view);
-	cal_component_get_uid (event->comp, &uid);
-	cal_client_remove_object (day_view->client, uid);
-
-	e_day_view_set_status_message (day_view, NULL);
-}
-
-void
-e_day_view_copy_clipboard (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	char *comp_str;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	event = get_current_event (day_view);
-	if (event == NULL)
-		return;
-
-	comp_str = cal_component_get_as_string (event->comp);
-	if (day_view->clipboard_selection != NULL)
-		g_free (day_view->clipboard_selection);
-	day_view->clipboard_selection = comp_str;
-	gtk_selection_owner_set (day_view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-e_day_view_paste_clipboard (EDayView *day_view)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	gtk_selection_convert (day_view->invisible,
-			       clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-static void
-e_day_view_recalc_work_week	(EDayView	*day_view)
-{		
-	time_t lower;
-
-	/* If we aren't showing the work week, just return. */
-	if (!day_view->work_week_view)
-		return;
-
-	e_day_view_recalc_work_week_days_shown	(day_view);
-	
-	/* If the date isn't set, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	lower = e_day_view_find_work_week_start (day_view, day_view->lower);
-	if (lower != day_view->lower) {
-		/* Reset the selection, as it may disappear. */
-		day_view->selection_start_day = -1;
-
-		e_day_view_recalc_day_starts (day_view, lower);
-		update_query (day_view);
-
-		/* This updates the date navigator. */
-		e_day_view_update_calendar_selection_time (day_view);
-	}
-}
-
-
-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 (event->type == GDK_2BUTTON_PRESS) {
-			time_t dtstart, dtend;
-
-			e_day_view_get_selected_time_range (day_view, &dtstart,
-							    &dtend);
-			gnome_calendar_new_appointment_for (day_view->calendar,
-							    dtstart, dtend,
-							    TRUE, FALSE);
-			return TRUE;
-		}
-
-		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;
-
-#if 0
-	g_print ("In e_day_view_on_main_canvas_button_press\n");
-#endif
-
-	/* Handle scroll wheel events */
-	if (event->button == 4) {
-		/* The wheel has been moved up, so scroll the canvas down. */
-		e_day_view_scroll (day_view, E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	}
-	if (event->button == 5) {
-		/* The wheel has been moved down, so scroll the canvas up. */
-		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		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 (event->type == GDK_2BUTTON_PRESS) {
-			time_t dtstart, dtend;
-
-			e_day_view_get_selected_time_range (day_view, &dtstart,
-							    &dtend);
-			gnome_calendar_new_appointment_for (day_view->calendar,
-							    dtstart, dtend,
-							    FALSE, FALSE);
-			return TRUE;
-		}
-
-		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;
-}
-
-
-/* Callback used when a component is destroyed.  Expects the closure data to be
- * a pointer to a boolean; will set it to TRUE.
- */
-static void
-comp_destroy_cb (GtkObject *object, gpointer data)
-{
-	gboolean *destroyed;
-
-	destroyed = data;
-	*destroyed = TRUE;
-}
-
-
-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);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->top_canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		EDayViewEvent *e;
-		gboolean destroyed;
-		guint id;
-
-		e = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
-		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (e->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (!destroyed) {
-			gtk_signal_disconnect (GTK_OBJECT (e->comp), id);
-
-			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);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->main_canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		EDayViewEvent *e;
-		gboolean destroyed;
-		guint id;
-
-		e = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
-
-		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (e->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (!destroyed) {
-			gtk_signal_disconnect (GTK_OBJECT (e->comp), id);
-
-			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)) {
-		gboolean destroyed;
-		guint id;
-
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &start_day, &end_day))
-			return;
-
-		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-		/* 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 (destroyed)
-			return;
-
-		gtk_signal_disconnect (GTK_OBJECT (event->comp), id);
-
-		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)) {
-		gboolean destroyed;
-		guint id;
-
-		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-		/* 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 (destroyed)
-			return;
-
-		gtk_signal_disconnect (GTK_OBJECT (event->comp), id);
-
-		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;
-			if (day_view->resize_end_row < day_view->resize_start_row)
-				day_view->resize_end_row = day_view->resize_start_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)
-{
-	EDayViewEvent *event;
-	gboolean destroyed;
-	guint id;
-
-	if (day == -1)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	else 
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	destroyed = FALSE;
-	id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-				 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-	e_day_view_stop_editing_event (day_view);
-
-	if (!destroyed) {
-		gtk_signal_disconnect (GTK_OBJECT (event->comp), id);
-
-		if (day_view->calendar)
-			gnome_calendar_edit_object (day_view->calendar, event->comp, FALSE);
-		else
-			g_warning ("Calendar not set");
-	}
-}
-
-enum {
-	/*
-	 * This is used to "flag" events that can not be edited
-	 */
-	MASK_EDITABLE = 1,
-
-	/*
-	 * To disable recurring actions to be displayed
-	 */
-	MASK_RECURRING = 2,
-
-	/*
-	 * To disable actions for non-recurring items to be displayed
-	 */
-	MASK_SINGLE   = 4,
-
-	/*
-	 * This is used to when an event is currently being edited
-	 * in another window and we want to disable the event
-	 * from being edited twice
-	 */
-	MASK_EDITING  = 8
-};
-
-static EPopupMenu main_items [] = {
-	E_POPUP_ITEM (N_("New _Appointment"),
-	  e_day_view_on_new_appointment, 0),
-	E_POPUP_ITEM (N_("New All Day _Event"),
-	  e_day_view_on_new_event, 0),
-	E_POPUP_ITEM (N_("New Meeting"),
-	  e_day_view_on_new_meeting, 0),
-	E_POPUP_ITEM (N_("New Task"),
-	  e_day_view_on_new_task, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("Print..."),
-	  e_day_view_on_print, 0),
-	
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Paste"),
-	  e_day_view_on_paste, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_SUBMENU (N_("Current View"), NULL, 0),
-
-	E_POPUP_ITEM (N_("Go to _Today"),
-	  e_day_view_on_goto_today, 0),
-	E_POPUP_ITEM (N_("_Go to Date..."),
-	  e_day_view_on_goto_date, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Publish Free/Busy Information"),
-	  e_day_view_on_publish, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Configure..."),
-	  e_day_view_on_settings, 0),
-	E_POPUP_ITEM (N_("_Configure Pilot..."),
-	  e_day_view_on_pilot_settings, 0),
-
-	E_POPUP_TERMINATOR
-};
-
-static EPopupMenu child_items [] = {
-
-	E_POPUP_ITEM (N_("_Open"), e_day_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Save As..."), e_day_view_on_save_as, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Print..."), e_day_view_on_print_event, MASK_EDITABLE | MASK_EDITING),
-
-	/* Only show this separator if one of the above is shown. */
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("C_ut"), e_day_view_on_cut, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Copy"), e_day_view_on_copy, 0),
-	E_POPUP_ITEM (N_("_Paste"), e_day_view_on_paste, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Schedule Meeting..."), e_day_view_on_meeting, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_day_view_on_forward, MASK_EDITABLE | MASK_EDITING),
-	
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Delete"), e_day_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_day_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING),
-	E_POPUP_ITEM (N_("Delete this _Occurrence"), e_day_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING),
-	E_POPUP_ITEM (N_("Delete _All Occurrences"), e_day_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING),
-
-	E_POPUP_TERMINATOR
-};
-
-static void
-free_view_popup (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	if (day_view->view_menu == NULL)
-		return;
-	
-	gnome_calendar_discard_view_popup (day_view->calendar, day_view->view_menu);
-	day_view->view_menu = NULL;
-}
-
-static void
-e_day_view_on_event_right_click (EDayView *day_view,
-				 GdkEventButton *bevent,
-				 gint day,
-				 gint event_num)
-{
-	EDayViewEvent *event;
-	int have_selection;
-	gboolean being_edited;
-	EPopupMenu *context_menu;
-	GtkMenu *popup;
-	int hide_mask = 0;
-	int disable_mask = 0;
-
-	/*
-	 * FIXME:
-	 * 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.
-	 */
-	
-	being_edited = FALSE;
-	
-	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)
-		&& day_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		day_view->view_menu = gnome_calendar_setup_view_popup (day_view->calendar);
-		main_items[9].submenu = day_view->view_menu;
-		context_menu = main_items;
-	} else {
-		context_menu = child_items;
-		
-		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 (cal_component_has_recurrences (event->comp)) 
-			hide_mask |= MASK_SINGLE;
-		else
-			hide_mask |= MASK_RECURRING;
-	}
-
-	if (being_edited)
-		disable_mask |= MASK_EDITING;
-
-	day_view->popup_event_day = day;
-	day_view->popup_event_num = event_num;
-	
-	popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, day_view);
-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",
-			    GTK_SIGNAL_FUNC (free_view_popup), day_view);
-	e_popup_menu (popup, (GdkEvent *) bevent);
-}
-
-static void
-e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-	
-	/* Edit a new event. If only one day is selected in the top canvas,
-	   we set the time to the first 1/2-hour of the working day. */
-	if (day_view->selection_in_top_canvas
-	    && day_view->selection_start_day != -1
-	    && day_view->selection_start_day == day_view->selection_end_day) {
-		dtstart = day_view->day_starts[day_view->selection_start_day];
-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,
-						     day_view->zone);
-		itt.hour = calendar_config_get_day_start_hour ();
-		itt.minute = calendar_config_get_day_start_minute ();
-		dtstart = icaltime_as_timet_with_zone (itt, day_view->zone);
-
-		icaltime_adjust (&itt, 0, 0, 30, 0);
-		dtend = icaltime_as_timet_with_zone (itt, day_view->zone);
-	} else {
-		e_day_view_get_selected_time_range (day_view, &dtstart,
-						    &dtend);
-	}
-
-	gnome_calendar_new_appointment_for (
-		day_view->calendar, dtstart, dtend, FALSE, FALSE);
-}
-
-static void
-e_day_view_on_new_event (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-	time_t dtstart, dtend;
-	
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-	gnome_calendar_new_appointment_for (
-		day_view->calendar, dtstart, dtend, TRUE, FALSE);
-}
-
-static void
-e_day_view_on_new_meeting (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-	
-	/* Edit a new event. If only one day is selected in the top canvas,
-	   we set the time to the first 1/2-hour of the working day. */
-	if (day_view->selection_in_top_canvas
-	    && day_view->selection_start_day != -1
-	    && day_view->selection_start_day == day_view->selection_end_day) {
-		dtstart = day_view->day_starts[day_view->selection_start_day];
-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,
-						     day_view->zone);
-		itt.hour = calendar_config_get_day_start_hour ();
-		itt.minute = calendar_config_get_day_start_minute ();
-		dtstart = icaltime_as_timet_with_zone (itt, day_view->zone);
-
-		icaltime_adjust (&itt, 0, 0, 30, 0);
-		dtend = icaltime_as_timet_with_zone (itt, day_view->zone);
-	} else {
-		e_day_view_get_selected_time_range (day_view, &dtstart,
-						    &dtend);
-	}
-
-	gnome_calendar_new_appointment_for (
-		day_view->calendar, dtstart, dtend, FALSE, TRUE);
-}
-
-static void
-e_day_view_on_new_task (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	gnome_calendar_new_task (day_view->calendar);
-}
-
-static void
-e_day_view_on_goto_date (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	goto_dialog (day_view->calendar);
-}
-
-static void
-e_day_view_on_goto_today (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	calendar_goto_today (day_view->calendar);
-}
-
-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;
-
-	if (day_view->calendar)
-		gnome_calendar_edit_object (day_view->calendar, event->comp, FALSE);
-	else
-		g_warning ("Calendar not set");
-}
-
-static void
-e_day_view_on_save_as (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-	
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	ical_string = cal_client_get_component_as_string (day_view->client, event->comp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
-	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
-	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
-}
-
-static void
-e_day_view_on_print (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	time_t start;
-	GnomeCalendarViewType view_type;
-	PrintView print_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	gnome_calendar_get_current_time_range (day_view->calendar, &start, NULL);
-	view_type = gnome_calendar_get_view (day_view->calendar);
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		print_view = PRINT_VIEW_DAY;
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		print_view = PRINT_VIEW_WEEK;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	print_calendar (day_view->calendar, FALSE, start, print_view);
-}
-
-static void
-e_day_view_on_print_event (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;
-
-	print_comp (event->comp, day_view->client, FALSE);
-}
-
-static void
-e_day_view_on_meeting (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;
-
-	if (day_view->calendar)
-		gnome_calendar_edit_object (day_view->calendar, event->comp, TRUE);
-	else
-		g_warning ("Calendar not set");
-}
-
-static void
-e_day_view_on_forward (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;
-
-	itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, event->comp, 
-			day_view->client, NULL);
-}
-
-static void
-e_day_view_on_publish (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	icaltimezone *utc;
-	time_t start = time (NULL), end;
-	GList *comp_list;
-
-	day_view = E_DAY_VIEW (data);
-
-	utc = icaltimezone_get_utc_timezone ();
-	start = time_day_begin_with_zone (start, utc);
-	end = time_add_week_with_zone (start, 6, utc);
-
-	comp_list = cal_client_get_free_busy (day_view->client, NULL, start, end);
-	if (comp_list) {
-		GList *l;
-
-		for (l = comp_list; l; l = l->next) {
-			CalComponent *comp = CAL_COMPONENT (l->data);
-			itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp, 
-					day_view->client, NULL);
-
-			gtk_object_unref (GTK_OBJECT (comp));
-		}
-
- 		g_list_free (comp_list);
-	}
-}
-
-static void
-e_day_view_on_settings (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	control_util_show_settings (day_view->calendar);
-}
-
-static void
-e_day_view_on_pilot_settings (GtkWidget *widget, gpointer data)
-{
-        char *args[] = {
-                "gpilotd-control-applet",
-                NULL
-        };
-        int pid;
-
-        args[0] = gnome_is_program_in_path ("gpilotd-control-applet");
-        if (!args[0]) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("The GNOME Pilot tools do not appear to be installed on this system."));
-		return;
-        }
-
-        pid = gnome_execute_async (NULL, 4, args);
-        if (pid == -1)
-                e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]);
-
-        g_free (args[0]);
-}
-
-static void
-e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-
-	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_comp_util_add_exdate (comp, event->start, day_view->zone);
-
-	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_delete_event_internal (EDayView *day_view, EDayViewEvent *event)
-{
-	CalComponentVType vtype;
-
-	vtype = cal_component_get_vtype (event->comp);
-
-	if (delete_component_dialog (event->comp, FALSE, 1, vtype,
-				     GTK_WIDGET (day_view))) {
-		const char *uid;
-
-		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_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gboolean destroyed;
-	guint id;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	destroyed = FALSE;
-	id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-				 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-	if (day_view->editing_event_day >= 0)
-		e_day_view_stop_editing_event (day_view);
-
-	if (!destroyed) {
-		gtk_signal_disconnect (GTK_OBJECT (event->comp), id);
-
-		e_day_view_delete_event_internal (day_view, event);
-	}
-}
-
-void
-e_day_view_delete_event		(EDayView       *day_view)
-{
-	EDayViewEvent *event;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->editing_event_day == -1)
-		return;
-
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent,
-					day_view->editing_event_num);
-	else
-		event = &g_array_index (day_view->events[day_view->editing_event_day],
-					EDayViewEvent,
-					day_view->editing_event_num);
-
-	e_day_view_delete_event_internal (day_view, event);
-}
-
-
-static void
-e_day_view_on_cut (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;
-
-	e_day_view_on_copy (widget, data);
-
-	cal_component_get_uid (event->comp, &uid);
-	cal_client_remove_object (day_view->client, uid);
-}
-
-static void
-e_day_view_on_copy (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	char *comp_str;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	comp_str = cal_component_get_as_string (event->comp);
-	if (day_view->clipboard_selection)
-		g_free (day_view->clipboard_selection);
-	day_view->clipboard_selection = comp_str;
-
-	gtk_selection_owner_set (day_view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-static void
-e_day_view_on_paste (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	gtk_selection_convert (day_view->invisible,
-			       clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-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;
-
-	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 an exception to get rid of the
-	   instance. */
-
-	comp = cal_component_clone (event->comp);
-	cal_comp_util_add_exdate (comp, event->start, day_view->zone);
-
-	/* 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 = &itt;
-	date.tzid = icaltimezone_get_tzid (day_view->zone);
-
-	*date.value = icaltime_from_timet_with_zone (event->start, FALSE,
-						     day_view->zone);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet_with_zone (event->end, FALSE,
-						     day_view->zone);
-	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) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_long_event_resize (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 gboolean
-e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-					  GdkEventButton *event,
-					  EDayView *day_view)
-{
-#if 0
-	g_print ("In e_day_view_on_main_canvas_button_release\n");
-#endif
-
-	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) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_resize (day_view);
-		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);
-
-#if 0
-	g_print ("Start: %s", ctime (&start));
-	g_print ("End  : %s", ctime (&end));
-#endif
-
-	if (day_view->calendar)
-		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;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (day_view->zone);
-
-	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_with_zone (dt, FALSE,
-							     day_view->zone);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = day_view->day_starts[day_view->resize_end_row + 1];
-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-							     day_view->zone);
-		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)) {
-		if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
-	} else {
-		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;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (day_view->zone);
-
-	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_with_zone (dt, FALSE,
-							     day_view->zone);
-		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_with_zone (dt, FALSE,
-							     day_view->zone);
-		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)) {
-		if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
-	} else {
-		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);
-	}
-}
-
-
-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 icaltimetype start_tt, end_tt;
-
-	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_tt = icaltime_from_timet_with_zone (start, FALSE,
-						  day_view->zone);
-	end_tt = icaltime_from_timet_with_zone (end, FALSE,
-						day_view->zone);
-
-	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_tt.hour * 60 + start_tt.minute - offset;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute - offset;
-
-	event.start_row_or_col = 0;
-	event.num_columns = 0;
-
-	event.different_timezone = FALSE;
-	if (!cal_comp_util_compare_event_timezones (comp, day_view->client,
-						    day_view->zone))
-		event.different_timezone = TRUE;
-
-	/* 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, rows_in_top_display, top_canvas_height, top_rows;
-
-	/* 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->events[day],
-						      day_view->rows,
-						      day_view->mins_per_row,
-						      day_view->cols_per_row[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->long_events,
-					       day_view->days_shown,
-					       day_view->day_starts,
-					       &rows_in_top_display);
-
-		/* 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 != rows_in_top_display) {
-			day_view->rows_in_top_display = rows_in_top_display;
-			top_rows = MAX (1, 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);
-		}
-	}
-
-
-	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_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) {
-		GSList *categories_list;
-
-		if (cal_component_has_alarms (comp))
-			num_icons++;
-		if (cal_component_has_recurrences (comp))
-			num_icons++;
-		if (event->different_timezone)
-			num_icons++;
-
-		cal_component_get_categories_list (comp, &categories_list);
-		num_icons += g_slist_length (categories_list);
-		cal_component_free_categories_list (categories_list);
-	}
-
-	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,
-					       "draw_background", FALSE,
-					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-					       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 + E_DAY_VIEW_LONG_EVENT_ICON_R_PAD;
-	time_width = e_day_view_get_time_string_width (day_view);
-
-	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);
-}
-
-
-/* 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) {
-			GSList *categories_list;
-
-			if (cal_component_has_alarms (comp))
-				num_icons++;
-			if (cal_component_has_recurrences (comp))
-				num_icons++;
-			if (event->different_timezone)
-				num_icons++;
-
-			cal_component_get_categories_list (comp, &categories_list);
-			num_icons += g_slist_length (categories_list);
-			cal_component_free_categories_list (categories_list);
-		}
-
-		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,
-						       "draw_background", FALSE,
-						       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-						       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;
-		}
-	}
-}
-
-
-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 start_dt, end_dt;
-	struct icaltimetype start_tt, end_tt;
-	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;
-		case GDK_Page_Up:
-			e_day_view_scroll (day_view, E_DAY_VIEW_PAGE_STEP);
-			break;
-		case GDK_Page_Down:
-			e_day_view_scroll (day_view, -E_DAY_VIEW_PAGE_STEP);
-			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->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
-		   || (event->length == 0)
-		   || (keyval == GDK_Tab)) {
-		return FALSE;
-	} else
-		initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);
-
-	/* Add a new event covering the selected range */
-
-	comp = cal_comp_event_new_with_defaults ();
-
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	start_tt = icaltime_from_timet_with_zone (dtstart, FALSE,
-						  day_view->zone);
-
-	end_tt = icaltime_from_timet_with_zone (dtend, FALSE,
-						day_view->zone);
-
-	if (day_view->selection_in_top_canvas) {
-		start_dt.tzid = NULL;
-		start_tt.is_date = 1;
-		end_tt.is_date = 1;
-	} else {
-		start_dt.tzid = icaltimezone_get_tzid (day_view->zone);
-	}
-
-	start_dt.value = &start_tt;
-	end_dt.value = &end_tt;
-	end_dt.tzid = start_dt.tzid;
-	cal_component_set_dtstart (comp, &start_dt);
-	cal_component_set_dtend (comp, &end_dt);
-
-	cal_component_set_categories (comp, day_view->default_category);
-
-	/* We add the event locally and start editing it. We don't send it
-	   to the server until the user finishes editing it. */
-	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");
-	}
-
-	if (initial_text)
-		g_free (initial_text);
-
-	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) {
-		if (day_view->calendar)
-			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) {
-		if (day_view->calendar)
-			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);
-	}
-}
-
-
-/* Scrolls the main canvas up or down. The pages_to_scroll argument
-   is multiplied with the adjustment's page size and added to the adjustment's
-   value, while ensuring we stay within the bounds. A positive value will
-   scroll the canvas down and a negative value will scroll it up. */
-static void
-e_day_view_scroll	(EDayView	*day_view,
-			 gfloat		 pages_to_scroll)
-{
-	GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-	gfloat new_value;
-
-	new_value = adj->value - adj->page_size * pages_to_scroll;
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
-}
-
-
-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, TRUE);
-
-	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);
-}
-
-
-/* Cancels the current edition by resetting the appointment's text to its original value */
-static void
-cancel_editing (EDayView *day_view)
-{
-	int day, event_num;
-	EDayViewEvent *event;
-	CalComponentText summary;
-
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-	g_assert (day != -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);
-
-	/* Reset the text to what was in the component */
-
-	cal_component_get_summary (event->comp, &summary);
-	gtk_object_set (GTK_OBJECT (event->canvas_item),
-			"text", summary.value ? summary.value : "",
-			NULL);
-
-	/* Stop editing */
-	e_day_view_stop_editing_event (day_view);
-}
-
-
-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;
-		} else if (event->key.keyval == GDK_Escape) {
-			cancel_editing (day_view);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-			return TRUE;
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-#if 0
-		g_print ("Item got double-click\n");
-#endif
-		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);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (day_view),
-			 e_day_view_signals[SELECTION_CHANGED]);
-}
-
-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);
-	g_assert (text != NULL);
-
-	if (string_is_empty (text)) {
-		ConfirmDeleteEmptyCompResult result;
-
-		result = cal_comp_confirm_delete_empty_comp (event->comp, day_view->client,
-							     GTK_WIDGET (day_view));
-
-		switch (result) {
-		case EMPTY_COMP_REMOVE_LOCALLY: {
-			const char *uid;
-
-			cal_component_get_uid (event->comp, &uid);
-
-			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);
-			goto out; }
-
-		case EMPTY_COMP_REMOVED_FROM_SERVER:
-			goto out;
-
-		case EMPTY_COMP_DO_NOT_REMOVE:
-			/* But we cannot keep an empty summary, so make the
-			 * canvas item refresh itself from the text that the
-			 * component already had.
-			 */
-
-			if (day == E_DAY_VIEW_LONG_EVENT)
-				e_day_view_reshape_long_event (day_view, event_num);
-			else
-				e_day_view_update_event_label (day_view, day, event_num);
-
-			goto out;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		g_assert_not_reached ();
-	}
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (summary.value && !strcmp (text, summary.value)) {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		else
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
-	} else {
-		summary.value = text;
-		summary.altrep = NULL;
-		cal_component_set_summary (event->comp, &summary);
-
-		if (cal_client_update_object (day_view->client, event->comp)) {
-			if (cal_component_has_attendees (event->comp) && send_component_dialog (event->comp, FALSE))
-				itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp,
-						day_view->client, NULL);
-		} else {
-			g_message ("e_day_view_on_editing_stopped(): Could not update the object!");
-		}
-	}
-
- out:
-
-	g_free (text);
-
-	gtk_signal_emit (GTK_OBJECT (day_view),
-			 e_day_view_signals[SELECTION_CHANGED]);
-}
-
-
-/* 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 icaltimetype tt;
-	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];
-
-	/* Create an icaltimetype and convert to a time_t. */
-	tt = icaltime_from_timet_with_zone (day_view->day_starts[col],
-					    FALSE, day_view->zone);
-	tt.hour = minutes / 60;
-	tt.minute = minutes % 60;
-	tt.second = 0;
-
-	val = icaltime_as_timet_with_zone (tt, day_view->zone);
-	return val;
-}
-
-
-static gboolean
-e_day_view_convert_time_to_grid_position (EDayView *day_view,
-					  time_t time,
-					  gint *col,
-					  gint *row)
-{
-	struct icaltimetype tt;
-	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 an icaltimetype,
-	   calculate the offset in minutes from the top of the display and
-	   divide it by the mins per row setting. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, day_view->zone);
-
-	minutes = tt.hour * 60 + tt.minute;
-	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;
-	if (end_row < start_row)
-		end_row = start_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 (event,
-					      day_view->days_shown,
-					      day_view->day_starts,
-					      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 (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &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;
-
-		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;
-		if (end_row < start_row)
-			end_row = start_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;
-	gboolean all_day_event;
-
-	/* Note that we only support DnD within the EDayView at present. */
-	if ((data->length >= 0) && (data->format == 8)
-	    && (day_view->drag_event_day != -1)) {
-		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 = 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);
-				day -= day_view->drag_event_offset;
-				day = MAX (day, 0);
-
-				e_day_view_find_long_event_days (event,
-								 day_view->days_shown,
-								 day_view->day_starts,
-								 &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 {
-				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 clone the event 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);
-
-			if (start_offset == 0 && end_offset == 0)
-				all_day_event = TRUE;
-			else
-				all_day_event = FALSE;
-
-			date.value = &itt;
-
-			dt = day_view->day_starts[day] + start_offset * 60;
-			itt = icaltime_from_timet_with_zone (dt, FALSE,
-							     day_view->zone);
-			if (all_day_event) {
-				itt.is_date = TRUE;
-				date.tzid = NULL;
-			} else {
-				/* FIXME: Should probably keep the timezone of
-				   the original start and end times. */
-				date.tzid = icaltimezone_get_tzid (day_view->zone);
-			}
-			cal_component_set_dtstart (comp, &date);
-
-			if (end_offset == 0)
-				dt = day_view->day_starts[day + num_days];
-			else
-				dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
-			itt = icaltime_from_timet_with_zone (dt, FALSE,
-							     day_view->zone);
-			if (all_day_event) {
-				itt.is_date = TRUE;
-				date.tzid = NULL;
-			} else {
-				/* FIXME: Should probably keep the timezone of
-				   the original start and end times. */
-				date.tzid = icaltimezone_get_tzid (day_view->zone);
-			}
-			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)) {
-				if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
-					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp,
-							day_view->client, NULL);
-			} else {
-				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;
-
-	/* Note that we only support DnD within the EDayView at present. */
-	if ((data->length >= 0) && (data->format == 8)
-	    && (day_view->drag_event_day != -1)) {
-		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 {
-				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;
-				if (end_row < start_row)
-					end_row = start_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 = icaltimezone_get_tzid (day_view->zone);
-
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
-			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-								     day_view->zone);
-			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_with_zone (dt, FALSE,
-								     day_view->zone);
-			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)) {
-				if (cal_component_has_attendees (comp) && send_component_dialog (comp, FALSE))
-					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp,
-							day_view->client, NULL);
-			} else {
-				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);
-}
-
-
-/* Converts an hour from 0-23 to the preferred time format, and returns the
-   suffix to add and the width of it in the normal font. */
-void
-e_day_view_convert_time_to_display	(EDayView	*day_view,
-					 gint		 hour,
-					 gint		*display_hour,
-					 gchar	       **suffix,
-					 gint		*suffix_width)
-{
-	/* Calculate the actual hour number to display. For 12-hour
-	   format we convert 0-23 to 12-11am/12-11pm. */
-	*display_hour = hour;
-	if (day_view->use_24_hour_format) {
-		*suffix = "";
-		*suffix_width = 0;
-	} else {
-		if (hour < 12) {
-			*suffix = day_view->am_string;
-			*suffix_width = day_view->am_string_width;
-		} else {
-			*display_hour -= 12;
-			*suffix = day_view->pm_string;
-			*suffix_width = day_view->pm_string_width;
-		}
-
-		/* 12-hour uses 12:00 rather than 0:00. */
-		if (*display_hour == 0)
-			*display_hour = 12;
-	}
-}
-
-
-gint
-e_day_view_get_time_string_width	(EDayView	*day_view)
-{
-	gint time_width;
-
-	time_width = day_view->digit_width * 4 + day_view->colon_width;
-
-	if (!day_view->use_24_hour_format)
-		time_width += MAX (day_view->am_string_width,
-				   day_view->pm_string_width);
-
-	return time_width;
-}
-
-static void
-invisible_destroyed (GtkWidget *invisible, EDayView *day_view)
-{
-	day_view->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       EDayView *day_view)
-{
-	if (day_view->clipboard_selection != NULL) {
-		gtk_selection_data_set (selection_data,
-					GDK_SELECTION_TYPE_STRING,
-					8,
-					day_view->clipboard_selection,
-					strlen (day_view->clipboard_selection));
-	}
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       EDayView *day_view)
-{
-	if (day_view->clipboard_selection != NULL) {
-		g_free (day_view->clipboard_selection);
-		day_view->clipboard_selection = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    EDayView *day_view)
-{
-	char *comp_str;
-	icalcomponent *icalcomp;
-	time_t dtstart, dtend;
-	struct icaltimetype itime;
-	icalcomponent_kind kind;
-	CalComponent *comp;
-	char *uid;
-	time_t tt_start, tt_end;
-	struct icaldurationtype ic_dur;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (selection_data->length < 0 ||
-	    selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	}
-
-	comp_str = (char *) selection_data->data;
-	icalcomp = icalparser_parse_string ((const char *) comp_str);
-	if (!icalcomp)
-		return;
-
-	/* check the type of the component */
-	kind = icalcomponent_isa (icalcomp);
-	if (kind != ICAL_VCALENDAR_COMPONENT &&
-	    kind != ICAL_VEVENT_COMPONENT &&
-	    kind != ICAL_VTODO_COMPONENT &&
-	    kind != ICAL_VJOURNAL_COMPONENT) {
-		return;
-	}
-
-	e_day_view_set_status_message (day_view, _("Updating objects"));
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-
-		subcomp = icalcomponent_get_first_component (
-			icalcomp, ICAL_ANY_COMPONENT);
-		while (subcomp) {
-			child_kind = icalcomponent_isa (subcomp);
-			if (child_kind == ICAL_VEVENT_COMPONENT ||
-			    child_kind == ICAL_VTODO_COMPONENT ||
-			    child_kind == ICAL_VJOURNAL_COMPONENT) {
-				tt_start = icaltime_as_timet (icalcomponent_get_dtstart (subcomp));
-				tt_end = icaltime_as_timet (icalcomponent_get_dtend (subcomp));
-				ic_dur = icaldurationtype_from_int (tt_end - tt_start);
-				itime = icaltime_from_timet_with_zone (dtstart, FALSE, day_view->zone);
-
-				icalcomponent_set_dtstart (subcomp, itime);
-				itime = icaltime_add (itime, ic_dur);
-				icalcomponent_set_dtend (subcomp, itime);
-
-				uid = cal_component_gen_uid ();
-				comp = cal_component_new ();
-				cal_component_set_icalcomponent (
-					comp, icalcomponent_new_clone (subcomp));
-				cal_component_set_uid (comp, uid);
-
-				cal_client_update_object (day_view->client, comp);
-
-				free (uid);
-				gtk_object_unref (GTK_OBJECT (comp));
-
-			}
-			subcomp = icalcomponent_get_next_component (
-				icalcomp, ICAL_ANY_COMPONENT);
-		}
-	}
-	else {
-		tt_start = icaltime_as_timet (icalcomponent_get_dtstart (icalcomp));
-		tt_end = icaltime_as_timet (icalcomponent_get_dtend (icalcomp));
-		ic_dur = icaldurationtype_from_int (tt_end - tt_start);
-		itime = icaltime_from_timet_with_zone (dtstart, FALSE, day_view->zone);
-
-		icalcomponent_set_dtstart (icalcomp, itime);
-		itime = icaltime_add (itime, ic_dur);
-		icalcomponent_set_dtend (icalcomp, itime);
-
-		comp = cal_component_new ();
-		cal_component_set_icalcomponent (comp, icalcomp);
-
-		uid = cal_component_gen_uid ();
-		cal_component_set_uid (comp, (const char *) uid);
-		free (uid);
-
-		cal_client_update_object (day_view->client, comp);
-
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	e_day_view_set_status_message (day_view, NULL);
-}
-
-
-/* Gets the visible time range. Returns FALSE if no time range has been set. */
-gboolean
-e_day_view_get_visible_time_range	(EDayView	*day_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	/* If the date isn't set, return FALSE. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return FALSE;
-
-	*start_time = day_view->day_starts[0];
-	*end_time = day_view->day_starts[day_view->days_shown];
-
-	return TRUE;
-}
-
-
-/* Queues a layout, unless one is already queued. */
-static void
-e_day_view_queue_layout (EDayView *day_view)
-{
-	if (day_view->layout_timeout_id == 0) {
-		day_view->layout_timeout_id = g_timeout_add (E_DAY_VIEW_LAYOUT_TIMEOUT, e_day_view_layout_timeout_cb, day_view);
-	}
-}
-
-
-/* Removes any queued layout. */
-static void
-e_day_view_cancel_layout (EDayView *day_view)
-{
-	if (day_view->layout_timeout_id != 0) {
-		gtk_timeout_remove (day_view->layout_timeout_id);
-		day_view->layout_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_day_view_layout_timeout_cb (gpointer data)
-{
-	EDayView *day_view = E_DAY_VIEW (data);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	e_day_view_check_layout (day_view);
-
-	day_view->layout_timeout_id = 0;
-	return FALSE;
-}
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint
-e_day_view_get_num_events_selected (EDayView *day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return (day_view->editing_event_day != -1) ? 1 : 0;
-}
-
-/* Displays messages on the status bar. */
-void
-e_day_view_set_status_message (EDayView *day_view, const char *message)
-{
-	extern EvolutionShellClient *global_shell_client; /* ugly */
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (!message || !*message) {
-		if (day_view->activity) {
-			gtk_object_unref (GTK_OBJECT (day_view->activity));
-			day_view->activity = NULL;
-		}
-	}
-	else if (!day_view->activity) {
-		int display;
-		char *client_id = g_strdup_printf ("%p", day_view);
-
-		if (progress_icon[0] == NULL)
-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CALENDAR_PROGRESS_IMAGE);
-		day_view->activity = evolution_activity_client_new (
-			global_shell_client, client_id,
-			progress_icon, message, TRUE, &display);
-
-		g_free (client_id);
-	}
-	else
-		evolution_activity_client_update (day_view->activity, message, -1.0);
-}
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
deleted file mode 100644
index 25f9181218..0000000000
--- a/calendar/gui/e-day-view.h
+++ /dev/null
@@ -1,672 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gal/widgets/e-popup-menu.h>
-
-#include "gnome-cal.h"
-#include "evolution-activity-client.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		1
-#define E_DAY_VIEW_ICON_Y_PAD		1
-
-/* The space between the icons and the long event text. */
-#define E_DAY_VIEW_LONG_EVENT_ICON_R_PAD	1
-
-/* 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_BG_SELECTED,
-	E_DAY_VIEW_COLOR_BG_GRID,
-
-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS,
-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED,
-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID,
-
-	E_DAY_VIEW_COLOR_EVENT_VBAR,
-	E_DAY_VIEW_COLOR_EVENT_BACKGROUND,
-	E_DAY_VIEW_COLOR_EVENT_BORDER,
-
-	E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND,
-	E_DAY_VIEW_COLOR_LONG_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;
-
-	/* These are the times of this specific occurrence of the event. */
-	time_t start;
-	time_t end;
-
-	/* For events in the main canvas, this contains the start column.
-	   For long events in the top canvas, this is its row. */
-	guint8 start_row_or_col;
-
-	/* For events in the main canvas, this is the number of columns that
-	   it covers. For long events this is set to 1 if the event is shown.
-	   For both types of events this is set to 0 if the event is not shown,
-	   i.e. it couldn't fit into the display. Currently long events are
-	   always shown as we just increase the height of the top canvas. */
-	guint8 num_columns;
-
-	/* TRUE if the event is at a different UTC offset than our current
-	   timezone, i.e. it is in a different timezone. */
-	guint different_timezone : 1;
-
-	/* These are minute offsets from the first time shown in the view.
-	   They range from 0 to 24 * 60. Currently the main canvas always
-	   starts at 12am  and the code to handle starting at other times
-	   isn't finished. */
-	guint16 start_minute;
-	guint16 end_minute;
-
-	/* This is the EText item containing the event summary. */
-	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;
-
-	/* S-expression for query and the query object */
-	char *sexp;
-	CalQuery *query;
-
-	/* The start and end of the days 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 date navigator. */
-	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];
-
-	/* The timezone. */
-	icaltimezone *zone;
-
-	/* 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 the timeout function for doing a new layout. */
-	gint layout_timeout_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;
-
-	/* Whether we use show event end times in the main canvas. */
-	gboolean show_event_end_times;
-
-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-	gint week_start_day;
-
-	/* 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.
-	   Note that there are a maximum of 12 * 24 rows (when a row is 5 mins)
-	   but we don't always have that many rows. */
-	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];
-
-	/* Sizes of the various time strings. */
-	gint small_hour_widths[24];
-	gint max_small_hour_width;
-	gint max_minute_width;
-	gint colon_width;
-	gint digit_width;	/* Size of '0' character. */
-
-	/* 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 used 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;
-	GdkPixmap *timezone_icon;
-	GdkBitmap *timezone_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;
-	EPopupMenu *view_menu;
-	
-	/* 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;
-
-	/* "am" and "pm" in the current locale, and their widths. */
-	gchar *am_string;
-	gchar *pm_string;
-	gint am_string_width;
-	gint pm_string_width;
-
-	/* the invisible widget to manage the clipboard selections */
-	GtkWidget *invisible;
-	gchar *clipboard_selection;
-
-	/* The default category for new events */
-	char *default_category;
-
-	/* The activity client used to show messages on the status bar. */
-	EvolutionActivityClient *activity;
-};
-
-struct _EDayViewClass
-{
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* selection_changed) (EDayView *day_view);
-};
-
-
-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);
-
-void       e_day_view_set_query			(EDayView	*day_view,
-						 const char	*sexp);
-
-void       e_day_view_set_default_category	(EDayView	*day_view,
-						 const char	*category);
-
-/* 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);
-
-/* Gets the visible time range. Returns FALSE if no time range has been set. */
-gboolean   e_day_view_get_visible_time_range	(EDayView	*day_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-
-/* 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 or 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);
-
-/* Whether we display event end times in the main canvas. */
-gboolean   e_day_view_get_show_event_end_times	(EDayView	*day_view);
-void	   e_day_view_set_show_event_end_times	(EDayView	*day_view,
-						 gboolean	 show);
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint	   e_day_view_get_week_start_day	(EDayView	*day_view);
-void	   e_day_view_set_week_start_day	(EDayView	*day_view,
-						 gint		 week_start_day);
-
-/* The current timezone. */
-icaltimezone* e_day_view_get_timezone		(EDayView	*day_view);
-void	      e_day_view_set_timezone		(EDayView	*day_view,
-						 icaltimezone	*zone);
-
-
-/* Clipboard-related functions */
-void       e_day_view_cut_clipboard             (EDayView       *day_view);
-void       e_day_view_copy_clipboard            (EDayView       *day_view);
-void       e_day_view_paste_clipboard           (EDayView       *day_view);
-
-void       e_day_view_delete_event		(EDayView       *day_view);
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint	   e_day_view_get_num_events_selected	(EDayView	*day_view);
-
-
-/*
- * 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);
-
-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);
-
-void	   e_day_view_convert_time_to_display	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		*display_hour,
-						 gchar	       **suffix,
-						 gint		*suffix_width);
-gint	   e_day_view_get_time_string_width	(EDayView	*day_view);
-
-
-gint	   e_day_view_event_sort_func		(const void	*arg1,
-						 const void	*arg2);
-
-void       e_day_view_set_status_message        (EDayView       *day_view,
-						 const char     *message);
-
-#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 f8cfe2fea3..0000000000
--- a/calendar/gui/e-itip-control.c
+++ /dev/null
@@ -1,2020 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-#include <gtk/gtkmisc.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/widgets/e-unicode.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <ical.h>
-#include <cal-util/cal-component.h>
-#include <cal-util/timeutil.h>
-#include <cal-client/cal-client.h>
-#include <e-util/e-time-utils.h>
-#include <e-util/e-dialog-widgets.h>
-#include <evolution-shell-client.h>
-#include <evolution-folder-selector-button.h>
-#include "calendar-config.h"
-#include "itip-utils.h"
-#include "e-itip-control.h"
-
-struct _EItipControlPrivate {
-	GtkWidget *html;
-
-#if 0
-	GtkWidget *count;
-	GtkWidget *next;
-	GtkWidget *prev;
-#endif
-
-	GPtrArray *event_clients;
-	CalClient *event_client;
-	GPtrArray *task_clients;
-	CalClient *task_client;
-	
-	char *vcalendar;
-	CalComponent *comp;
-	icalcomponent *main_comp;
-	icalcomponent *ical_comp;
-	icalcomponent *top_level;
-	icalcompiter iter;
-	icalproperty_method method;
-
-	int current;
-	int total;
-
-	GList *addresses;
-	gchar *from_address;
-	gchar *my_address;
-};
-
-/* HTML Strings */
-#define HTML_BODY_START "<body bgcolor=\"#ffffff\" text=\"#000000\" link=\"#336699\">"
-#define HTML_SEP        "<hr color=#336699 align=\"left\" width=450>"
-#define HTML_BODY_END   "</body>"
-#define HTML_FOOTER     "</html>"
-
-/* We don't use these now, as we need to be able to translate the text.
-   But I've left these here, in case there are problems with the new code. */
-#if 0
-#define PUBLISH_OPTIONS "<form><b>Choose an action:</b>&nbsp<select NAME=\"action\" SIZE=\"1\"> \
-<option VALUE=\"U\">Update</option></select>&nbsp &nbsp \
-<input TYPE=Submit name=\"ok\" value=\"OK\"></form>"
-
-#define REQUEST_OPTIONS "<form><b>Choose an action:</b>&nbsp<select NAME=\"action\" SIZE=\"1\"> \
-<option VALUE=\"A\">Accept</option> \
-<option VALUE=\"T\">Tentatively accept</option> \
-<option VALUE=\"D\">Decline</option></select>&nbsp \
-<input TYPE=\"checkbox\" name=\"rsvp\" value=\"1\" checked>RSVP&nbsp&nbsp\
-<input TYPE=\"submit\" name=\"ok\" value=\"OK\"><br> \
-</form>"
-
-#define REQUEST_FB_OPTIONS "<form><b>Choose an action:</b><select NAME=\"action\" SIZE=\"1\"> \
-<option VALUE=\"F\">Send Free/Busy Information</option></select>&nbsp &nbsp \
-<input TYPE=Submit name=\"ok\" value=\"OK\"></form>"
-
-#define REPLY_OPTIONS "<form><b>Choose an action:</b><select NAME=\"action\" SIZE=\"1\"> \
-<option VALUE=\"R\">Update respondent status</option></select>&nbsp &nbsp \
-<input TYPE=Submit name=\"ok\" value=\"OK\"></form>"
-
-#define REFRESH_OPTIONS "<form><b>Choose an action:</b><select NAME=\"action\" SIZE=\"1\"> \
-<option VALUE=\"S\">Send Latest Information</option></select>&nbsp &nbsp \
-<input TYPE=Submit name=\"ok\" value=\"OK\"></form>"
-
-#define CANCEL_OPTIONS "<form><b>Choose an action:</b><select NAME=\"action\" SIZE=\"1\"> \
-<option VALUE=\"C\">Cancel</option></select>&nbsp &nbsp \
-<input TYPE=Submit name=\"ok\" value=\"OK\"></form>"
-#endif
-
-extern EvolutionShellClient *global_shell_client;	
-
-static const char *calendar_types[] = { "calendar", NULL };
-static const char *tasks_types[] = { "tasks", NULL };
-
-static void class_init	(EItipControlClass	 *klass);
-static void init	(EItipControl		 *itip);
-static void destroy	(GtkObject               *obj);
-
-#if 0
-static void prev_clicked_cb (GtkWidget *widget, gpointer data);
-static void next_clicked_cb (GtkWidget *widget, gpointer data);
-#endif
-static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data);
-static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data);
-static void ok_clicked_cb (GtkHTML *html, const gchar *method, const gchar *url, const gchar *encoding, gpointer data);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-GtkType
-e_itip_control_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info =
-		{
-			"EItipControl",
-			sizeof (EItipControl),
-			sizeof (EItipControlClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gtk_vbox_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-class_init (EItipControlClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-
-	parent_class = gtk_type_class (gtk_vbox_get_type ());
-
-	object_class->destroy = destroy;
-}
-
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	gboolean *success = data;
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS)
-		*success = TRUE;
-	else
-		*success = FALSE;
-
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static CalClient *
-start_calendar_server (char *uri)
-{
-	CalClient *client;
-	gboolean success = FALSE;
-
-	client = cal_client_new ();
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-			    start_calendar_server_cb, &success);
-
-	cal_client_open_calendar (client, uri, TRUE);
-			
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (success)
-		return client;
-
-	gtk_object_unref (GTK_OBJECT (client));
-	
-	return NULL;
-}
-
-static CalClient *
-start_default_server (gboolean tasks)
-{
-	CalClient *client;
-	gboolean success = FALSE;
-
-	client = cal_client_new ();
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-			    start_calendar_server_cb, &success);
-
-	if (tasks) {
-		if (!cal_client_open_default_tasks (client, FALSE))
-			goto error;
-	} else {
-		if (!cal_client_open_default_calendar (client, FALSE))
-			goto error;
-	}
-	
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (success)
-		return client;
-
- error:
-	gtk_object_unref (GTK_OBJECT (client));
-	
-	return NULL;
-}
-
-static GPtrArray *
-get_servers (EvolutionShellClient *shell_client, const char *possible_types[], gboolean tasks)
-{
-	GNOME_Evolution_StorageRegistry registry;
-	GNOME_Evolution_StorageRegistry_StorageList *storage_list;
-	GPtrArray *servers;
-	int i, j, k;
-	CORBA_Environment ev;
-	
-	servers = g_ptr_array_new ();
-	
-	bonobo_object_ref (BONOBO_OBJECT (shell_client));
-	registry = evolution_shell_client_get_storage_registry_interface (shell_client);
-
-	CORBA_exception_init (&ev);
-	storage_list = GNOME_Evolution_StorageRegistry_getStorageList (registry, &ev);
-	if (BONOBO_EX (&ev)) {
-		CORBA_exception_free (&ev);
-		return servers;
-	}
-	
-	for (i = 0; i < storage_list->_length; i++) {
-		GNOME_Evolution_Storage storage;
-		GNOME_Evolution_FolderList *folder_list;
-		
-		storage = storage_list->_buffer[i];
-		folder_list = GNOME_Evolution_Storage__get_folderList (storage, &ev);
-
-		for (j = 0; j < folder_list->_length; j++) {
-			GNOME_Evolution_Folder folder;
-			
-			folder = folder_list->_buffer[j];
-			for (k = 0; possible_types[k] != NULL; k++) {
-				CalClient *client;
-				char *uri;
-
-				if (strcmp (possible_types[k], folder.type))
-					continue;
-
-				uri = cal_util_expand_uri (folder.physicalUri, tasks);
-				client = start_calendar_server (uri);
-				if (client != NULL)
-					g_ptr_array_add (servers, client);			
-				g_free (uri);
-
-				break;
-			}
-		}
-
-		CORBA_free (folder_list);		
-	}
-	
-	bonobo_object_unref (BONOBO_OBJECT (shell_client));
-
-	return servers;
-}
-
-static CalClient *
-find_server (GPtrArray *servers, CalComponent *comp)
-{
-	const char *uid;
-	int i;
-
-	cal_component_get_uid (comp, &uid);	
-	for (i = 0; i < servers->len; i++) {
-		CalClient *client;
-		CalComponent *found_comp;
-		CalClientGetStatus status;
-		
-		client = g_ptr_array_index (servers, i);
-		status = cal_client_get_object (client, uid, &found_comp);
-		if (status == CAL_CLIENT_GET_SUCCESS) {
-			gtk_object_unref (GTK_OBJECT (found_comp));
-			gtk_object_ref (GTK_OBJECT (client));
-
-			return client;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-init (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *scrolled_window;
-
-	priv = g_new0 (EItipControlPrivate, 1);
-
-	itip->priv = priv;
-
-	/* Addresses */
-	priv->addresses = itip_addresses_get ();
-
-	/* Header */
-#if 0
-	priv->prev = gnome_stock_button (GNOME_STOCK_BUTTON_PREV);
-	gtk_widget_show (priv->prev);
-	priv->next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
-	gtk_widget_show (priv->next);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->prev, FALSE, FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->count, TRUE, TRUE, 4);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->next, FALSE, FALSE, 4);
-	gtk_widget_show (hbox);
-
-	gtk_signal_connect (GTK_OBJECT (priv->prev), "clicked",
-			    GTK_SIGNAL_FUNC (prev_clicked_cb), itip);
-	gtk_signal_connect (GTK_OBJECT (priv->next), "clicked",
-			    GTK_SIGNAL_FUNC (next_clicked_cb), itip);
-#endif
-
-	/* Get the cal clients */
-	priv->event_clients = get_servers (global_shell_client, calendar_types, FALSE);
-	priv->event_client = NULL;
-	priv->task_clients = get_servers (global_shell_client, tasks_types, TRUE);
-	priv->task_client = NULL;
-	
-	/* Html Widget */
-	priv->html = gtk_html_new ();
-	gtk_html_set_default_content_type (GTK_HTML (priv->html), 
-					   "text/html; charset=utf-8");
-	gtk_widget_show (priv->html);
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_widget_show (scrolled_window);
-
-	gtk_container_add (GTK_CONTAINER (scrolled_window), priv->html);
-	gtk_widget_set_usize (scrolled_window, 600, 400);
-	gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 4);
-
-	gtk_signal_connect (GTK_OBJECT (priv->html), "url_requested",
-			    url_requested_cb, itip);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "object_requested",
-			    GTK_SIGNAL_FUNC (object_requested_cb),
-			    itip);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "submit",
-			    ok_clicked_cb, itip);
-
-}
-
-static void
-clean_up (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	g_free (priv->vcalendar);
-	priv->vcalendar = NULL;
-
-	if (priv->comp)
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-	priv->comp = NULL;
-
-	icalcomponent_free (priv->top_level);
-	priv->top_level = NULL;
-	icalcomponent_free (priv->main_comp);
-	priv->main_comp = NULL;
-	priv->ical_comp = NULL;
-
-	priv->current = 0;
-	priv->total = 0;
-
-	g_free (priv->my_address);
-	priv->my_address = NULL;
-	g_free (priv->from_address);
-	priv->from_address = NULL;
-}
-
-static void
-destroy (GtkObject *obj)
-{
-	EItipControl *itip = E_ITIP_CONTROL (obj);
-	EItipControlPrivate *priv;
-	int i;
-	
-	priv = itip->priv;
-
-	clean_up (itip);
-
-	itip_addresses_free (priv->addresses);
-	priv->addresses = NULL;
-
-	for (i = 0; i < priv->event_clients->len; i++) 
-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (priv->event_clients, i)));
-	g_ptr_array_free (priv->event_clients, TRUE);
-	for (i = 0; i < priv->task_clients->len; i++) 
-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (priv->task_clients, i)));
-	g_ptr_array_free (priv->task_clients, TRUE);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (obj);
-}
-
-GtkWidget *
-e_itip_control_new (void)
-{
-	return gtk_type_new (E_TYPE_ITIP_CONTROL);
-}
-
-static void
-find_my_address (EItipControl *itip, icalcomponent *ical_comp)
-{
-	EItipControlPrivate *priv;
-	icalproperty *prop;
-	char *my_alt_address = NULL;
-	
-	priv = itip->priv;
-
-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
-	{
-		icalvalue *value;
-		icalparameter *param;
-		const char *attendee, *name;
-		char *attendee_clean, *name_clean;
-		GList *l;
-
-		value = icalproperty_get_value (prop);
-		if (value != NULL) {
-			attendee = icalvalue_get_string (value);
-			attendee_clean = g_strdup (itip_strip_mailto (attendee));
-			attendee_clean = g_strstrip (attendee_clean);
-		} else {
-			attendee = NULL;
-			attendee_clean = NULL;
-		}
-		
-		param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);
-		if (param != NULL) {
-			name = icalparameter_get_cn (param);
-			name_clean = g_strdup (name);
-			name_clean = g_strstrip (name_clean);
-		} else {
-			name = NULL;
-			name_clean = NULL;
-		}
-		
-		for (l = priv->addresses; l != NULL; l = l->next) {
-			ItipAddress *a = l->data;
-			
-			/* Check for a matching address */
-			if (attendee_clean != NULL
-			    && !g_strcasecmp (a->address, attendee_clean)) {
-				priv->my_address = g_strdup (a->address);
-				g_free (attendee_clean);
-				g_free (name_clean);
-				return;
-			}
-			
-			/* Check for a matching cname to fall back on */
-			if (name_clean != NULL 
-			    && !g_strcasecmp (a->name, name_clean))
-				my_alt_address = g_strdup (attendee_clean);
-		}
-		g_free (attendee_clean);
-		g_free (name_clean);
-	}
-
-	priv->my_address = my_alt_address;
-}
-
-static icalproperty *
-find_attendee (icalcomponent *ical_comp, const char *address)
-{
-	icalproperty *prop;
-
-	if (address == NULL)
-		return NULL;
-
-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
-	{
-		icalvalue *value;
-		const char *attendee;
-		char *text;
-
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-
-		text = g_strdup (itip_strip_mailto (attendee));
-		text = g_strstrip (text);
-		if (!g_strcasecmp (address, text)) {
-			g_free (text);
-			break;
-		}
-		g_free (text);
-	}
-	
-	return prop;
-}
-
-#if 0
-static void
-set_label (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	gchar *text;
-
-	priv = itip->priv;
-
-	text = g_strdup_printf ("%d of %d", priv->current, priv->total);
-	gtk_label_set_text (GTK_LABEL (priv->count), text);
-
-}
-
-static void
-set_button_status (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->current == priv->total)
-		gtk_widget_set_sensitive (priv->next, FALSE);
-	else
-		gtk_widget_set_sensitive (priv->next, TRUE);
-
-	if (priv->current == 1)
-		gtk_widget_set_sensitive (priv->prev, FALSE);
-	else
-		gtk_widget_set_sensitive (priv->prev, TRUE);
-}
-#endif
-
-static void
-write_label_piece (EItipControl *itip, CalComponentDateTime *dt,
-		   char *buffer, int size,
-		   const char *stext, const char *etext)
-{
-	EItipControlPrivate *priv;
-	struct tm tmp_tm;
-	char time_buf[64], *time_utf8;
-	icaltimezone *zone = NULL;
-	char *display_name;
-
-	priv = itip->priv;
-
-	/* UTC times get converted to the current timezone. This is done for
-	   the COMPLETED property, which is always in UTC, and also because
-	   Outlook sends simple events as UTC times. */
-	if (dt->value->is_utc) {
-		char *location = calendar_config_get_timezone ();
-		zone = icaltimezone_get_builtin_timezone (location);
-		icaltimezone_convert_time (dt->value, icaltimezone_get_utc_timezone (), zone);
-	}
-
-	tmp_tm = icaltimetype_to_tm (dt->value);
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	e_time_format_date_and_time (&tmp_tm,
-				     calendar_config_get_24_hour_format (),
-				     FALSE, FALSE,
-				     time_buf, sizeof (time_buf));
-
-	time_utf8 = e_utf8_from_locale_string (time_buf);
-	strcat (buffer, time_utf8);
-	g_free (time_utf8);
-
-	if (!dt->value->is_utc && dt->tzid) {
-		zone = icalcomponent_get_timezone (priv->top_level, dt->tzid);
-	}
-
-	/* Output timezone after time, e.g. " America/New_York". */
-	if (zone) {
-		/* Note that this returns UTF-8, since all iCalendar data is
-		   UTF-8. But it probably is not translated. */
-		display_name = icaltimezone_get_display_name (zone);
-		if (display_name && *display_name) {
-			strcat (buffer, " ");
-
-			/* We check if it is one of our builtin timezone names,
-			   in which case we call gettext to translate it, and
-			   we need to convert to UTF-8. If it isn't a builtin
-			   timezone name, we use it as-is, as it is already
-			   UTF-8. */
-			if (icaltimezone_get_builtin_timezone (display_name)) {
-				strcat (buffer, U_(display_name));
-			} else {
-				strcat (buffer, display_name);
-			}
-		}
-	}
-
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-static void
-set_date_label (EItipControl *itip, GtkHTML *html, GtkHTMLStream *html_stream,
-		CalComponent *comp)
-{
-	EItipControlPrivate *priv;
-	CalComponentDateTime datetime;
-	static char buffer[1024];
-	gboolean wrote = FALSE, task_completed = FALSE;
-	CalComponentVType type;
-
-	priv = itip->priv;
-
-	type = cal_component_get_vtype (comp);
-
-	buffer[0] = '\0';
-	cal_component_get_dtstart (comp, &datetime);
-	if (datetime.value) {
-		switch (type) {
-		case CAL_COMPONENT_EVENT:
-			write_label_piece (itip, &datetime, buffer, 1024,
-					   U_("Meeting begins: <b>"),
-					   "</b><br>");
-			break;
-		case CAL_COMPONENT_TODO:
-			write_label_piece (itip, &datetime, buffer, 1024,
-					   U_("Task begins: <b>"),
-					   "</b><br>");
-			break;
-		case CAL_COMPONENT_FREEBUSY:
-			write_label_piece (itip, &datetime, buffer, 1024,
-					   U_("Free/Busy info begins: <b>"),
-					   "</b><br>");
-			break;
-		default:
-			write_label_piece (itip, &datetime, buffer, 1024, U_("Begins: <b>"), "</b><br>");
-		}
-		gtk_html_write (html, html_stream, buffer, strlen(buffer));
-		wrote = TRUE;
-	}
-	cal_component_free_datetime (&datetime);
-
-	buffer[0] = '\0';
-	cal_component_get_dtend (comp, &datetime);
-	if (datetime.value){
-		switch (type) {
-		case CAL_COMPONENT_EVENT:
-			write_label_piece (itip, &datetime, buffer, 1024, U_("Meeting ends: <b>"), "</b><br>");
-			break;
-		case CAL_COMPONENT_FREEBUSY:
-			write_label_piece (itip, &datetime, buffer, 1024, U_("Free/Busy info ends: <b>"),
-					   "</b><br>");
-			break;
-		default:
-			write_label_piece (itip, &datetime, buffer, 1024, U_("Ends: <b>"), "</b><br>");
-		}
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-	}
-	cal_component_free_datetime (&datetime);
-
-	buffer[0] = '\0';
-	datetime.tzid = NULL;
-	cal_component_get_completed (comp, &datetime.value);
-	if (type == CAL_COMPONENT_TODO && datetime.value) {
-		/* Pass TRUE as is_utc, so it gets converted to the current
-		   timezone. */
-		datetime.value->is_utc = TRUE;
-		write_label_piece (itip, &datetime, buffer, 1024, U_("Task Completed: <b>"), "</b><br>");
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-		task_completed = TRUE;
-	}
-	cal_component_free_datetime (&datetime);
-
-	buffer[0] = '\0';
-	cal_component_get_due (comp, &datetime);
-	if (type == CAL_COMPONENT_TODO && !task_completed && datetime.value) {
-		write_label_piece (itip, &datetime, buffer, 1024, U_("Task Due: <b>"), "</b><br>");
-		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-		wrote = TRUE;
-	}
-
-	cal_component_free_datetime (&datetime);
-
-	if (wrote)
-		gtk_html_stream_printf (html_stream, "<br>");
-}
-
-static void
-set_message (GtkHTML *html, GtkHTMLStream *html_stream, const gchar *message, gboolean err)
-{
-	if (message == NULL)
-		return;
-
-
-	if (err) {
-		gtk_html_stream_printf (html_stream, "<b><font color=\"#ff0000\">%s</font></b><br><br>", message);
-	} else {
-		gtk_html_stream_printf (html_stream, "<b>%s</b><br><br>", message);
-	}
-}
-
-static void
-write_error_html (EItipControl *itip, const gchar *itip_err)
-{
-	EItipControlPrivate *priv;
-	GtkHTMLStream *html_stream;
-
-	priv = itip->priv;
-
-	/* Html widget */
-	html_stream = gtk_html_begin (GTK_HTML (priv->html));
-	gtk_html_stream_printf (html_stream,
-				"<html><head><title>%s</title></head>",
-				U_("iCalendar Information"));
-
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_START, strlen(HTML_BODY_START));
-
-	/* The table */
-	gtk_html_stream_printf (html_stream, "<table width=450 cellspacing=\"0\" cellpadding=\"4\" border=\"0\">");
-	/* The column for the image */
-	gtk_html_stream_printf (html_stream, "<tr><td width=48 align=\"center\" valign=\"top\" rowspan=\"8\">");
-	/* The image */
-	gtk_html_stream_printf (html_stream, "<img src=\"/meeting-request.png\"></td>");
-
-	gtk_html_stream_printf (html_stream, "<td align=\"left\" valign=\"top\">");
-
-	/* Title */
-	set_message (GTK_HTML (priv->html), html_stream, U_("iCalendar Error"), TRUE);
-
-	/* Error */
-	gtk_html_write (GTK_HTML (priv->html), html_stream, itip_err, strlen(itip_err));
-
-	/* Clean up */
-	gtk_html_stream_printf (html_stream, "</td></tr></table>");
-
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_END, strlen(HTML_BODY_END));
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_FOOTER, strlen(HTML_FOOTER));
-
-	gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK);
-}
-
-static void
-write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, const gchar *options)
-{
-	EItipControlPrivate *priv;
-	GtkHTMLStream *html_stream;
-	CalComponentText text;
-	CalComponentOrganizer organizer;
-	CalComponentAttendee *attendee;
-	GSList *attendees, *l = NULL;
-	gchar *html;
-	const gchar *const_html;
-
-	priv = itip->priv;
-
-	/* Html widget */
-	html_stream = gtk_html_begin (GTK_HTML (priv->html));
-	gtk_html_stream_printf (html_stream,
-				"<html><head><title>%s</title></head>",
-				U_("iCalendar Information"));
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_START, strlen(HTML_BODY_START));
-
-	/* The table */
-	const_html = "<table width=450 cellspacing=\"0\" cellpadding=\"4\" border=\"0\">";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	/* The column for the image */
-	const_html = "<tr><td width=48 align=\"center\" valign=\"top\" rowspan=\"8\">";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	/* The image */
-	const_html = "<img src=\"/meeting-request.png\"></td>";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	const_html = "<td align=\"left\" valign=\"top\">";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	switch (priv->method) {
-	case ICAL_METHOD_REFRESH:
-	case ICAL_METHOD_REPLY:
-		/* An attendee sent this */
-		cal_component_get_attendee_list (priv->comp, &attendees);
-		if (attendees != NULL) {
-			attendee = attendees->data;
-			html = g_strdup_printf (itip_desc,
-						attendee->cn ?
-						attendee->cn :
-						itip_strip_mailto (attendee->value));
-		} else {
-			html = g_strdup_printf (itip_desc, U_("An unknown person"));
-		}
-		break;
-	case ICAL_METHOD_PUBLISH:
-	case ICAL_METHOD_REQUEST:
-	case ICAL_METHOD_ADD:
-	case ICAL_METHOD_CANCEL:
-	default:
-		/* The organizer sent this */
-		cal_component_get_organizer (priv->comp, &organizer);
-		if (organizer.value != NULL)
-			html = g_strdup_printf (itip_desc,
-						organizer.cn ?
-						organizer.cn :
-						itip_strip_mailto (organizer.value));
-		else
-			html = g_strdup_printf (itip_desc, U_("An unknown person"));
-		break;
-	}
-	gtk_html_write (GTK_HTML (priv->html), html_stream, html, strlen(html));
-	g_free (html);
-
-	/* Describe what the user can do */
-	const_html = U_("<br> Please review the following information, "
-			"and then select an action from the menu below.");
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	/* Separator */
-	gtk_html_write (GTK_HTML (priv->html), html_stream, HTML_SEP, strlen (HTML_SEP));
-
-	/* Title */
-	set_message (GTK_HTML (priv->html), html_stream, itip_title, FALSE);
-
-	/* Date information */
-	set_date_label (itip, GTK_HTML (priv->html), html_stream, priv->comp);
-
-	/* Summary */
-	cal_component_get_summary (priv->comp, &text);
-	gtk_html_stream_printf (html_stream, "<b>%s</b> %s<br><br>",
-				U_("Summary:"), text.value ? text.value : U_("<i>None</i>"));
-
-	/* Status */
-	if (priv->method == ICAL_METHOD_REPLY) {
-		GSList *alist;
-
-		cal_component_get_attendee_list (priv->comp, &alist);
-		
-		if (alist != NULL) {
-			CalComponentAttendee *a = alist->data;
-
-			gtk_html_stream_printf (html_stream, "<b>%s</b> ",
-						U_("Status:"));
-			
-			switch (a->status) {
-			case ICAL_PARTSTAT_ACCEPTED:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							U_("Accepted"));
-				break;
-			case ICAL_PARTSTAT_TENTATIVE:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							U_("Tentatively Accepted"));
-				break;
-			case ICAL_PARTSTAT_DECLINED:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							U_("Declined"));
-				break;
-			default:
-				gtk_html_stream_printf (html_stream, "%s<br><br>",
-							U_("Unknown"));
-			}
-		}
-		
-		cal_component_free_attendee_list (alist);
-	}
-	
-	/* Description */
-	cal_component_get_description_list (priv->comp, &l);
-	if (l)
-		text = *((CalComponentText *)l->data);
-
-	if (l && text.value) {
-		gtk_html_stream_printf (html_stream, "<b>%s</b> %s",
-					U_("Description:"), text.value);
-	}
-	cal_component_free_text_list (l);
-
-	/* Separator */
-	gtk_html_write (GTK_HTML (priv->html), html_stream, HTML_SEP, strlen (HTML_SEP));
-
-	/* Options */
-	if (options != NULL) {
-		const_html = "</td></tr><tr><td valign=\"center\">";
-		gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen (const_html));
-		gtk_html_write (GTK_HTML (priv->html), html_stream, options, strlen (options));
-	}
-	
-	const_html = "</td></tr></table>";
-	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
-
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_BODY_END, strlen(HTML_BODY_END));
-	gtk_html_write (GTK_HTML (priv->html), html_stream,
-			HTML_FOOTER, strlen(HTML_FOOTER));
-
-	gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK);
-}
-
-
-static char*
-get_publish_options (gboolean selector)
-{
-	char *html;
-	
-	html = g_strdup_printf ("<form><b>%s</b>&nbsp"
-				"<select NAME=\"action\" SIZE=\"1\"> "
-				"<option VALUE=\"U\">%s</option>"
-				"</select>&nbsp &nbsp "
-				"<input TYPE=Submit name=\"ok\" value=\"%s\">"
-				"</form>",
-				U_("Choose an action:"),
-				U_("Update"),
-				U_("OK"));
-
-	if (selector) {
-		char *sel;
-		
-		sel = g_strconcat (html, "<object classid=\"gtk:label\">", NULL);
-		g_free (html);
-		html = sel;
-	}
-	
-	return html;
-}
-
-static char*
-get_request_options (gboolean selector)
-{
-	char *html;
-	
-	html = g_strdup_printf ("<form><b>%s</b>&nbsp"
-				"<select NAME=\"action\" SIZE=\"1\"> "
-				"<option VALUE=\"A\">%s</option> "
-				"<option VALUE=\"T\">%s</option> "
-				"<option VALUE=\"D\">%s</option></select>&nbsp "
-				"<input TYPE=\"checkbox\" name=\"rsvp\" value=\"1\" checked>%s&nbsp&nbsp"
-				"<input TYPE=\"submit\" name=\"ok\" value=\"%s\"><br> "
-				"</form>",
-				U_("Choose an action:"),
-				U_("Accept"),
-				U_("Tentatively accept"),
-				U_("Decline"),
-				U_("RSVP"),
-				U_("OK"));
-
-	if (selector) {
-		char *sel;
-		
-		sel = g_strconcat (html, "<object classid=\"gtk:label\">", NULL);
-		g_free (html);
-		html = sel;
-	}
-	
-	return html;
-}
-
-static char*
-get_request_fb_options ()
-{
-	return g_strdup_printf ("<form><b>%s</b>&nbsp"
-				"<select NAME=\"action\" SIZE=\"1\"> "
-				"<option VALUE=\"F\">%s</option></select>&nbsp &nbsp "
-				"<input TYPE=Submit name=\"ok\" value=\"%s\">"
-				"</form>",
-				U_("Choose an action:"),
-				U_("Send Free/Busy Information"),
-				U_("OK"));
-}
-
-static char*
-get_reply_options ()
-{
-	return g_strdup_printf ("<form><b>%s</b>&nbsp"
-				"<select NAME=\"action\" SIZE=\"1\"> "
-				"<option VALUE=\"R\">%s</option></select>&nbsp &nbsp "
-				"<input TYPE=Submit name=\"ok\" value=\"%s\">"
-				"</form>",
-				U_("Choose an action:"),
-				U_("Update respondent status"),
-				U_("OK"));
-}
-
-static char*
-get_refresh_options ()
-{
-	return g_strdup_printf ("<form><b>%s</b>&nbsp"
-				"<select NAME=\"action\" SIZE=\"1\"> "
-				"<option VALUE=\"S\">%s</option></select>&nbsp &nbsp "
-				"<input TYPE=Submit name=\"ok\" value=\"%s\">"
-				"</form>",
-				U_("Choose an action:"),
-				U_("Send Latest Information"),
-				U_("OK"));
-}
-
-static char*
-get_cancel_options ()
-{
-	return g_strdup_printf ("<form><b>%s</b>&nbsp"
-				"<select NAME=\"action\" SIZE=\"1\"> "
-				"<option VALUE=\"C\">%s</option></select>&nbsp &nbsp "
-				"<input TYPE=Submit name=\"ok\" value=\"%s\">"
-				"</form>",
-				U_("Choose an action:"),
-				U_("Cancel"),
-				U_("OK"));
-}
-
-
-static CalComponent *
-get_real_item (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	CalComponent *comp;
-	CalComponentVType type;
-	CalClientGetStatus status = CAL_CLIENT_GET_NOT_FOUND;
-	const char *uid;
-	
-	priv = itip->priv;
-
-	type = cal_component_get_vtype (priv->comp);
-	cal_component_get_uid (priv->comp, &uid);
-
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		if (priv->event_client != NULL)
-			status = cal_client_get_object (priv->event_client, uid, &comp);
-		break;
-	case CAL_COMPONENT_TODO:
-		if (priv->task_client != NULL)
-			status = cal_client_get_object (priv->task_client, uid, &comp);
-		break;
-	default:
-		status = CAL_CLIENT_GET_NOT_FOUND;
-	}
-
-	if (status != CAL_CLIENT_GET_SUCCESS)
-		return NULL;
-
-	return comp;
-}
-
-static void
-show_current_event (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalComponent *comp;
-	const gchar *itip_title, *itip_desc;
-	char *options;
-
-	priv = itip->priv;
-
-	priv->event_client = find_server (priv->event_clients, priv->comp);
-	
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		itip_desc = U_("<b>%s</b> has published meeting information.");
-		itip_title = U_("Meeting Information");
-		options = get_publish_options (priv->event_client ? FALSE : TRUE);
-		break;
-	case ICAL_METHOD_REQUEST:
-		itip_desc = U_("<b>%s</b> requests your presence at a meeting.");
-		itip_title = U_("Meeting Proposal");
-		options = get_request_options (priv->event_client ? FALSE : TRUE);
-		break;
-	case ICAL_METHOD_ADD:
-		itip_desc = U_("<b>%s</b> wishes to add to an existing meeting.");
-		itip_title = U_("Meeting Update");
-		options = get_publish_options (priv->event_client ? FALSE : TRUE);
-		break;
-	case ICAL_METHOD_REFRESH:
-		itip_desc = U_("<b>%s</b> wishes to receive the latest meeting information.");
-		itip_title = U_("Meeting Update Request");
-		options = get_refresh_options ();
-
-		/* Provide extra info, since its not in the component */
-		comp = get_real_item (itip);
-		if (comp != NULL) {
-			CalComponentText text;
-			GSList *l;
-			
-			cal_component_get_summary (comp, &text);
-			cal_component_set_summary (priv->comp, &text);
-			cal_component_get_description_list (comp, &l);
-			cal_component_set_description_list (priv->comp, l);
-			cal_component_free_text_list (l);
-			
-			gtk_object_unref (GTK_OBJECT (comp));
-		} else {
-			CalComponentText text = {_("Unknown"), NULL};
-			
-			cal_component_set_summary (priv->comp, &text);
-		}
-		break;
-	case ICAL_METHOD_REPLY:
-		itip_desc = U_("<b>%s</b> has replied to a meeting request.");
-		itip_title = U_("Meeting Reply");
-		options = get_reply_options ();
-		break;
-	case ICAL_METHOD_CANCEL:
-		itip_desc = U_("<b>%s</b> has cancelled a meeting.");
-		itip_title = U_("Meeting Cancellation");
-		options = get_cancel_options ();
-		break;
-	default:
-		itip_desc = U_("<b>%s</b> has sent an unintelligible message.");
-		itip_title = U_("Bad Meeting Message");
-		options = NULL;
-	}
-
-	write_html (itip, itip_desc, itip_title, options);
-	g_free (options);
-}
-
-static void
-show_current_todo (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalComponent *comp;
-	const gchar *itip_title, *itip_desc;
-	char *options;
-
-	priv = itip->priv;
-
-	priv->task_client = find_server (priv->task_clients, priv->comp);
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		itip_desc = U_("<b>%s</b> has published task information.");
-		itip_title = U_("Task Information");
-		options = get_publish_options (priv->task_client ? FALSE : TRUE);
-		break;
-	case ICAL_METHOD_REQUEST:
-		itip_desc = U_("<b>%s</b> requests you perform a task.");
-		itip_title = U_("Task Proposal");
-		options = get_request_options (priv->task_client ? FALSE : TRUE);
-		break;
-	case ICAL_METHOD_ADD:
-		itip_desc = U_("<b>%s</b> wishes to add to an existing task.");
-		itip_title = U_("Task Update");
-		options = get_publish_options (priv->task_client ? FALSE : TRUE);
-		break;
-	case ICAL_METHOD_REFRESH:
-		itip_desc = U_("<b>%s</b> wishes to receive the latest task information.");
-		itip_title = U_("Task Update Request");
-		options = get_refresh_options ();
-
-
-		/* Provide extra info, since its not in the component */
-		comp = get_real_item (itip);
-		if (comp != NULL) {
-			CalComponentText text;
-			GSList *l;
-			
-			cal_component_get_summary (comp, &text);
-			cal_component_set_summary (priv->comp, &text);
-			cal_component_get_description_list (comp, &l);
-			cal_component_set_description_list (priv->comp, l);
-			cal_component_free_text_list (l);
-			
-			gtk_object_unref (GTK_OBJECT (comp));
-		} else {
-			CalComponentText text = {_("Unknown"), NULL};
-			
-			cal_component_set_summary (priv->comp, &text);
-		}
-		break;
-	case ICAL_METHOD_REPLY:
-		itip_desc = U_("<b>%s</b> has replied to a task assignment.");
-		itip_title = U_("Task Reply");
-		options = get_reply_options ();
-		break;
-	case ICAL_METHOD_CANCEL:
-		itip_desc = U_("<b>%s</b> has cancelled a task.");
-		itip_title = U_("Task Cancellation");
-		options = get_cancel_options ();
-		break;
-	default:
-		itip_desc = U_("<b>%s</b> has sent an unintelligible message.");
-		itip_title = U_("Bad Task Message");
-		options = NULL;
-	}
-
-	write_html (itip, itip_desc, itip_title, options);
-	g_free (options);
-}
-
-static void
-show_current_freebusy (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
-
-	priv = itip->priv;
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		itip_desc = U_("<b>%s</b> has published free/busy information.");
-		itip_title = U_("Free/Busy Information");
-		options = NULL;
-		break;
-	case ICAL_METHOD_REQUEST:
-		itip_desc = U_("<b>%s</b> requests your free/busy information.");
-		itip_title = U_("Free/Busy Request");
-		options = get_request_fb_options ();
-		break;
-	case ICAL_METHOD_REPLY:
-		itip_desc = U_("<b>%s</b> has replied to a free/busy request.");
-		itip_title = U_("Free/Busy Reply");
-		options = NULL;
-		break;
-	default:
-		itip_desc = U_("<b>%s</b> has sent an unintelligible message.");
-		itip_title = U_("Bad Free/Busy Message");
-		options = NULL;
-	}
-
-	write_html (itip, itip_desc, itip_title, options);
-	g_free (options);
-}
-
-static icalcomponent *
-get_next (icalcompiter *iter)
-{
-	icalcomponent *ret = NULL;
-	icalcomponent_kind kind;
-
-	do {
-		icalcompiter_next (iter);
-		ret = icalcompiter_deref (iter);
-		kind = icalcomponent_isa (ret);
-	} while (ret != NULL 
-		 && kind != ICAL_VEVENT_COMPONENT
-		 && kind != ICAL_VTODO_COMPONENT
-		 && kind != ICAL_VFREEBUSY_COMPONENT);
-
-	return ret;
-}
-
-#if 0
-static icalcomponent *
-get_prev (icalcompiter *iter)
-{
-	icalcomponent *ret = NULL;
-	icalcomponent_kind kind = ICAL_NO_COMPONENT;
-
-	while (kind != ICAL_VEVENT_COMPONENT
-	       && kind != ICAL_VTODO_COMPONENT
-	       && kind != ICAL_VFREEBUSY_COMPONENT) {
-		icalcompiter_prior (iter);
-		ret = icalcompiter_deref (iter);
-		kind = icalcomponent_isa (ret);
-	}
-
-	return ret;
-}
-#endif
-
-static void
-show_current (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalComponentVType type;
-	icalcomponent *alarm_comp;
-	icalcompiter alarm_iter;
-
-	priv = itip->priv;
-
-#if 0
-	set_label (itip);
-	set_button_status (itip);
-#endif
-
-	if (priv->comp)
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-	if (priv->event_client != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->event_client));
-	priv->event_client = NULL;
-	if (priv->task_client != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->task_client));
-	priv->task_client = NULL;
-
-	/* Strip out alarms for security purposes */
-	alarm_iter = icalcomponent_begin_component (priv->ical_comp, ICAL_VALARM_COMPONENT);
-	while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) {
-		icalcomponent_remove_component (priv->ical_comp, alarm_comp);
-
-		icalcompiter_next (&alarm_iter);
-	}
-
-	priv->comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (priv->comp, priv->ical_comp)) {
-		write_error_html (itip, U_("The message does not appear to be properly formed"));
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-		return;
-	};
-
-	type = cal_component_get_vtype (priv->comp);
-
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		show_current_event (itip);
-		break;
-	case CAL_COMPONENT_TODO:
-		show_current_todo (itip);
-		break;
-	case CAL_COMPONENT_FREEBUSY:
-		show_current_freebusy (itip);
-		break;
-	default:
-		write_error_html (itip, U_("The message contains only unsupported requests."));
-	}
-
-	find_my_address (itip, priv->ical_comp);
-}
-
-void
-e_itip_control_set_data (EItipControl *itip, const gchar *text)
-{
-	EItipControlPrivate *priv;
-	icalproperty *prop;
-	icalcomponent_kind kind = ICAL_NO_COMPONENT;
-	icalcomponent *tz_comp;
-	icalcompiter tz_iter;
-
-	priv = itip->priv;
-
-	clean_up (itip);
-
-	priv->comp = NULL;
-	priv->total = 0;
-	priv->current = 0;
-
-	priv->vcalendar = g_strdup (text);
-	priv->top_level = cal_util_new_top_level ();
-
-	priv->main_comp = icalparser_parse_string (priv->vcalendar);
-	if (priv->main_comp == NULL) {
-		write_error_html (itip, U_("The attachment does not contain a valid calendar message"));
-		return;
-	}
-
-	prop = icalcomponent_get_first_property (priv->main_comp, ICAL_METHOD_PROPERTY);
-	if (prop == NULL) {
-		write_error_html (itip, U_("The attachment does not contain a valid calendar message"));
-		return;
-	}
-
-	priv->method = icalproperty_get_method (prop);
-
-	tz_iter = icalcomponent_begin_component (priv->main_comp, ICAL_VTIMEZONE_COMPONENT);
-	while ((tz_comp = icalcompiter_deref (&tz_iter)) != NULL) {
-		icalcomponent *clone;
-
-		clone = icalcomponent_new_clone (tz_comp);
-		icalcomponent_add_component (priv->top_level, clone);
-
-		icalcompiter_next (&tz_iter);
-	}
-
-	priv->iter = icalcomponent_begin_component (priv->main_comp, ICAL_ANY_COMPONENT);
-	priv->ical_comp = icalcompiter_deref (&priv->iter);
-	kind = icalcomponent_isa (priv->ical_comp);
-	if (kind != ICAL_VEVENT_COMPONENT
-	    && kind != ICAL_VTODO_COMPONENT
-	    && kind != ICAL_VFREEBUSY_COMPONENT)
-		priv->ical_comp = get_next (&priv->iter);
-
-	if (priv->ical_comp == NULL) {
-		write_error_html (itip, U_("The attachment has no viewable calendar items"));		
-		return;
-	}
-
-	priv->total = icalcomponent_count_components (priv->main_comp, ICAL_VEVENT_COMPONENT);
-	priv->total += icalcomponent_count_components (priv->main_comp, ICAL_VTODO_COMPONENT);
-	priv->total += icalcomponent_count_components (priv->main_comp, ICAL_VFREEBUSY_COMPONENT);
-
-	if (priv->total > 0)
-		priv->current = 1;
-	else
-		priv->current = 0;
-
-	show_current (itip);
-}
-
-gchar *
-e_itip_control_get_data (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return g_strdup (priv->vcalendar);
-}
-
-gint
-e_itip_control_get_data_size (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->vcalendar == NULL)
-		return 0;
-
-	return strlen (priv->vcalendar);
-}
-
-void
-e_itip_control_set_from_address (EItipControl *itip, const gchar *address)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	if (priv->from_address)
-		g_free (priv->from_address);
-
-	priv->from_address = g_strdup (address);
-}
-
-const gchar *
-e_itip_control_get_from_address (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	return priv->from_address;
-}
-
-
-static gboolean
-change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status)
-{
-	icalproperty *prop;
-
-	prop = find_attendee (ical_comp, address);
-	if (prop) {
-		icalparameter *param;
-
-		icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-		param = icalparameter_new_partstat (status);
-		icalproperty_add_parameter (prop, param);
-	} else {
-		icalparameter *param;
-		
-		if (address != NULL) {
-			prop = icalproperty_new_attendee (address);
-			icalcomponent_add_property (ical_comp, prop);
-
-			param = icalparameter_new_role (ICAL_ROLE_OPTPARTICIPANT);
-			icalproperty_add_parameter (prop, param);
-
-			param = icalparameter_new_partstat (status);
-			icalproperty_add_parameter (prop, param);
-		} else {
-			ItipAddress *a;
-
-			a = itip_addresses_get_default ();
-			
-			prop = icalproperty_new_attendee (a->address);
-			icalcomponent_add_property (ical_comp, prop);
-			
-			param = icalparameter_new_cn (a->name);
-			icalproperty_add_parameter (prop, param);	
-
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-			icalproperty_add_parameter (prop, param);
-			
-			param = icalparameter_new_partstat (status);
-			icalproperty_add_parameter (prop, param);
-			
-			itip_address_free (a);
-		}
-	}
-
-	return TRUE;
-}
-
-static void
-update_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	icalcomponent *clone;
-	CalClient *client;
-	CalComponentVType type;
-	GtkWidget *dialog;
-
-	priv = itip->priv;
-
-	type = cal_component_get_vtype (priv->comp);
-	if (type == CAL_COMPONENT_TODO)
-		client = priv->task_client;
-	else
-		client = priv->event_client;
-
-	clone = icalcomponent_new_clone (priv->ical_comp);
-	icalcomponent_add_component (priv->top_level, clone);
-
-	if (!cal_client_update_objects (client, priv->top_level))
-		dialog = gnome_warning_dialog (_("Calendar file could not be updated!\n"));
-	else
-		dialog = gnome_ok_dialog (_("Update complete\n"));
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-	icalcomponent_remove_component (priv->top_level, clone);
-}
-
-static void
-update_attendee_status (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalClient *client;
-	CalClientGetStatus status;
-	CalComponent *comp = NULL;
-	CalComponentVType type;
-	const char *uid;
-	GtkWidget *dialog;
-
-	priv = itip->priv;
-
-	type = cal_component_get_vtype (priv->comp);
-	if (type == CAL_COMPONENT_TODO)
-		client = priv->task_client;
-	else
-		client = priv->event_client;
-
-	if (client == NULL) {
-		dialog = gnome_warning_dialog (_("Attendee status can not be updated "
-						 "because the item no longer exists"));
-		goto cleanup;
-	}
-	
-	/* Obtain our version */
-	cal_component_get_uid (priv->comp, &uid);
-	status = cal_client_get_object (client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		GSList *attendees;
-
-		cal_component_get_attendee_list (priv->comp, &attendees);
-		if (attendees != NULL) {
-			CalComponentAttendee *a = attendees->data;
-			icalproperty *prop;
-
-			prop = find_attendee (cal_component_get_icalcomponent (comp),
-					      itip_strip_mailto (a->value));
-			
-			if (prop == NULL) {
-				dialog = gnome_question_dialog_modal (_("This response is not from a current "
-									"attendee.  Add as an attendee?"),
-								      NULL, NULL);
-				if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == GNOME_YES) {
-					change_status (cal_component_get_icalcomponent (comp),
-						       itip_strip_mailto (a->value),
-						       a->status);
-					cal_component_rescan (comp);
-				} else {
-					goto cleanup;
-				}
-			} else if (a->status == ICAL_PARTSTAT_NONE || a->status == ICAL_PARTSTAT_X) {
-				dialog = gnome_warning_dialog (_("Attendee status could "
-								 "not be updated because "
-								 "of an invalid status!\n"));
-				goto cleanup;
-			} else {
-				change_status (cal_component_get_icalcomponent (comp),
-					       itip_strip_mailto (a->value),
-					       a->status);
-				cal_component_rescan (comp);				
-			}
-		}
-
-		if (!cal_client_update_object (client, comp))
-			dialog = gnome_warning_dialog (_("Attendee status could not be updated!\n"));
-		else
-			dialog = gnome_ok_dialog (_("Attendee status updated\n"));
-	} else {
-		dialog = gnome_warning_dialog (_("Attendee status can not be updated "
-						 "because the item no longer exists"));
-	}
-
- cleanup:
-	if (comp != NULL)
-		gtk_object_unref (GTK_OBJECT (comp));
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-remove_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalClient *client;
-	CalComponentVType type;
-	const char *uid;
-	GtkWidget *dialog;
-
-	priv = itip->priv;
-
-	type = cal_component_get_vtype (priv->comp);
-	if (type == CAL_COMPONENT_TODO)
-		client = priv->task_client;
-	else
-		client = priv->event_client;
-
-	if (client == NULL)
-		return;
-	
-	cal_component_get_uid (priv->comp, &uid);
-	if (cal_client_remove_object (client, uid)) {
-		dialog = gnome_ok_dialog (_("Removal Complete"));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	}
-}
-
-static void
-send_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalComponent *comp;
-	CalComponentVType vtype;
-	GtkWidget *dialog;
-
-	priv = itip->priv;
-
-	comp = get_real_item (itip);
-	vtype = cal_component_get_vtype (comp);
-	
-	if (comp != NULL) {
-		switch (vtype) {
-		case CAL_COMPONENT_EVENT:
-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, priv->event_client, NULL);
-			break;
-		case CAL_COMPONENT_TODO:
-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, priv->task_client, NULL);
-			break;
-		default:
-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, NULL, NULL);
-		}
-		gtk_object_unref (GTK_OBJECT (comp));
-		dialog = gnome_ok_dialog (_("Item sent!\n"));
-	} else {
-		dialog = gnome_warning_dialog (_("The item could not be sent!\n"));
-	}
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-send_freebusy (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalComponentDateTime datetime;
-	time_t start, end;
-	GtkWidget *dialog;
-	GList *comp_list;
-	icaltimezone *zone;
-
-	priv = itip->priv;
-
-	cal_component_get_dtstart (priv->comp, &datetime);
-	if (datetime.tzid) {
-		zone = icalcomponent_get_timezone (priv->top_level,
-						   datetime.tzid);
-	} else {
-		zone = NULL;
-	}
-	start = icaltime_as_timet_with_zone (*datetime.value, zone);
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_dtend (priv->comp, &datetime);
-	if (datetime.tzid) {
-		zone = icalcomponent_get_timezone (priv->top_level,
-						   datetime.tzid);
-	} else {
-		zone = NULL;
-	}
-	end = icaltime_as_timet_with_zone (*datetime.value, zone);
-	cal_component_free_datetime (&datetime);
-
-	comp_list = cal_client_get_free_busy (priv->event_client, NULL, start, end);
-
-	if (comp_list) {
-		GList *l;
-
-		for (l = comp_list; l; l = l->next) {
-			CalComponent *comp = CAL_COMPONENT (l->data);
-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp, priv->event_client, NULL);
-
-			gtk_object_unref (GTK_OBJECT (comp));
-		}
-		dialog = gnome_ok_dialog (_("Item sent!\n"));
-
-		g_list_free (comp_list);
-	} else {
-		dialog = gnome_warning_dialog (_("The item could not be sent!\n"));
-	}
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-#if 0
-static void
-prev_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	priv->current--;
-	priv->ical_comp = get_prev (&priv->iter);
-
-	show_current (itip);
-}
-
-static void
-next_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	priv->current++;
-	priv->ical_comp = get_next (&priv->iter);
-
-	show_current (itip);
-}
-#endif
-
-static void
-button_selected_cb (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folder *folder, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-	CalComponentVType type;
-	char *uri;
-	
-	priv = itip->priv;
-	
-	type = cal_component_get_vtype (priv->comp);
-	if (type == CAL_COMPONENT_TODO)
-		uri = cal_util_expand_uri (folder->physicalUri, TRUE);
-	else
-		uri = cal_util_expand_uri (folder->physicalUri, FALSE);
-
-	gtk_object_unref (GTK_OBJECT (priv->event_client));
-	priv->event_client = start_calendar_server (uri);
-
-	g_free (uri);
-}
-
-static void
-url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
-{	unsigned char buffer[4096];
-	int len, fd;
-        char *path;
-
-	path = g_strdup_printf ("%s/%s", EVOLUTION_ICONSDIR, url);
-
-	if ((fd = open (path, O_RDONLY)) == -1) {
-		g_warning ("%s", g_strerror (errno));
-		goto cleanup;
-	}
-
-       	while ((len = read (fd, buffer, 4096)) > 0) {
-		gtk_html_write (html, handle, buffer, len);
-	}
-
-	if (len < 0) {
-		/* check to see if we stopped because of an error */
-		gtk_html_end (html, handle, GTK_HTML_STREAM_ERROR);
-		g_warning ("%s", g_strerror (errno));
-		goto cleanup;
-	}
-	/* done with no errors */
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-	close (fd);
-
- cleanup:
-	g_free (path);
-}
-
-static gboolean
-object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) 
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-	GtkWidget *button;
-	CalComponentVType vtype;
-	
-	priv = itip->priv;	
-
-	vtype = cal_component_get_vtype (priv->comp);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		button = evolution_folder_selector_button_new (
-			global_shell_client, _("Select Calendar Folder"),
-			calendar_config_default_calendar_folder (), 
-			calendar_types);
-		priv->event_client = start_default_server (FALSE);
-		break;
-	case CAL_COMPONENT_TODO:
-		button = evolution_folder_selector_button_new (
-			global_shell_client, _("Select Tasks Folder"),
-			calendar_config_default_tasks_folder (), 
-			tasks_types);
-		priv->task_client = start_default_server (TRUE);
-		break;
-	default:
-		button = NULL;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (button), "selected", 
-			    button_selected_cb, itip);
-	
-	gtk_container_add (GTK_CONTAINER (eb), button);
-	gtk_widget_show (button);
-
-	return TRUE;
-}
-
-static void
-ok_clicked_cb (GtkHTML *html, const gchar *method, const gchar *url, const gchar *encoding, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-	gchar **fields;
-	gboolean rsvp = FALSE, status = FALSE;
-	int i;
-
-	priv = itip->priv;
-
-	fields = g_strsplit (encoding, "&", -1);
-	for (i = 0; fields[i] != NULL; i++) {
-		gchar **key_value;
-
-		key_value = g_strsplit (fields[i], "=", 2);
-
-		if (key_value[0] != NULL && !strcmp (key_value[0], "action")) {
-			if (key_value[1] == NULL)
-				break;
-
-			switch (key_value[1][0]) {
-			case 'U':
-				update_item (itip);
-				break;
-			case 'A':
-				status = change_status (priv->ical_comp, priv->my_address, 
-							ICAL_PARTSTAT_ACCEPTED);
-				if (status) {
-					cal_component_rescan (priv->comp);
-					update_item (itip);
-				}
-				break;
-			case 'T':
-				status = change_status (priv->ical_comp, priv->my_address,
-							ICAL_PARTSTAT_TENTATIVE);
-				if (status) {
-					cal_component_rescan (priv->comp);
-					update_item (itip);
-				}
-				break;
-			case 'D':
-				status = change_status (priv->ical_comp, priv->my_address,
-							ICAL_PARTSTAT_DECLINED);
-				if (status) {
-					cal_component_rescan (priv->comp);
-					remove_item (itip);
-				}
-				break;
-			case 'F':
-				send_freebusy (itip);
-				break;
-			case 'R':
-				update_attendee_status (itip);
-				break;
-			case 'S':
-				send_item (itip);
-				break;
-			case 'C':
-				remove_item (itip);
-				break;
-			}
-		}
-
-		if (key_value[0] != NULL && !strcmp (key_value[0], "rsvp"))
-			if (*key_value[1] == '1')
-				rsvp = TRUE;
-
-		g_strfreev (key_value);
-
-	}
-	g_strfreev (fields);
-
-	if (rsvp && status) {
-		CalComponent *comp = NULL;
-		CalComponentVType vtype;
-		icalcomponent *ical_comp;
-		icalproperty *prop;
-		icalvalue *value;
-		const char *attendee;
-		GSList *l, *list = NULL;
-		
-		comp = cal_component_clone (priv->comp);
-		if (comp == NULL)
-			return;
-		vtype = cal_component_get_vtype (comp);
-		
-		if (priv->my_address == NULL)
-			find_my_address (itip, priv->ical_comp);
-		g_assert (priv->my_address != NULL);
-		
-		ical_comp = cal_component_get_icalcomponent (comp);
-		
-		for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-		     prop != NULL;
-		     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
-		{
-			char *text;
-			
-			value = icalproperty_get_value (prop);
-			if (!value)
-				continue;
-			
-			attendee = icalvalue_get_string (value);
-			
-			text = g_strdup (itip_strip_mailto (attendee));
-			text = g_strstrip (text);
-			if (g_strcasecmp (priv->my_address, text))
-				list = g_slist_prepend (list, prop);
-			g_free (text);
-		}
-		
-		for (l = list; l; l = l->next) {
-			prop = l->data;
-			icalcomponent_remove_property (ical_comp, prop);
-			icalproperty_free (prop);
-		}
-		g_slist_free (list);
-		
-		cal_component_rescan (comp);
-		switch (vtype) {
-		case CAL_COMPONENT_EVENT:
-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp,
-					priv->event_client, priv->top_level);
-			break;
-		case CAL_COMPONENT_TODO:
-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp,
-					priv->task_client, priv->top_level);
-			break;
-		default:
-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp, NULL, NULL);
-		}
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
deleted file mode 100644
index 68e15d6989..0000000000
--- a/calendar/gui/e-itip-control.glade
+++ /dev/null
@@ -1,478 +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>Calendar Message</label>
-    <label_xalign>0</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_NONE</shadow_type>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <border_width>3</border_width>
-	    <rows>4</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>3</row_spacing>
-	    <column_spacing>3</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>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>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Organizer:</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>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>Date:</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>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>label8</name>
-	      <label>Summary:</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>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>Description:</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>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>
-	    <class>GtkLabel</class>
-	    <name>label12</name>
-	    <label>Server Message:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>3</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow3</name>
-	    <border_width>3</border_width>
-	    <width>365</width>
-	    <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>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>message_text</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>button_box</name>
-	    <border_width>3</border_width>
-	    <height>30</height>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </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>loading_progress</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 30917fb13d..0000000000
--- a/calendar/gui/e-itip-control.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifndef _E_ITIP_CONTROL_H_
-#define _E_ITIP_CONTROL_H_
-
-#include <gtk/gtk.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_ITIP_CONTROL			(e_itip_control_get_type ())
-#define E_ITIP_CONTROL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_ITIP_CONTROL, EItipControl))
-#define E_ITIP_CONTROL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITIP_CONTROL, EItipControlClass))
-#define E_IS_ITIP_CONTROL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_ITIP_CONTROL))
-#define E_IS_ITIP_CONTROL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_ITIP_CONTROL))
-
-
-typedef struct _EItipControl        EItipControl;
-typedef struct _EItipControlPrivate EItipControlPrivate;
-typedef struct _EItipControlClass   EItipControlClass;
-
-struct _EItipControl {
-	GtkVBox parent;
-
-	EItipControlPrivate *priv;
-};
-
-struct _EItipControlClass {
-	GtkVBoxClass parent_class;
-};
-
-
-
-GtkType      e_itip_control_get_type         (void);
-GtkWidget *  e_itip_control_new              (void);
-void         e_itip_control_set_data         (EItipControl *itip,
-					      const gchar  *text);
-gchar *      e_itip_control_get_data         (EItipControl *itip);
-gint         e_itip_control_get_data_size    (EItipControl *itip);
-void         e_itip_control_set_from_address (EItipControl *itip,
-					      const gchar  *address);
-const gchar *e_itip_control_get_from_address (EItipControl *itip);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_ITIP_CONTROL_H_ */
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
deleted file mode 100644
index 3d4a8a4f48..0000000000
--- a/calendar/gui/e-meeting-attendee.c
+++ /dev/null
@@ -1,990 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-attendee.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include "e-meeting-attendee.h"
-
-struct _EMeetingAttendeePrivate {
-	gchar *address;
-	gchar *member;
-
-	icalparameter_cutype cutype;
-	icalparameter_role role;
-
-	gboolean rsvp;
-
-	gchar *delto;
-	gchar *delfrom;
-
-	icalparameter_partstat status;
-	
-	gchar *sentby;
-	gchar *cn;
-	gchar *language;
-
-	gboolean has_calendar_info;
-
-	GArray *busy_periods;
-	gboolean busy_periods_sorted;
-
-	EMeetingTime busy_periods_start;
-	EMeetingTime busy_periods_end;
-	gboolean start_busy_range_set;
-	gboolean end_busy_range_set;
-	
-	gint longest_period_in_days;
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL];
-
-static void class_init	(EMeetingAttendeeClass *klass);
-static void init	(EMeetingAttendee *ia);
-static void destroy	(GtkObject *obj);
-
-
-static GtkObjectClass *parent_class = NULL;
-
-
-GtkType
-e_meeting_attendee_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0)
-	{
-		static const GtkTypeInfo info =
-		{
-			"EMeetingAttendee",
-			sizeof (EMeetingAttendee),
-			sizeof (EMeetingAttendeeClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-class_init (EMeetingAttendeeClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMeetingAttendeeClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	object_class->destroy = destroy;
-}
-
-static gchar *
-string_test (gchar *string)
-{
-	return string != NULL ? string : g_strdup ("");
-}
-
-static gboolean
-string_is_set (gchar *string) 
-{
-	if (string != NULL && *string != '\0')
-		return TRUE;
-	
-	return FALSE;
-}
-
-static void
-notify_changed (EMeetingAttendee *ia) 
-{
-	gtk_signal_emit (GTK_OBJECT (ia), signals[CHANGED]);
-}
-
-static void
-init (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-
-	priv = g_new0 (EMeetingAttendeePrivate, 1);
-
-	ia->priv = priv;
-
-	priv->address = string_test (NULL);
-	priv->member = string_test (NULL);
-
-	priv->cutype = ICAL_CUTYPE_NONE;
-	priv->role = ICAL_ROLE_NONE;
-
-	priv->rsvp = FALSE;
-
-	priv->delto = string_test (NULL);
-	priv->delfrom = string_test (NULL);
-	
-	priv->status = ICAL_PARTSTAT_NONE;
-	
-	priv->sentby = string_test (NULL);
-	priv->cn = string_test (NULL);
-	priv->language = string_test (NULL);
-
-	priv->has_calendar_info = FALSE;
-	
-	priv->busy_periods = g_array_new (FALSE, FALSE, sizeof (EMeetingFreeBusyPeriod));
-	priv->busy_periods_sorted = FALSE;
-
-	g_date_clear (&priv->busy_periods_start.date, 1);
-	priv->busy_periods_start.hour = 0;
-	priv->busy_periods_start.minute = 0;
-
-	g_date_clear (&priv->busy_periods_end.date, 1);
-	priv->busy_periods_end.hour = 0;
-	priv->busy_periods_end.minute = 0;
-
-	priv->start_busy_range_set = FALSE;
-	priv->end_busy_range_set = FALSE;
-	
-	priv->longest_period_in_days = 0;
-}
-
-
-static void
-destroy (GtkObject *obj)
-{
-	EMeetingAttendee *ia = E_MEETING_ATTENDEE (obj);
-	EMeetingAttendeePrivate *priv;
-
-	priv = ia->priv;
-
-	g_free (priv->address);
-	g_free (priv->member);
-
-	g_free (priv->delto);
-	g_free (priv->delfrom);
-
-	g_free (priv->sentby);
-	g_free (priv->cn);
-	g_free (priv->language);
-	
-	g_array_free (priv->busy_periods, TRUE);
-	
-	g_free (priv);
-}
-
-GtkObject *
-e_meeting_attendee_new (void)
-{
-	return gtk_type_new (E_TYPE_MEETING_ATTENDEE);
-}
-
-GtkObject *
-e_meeting_attendee_new_from_cal_component_attendee (CalComponentAttendee *ca)
-{
-	EMeetingAttendee *ia;
-	
-	ia = E_MEETING_ATTENDEE (gtk_type_new (E_TYPE_MEETING_ATTENDEE));
-
-	e_meeting_attendee_set_address (ia, g_strdup (ca->value));
-	e_meeting_attendee_set_member (ia, g_strdup (ca->member));
-	e_meeting_attendee_set_cutype (ia, ca->cutype);
-	e_meeting_attendee_set_role (ia, ca->role);
-	e_meeting_attendee_set_status (ia, ca->status);
-	e_meeting_attendee_set_rsvp (ia, ca->rsvp);
-	e_meeting_attendee_set_delto (ia, g_strdup (ca->delto));
-	e_meeting_attendee_set_delfrom (ia, g_strdup (ca->delfrom));
-	e_meeting_attendee_set_sentby (ia, g_strdup (ca->sentby));
-	e_meeting_attendee_set_cn (ia, g_strdup (ca->cn));
-	e_meeting_attendee_set_language (ia, g_strdup (ca->language));
-	
-	return GTK_OBJECT (ia);
-}
-
-CalComponentAttendee *
-e_meeting_attendee_as_cal_component_attendee (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	CalComponentAttendee *ca;
-
-	priv = ia->priv;
-	
-	ca = g_new0 (CalComponentAttendee, 1);
-
-	ca->value = priv->address;
-	ca->member = string_is_set (priv->member) ? priv->member : NULL;
-	ca->cutype= priv->cutype;
-	ca->role = priv->role;
-	ca->status = priv->status;
-	ca->rsvp = priv->rsvp;
-	ca->delto = string_is_set (priv->delto) ? priv->delto : NULL;
-	ca->delfrom = string_is_set (priv->delfrom) ? priv->delfrom : NULL;
-	ca->sentby = string_is_set (priv->sentby) ? priv->sentby : NULL;
-	ca->cn = string_is_set (priv->cn) ? priv->cn : NULL;
-	ca->language = string_is_set (priv->language) ? priv->language : NULL;
-
-	return ca;
-}
-
-
-const gchar *
-e_meeting_attendee_get_address (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->address;
-}
-
-void
-e_meeting_attendee_set_address (EMeetingAttendee *ia, gchar *address)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->address != NULL)
-		g_free (priv->address);
-	
-	priv->address = string_test (address);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_address (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return string_is_set (priv->address);
-}
-
-const gchar *
-e_meeting_attendee_get_member (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->member;
-}
-
-void
-e_meeting_attendee_set_member (EMeetingAttendee *ia, gchar *member)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->member != NULL)
-		g_free (priv->member);
-	
-	priv->member = string_test (member);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_member (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->member);
-}
-
-icalparameter_cutype
-e_meeting_attendee_get_cutype (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->cutype;
-}
-
-void 
-e_meeting_attendee_set_cutype (EMeetingAttendee *ia, icalparameter_cutype cutype)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->cutype = cutype;
-
-	notify_changed (ia);
-}
-
-icalparameter_role
-e_meeting_attendee_get_role (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->role;
-}
-
-void
-e_meeting_attendee_set_role (EMeetingAttendee *ia, icalparameter_role role)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->role = role;
-
-	notify_changed (ia);
-}
-
-gboolean 
-e_meeting_attendee_get_rsvp (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->rsvp;
-}
-
-void
-e_meeting_attendee_set_rsvp (EMeetingAttendee *ia, gboolean rsvp)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->rsvp = rsvp;
-
-	notify_changed (ia);
-}
-
-const gchar *
-e_meeting_attendee_get_delto (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->delto;
-}
-
-void
-e_meeting_attendee_set_delto (EMeetingAttendee *ia, gchar *delto)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->delto != NULL)
-		g_free (priv->delto);
-	
-	priv->delto = string_test (delto);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_delto (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->delto);
-}
-
-const gchar *
-e_meeting_attendee_get_delfrom (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->delfrom;
-}
-
-void
-e_meeting_attendee_set_delfrom (EMeetingAttendee *ia, gchar *delfrom)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->delfrom != NULL)
-		g_free (priv->delfrom);
-	
-	priv->delfrom = string_test (delfrom);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_delfrom (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->delfrom);
-}
-
-icalparameter_partstat
-e_meeting_attendee_get_status (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->status;
-}
-
-void
-e_meeting_attendee_set_status (EMeetingAttendee *ia, icalparameter_partstat status)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	priv->status = status;
-
-	notify_changed (ia);
-}
-
-const gchar *
-e_meeting_attendee_get_sentby (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->sentby;
-}
-
-void
-e_meeting_attendee_set_sentby (EMeetingAttendee *ia, gchar *sentby)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->sentby != NULL)
-		g_free (priv->sentby);
-	
-	priv->sentby = string_test (sentby);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_sentby (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->sentby);
-}
-
-const gchar *
-e_meeting_attendee_get_cn (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->cn;
-}
-
-void
-e_meeting_attendee_set_cn (EMeetingAttendee *ia, gchar *cn)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->cn != NULL)
-		g_free (priv->cn);
-	
-	priv->cn = string_test (cn);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_cn (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->cn);
-}
-
-const gchar *
-e_meeting_attendee_get_language (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->language;
-}
-
-void
-e_meeting_attendee_set_language (EMeetingAttendee *ia, gchar *language)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	if (priv->language != NULL)
-		g_free (priv->language);
-	
-	priv->language = string_test (language);
-
-	notify_changed (ia);
-}
-
-gboolean
-e_meeting_attendee_is_set_language (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return string_is_set (priv->language);
-}
-
-EMeetingAttendeeType
-e_meeting_attendee_get_atype (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	if (priv->cutype == ICAL_CUTYPE_ROOM
-	    || priv->cutype == ICAL_CUTYPE_RESOURCE)
-		return E_MEETING_ATTENDEE_RESOURCE;
-
-	if (priv->role == ICAL_ROLE_CHAIR
-	    || priv->role == ICAL_ROLE_REQPARTICIPANT)
-		return E_MEETING_ATTENDEE_REQUIRED_PERSON;
-	
-	return E_MEETING_ATTENDEE_OPTIONAL_PERSON;
-}
-
-static gint
-compare_times (EMeetingTime *time1,
-	       EMeetingTime *time2)
-{
-	gint day_comparison;
-
-	day_comparison = g_date_compare (&time1->date,
-					 &time2->date);
-	if (day_comparison != 0)
-		return day_comparison;
-
-	if (time1->hour < time2->hour)
-		return -1;
-	if (time1->hour > time2->hour)
-		return 1;
-
-	if (time1->minute < time2->minute)
-		return -1;
-	if (time1->minute > time2->minute)
-		return 1;
-
-	/* The start times are exactly the same. */
-	return 0;
-}
-
-static gint
-compare_period_starts (const void *arg1,
-		       const void *arg2)
-{
-	EMeetingFreeBusyPeriod *period1, *period2;
-
-	period1 = (EMeetingFreeBusyPeriod *) arg1;
-	period2 = (EMeetingFreeBusyPeriod *) arg2;
-
-	return compare_times (&period1->start, &period2->start);
-}
-
-static void
-ensure_periods_sorted (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	if (priv->busy_periods_sorted)
-		return;
-
-	qsort (priv->busy_periods->data, priv->busy_periods->len,
-	       sizeof (EMeetingFreeBusyPeriod),
-	       compare_period_starts);
-
-	priv->busy_periods_sorted = TRUE;
-}
-
-gboolean
-e_meeting_attendee_get_has_calendar_info (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return priv->has_calendar_info;
-}
-
-void
-e_meeting_attendee_set_has_calendar_info (EMeetingAttendee *ia, gboolean has_calendar_info)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	priv->has_calendar_info = has_calendar_info;
-}
-
-const GArray *
-e_meeting_attendee_get_busy_periods (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	ensure_periods_sorted (ia);
-	
-	return priv->busy_periods;	
-}
-
-gint
-e_meeting_attendee_find_first_busy_period (EMeetingAttendee *ia, GDate *date)
-{
-	EMeetingAttendeePrivate *priv;
-	EMeetingFreeBusyPeriod *period;
-	gint lower, upper, middle = 0, cmp = 0;
-	GDate tmp_date;
-
-	priv = ia->priv;
-	
-	/* Make sure the busy periods have been sorted. */
-	ensure_periods_sorted (ia);
-
-	/* Calculate the first day which could have a busy period which
-	   continues onto our given date. */
-	tmp_date = *date;
-	g_date_subtract_days (&tmp_date, priv->longest_period_in_days);
-
-	/* We want the first busy period which starts on tmp_date. */
-	lower = 0;
-	upper = priv->busy_periods->len;
-
-	if (upper == 0)
-		return -1;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		period = &g_array_index (priv->busy_periods,
-					 EMeetingFreeBusyPeriod, middle);
-
-		cmp = g_date_compare (&tmp_date, &period->start.date);
-	  
-		if (cmp == 0)
-			break;
-		else if (cmp < 0)
-			upper = middle;
-		else
-			lower = middle + 1;
-	}
-
-	/* There may be several busy periods on the same day so we step
-	   backwards to the first one. */
-	if (cmp == 0) {
-		while (middle > 0) {
-			period = &g_array_index (priv->busy_periods,
-						 EMeetingFreeBusyPeriod, middle - 1);
-			if (g_date_compare (&tmp_date, &period->start.date) != 0)
-				break;
-			middle--;
-		}
-	} else if (cmp > 0) {
-		/* This means we couldn't find a period on the given day, and
-		   the last one we looked at was before it, so if there are
-		   any more periods after this one we return it. */
-		middle++;
-		if (priv->busy_periods->len <= middle)
-			return -1;
-	}
-
-	return middle;
-}
-
-gboolean
-e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, 
-				    gint start_year,
-				    gint start_month,
-				    gint start_day,
-				    gint start_hour,
-				    gint start_minute,
-				    gint end_year,
-				    gint end_month,
-				    gint end_day,
-				    gint end_hour,
-				    gint end_minute,
-				    EMeetingFreeBusyType busy_type)
-{
-	EMeetingAttendeePrivate *priv;
-	EMeetingFreeBusyPeriod period;
-	gint period_in_days;
-
-	g_return_val_if_fail (ia != NULL, FALSE);
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-	g_return_val_if_fail (busy_type >= 0, FALSE);
-	g_return_val_if_fail (busy_type < E_MEETING_FREE_BUSY_LAST, FALSE);
-
-	priv = ia->priv;
-	
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year))
-		return FALSE;
-	if (!g_date_valid_dmy (end_day, end_month, end_year))
-		return FALSE;
-	if (start_hour < 0 || start_hour > 23)
-		return FALSE;
-	if (end_hour < 0 || end_hour > 23)
-		return FALSE;
-	if (start_minute < 0 || start_minute > 59)
-		return FALSE;
-	if (end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_clear (&period.start.date, 1);
-	g_date_clear (&period.end.date, 1);
-	g_date_set_dmy (&period.start.date, start_day, start_month, start_year);
-	g_date_set_dmy (&period.end.date, end_day, end_month, end_year);
-	period.start.hour = start_hour;
-	period.start.minute = start_minute;
-	period.end.hour = end_hour;
-	period.end.minute = end_minute;
-	period.busy_type = busy_type;
-
-	/* Check that the start time is before or equal to the end time. */
-	if (compare_times (&period.start, &period.end) > 0)
-		return FALSE;
-
-	/* If the busy range is not set elsewhere, track it as best we can */
-	if (!priv->start_busy_range_set) {
-		if (!g_date_valid (&priv->busy_periods_start.date)) {
-			priv->busy_periods_start.date = period.start.date;
-			priv->busy_periods_start.hour = period.start.hour;
-			priv->busy_periods_start.minute = period.start.minute;			
-		} else {
-			switch (g_date_compare (&period.start.date, &priv->busy_periods_start.date)) {
-			case -1:
-				priv->busy_periods_start.date = period.start.date;
-				priv->busy_periods_start.hour = period.start.hour;
-				priv->busy_periods_start.minute = period.start.minute;			
-				break;
-			case 0:
-				if (period.start.hour < priv->busy_periods_start.hour
-				    || (period.start.hour == priv->busy_periods_start.hour
-					&& period.start.minute < priv->busy_periods_start.minute)) {
-					priv->busy_periods_start.date = period.start.date;
-					priv->busy_periods_start.hour = period.start.hour;
-					priv->busy_periods_start.minute = period.start.minute;			
-					break;
-				}
-				break;
-			}
-		}
-	}
-	if (!priv->end_busy_range_set) {
-		if (!g_date_valid (&priv->busy_periods_end.date)) {
-			priv->busy_periods_end.date = period.end.date;
-			priv->busy_periods_end.hour = period.end.hour;
-			priv->busy_periods_end.minute = period.end.minute;			
-		} else {
-			switch (g_date_compare (&period.end.date, &priv->busy_periods_end.date)) {
-			case 0:
-				if (period.end.hour > priv->busy_periods_end.hour
-				    || (period.end.hour == priv->busy_periods_end.hour
-					&& period.end.minute > priv->busy_periods_end.minute)) {
-					priv->busy_periods_end.date = period.end.date;
-					priv->busy_periods_end.hour = period.end.hour;
-					priv->busy_periods_end.minute = period.end.minute;			
-					break;
-				}
-				break;
-			case 1:
-				priv->busy_periods_end.date = period.end.date;
-				priv->busy_periods_end.hour = period.end.hour;
-				priv->busy_periods_end.minute = period.end.minute;			
-				break;
-			}
-		}
-	}
-	
-	g_array_append_val (priv->busy_periods, period);
-	priv->has_calendar_info = TRUE;
-	priv->busy_periods_sorted = FALSE;
-
-	period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
-	priv->longest_period_in_days = MAX (priv->longest_period_in_days, period_in_days);
-
-	return TRUE;
-}
-
-EMeetingTime
-e_meeting_attendee_get_start_busy_range (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-
-	return priv->busy_periods_start;
-}
-
-EMeetingTime
-e_meeting_attendee_get_end_busy_range (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	priv = ia->priv;
-	
-	return priv->busy_periods_end;
-}
-
-gboolean
-e_meeting_attendee_set_start_busy_range (EMeetingAttendee *ia,
-					 gint start_year,
-					 gint start_month,
-					 gint start_day,
-					 gint start_hour,
-					 gint start_minute)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-
-	priv = ia->priv;
-	
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year))
-		return FALSE;
-	if (start_hour < 0 || start_hour > 23)
-		return FALSE;
-	if (start_minute < 0 || start_minute > 59)
-		return FALSE;
-
-	g_date_clear (&priv->busy_periods_start.date, 1);
-	g_date_set_dmy (&priv->busy_periods_start.date,
-			start_day, start_month, start_year);
-	priv->busy_periods_start.hour = start_hour;
-	priv->busy_periods_start.minute = start_minute;
-
-	priv->start_busy_range_set = TRUE;
-	
-	return TRUE;
-}
-
-gboolean
-e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,
-				       gint end_year,
-				       gint end_month,
-				       gint end_day,
-				       gint end_hour,
-				       gint end_minute)
-{
-	EMeetingAttendeePrivate *priv;
-	
-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-
-	priv = ia->priv;
-	
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (end_day, end_month, end_year))
-		return FALSE;
-	if (end_hour < 0 || end_hour > 23)
-		return FALSE;
-	if (end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_clear (&priv->busy_periods_end.date, 1);
-	g_date_set_dmy (&priv->busy_periods_end.date,
-			end_day, end_month, end_year);
-	priv->busy_periods_end.hour = end_hour;
-	priv->busy_periods_end.minute = end_minute;
-
-	priv->end_busy_range_set = TRUE;
-	
-	return TRUE;
-}
-
-/* Clears all busy times for the given attendee. */
-void
-e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia)
-{
-	EMeetingAttendeePrivate *priv;
-
-	g_return_if_fail (E_IS_MEETING_ATTENDEE (ia));
-
-	priv = ia->priv;
-	
-	g_array_set_size (priv->busy_periods, 0);
-	priv->busy_periods_sorted = TRUE;
-
-	g_date_clear (&priv->busy_periods_start.date, 1);
-	priv->busy_periods_start.hour = 0;
-	priv->busy_periods_start.minute = 0;
-
-	g_date_clear (&priv->busy_periods_end.date, 1);
-	priv->busy_periods_end.hour = 0;
-	priv->busy_periods_end.minute = 0;
-
-	priv->longest_period_in_days = 0;
-}
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
deleted file mode 100644
index 69f2ced837..0000000000
--- a/calendar/gui/e-meeting-attendee.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-meeting_attendee.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifndef _E_MEETING_ATTENDEE_H_
-#define _E_MEETING_ATTENDEE_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <cal-util/cal-component.h>
-#include "e-meeting-types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MEETING_ATTENDEE			(e_meeting_attendee_get_type ())
-#define E_MEETING_ATTENDEE(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendee))
-#define E_MEETING_ATTENDEE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_ATTENDEE, EMeetingAttendeeClass))
-#define E_IS_MEETING_ATTENDEE(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))
-#define E_IS_MEETING_ATTENDEE_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))
-
-
-typedef struct _EMeetingAttendee         EMeetingAttendee;
-typedef struct _EMeetingAttendeePrivate  EMeetingAttendeePrivate;
-typedef struct _EMeetingAttendeeClass    EMeetingAttendeeClass;
-
-/* These specify the type of attendee. Either a person or a resource (e.g. a
-   meeting room). These are used for the Autopick options, where the user can
-   ask for a time when, for example, all people and one resource are free.
-   The default is E_MEETING_ATTENDEE_REQUIRED_PERSON. */
-typedef enum
-{
-	E_MEETING_ATTENDEE_REQUIRED_PERSON,
-	E_MEETING_ATTENDEE_OPTIONAL_PERSON,
-	E_MEETING_ATTENDEE_RESOURCE
-} EMeetingAttendeeType;
-
-struct _EMeetingAttendee {
-	GtkObject parent;
-
-	EMeetingAttendeePrivate *priv;
-};
-
-struct _EMeetingAttendeeClass {
-	GtkObjectClass parent_class;
-
-	void (* changed) (EMeetingAttendee *ia);
-};
-
-
-GtkType    e_meeting_attendee_get_type (void);
-GtkObject *e_meeting_attendee_new      (void);
-GtkObject *e_meeting_attendee_new_from_cal_component_attendee (CalComponentAttendee *ca);
-
-CalComponentAttendee *e_meeting_attendee_as_cal_component_attendee (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_address (EMeetingAttendee *ia);
-void e_meeting_attendee_set_address (EMeetingAttendee *ia, gchar *address);
-gboolean e_meeting_attendee_is_set_address (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_member (EMeetingAttendee *ia);
-void e_meeting_attendee_set_member (EMeetingAttendee *ia, gchar *member);
-gboolean e_meeting_attendee_is_set_member (EMeetingAttendee *ia);
-
-icalparameter_cutype e_meeting_attendee_get_cutype (EMeetingAttendee *ia);
-void e_meeting_attendee_set_cutype (EMeetingAttendee *ia, icalparameter_cutype cutype);
-
-icalparameter_role e_meeting_attendee_get_role (EMeetingAttendee *ia);
-void e_meeting_attendee_set_role (EMeetingAttendee *ia, icalparameter_role role);
-
-gboolean e_meeting_attendee_get_rsvp (EMeetingAttendee *ia);
-void e_meeting_attendee_set_rsvp (EMeetingAttendee *ia, gboolean rsvp);
-
-const gchar *e_meeting_attendee_get_delto (EMeetingAttendee *ia);
-void e_meeting_attendee_set_delto (EMeetingAttendee *ia, gchar *delto);
-gboolean e_meeting_attendee_is_set_delto (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_delfrom (EMeetingAttendee *ia);
-void e_meeting_attendee_set_delfrom (EMeetingAttendee *ia, gchar *delfrom);
-gboolean e_meeting_attendee_is_set_delfrom (EMeetingAttendee *ia);
-
-icalparameter_partstat e_meeting_attendee_get_status (EMeetingAttendee *ia);
-void e_meeting_attendee_set_status (EMeetingAttendee *ia, icalparameter_partstat status);
-
-const gchar *e_meeting_attendee_get_sentby (EMeetingAttendee *ia);
-void e_meeting_attendee_set_sentby (EMeetingAttendee *ia, gchar *sentby);
-gboolean e_meeting_attendee_is_set_sentby (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_cn (EMeetingAttendee *ia);
-void e_meeting_attendee_set_cn (EMeetingAttendee *ia, gchar *cn);
-gboolean e_meeting_attendee_is_set_cn (EMeetingAttendee *ia);
-
-const gchar *e_meeting_attendee_get_language (EMeetingAttendee *ia);
-void e_meeting_attendee_set_language (EMeetingAttendee *ia, gchar *language);
-gboolean e_meeting_attendee_is_set_language (EMeetingAttendee *ia);
-
-EMeetingAttendeeType e_meeting_attendee_get_atype (EMeetingAttendee *ia);
-
-gboolean e_meeting_attendee_get_has_calendar_info (EMeetingAttendee *ia);
-void e_meeting_attendee_set_has_calendar_info (EMeetingAttendee *ia, gboolean has_calendar_info);
-
-const GArray *e_meeting_attendee_get_busy_periods (EMeetingAttendee *ia);
-gint e_meeting_attendee_find_first_busy_period (EMeetingAttendee *ia, GDate *date);
-gboolean e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, 
-					gint start_year,
-					gint start_month,
-					gint start_day,
-					gint start_hour,
-					gint start_minute,
-					gint end_year,
-					gint end_month,
-					gint end_day,
-					gint end_hour,
-					gint end_minute,
-					EMeetingFreeBusyType busy_type);
-
-EMeetingTime e_meeting_attendee_get_start_busy_range (EMeetingAttendee *ia);
-EMeetingTime e_meeting_attendee_get_end_busy_range (EMeetingAttendee *ia);
-
-gboolean e_meeting_attendee_set_start_busy_range (EMeetingAttendee *ia,
-						  gint start_year,
-						  gint start_month,
-						  gint start_day,
-						  gint start_hour,
-						  gint start_minute);
-gboolean e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,
-						gint end_year,
-						gint end_month,
-						gint end_day,
-						gint end_hour,
-						gint end_minute);
-
-void e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_ATTENDEE_H_ */
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
deleted file mode 100644
index 6adfb9c1c9..0000000000
--- a/calendar/gui/e-meeting-model.c
+++ /dev/null
@@ -1,1748 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-model.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-#include <bonobo/bonobo-exception.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <gal/e-table/e-table-without.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-popup.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <e-book.h>
-#include <e-card-types.h>
-#include <e-card-cursor.h>
-#include <e-card.h>
-#include <e-card-simple.h>
-#include <e-destination.h>
-#include <cal-util/cal-component.h>
-#include <cal-util/cal-util.h>
-#include <cal-util/timeutil.h>
-#include "Evolution-Addressbook-SelectNames.h"
-#include "calendar-config.h"
-#include "itip-utils.h"
-#include "e-meeting-utils.h"
-#include "e-meeting-attendee.h"
-#include "e-meeting-model.h"
-
-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-
-struct _EMeetingModelPrivate 
-{
-	GPtrArray *attendees;
-	ETableWithout *without;
-	
-	CalClient *client;
-	icaltimezone *zone;
-	
-	EBook *ebook;
-	gboolean book_loaded;
-	gboolean book_load_wait;
-
-	GPtrArray *refresh_queue;
-	GHashTable *refresh_data;
-	gint refresh_idle_id;
-
-	/* For invite others dialogs */
-        GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-};
-
-#define BUF_SIZE 1024
-
-static char *sections[] = {N_("Chair Persons"), 
-			   N_("Required Participants"), 
-			   N_("Optional Participants"), 
-			   N_("Non-Participants"),
-			   NULL};
-static icalparameter_role roles[] = {ICAL_ROLE_CHAIR,
-				     ICAL_ROLE_REQPARTICIPANT,
-				     ICAL_ROLE_OPTPARTICIPANT,
-				     ICAL_ROLE_NONPARTICIPANT,
-				     ICAL_ROLE_NONE};
-
-typedef struct _EMeetingModelQueueData EMeetingModelQueueData;
-struct _EMeetingModelQueueData {
-	EMeetingModel *im;
-	EMeetingAttendee *ia;
-
-	gboolean refreshing;
-	
-	EMeetingTime start;
-	EMeetingTime end;
-
-	char buffer[BUF_SIZE];
-	GString *string;
-	
-	GPtrArray *call_backs;
-	GPtrArray *data;
-};
-
-
-static void class_init	(EMeetingModelClass	 *klass);
-static void init	(EMeetingModel		 *model);
-static void destroy	(GtkObject *obj);
-
-static void refresh_queue_add (EMeetingModel *im, int row,
-			       EMeetingTime *start,
-			       EMeetingTime *end,
-			       EMeetingModelRefreshCallback call_back,
-			       gpointer data);
-static void refresh_queue_remove (EMeetingModel *im,
-				  EMeetingAttendee *ia);
-static gboolean refresh_busy_periods (gpointer data);
-
-static void attendee_changed_cb (EMeetingAttendee *ia, gpointer data);
-static void select_names_ok_cb (BonoboListener    *listener,
-				char              *event_name,
-				CORBA_any         *arg,
-				CORBA_Environment *ev,
-				gpointer           data);
-
-static void table_destroy_cb (ETableScrolled *etable, gpointer data);
-
-static ETableModelClass *parent_class = NULL;
-
-GtkType
-e_meeting_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0)
-	{
-		static const GtkTypeInfo info =
-		{
-			"EMeetingModel",
-			sizeof (EMeetingModel),
-			sizeof (EMeetingModelClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (e_table_model_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer data)
-{
-	EMeetingModel *im = E_MEETING_MODEL (data);
-	EMeetingModelPrivate *priv;
-	
-	priv = im->priv;
-
-	if (status == E_BOOK_STATUS_SUCCESS)
-		priv->book_loaded = TRUE;
-	else
-		g_warning ("Book not loaded");
-	
-	if (priv->book_load_wait) {
-		priv->book_load_wait = FALSE;
-		gtk_main_quit ();
-	}
-}
-
-static void
-start_addressbook_server (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	gchar *uri, *path;
-
-	priv = im->priv;
-	
-	priv->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 (priv->ebook, uri, book_open_cb, im);
-
-	g_free (uri);
-}
-
-static EMeetingAttendee *
-find_match (EMeetingModel *im, const char *address, int *pos)
-{
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia;
-	const gchar *ia_address;
-	int i;
-	
-	priv = im->priv;
-	
-	if (address == NULL)
-		return NULL;
-	
-	/* Make sure we can add the new delegatee person */
-	for (i = 0; i < priv->attendees->len; i++) {
-		ia = g_ptr_array_index (priv->attendees, i);
-
-		ia_address = e_meeting_attendee_get_address (ia);
-		if (ia_address != NULL && !g_strcasecmp (itip_strip_mailto (ia_address), itip_strip_mailto (address))) {
-			if (pos != NULL)
-				*pos = i;
-			return ia;
-		}
-	}
-
-	return NULL;
-}
-
-static icalparameter_cutype
-text_to_type (const char *type)
-{
-	if (!g_strcasecmp (type, _("Individual")))
-		return ICAL_CUTYPE_INDIVIDUAL;
-	else if (!g_strcasecmp (type, _("Group")))
-		return ICAL_CUTYPE_GROUP;
-	else if (!g_strcasecmp (type, _("Resource")))
-		return ICAL_CUTYPE_RESOURCE;
-	else if (!g_strcasecmp (type, _("Room")))
-		return ICAL_CUTYPE_ROOM;
-	else
-		return ICAL_CUTYPE_NONE;
-}
-
-static char *
-type_to_text (icalparameter_cutype type)
-{
-	switch (type) {
-	case ICAL_CUTYPE_INDIVIDUAL:
-		return _("Individual");
-	case ICAL_CUTYPE_GROUP:
-		return _("Group");
-	case ICAL_CUTYPE_RESOURCE:
-		return _("Resource");
-	case ICAL_CUTYPE_ROOM:
-		return _("Room");
-	default:
-		return _("Unknown");
-	}
-
-	return NULL;
-
-}
-
-static icalparameter_role
-text_to_role (const char *role)
-{
-	if (!g_strcasecmp (role, _("Chair")))
-		return ICAL_ROLE_CHAIR;
-	else if (!g_strcasecmp (role, _("Required Participant")))
-		return ICAL_ROLE_REQPARTICIPANT;
-	else if (!g_strcasecmp (role, _("Optional Participant")))
-		return ICAL_ROLE_OPTPARTICIPANT;
-	else if (!g_strcasecmp (role, _("Non-Participant")))
-		return ICAL_ROLE_NONPARTICIPANT;
-	else
-		return ICAL_ROLE_NONE;
-}
-
-static char *
-role_to_text (icalparameter_role role) 
-{
-	switch (role) {
-	case ICAL_ROLE_CHAIR:
-		return _("Chair");
-	case ICAL_ROLE_REQPARTICIPANT:
-		return _("Required Participant");
-	case ICAL_ROLE_OPTPARTICIPANT:
-		return _("Optional Participant");
-	case ICAL_ROLE_NONPARTICIPANT:
-		return _("Non-Participant");
-	default:
-		return _("Unknown");
-	}
-
-	return NULL;
-}
-
-static gboolean
-text_to_boolean (const char *role)
-{
-	if (!g_strcasecmp (role, _("Yes")))
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static char *
-boolean_to_text (gboolean b) 
-{
-	if (b)
-		return _("Yes");
-	else
-		return _("No");
-}
-
-static icalparameter_partstat
-text_to_partstat (const char *partstat)
-{
-	if (!g_strcasecmp (partstat, _("Needs Action")))
-		return ICAL_PARTSTAT_NEEDSACTION;
-	else if (!g_strcasecmp (partstat, _("Accepted")))
-		return ICAL_PARTSTAT_ACCEPTED;
-	else if (!g_strcasecmp (partstat, _("Declined")))
-		return ICAL_PARTSTAT_DECLINED;
-	else if (!g_strcasecmp (partstat, _("Tentative")))
-		return ICAL_PARTSTAT_TENTATIVE;
-	else if (!g_strcasecmp (partstat, _("Delegated")))
-		return ICAL_PARTSTAT_DELEGATED;
-	else if (!g_strcasecmp (partstat, _("Completed")))
-		return ICAL_PARTSTAT_COMPLETED;
-	else if (!g_strcasecmp (partstat, _("In Process")))
-		return ICAL_PARTSTAT_INPROCESS;
-	else
-		return ICAL_PARTSTAT_NONE;
-}
-
-static char *
-partstat_to_text (icalparameter_partstat partstat) 
-{
-	switch (partstat) {
-	case ICAL_PARTSTAT_NEEDSACTION:
-		return _("Needs Action");
-	case ICAL_PARTSTAT_ACCEPTED:
-		return _("Accepted");
-	case ICAL_PARTSTAT_DECLINED:
-		return _("Declined");
-	case ICAL_PARTSTAT_TENTATIVE:
-		return _("Tentative");
-	case ICAL_PARTSTAT_DELEGATED:
-		return _("Delegated");
-	case ICAL_PARTSTAT_COMPLETED:
-		return _("Completed");
-	case ICAL_PARTSTAT_INPROCESS:
-		return _("In Process");
-	case ICAL_PARTSTAT_NONE:
-	default:
-		return _("Unknown");
-	}
-
-	return NULL;
-}
-
-static int
-column_count (ETableModel *etm)
-{
-	return E_MEETING_MODEL_COLUMN_COUNT;
-}
-
-static int
-row_count (ETableModel *etm)
-{
-	EMeetingModel *im;
-	EMeetingModelPrivate *priv;
-
-	im = E_MEETING_MODEL (etm);	
-	priv = im->priv;
-
-	return (priv->attendees->len);
-}
-
-static void
-append_row (ETableModel *etm, ETableModel *source, int row)
-{	
-	EMeetingModel *im;
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia;
-	char *address;
-	
-	im = E_MEETING_MODEL (etm);	
-	priv = im->priv;
-	
-	address = (char *) e_table_model_value_at (source, E_MEETING_MODEL_ADDRESS_COL, row);
-	if (find_match (im, address, NULL) != NULL) {
-		return;
-	}
-	
-	ia = E_MEETING_ATTENDEE (e_meeting_attendee_new ());
-	
-	e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", address));
-	e_meeting_attendee_set_member (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_MEMBER_COL, row)));
-	e_meeting_attendee_set_cutype (ia, text_to_type (e_table_model_value_at (source, E_MEETING_MODEL_TYPE_COL, row)));
-	e_meeting_attendee_set_role (ia, text_to_role (e_table_model_value_at (source, E_MEETING_MODEL_ROLE_COL, row)));
-	e_meeting_attendee_set_rsvp (ia, text_to_boolean (e_table_model_value_at (source, E_MEETING_MODEL_RSVP_COL, row)));
-	e_meeting_attendee_set_delto (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_DELTO_COL, row)));
-	e_meeting_attendee_set_delfrom (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_DELFROM_COL, row)));
-	e_meeting_attendee_set_status (ia, text_to_partstat (e_table_model_value_at (source, E_MEETING_MODEL_STATUS_COL, row)));
-	e_meeting_attendee_set_cn (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_CN_COL, row)));
-	e_meeting_attendee_set_language (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_LANGUAGE_COL, row)));
-
-	e_meeting_model_add_attendee (E_MEETING_MODEL (etm), ia);
-}
-
-static void *
-value_at (ETableModel *etm, int col, int row)
-{
-	EMeetingModel *im;
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia;
-
-	im = E_MEETING_MODEL (etm);	
-	priv = im->priv;
-
-	ia = g_ptr_array_index (priv->attendees, row);
-	
-	switch (col) {
-	case E_MEETING_MODEL_ADDRESS_COL:
-		return (void *)itip_strip_mailto (e_meeting_attendee_get_address (ia));
-	case E_MEETING_MODEL_MEMBER_COL:
-		return (void *)e_meeting_attendee_get_member (ia);
-	case E_MEETING_MODEL_TYPE_COL:
-		return type_to_text (e_meeting_attendee_get_cutype (ia));
-	case E_MEETING_MODEL_ROLE_COL:
-		return role_to_text (e_meeting_attendee_get_role (ia));
-	case E_MEETING_MODEL_RSVP_COL:
-		return boolean_to_text (e_meeting_attendee_get_rsvp (ia));
-	case E_MEETING_MODEL_DELTO_COL:
-		return (void *)itip_strip_mailto (e_meeting_attendee_get_delto (ia));
-	case E_MEETING_MODEL_DELFROM_COL:
-		return (void *)itip_strip_mailto (e_meeting_attendee_get_delfrom (ia));
-	case E_MEETING_MODEL_STATUS_COL:
-		return partstat_to_text (e_meeting_attendee_get_status (ia));
-	case E_MEETING_MODEL_CN_COL:
-		return (void *)e_meeting_attendee_get_cn (ia);
-	case E_MEETING_MODEL_LANGUAGE_COL:
-		return (void *)e_meeting_attendee_get_language (ia);
-	}
-	
-	return NULL;
-}
-
-static void
-set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	EMeetingModel *im;
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia;
-
-	im = E_MEETING_MODEL (etm);	
-	priv = im->priv;
-
-	ia = g_ptr_array_index (priv->attendees, row);
-
-	e_table_model_pre_change (etm);
-	
-	switch (col) {
-	case E_MEETING_MODEL_ADDRESS_COL:
-		e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", (char *) val));
-		break;
-	case E_MEETING_MODEL_MEMBER_COL:
-		e_meeting_attendee_set_member (ia, g_strdup (val));
-		break;
-	case E_MEETING_MODEL_TYPE_COL:
-		e_meeting_attendee_set_cutype (ia, text_to_type (val));
-		break;
-	case E_MEETING_MODEL_ROLE_COL:
-		e_meeting_attendee_set_role (ia, text_to_role (val));
-		break;
-	case E_MEETING_MODEL_RSVP_COL:
-		e_meeting_attendee_set_rsvp (ia, text_to_boolean (val));
-		break;
-	case E_MEETING_MODEL_DELTO_COL:
-		e_meeting_attendee_set_delto (ia, g_strdup (val));
-		break;
-	case E_MEETING_MODEL_DELFROM_COL:
-		e_meeting_attendee_set_delfrom (ia, g_strdup (val));
-		break;
-	case E_MEETING_MODEL_STATUS_COL:
-		e_meeting_attendee_set_status (ia, text_to_partstat (val));
-		break;
-	case E_MEETING_MODEL_CN_COL:
-		e_meeting_attendee_set_cn (ia, g_strdup (val));
-		break;
-	case E_MEETING_MODEL_LANGUAGE_COL:
-		e_meeting_attendee_set_language (ia, g_strdup (val));
-		break;
-	}
-
-	e_table_model_cell_changed (etm, col, row);
-}
-
-static gboolean
-is_cell_editable (ETableModel *etm, int col, int row)
-{
-	switch (col) {
-	case E_MEETING_MODEL_DELTO_COL:
-	case E_MEETING_MODEL_DELFROM_COL:
-		return FALSE;
-
-	default:
-	}
-
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etm, int col, const void *val)
-{
-	return g_strdup (val);
-}
-
-static void
-free_value (ETableModel *etm, int col, void *val)
-{
-	g_free (val);
-}
-
-static void *
-init_value (ETableModel *etm, int col)
-{
-	switch (col) {
-	case E_MEETING_MODEL_ADDRESS_COL:
-		return g_strdup ("");
-	case E_MEETING_MODEL_MEMBER_COL:
-		return g_strdup ("");
-	case E_MEETING_MODEL_TYPE_COL:
-		return g_strdup (_("Individual"));
-	case E_MEETING_MODEL_ROLE_COL:
-		return g_strdup (_("Required Participant"));
-	case E_MEETING_MODEL_RSVP_COL:
-		return g_strdup (_("Yes"));
-	case E_MEETING_MODEL_DELTO_COL:
-		return g_strdup ("");
-	case E_MEETING_MODEL_DELFROM_COL:
-		return g_strdup ("");
-	case E_MEETING_MODEL_STATUS_COL:
-		return g_strdup (_("Needs Action"));
-	case E_MEETING_MODEL_CN_COL:
-		return g_strdup ("");
-	case E_MEETING_MODEL_LANGUAGE_COL:
-		return g_strdup ("en");
-	}
-	
-	return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etm, int col, const void *val)
-{
-	
-	switch (col) {
-	case E_MEETING_MODEL_ADDRESS_COL:
-	case E_MEETING_MODEL_MEMBER_COL:
-	case E_MEETING_MODEL_DELTO_COL:
-	case E_MEETING_MODEL_DELFROM_COL:
-	case E_MEETING_MODEL_CN_COL:
-		if (val && !g_strcasecmp (val, ""))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-	}
-	
-	return TRUE;
-}
-
-static char *
-value_to_string (ETableModel *etm, int col, const void *val)
-{
-	return g_strdup (val);
-}
-
-static void *
-get_key (ETableModel *source, int row, gpointer data) 
-{
-	EMeetingModel *im;
-	EMeetingModelPrivate *priv;
-	char *str;
-	
-	im = E_MEETING_MODEL (source);
-	priv = im->priv;
-
-	str = value_at (source, E_MEETING_MODEL_DELTO_COL, row);
-	if (str && *str)
-		return g_strdup ("delegator");
-
-	return g_strdup ("none");
-}
-
-static void *
-duplicate_key (const void *key, gpointer data) 
-{
-	return g_strdup (key);
-}
-
-static void
-free_gotten_key (void *key, gpointer data)
-{
-	g_free (key);
-}
-
-static void
-free_duplicated_key (void *key, gpointer data)
-{
-	g_free (key);
-}
-
-static void
-class_init (EMeetingModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *etm_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	etm_class = E_TABLE_MODEL_CLASS (klass);
-
-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);
-
-	object_class->destroy = destroy;
-
-	etm_class->column_count = column_count;
-	etm_class->row_count = row_count;
-	etm_class->value_at = value_at;
-	etm_class->set_value_at = set_value_at;
-	etm_class->is_cell_editable = is_cell_editable;
-	etm_class->append_row = append_row;
-	etm_class->duplicate_value = duplicate_value;
-	etm_class->free_value = free_value;
-	etm_class->initialize_value = init_value;
-	etm_class->value_is_empty = value_is_empty;
-	etm_class->value_to_string = value_to_string;
-}
-
-
-static void
-init (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-
-	priv = g_new0 (EMeetingModelPrivate, 1);
-
-	im->priv = priv;
-
-	priv->attendees = g_ptr_array_new ();
-	
-	priv->without = E_TABLE_WITHOUT (e_table_without_new (E_TABLE_MODEL (im),
-							      g_str_hash,
-							      g_str_equal,
-							      get_key,
-							      duplicate_key,
-							      free_gotten_key,
-							      free_duplicated_key,
-							      NULL));
-	e_table_without_hide (priv->without, g_strdup ("delegator"));
-	
-	priv->client = NULL;
-	priv->zone = icaltimezone_get_builtin_timezone (calendar_config_get_timezone ());
-	
-	priv->ebook = NULL;
-	priv->book_loaded = FALSE;
-	priv->book_load_wait = FALSE;
-
-	priv->refresh_queue = g_ptr_array_new ();
-	priv->refresh_data = g_hash_table_new (g_direct_hash, g_direct_equal);
-	priv->refresh_idle_id = -1;
-	
-	start_addressbook_server (im);
-}
-
-static void
-destroy (GtkObject *obj)
-{
-	EMeetingModel *im = E_MEETING_MODEL (obj);
-	EMeetingModelPrivate *priv;
-	int i;
-	
-	priv = im->priv;
-
-	for (i = 0; i < priv->attendees->len; i++)
-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (priv->attendees, i)));
-	g_ptr_array_free (priv->attendees, TRUE); 
-	
-	if (priv->client != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->client));
-
-	if (priv->ebook != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->ebook));
-
-	if (priv->corba_select_names != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-		CORBA_exception_init (&ev);
-		bonobo_object_release_unref (priv->corba_select_names, &ev);
-		CORBA_exception_free (&ev);
-	}
-
- 	while (priv->refresh_queue->len > 0)
- 		refresh_queue_remove (im, g_ptr_array_index (priv->refresh_queue, 0));
- 	g_ptr_array_free (priv->refresh_queue, TRUE);
- 	g_hash_table_destroy (priv->refresh_data);
- 	
- 	if (priv->refresh_idle_id)
- 		g_source_remove (priv->refresh_idle_id);
- 		
-	g_free (priv);
-}
-
-GtkObject *
-e_meeting_model_new (void)
-{
-	return gtk_type_new (E_TYPE_MEETING_MODEL);
-}
-
-
-CalClient *
-e_meeting_model_get_cal_client (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	
-	priv = im->priv;
-
-	return priv->client;
-}
-
-void
-e_meeting_model_set_cal_client (EMeetingModel *im, CalClient *client)
-{
-	EMeetingModelPrivate *priv;
-	
-	priv = im->priv;
-
-	if (priv->client != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	
-	if (client != NULL)
-		gtk_object_ref (GTK_OBJECT (client));
-	priv->client = client;
-}
-
-icaltimezone *
-e_meeting_model_get_zone (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	
-	g_return_val_if_fail (im != NULL, NULL);
-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), NULL);
-
-	priv = im->priv;
-	
-	return priv->zone;
-}
-
-void
-e_meeting_model_set_zone (EMeetingModel *im, icaltimezone *zone)
-{
-	EMeetingModelPrivate *priv;
-	
-	g_return_if_fail (im != NULL);
-	g_return_if_fail (E_IS_MEETING_MODEL (im));
-
-	priv = im->priv;
-	
-	priv->zone = zone;
-}
-
-static ETableScrolled *
-build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_file)
-{
-	GtkWidget *etable;
-	ETable *real_table;
-	ETableExtras *extras;
-	GList *strings;
-	ECell *popup_cell, *cell;
-	
-	extras = e_table_extras_new ();
-
-	/* For type */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-	
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Individual"));
-	strings = g_list_append (strings, (char*) U_("Group"));
-	strings = g_list_append (strings, (char*) U_("Resource"));
-	strings = g_list_append (strings, (char*) U_("Room"));
-	strings = g_list_append (strings, (char*) U_("Unknown"));
-
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);
-	e_table_extras_add_cell (extras, "typeedit", popup_cell);
-	
-	/* For role */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-	
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Chair"));
-	strings = g_list_append (strings, (char*) U_("Required Participant"));
-	strings = g_list_append (strings, (char*) U_("Optional Participant"));
-	strings = g_list_append (strings, (char*) U_("Non-Participant"));
-	strings = g_list_append (strings, (char*) U_("Unknown"));
-
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);
-	e_table_extras_add_cell (extras, "roleedit", popup_cell);
-
-	/* For rsvp */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Yes"));
-	strings = g_list_append (strings, (char*) U_("No"));
-
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);
-	e_table_extras_add_cell (extras, "rsvpedit", popup_cell);
-
-	/* For status */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	gtk_object_unref (GTK_OBJECT (cell));
-
-	strings = NULL;
-	strings = g_list_append (strings, (char*) U_("Needs Action"));
-	strings = g_list_append (strings, (char*) U_("Accepted"));
-	strings = g_list_append (strings, (char*) U_("Declined"));
-	strings = g_list_append (strings, (char*) U_("Tentative"));
-	strings = g_list_append (strings, (char*) U_("Delegated"));
-
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);
-	e_table_extras_add_cell (extras, "statusedit", popup_cell);
-
-	etable = e_table_scrolled_new_from_spec_file (model, extras, spec_file, NULL);
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (etable));
-	gtk_object_set (GTK_OBJECT (real_table), "uniform_row_height", TRUE, NULL);
-	e_table_load_state (real_table, state_file);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (real_table),
-			    "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (etable), "destroy", 
-			    GTK_SIGNAL_FUNC (table_destroy_cb), g_strdup (state_file));
-
-	gtk_object_unref (GTK_OBJECT (extras));
-	
-	return E_TABLE_SCROLLED (etable);
-}
-
-void
-e_meeting_model_add_attendee (EMeetingModel *im, EMeetingAttendee *ia)
-{
-	EMeetingModelPrivate *priv;
-	
-	priv = im->priv;
-	
-	e_table_model_pre_change (E_TABLE_MODEL (im));
-
-	gtk_object_ref (GTK_OBJECT (ia));
-	g_ptr_array_add (priv->attendees, ia);
-	
-	gtk_signal_connect (GTK_OBJECT (ia), "changed",
-			    GTK_SIGNAL_FUNC (attendee_changed_cb), im);
-
-	e_table_model_row_inserted (E_TABLE_MODEL (im), row_count (E_TABLE_MODEL (im)) - 1);
-}
-
-EMeetingAttendee *
-e_meeting_model_add_attendee_with_defaults (EMeetingModel *im)
-{
-	EMeetingAttendee *ia;
-	char *str;
-	
-	ia = E_MEETING_ATTENDEE (e_meeting_attendee_new ());
-
-	e_meeting_attendee_set_address (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_ADDRESS_COL));
-	e_meeting_attendee_set_member (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_MEMBER_COL));
-
-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_TYPE_COL);
-	e_meeting_attendee_set_cutype (ia, text_to_type (str));
-	g_free (str);
-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_ROLE_COL);
-	e_meeting_attendee_set_role (ia, text_to_role (str));
-	g_free (str);	
-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_RSVP_COL);
-	e_meeting_attendee_set_role (ia, text_to_boolean (str));
-	g_free (str);
-	
-	e_meeting_attendee_set_delto (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_DELTO_COL));
-	e_meeting_attendee_set_delfrom (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_DELFROM_COL));
-
-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_STATUS_COL);
-	e_meeting_attendee_set_status (ia, text_to_partstat (str));
-	g_free (str);
-
-	e_meeting_attendee_set_cn (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_CN_COL));
-	e_meeting_attendee_set_language (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_LANGUAGE_COL));
-
-	e_meeting_model_add_attendee (im, ia);
-
-	return ia;
-}
-
-void
-e_meeting_model_remove_attendee (EMeetingModel *im, EMeetingAttendee *ia)
-{
-	EMeetingModelPrivate *priv;
-	gint i, row = -1;
-	
-	priv = im->priv;
-	
-	for (i = 0; i < priv->attendees->len; i++) {
-		if (ia == g_ptr_array_index (priv->attendees, i)) {
-			row = i;
-			break;
-		}
-	}
-	
-	if (row != -1) {
-		e_table_model_pre_change (E_TABLE_MODEL (im));
-
-		g_ptr_array_remove_index (priv->attendees, row);		
-		gtk_object_unref (GTK_OBJECT (ia));
-
-		e_table_model_row_deleted (E_TABLE_MODEL (im), row);
-	}
-}
-
-void
-e_meeting_model_remove_all_attendees (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	gint i, len;
-	
-	priv = im->priv;
-	
-	e_table_model_pre_change (E_TABLE_MODEL (im));
-
-	len = priv->attendees->len;
-
-	for (i = 0; i < len; i++) {
-		EMeetingAttendee *ia = g_ptr_array_index (priv->attendees, i);
-		gtk_object_unref (GTK_OBJECT (ia));
-	}
-
-	g_ptr_array_set_size (priv->attendees, 0);
-	e_table_model_rows_deleted (E_TABLE_MODEL (im), 0, len);
-}
-
-EMeetingAttendee *
-e_meeting_model_find_attendee (EMeetingModel *im, const gchar *address, gint *row)
-{
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia;
-	int i;
-	
-	priv = im->priv;
-	
-	if (address == NULL)
-		return NULL;
-	
-	for (i = 0; i < priv->attendees->len; i++) {
-		const gchar *ia_address;
-		
-		ia = g_ptr_array_index (priv->attendees, i);
-			
-		ia_address = e_meeting_attendee_get_address (ia);
-		if (ia_address && !g_strcasecmp (itip_strip_mailto (ia_address), itip_strip_mailto (address))) {
-			if (row != NULL)
-				*row = i;
-
-			return ia;
-		}
-	}
-
-	return NULL;
-}
-
-EMeetingAttendee *
-e_meeting_model_find_attendee_at_row (EMeetingModel *im, gint row)
-{
-	EMeetingModelPrivate *priv;
-
-	g_return_val_if_fail (im != NULL, NULL);
-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), NULL);
-	g_return_val_if_fail (row >= 0, NULL);
-
-	priv = im->priv;
-	g_return_val_if_fail (row < priv->attendees->len, NULL);
-
-	return g_ptr_array_index (priv->attendees, row);
-}
-
-gint 
-e_meeting_model_count_actual_attendees (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	
-	priv = im->priv;
-
-	return e_table_model_row_count (E_TABLE_MODEL (priv->without));	
-}
-
-const GPtrArray *
-e_meeting_model_get_attendees (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	
-	priv = im->priv;
-	
-	return priv->attendees;
-}
-
-static icaltimezone *
-find_zone (icalproperty *ip, icalcomponent *tz_top_level)
-{
-	icalparameter *param;
-	icalcomponent *sub_comp;
-	const char *tzid;
-	icalcompiter iter;
-
-	if (tz_top_level == NULL)
-		return NULL;
-	
-	param = icalproperty_get_first_parameter (ip, ICAL_TZID_PARAMETER);
-	if (param == NULL)
-		return NULL;
-	tzid = icalparameter_get_tzid (param);
-
-	iter = icalcomponent_begin_component (tz_top_level, ICAL_VTIMEZONE_COMPONENT);
-	while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
-		icalcomponent *clone;
-		const char *tz_tzid;
-		
-		tz_tzid = icalproperty_get_tzid (sub_comp);
-		if (!strcmp (tzid, tz_tzid)) {
-			icaltimezone *zone;
-
-			zone = icaltimezone_new ();
-			clone = icalcomponent_new_clone (sub_comp);
-			icaltimezone_set_component (zone, clone);
-			
-			return zone;
-		}
-		
-		icalcompiter_next (&iter);
-	}
-
-	return NULL;
-}
-
-
-static void
-refresh_queue_add (EMeetingModel *im, int row,
-		   EMeetingTime *start,
-		   EMeetingTime *end,
-		   EMeetingModelRefreshCallback call_back,
-		   gpointer data) 
-{
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia;
-	EMeetingModelQueueData *qdata;
-
-	priv = im->priv;
-	
-	ia = g_ptr_array_index (priv->attendees, row);
-	if (ia == NULL)
-		return;
-
-	qdata = g_hash_table_lookup (priv->refresh_data, ia);
-	if (qdata == NULL) {
-		qdata = g_new0 (EMeetingModelQueueData, 1);
-
-		qdata->im = im;
-		qdata->ia = ia;
-		e_meeting_attendee_clear_busy_periods (ia);
-		e_meeting_attendee_set_has_calendar_info (ia, FALSE);
-
-	        qdata->start = *start;
-	        qdata->end = *end;
-		qdata->string = g_string_new (NULL);
-		qdata->call_backs = g_ptr_array_new ();
-		qdata->data = g_ptr_array_new ();
-		g_ptr_array_add (qdata->call_backs, call_back);
-		g_ptr_array_add (qdata->data, data);
-
-		g_hash_table_insert (priv->refresh_data, ia, qdata);
-	} else {
-		if (e_meeting_time_compare_times (start, &qdata->start) == -1)
-			qdata->start = *start;
-		if (e_meeting_time_compare_times (end, &qdata->end) == 1)
-			qdata->end = *end;
-		g_ptr_array_add (qdata->call_backs, call_back);
-		g_ptr_array_add (qdata->data, data);
-	}
-
-	gtk_object_ref (GTK_OBJECT (ia));
-	g_ptr_array_add (priv->refresh_queue, ia);
-
-	if (priv->refresh_idle_id == -1)
-		priv->refresh_idle_id = g_idle_add (refresh_busy_periods, im);
-}
-
-static void
-refresh_queue_remove (EMeetingModel *im, EMeetingAttendee *ia) 
-{
-	EMeetingModelPrivate *priv;
-	EMeetingModelQueueData *qdata;
-	
-	priv = im->priv;
-	
-	/* Free the queue data */
-	qdata = g_hash_table_lookup (priv->refresh_data, ia);
-	g_assert (qdata != NULL);
-
-	g_hash_table_remove (priv->refresh_data, ia);
-	g_ptr_array_free (qdata->call_backs, TRUE);
-	g_ptr_array_free (qdata->data, TRUE);
-	g_free (qdata);
-
-	/* Unref the attendee */
-	g_ptr_array_remove (priv->refresh_queue, ia);
-	gtk_object_unref (GTK_OBJECT (ia));
-}
-
-static void
-process_callbacks (EMeetingModelQueueData *qdata) 
-{
-	int i;
-
-	for (i = 0; i < qdata->call_backs->len; i++) {
-		EMeetingModelRefreshCallback call_back;
-		gpointer *data;
-
-		call_back = g_ptr_array_index (qdata->call_backs, i);
-		data = g_ptr_array_index (qdata->data, i);
-
-		call_back (data);
-	}
-
-	refresh_queue_remove (qdata->im, qdata->ia);
-}
-
-static void
-process_free_busy_comp (EMeetingAttendee *ia,
-			icalcomponent *fb_comp,
-			icaltimezone *zone,
-			icalcomponent *tz_top_level)
-{
-	icalproperty *ip;
-	
-	ip = icalcomponent_get_first_property (fb_comp, ICAL_DTSTART_PROPERTY);
-	if (ip != NULL) {
-		struct icaltimetype dtstart;
-		icaltimezone *ds_zone;
-		
-		dtstart = icalproperty_get_dtstart (ip);
-		if (!dtstart.is_utc)
-			ds_zone = find_zone (ip, tz_top_level);
-		else
-			ds_zone = icaltimezone_get_utc_timezone ();
-		icaltimezone_convert_time (&dtstart, ds_zone, zone);
-		e_meeting_attendee_set_start_busy_range (ia,
-							 dtstart.year,
-							 dtstart.month,
-							 dtstart.day,
-							 dtstart.hour,
-							 dtstart.minute);
-	}
-	
-	ip = icalcomponent_get_first_property (fb_comp, ICAL_DTEND_PROPERTY);
-	if (ip != NULL) {
-		struct icaltimetype dtend;
-		icaltimezone *de_zone;
-		
-		dtend = icalproperty_get_dtend (ip);
-		if (!dtend.is_utc)
-			de_zone = find_zone (ip, tz_top_level);
-		else
-			de_zone = icaltimezone_get_utc_timezone ();
-		icaltimezone_convert_time (&dtend, de_zone, zone);
-		e_meeting_attendee_set_end_busy_range (ia,
-						       dtend.year,
-						       dtend.month,
-						       dtend.day,
-						       dtend.hour,
-						       dtend.minute);
-	}
-	
-	ip = icalcomponent_get_first_property (fb_comp, ICAL_FREEBUSY_PROPERTY);
-	while (ip != NULL) {
-		icalparameter *param;
-		struct icalperiodtype fb;
-		EMeetingFreeBusyType busy_type = E_MEETING_FREE_BUSY_LAST;
-		icalparameter_fbtype fbtype = ICAL_FBTYPE_BUSY;
-			
-		fb = icalproperty_get_freebusy (ip);
-		param = icalproperty_get_first_parameter (ip, ICAL_FBTYPE_PARAMETER);
-		if (param != NULL)
-			fbtype =  icalparameter_get_fbtype (param);
-			
-		switch (fbtype) {
-		case ICAL_FBTYPE_BUSY:
-			busy_type = E_MEETING_FREE_BUSY_BUSY;
-			break;
-
-		case ICAL_FBTYPE_BUSYUNAVAILABLE:
-			busy_type = E_MEETING_FREE_BUSY_OUT_OF_OFFICE;
-			break;
-
-		case ICAL_FBTYPE_BUSYTENTATIVE:
-			busy_type = E_MEETING_FREE_BUSY_TENTATIVE;
-			break;
-
-		default:
-		}
-			
-		if (busy_type != E_MEETING_FREE_BUSY_LAST) {
-			icaltimezone *utc_zone = icaltimezone_get_utc_timezone ();
-
-			icaltimezone_convert_time (&fb.start, utc_zone, zone);
-			icaltimezone_convert_time (&fb.end, utc_zone, zone);
-			e_meeting_attendee_add_busy_period (ia,
-							    fb.start.year,
-							    fb.start.month,
-							    fb.start.day,
-							    fb.start.hour,
-							    fb.start.minute,
-							    fb.end.year,
-							    fb.end.month,
-							    fb.end.day,
-							    fb.end.hour,
-							    fb.end.minute,
-							    busy_type);
-		}
-		
-		ip = icalcomponent_get_next_property (fb_comp, ICAL_FREEBUSY_PROPERTY);
-	}
-}
-
-static void
-process_free_busy (EMeetingModelQueueData *qdata, char *text)
-{
- 	EMeetingModel *im = qdata->im;
- 	EMeetingModelPrivate *priv;
- 	EMeetingAttendee *ia = qdata->ia;
-	icalcomponent *main_comp;
-	icalcomponent_kind kind = ICAL_NO_COMPONENT;
-
-	priv = im->priv;
-
-	main_comp = icalparser_parse_string (text);
- 	if (main_comp == NULL) {
- 		process_callbacks (qdata);
-  		return;
- 	}
-
-	kind = icalcomponent_isa (main_comp);
-	if (kind == ICAL_VCALENDAR_COMPONENT) {	
-		icalcompiter iter;
-		icalcomponent *tz_top_level, *sub_comp;
-
-		tz_top_level = cal_util_new_top_level ();
-		
-		iter = icalcomponent_begin_component (main_comp, ICAL_VTIMEZONE_COMPONENT);
-		while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
-			icalcomponent *clone;
-			
-			clone = icalcomponent_new_clone (sub_comp);
-			icalcomponent_add_component (tz_top_level, clone);
-			
-			icalcompiter_next (&iter);
-		}
-
-		iter = icalcomponent_begin_component (main_comp, ICAL_VFREEBUSY_COMPONENT);
-		while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
-			process_free_busy_comp (ia, sub_comp, priv->zone, tz_top_level);
-
-			icalcompiter_next (&iter);
-		}
-		icalcomponent_free (tz_top_level);
-	} else if (kind == ICAL_VFREEBUSY_COMPONENT) {
-		process_free_busy_comp (ia, main_comp, priv->zone, NULL);
-	} else {
-		return;
-	}
-	
-	icalcomponent_free (main_comp);
-
-	process_callbacks (qdata);
-}
-
-static void
-async_close (GnomeVFSAsyncHandle *handle,
-	     GnomeVFSResult result,
-	     gpointer data)
-{
-	EMeetingModelQueueData *qdata = data;
-
-	process_free_busy (qdata, qdata->string->str);
-}
-
-static void
-async_read (GnomeVFSAsyncHandle *handle,
-	    GnomeVFSResult result,
-	    gpointer buffer,
-	    GnomeVFSFileSize requested,
-	    GnomeVFSFileSize read,
-	    gpointer data)
-{
-	EMeetingModelQueueData *qdata = data;
-	GnomeVFSFileSize buf_size = BUF_SIZE - 1;
-
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_async_close (handle, async_close, qdata);
-		return;
-	}
-	
-	((char *)buffer)[read] = '\0';
-	qdata->string = g_string_append (qdata->string, buffer);
-	
-	if (read < requested) {
-		gnome_vfs_async_close (handle, async_close, qdata);
-		return;
-	}
-
-	gnome_vfs_async_read (handle, qdata->buffer, buf_size, async_read, qdata);	
-}
-
-static void
-async_open (GnomeVFSAsyncHandle *handle,
-	    GnomeVFSResult result,
-	    gpointer data)
-{
-	EMeetingModelQueueData *qdata = data;
-	GnomeVFSFileSize buf_size = BUF_SIZE - 1;
-
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_async_close (handle, async_close, qdata);
-		return;
-	}
-
-	gnome_vfs_async_read (handle, qdata->buffer, buf_size, async_read, qdata);
-}
-
-static void
-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer data)
-{
-	EMeetingModelQueueData *qdata = data;
-	int length, i;
-
-	if (status != E_BOOK_STATUS_SUCCESS)
-		return;
-
-	length = e_card_cursor_get_length (cursor);
-	for (i = 0; i < length; i ++) {
-		GnomeVFSAsyncHandle *handle;
-		ECard *card = e_card_cursor_get_nth (cursor, i);
-		const char *addr;
-		
-		if (card->fburl == NULL)
-			continue;
-
-		addr = itip_strip_mailto (e_meeting_attendee_get_address (qdata->ia));
-		if (!e_card_email_match_string (card, addr))
-			continue;
-
-		/* Read in free/busy data from the url */
-		gnome_vfs_async_open (&handle, card->fburl, GNOME_VFS_OPEN_READ, async_open, qdata);
-		return;
-	}
-
-	process_callbacks (qdata);
-}
-
-static gboolean
-refresh_busy_periods (gpointer data)
-{	
-	EMeetingModel *im = E_MEETING_MODEL (data);
-	EMeetingModelPrivate *priv;
-	EMeetingAttendee *ia = NULL;
-	EMeetingModelQueueData *qdata = NULL;
-	char *query;
-	int i;
-	
-	priv = im->priv;
-
-	/* Check to see if there are any remaining attendees in the queue */
-	for (i = 0; i < priv->refresh_queue->len; i++) {
-		ia = g_ptr_array_index (priv->refresh_queue, i);
-		g_assert (ia != NULL);
-
-		qdata = g_hash_table_lookup (priv->refresh_data, ia);
-		g_assert (qdata != NULL);
-
-		if (!qdata->refreshing)
-			break;
-	}
-
-	/* The everything in the queue is being refreshed */
-	if (i >= priv->refresh_queue->len) {
-		priv->refresh_idle_id = -1;
-		return FALSE;
-	}
-	
-	/* Indicate we are trying to refresh it */
-	qdata->refreshing = TRUE;
-	
-	/* Check the server for free busy data */	
-	if (priv->client) {
-		GList *fb_data, *users = NULL;
-		struct icaltimetype itt;
-		time_t startt, endt;
-		const char *user;
-		
-		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->start.date);
-		itt.month = g_date_month (&qdata->start.date);
-		itt.day = g_date_day (&qdata->start.date);
-		itt.hour = qdata->start.hour;
-		itt.minute = qdata->start.minute;
-		startt = icaltime_as_timet_with_zone (itt, priv->zone);
-
-		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->end.date);
-		itt.month = g_date_month (&qdata->end.date);
-		itt.day = g_date_day (&qdata->end.date);
-		itt.hour = qdata->end.hour;
-		itt.minute = qdata->end.minute;
-		endt = icaltime_as_timet_with_zone (itt, priv->zone);
-
-		user = itip_strip_mailto (e_meeting_attendee_get_address (ia));
-		users = g_list_append (users, g_strdup (user));
-		fb_data = cal_client_get_free_busy (priv->client, users, startt, endt);
-
-		g_list_foreach (users, (GFunc)g_free, NULL);
-		g_list_free (users);
-
-		if (fb_data != NULL) {
-			CalComponent *comp = fb_data->data;
-			char *comp_str;
-				
-			comp_str = cal_component_get_as_string (comp);
-			process_free_busy (qdata, comp_str);
-			g_free (comp_str);
-			return TRUE;
-		}
-	}
-
-	/* Look for fburl's of attendee with no free busy info on server */
-	if (!priv->book_loaded) {
-		priv->book_load_wait = TRUE;
-		gtk_main ();
-	}
-
-	if (!e_meeting_attendee_is_set_address (ia)) {
-		process_callbacks (qdata);
-		return TRUE;
-	}
-	
-	query = g_strdup_printf ("(contains \"email\" \"%s\")", 
-				 itip_strip_mailto (e_meeting_attendee_get_address (ia)));
-	e_book_get_cursor (priv->ebook, query, cursor_cb, qdata);
-	g_free (query);
-
-	return TRUE;
-}
-		
-void
-e_meeting_model_refresh_all_busy_periods (EMeetingModel *im,
-					  EMeetingTime *start,
-					  EMeetingTime *end,
-					  EMeetingModelRefreshCallback call_back,
-					  gpointer data)
-{
-	EMeetingModelPrivate *priv;
-	int i;
-	
-	g_return_if_fail (im != NULL);
-	g_return_if_fail (E_IS_MEETING_MODEL (im));
-
-	priv = im->priv;
-	
-	for (i = 0; i < priv->attendees->len; i++)
-		refresh_queue_add (im, i, start, end, call_back, data);
-}
-
-void 
-e_meeting_model_refresh_busy_periods (EMeetingModel *im,
-				      int row,
-				      EMeetingTime *start,
-				      EMeetingTime *end,
-				      EMeetingModelRefreshCallback call_back,
-				      gpointer data)
-{
-	EMeetingModelPrivate *priv;
-	
-	g_return_if_fail (im != NULL);
-	g_return_if_fail (E_IS_MEETING_MODEL (im));
-
-	priv = im->priv;
-
-	refresh_queue_add (im, row, start, end, call_back, data);
-}
-
-ETableScrolled *
-e_meeting_model_etable_from_model (EMeetingModel *im, const gchar *spec_file, const gchar *state_file)
-{
-	EMeetingModelPrivate *priv;
-	
-	g_return_val_if_fail (im != NULL, NULL);
-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), NULL);
-
-	priv = im->priv;
-	
-	return build_etable (E_TABLE_MODEL (priv->without), spec_file, state_file);
-}
-
-int
-e_meeting_model_etable_model_to_view_row (ETable *et, EMeetingModel *im, int model_row)
-{
-	EMeetingModelPrivate *priv;
-	int row;
-	
-	g_return_val_if_fail (im != NULL, -1);
-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), -1);
-	
-	priv = im->priv;
-	
-	row = e_table_model_to_view_row (et, model_row);
-	if (row == -1)
-		return -1;
-	
-	return e_table_subset_model_to_view_row (E_TABLE_SUBSET (priv->without), row);
-}
-
-int
-e_meeting_model_etable_view_to_model_row (ETable *et, EMeetingModel *im, int view_row)
-{
-	EMeetingModelPrivate *priv;
-	int row;
-	
-	g_return_val_if_fail (im != NULL, -1);
-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), -1);
-	
-	priv = im->priv;
-	
-	row = e_table_view_to_model_row (et, view_row);
-	if (row == -1)
-		return -1;
-	
-	return e_table_subset_view_to_model_row (E_TABLE_SUBSET (priv->without), row);
-}
-
-
-static void
-add_section (GNOME_Evolution_Addressbook_SelectNames corba_select_names, const char *name)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_addSection (corba_select_names,
-							    name, 
-							    gettext (name),
-							    &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-get_select_name_dialog (EMeetingModel *im) 
-{
-	EMeetingModelPrivate *priv;
-	CORBA_Environment ev;
-	int i;
-	
-	priv = im->priv;
-
-	if (priv->corba_select_names != CORBA_OBJECT_NIL) {
-		Bonobo_Control corba_control;
-		GtkWidget *control_widget;
-		int i;
-		
-		CORBA_exception_init (&ev);
-		for (i = 0; sections[i] != NULL; i++) {			
-			corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection 
-				(priv->corba_select_names, sections[i], &ev);
-			if (BONOBO_EX (&ev)) {
-				CORBA_exception_free (&ev);
-				return FALSE;				
-			}
-			
-			control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
-			
-			bonobo_widget_set_property (BONOBO_WIDGET (control_widget), "text", "", NULL);		
-		}
-		CORBA_exception_free (&ev);
-
-		return TRUE;
-	}
-	
-	CORBA_exception_init (&ev);
-
-	priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
-
-	for (i = 0; sections[i] != NULL; i++)
-		add_section (priv->corba_select_names, sections[i]);
-
-	bonobo_event_source_client_add_listener (priv->corba_select_names,
-						 select_names_ok_cb,
-						 "GNOME/Evolution:ok:dialog",
-						 NULL, im);
-	
-	if (BONOBO_EX (&ev)) {
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-void
-e_meeting_model_invite_others_dialog (EMeetingModel *im)
-{
-	EMeetingModelPrivate *priv;
-	CORBA_Environment ev;
-
-	priv = im->priv;
-	
-	if (!get_select_name_dialog (im))
-		return;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (
-		priv->corba_select_names, _("Required Participants"), &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-process_section (EMeetingModel *im, EDestination **destv, icalparameter_role role)
-{
-	int i;
-	
-	for (i = 0; destv[i] != NULL; i++) {
-		EMeetingAttendee *ia;
-		const char *name, *address;
-		
-		name = e_destination_get_name (destv[i]);		
-		address = e_destination_get_email (destv[i]);
-		
-		if (address == NULL || *address == '\0')
-			continue;
-		
-		if (e_meeting_model_find_attendee (im, address, NULL) == NULL) {
-			ia = e_meeting_model_add_attendee_with_defaults (im);
-
-			e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", address));
-			e_meeting_attendee_set_role (ia, role);
-			e_meeting_attendee_set_cn (ia, g_strdup (name));
-		}
-	}
-}
-
-static void
-select_names_ok_cb (BonoboListener    *listener,
-		    char              *event_name,
-		    CORBA_any         *arg,
-		    CORBA_Environment *ev,
-		    gpointer           data)
-{
-	EMeetingModel *im = data;
-	EMeetingModelPrivate *priv;
-	Bonobo_Control corba_control;
-	GtkWidget *control_widget;
-	EDestination **destv;
-	char *string = NULL;
-	int i;
-	
-	priv = im->priv;
-
-	for (i = 0; sections[i] != NULL; i++) {
-		corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection 
-			(priv->corba_select_names, sections[i], ev);
-		control_widget = bonobo_widget_new_control_from_objref
-			(corba_control, CORBA_OBJECT_NIL);
-		
-		bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations", &string, NULL);
-		destv = e_destination_importv (string);
-		if (destv != NULL) {
-			process_section (im, destv, roles[i]);
-			e_destination_freev (destv);
-		}		
-	}
-}
-
-static void
-attendee_changed_cb (EMeetingAttendee *ia, gpointer data) 
-{
-	EMeetingModel *im = E_MEETING_MODEL (data);
-	EMeetingModelPrivate *priv;
-	gint row = -1, i;
-	
-	priv = im->priv;
-
-	for (i = 0; i < priv->attendees->len; i++) {
-		if (ia == g_ptr_array_index (priv->attendees, i)) {
-			row = 1;
-			break;
-		}
-	}
-	
-	if (row == -1)
-		return;
-	
-	/* FIXME: Ideally I think you are supposed to call pre_change() before
-	   the data structures are changed. */
-	e_table_model_pre_change (E_TABLE_MODEL (im));
-	e_table_model_row_changed (E_TABLE_MODEL (im), row);
-}
-
-static void
-table_destroy_cb (ETableScrolled *etable, gpointer data)
-{
-	ETable *real_table;
-	char *filename = data;
-	
-	real_table = e_table_scrolled_get_table (etable);
-	e_table_save_state (real_table, filename);
-
-	g_free (data);
-}
-
diff --git a/calendar/gui/e-meeting-model.h b/calendar/gui/e-meeting-model.h
deleted file mode 100644
index 7e1aa0758b..0000000000
--- a/calendar/gui/e-meeting-model.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-model.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifndef _E_MODEL_H_
-#define _E_MODEL_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-model.h>
-#include <cal-client/cal-client.h>
-#include "e-meeting-attendee.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MEETING_MODEL			(e_meeting_model_get_type ())
-#define E_MEETING_MODEL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MEETING_MODEL, EMeetingModel))
-#define E_MEETING_MODEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_MODEL, EMeetingModelClass))
-#define E_IS_MEETING_MODEL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_MEETING_MODEL))
-#define E_IS_MEETING_MODEL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_MODEL))
-
-
-typedef struct _EMeetingModel        EMeetingModel;
-typedef struct _EMeetingModelPrivate EMeetingModelPrivate;
-typedef struct _EMeetingModelClass   EMeetingModelClass;
-
-typedef enum {
-	E_MEETING_MODEL_ADDRESS_COL,
-	E_MEETING_MODEL_MEMBER_COL,
-	E_MEETING_MODEL_TYPE_COL,
-	E_MEETING_MODEL_ROLE_COL,
-	E_MEETING_MODEL_RSVP_COL,
-	E_MEETING_MODEL_DELTO_COL,
-	E_MEETING_MODEL_DELFROM_COL,
-	E_MEETING_MODEL_STATUS_COL,
-	E_MEETING_MODEL_CN_COL,
-	E_MEETING_MODEL_LANGUAGE_COL,
-	E_MEETING_MODEL_COLUMN_COUNT
-} EMeetingModelColumns;
-
-struct _EMeetingModel {
-	ETableModel parent;
-
-	EMeetingModelPrivate *priv;
-};
-
-struct _EMeetingModelClass {
-	ETableModelClass parent_class;
-};
-
-typedef void	(* EMeetingModelRefreshCallback) (gpointer data);
-
-
-GtkType    e_meeting_model_get_type (void);
-GtkObject *e_meeting_model_new      (void);
-
-CalClient *e_meeting_model_get_cal_client (EMeetingModel *im);
-void e_meeting_model_set_cal_client (EMeetingModel *im, CalClient *client);
-
-icaltimezone *e_meeting_model_get_zone (EMeetingModel *im);
-void e_meeting_model_set_zone (EMeetingModel *im, icaltimezone *zone);
-
-void e_meeting_model_add_attendee (EMeetingModel *im, EMeetingAttendee *ia);
-EMeetingAttendee *e_meeting_model_add_attendee_with_defaults (EMeetingModel *im);
-
-void e_meeting_model_remove_attendee (EMeetingModel *im, EMeetingAttendee *ia);
-void e_meeting_model_remove_all_attendees (EMeetingModel *im);
-
-EMeetingAttendee *e_meeting_model_find_attendee (EMeetingModel *im, const gchar *address, gint *row);
-EMeetingAttendee *e_meeting_model_find_attendee_at_row (EMeetingModel *im, gint row);
-
-gint e_meeting_model_count_actual_attendees (EMeetingModel *im);
-const GPtrArray *e_meeting_model_get_attendees (EMeetingModel *im);
-
-void e_meeting_model_refresh_all_busy_periods (EMeetingModel *im,
-					       EMeetingTime *start,
-					       EMeetingTime *end,
-					       EMeetingModelRefreshCallback call_back,
-					       gpointer data);
-void e_meeting_model_refresh_busy_periods (EMeetingModel *im,
-					   int row,
-					   EMeetingTime *start,
-					   EMeetingTime *end,
-					   EMeetingModelRefreshCallback call_back,
-					   gpointer data);
-
-
-/* Helpful functions */
-ETableScrolled    *e_meeting_model_etable_from_model (EMeetingModel *im, const gchar *spec_file, const gchar *state_file);
-int e_meeting_model_etable_model_to_view_row (ETable *et, EMeetingModel *im, int model_row);
-int e_meeting_model_etable_view_to_model_row (ETable *et, EMeetingModel *im, int view_row);
-
-void e_meeting_model_invite_others_dialog (EMeetingModel *im);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_MODEL_H_ */
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
deleted file mode 100644
index d44a1f436d..0000000000
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ /dev/null
@@ -1,1020 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EMeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "calendar-config.h"
-#include "e-meeting-time-sel-item.h"
-#include "e-meeting-time-sel.h"
-
-/* Initially the grid lines were drawn at the bottom of cells, but this didn't
-   line up well with the GtkEntry widgets, which in the default theme draw a
-   black shadow line across the top. So I've switched our code to draw the
-   lines across the top of cells. */
-#define E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM 0
-
-static void e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class);
-static void e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item);
-static void e_meeting_time_selector_item_destroy (GtkObject *object);
-
-static void e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg,
-						  guint arg_id);
-static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,
-						 double *affine,
-						 ArtSVP *clip_path, int flags);
-static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item,
-					       GdkDrawable *drawable,
-					       int x, int y,
-					       int width, int height);
-static double e_meeting_time_selector_item_point (GnomeCanvasItem *item,
-						  double x, double y,
-						  int cx, int cy,
-						  GnomeCanvasItem **actual_item);
-static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item,
-						GdkEvent *event);
-static gint e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
-						       GdkEvent *event);
-static gint e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
-							 GdkEvent *event);
-static gint e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
-							GdkEvent *event);
-
-static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
-							GdkDrawable *drawable,
-							GDate *date,
-							int x, int scroll_y,
-							int width, int height);
-static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int y, int width, int height);
-static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
-						    GdkDrawable *drawable,
-						    GDate *date,
-						    int x, int scroll_y,
-						    int width, int height);
-static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height);
-static gint e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row);
-static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int row, int x, int y, int width, int first_period, EMeetingFreeBusyType busy_type);
-
-static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y);
-static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
-								   gint row,
-								   gint x,
-								   gint width,
-								   gint *start_x,
-								   gint *end_x);
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MEETING_TIME_SELECTOR
-};
-
-
-GtkType
-e_meeting_time_selector_item_get_type (void)
-{
-	static GtkType e_meeting_time_selector_item_type = 0;
-
-	if (!e_meeting_time_selector_item_type) {
-		GtkTypeInfo e_meeting_time_selector_item_info = {
-			"EMeetingTimeSelectorItem",
-			sizeof (EMeetingTimeSelectorItem),
-			sizeof (EMeetingTimeSelectorItemClass),
-			(GtkClassInitFunc) e_meeting_time_selector_item_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_meeting_time_selector_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_meeting_time_selector_item_info);
-	}
-
-	return e_meeting_time_selector_item_type;
-}
-
-
-static void
-e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) mts_item_class;
-	item_class = (GnomeCanvasItemClass *) mts_item_class;
-
-	gtk_object_add_arg_type ("EMeetingTimeSelectorItem::meeting_time_selector",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_MEETING_TIME_SELECTOR);
-
-	object_class->destroy = e_meeting_time_selector_item_destroy;
-	object_class->set_arg = e_meeting_time_selector_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_meeting_time_selector_item_realize;
-	item_class->unrealize   = e_meeting_time_selector_item_unrealize;
-	item_class->update      = e_meeting_time_selector_item_update;
-	item_class->draw        = e_meeting_time_selector_item_draw;
-	item_class->point       = e_meeting_time_selector_item_point;
-	item_class->event       = e_meeting_time_selector_item_event;
-}
-
-
-static void
-e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (mts_item);
-	
-	mts_item->mts = NULL;
-
-	mts_item->main_gc = NULL;
-	mts_item->stipple_gc = NULL;
-
-	/* Create the cursors. */
-	mts_item->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	mts_item->resize_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	mts_item->last_cursor_set = NULL;
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-}
-
-
-static void
-e_meeting_time_selector_item_destroy (GtkObject *object)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
-
-	gdk_cursor_destroy (mts_item->normal_cursor);
-	gdk_cursor_destroy (mts_item->resize_cursor);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMeetingTimeSelectorItem *mts_item;
-
-	item = GNOME_CANVAS_ITEM (o);
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_MEETING_TIME_SELECTOR:
-		mts_item->mts = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvas *canvas;
-	GdkWindow *window;
-	EMeetingTimeSelectorItem *mts_item;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)(item);
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	canvas = item->canvas;
-	window = GTK_WIDGET (canvas)->window;
-
-	mts_item->main_gc = gdk_gc_new (window);
-	mts_item->stipple_gc = gdk_gc_new (window);
-}
-
-
-static void
-e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	gdk_gc_unref (mts_item->main_gc);
-	mts_item->main_gc = NULL;
-	gdk_gc_unref (mts_item->stipple_gc);
-	mts_item->stipple_gc = NULL;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)(item);
-}
-
-
-static void
-e_meeting_time_selector_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 grid 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_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorItem *mts_item;
-	ETable *real_table;
-	EMeetingAttendee *ia;
-	gint day_x, meeting_start_x, meeting_end_x, bar_y, bar_height;
-	gint row, row_y, start_x, end_x;
-	GDate date, last_date, current_date;
-	gboolean is_display_top, show_meeting_time;
-	GdkGC *gc, *stipple_gc;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-	mts = mts_item->mts;
-	g_return_if_fail (mts != NULL);
-	gc = mts_item->main_gc;
-	stipple_gc = mts_item->stipple_gc;
-
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));	
-
-	is_display_top = (GTK_WIDGET (item->canvas) == mts->display_top)
-		? TRUE : FALSE;
-
-	/* Calculate the first and last visible days and positions. */
-	e_meeting_time_selector_calculate_day_and_position (mts, x,
-							    &date, &day_x);
-	e_meeting_time_selector_calculate_day_and_position (mts, x + width,
-							    &last_date, NULL);
-
-	/* For the top display draw the 'All Attendees' row background. */
-	if (is_display_top) {
-		gdk_gc_set_foreground (gc, &mts->all_attendees_bg_color);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    0, mts->row_height * 2 - y,
-				    width, mts->row_height);
-	} else {
-		gdk_gc_set_foreground (gc, &mts->bg_color);
-		gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
-	}
-
-	/* Calculate the x coordinates of the meeting time. */
-	show_meeting_time = e_meeting_time_selector_get_meeting_time_positions (mts, &meeting_start_x, &meeting_end_x);
-
-	/* Draw the meeting time background. */
-	if (show_meeting_time
-	    && (meeting_end_x - 1 >= x) && (meeting_start_x + 1 < x + width)
-	    && (meeting_end_x - meeting_start_x > 2)) {
-		gdk_gc_set_foreground (gc, &mts->meeting_time_bg_color);
-		if (is_display_top)
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x + 1 - x, mts->row_height * 2 - y,
-					    meeting_end_x - meeting_start_x - 2, mts->row_height);
-		else
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x + 1 - x, 0,
-					    meeting_end_x - meeting_start_x - 2, height);
-	}
-
-	/* For the main display draw the stipple background for attendee's
-	   that have no calendar information. */
-	if (!is_display_top) {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		gdk_gc_set_foreground (stipple_gc, &mts->grid_color);
-		gdk_gc_set_background (stipple_gc, &mts->stipple_bg_color);
-		gdk_gc_set_stipple (stipple_gc, mts->stipple);
-		gnome_canvas_set_stipple_origin (item->canvas, stipple_gc);
-		gdk_gc_set_fill (stipple_gc, GDK_OPAQUE_STIPPLED);
-		row = y / mts->row_height;
-		row_y = row * mts->row_height - y;
-		while (row < e_meeting_model_count_actual_attendees (mts->model) && row_y < height) {
-			gint model_row = e_meeting_model_etable_view_to_model_row (real_table, 
-										   mts->model, row);
-
-			ia = e_meeting_model_find_attendee_at_row (mts->model, model_row);
-
-			if (e_meeting_attendee_get_has_calendar_info (ia)) {
-				if (e_meeting_time_selector_item_calculate_busy_range (mts, model_row, x, width, &start_x, &end_x)) {
-					if (start_x >= width || end_x <= 0) {
-						gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, width, mts->row_height);
-					} else {
-						if (start_x >= 0) {
-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, start_x, mts->row_height);
-							gdk_draw_line (drawable, gc, start_x, row_y, start_x, row_y + mts->row_height);
-						}
-						if (end_x <= width) {
-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, end_x, row_y, width - end_x, mts->row_height);
-							gdk_draw_line (drawable, gc, end_x, row_y, end_x, row_y + mts->row_height);
-						}
-					}
-				}
-			} else {
-				gdk_draw_rectangle (drawable, stipple_gc, TRUE,
-						    0, row_y,
-						    width, mts->row_height);
-			}
-			row++;
-			row_y += mts->row_height;
-		}
-		gdk_gc_set_fill (gc, GDK_SOLID);
-	}
-
-	/* Now paint the visible days one by one. */
-	current_date = date;
-	for (;;) {
-		/* Currently we use the same GnomeCanvasItem class for the
-		   top display and the main display. We may use separate
-		   classes in future if necessary. */
-		if (is_display_top)
-			e_meeting_time_selector_item_paint_day_top (mts_item, drawable, &current_date, day_x, y, width, height);
-		else
-			e_meeting_time_selector_item_paint_day (mts_item, drawable, &current_date, day_x, y, width, height);
-
-		day_x += mts_item->mts->day_width;
-		if (g_date_compare (&current_date, &last_date) == 0)
-			break;
-		g_date_add_days (&current_date, 1);
-	}
-
-	/* Draw the busy periods. */
-	if (is_display_top)
-		e_meeting_time_selector_item_paint_all_attendees_busy_periods (mts_item, drawable, &date, x, y, width, height);
-	else
-		e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &date, x, y, width, height);
-
-
-	/* Draw the currently-selected meeting time vertical bars. */
-	if (show_meeting_time) {
-		if (is_display_top) {
-			bar_y = mts->row_height * 2 - y;
-			bar_height = mts->row_height;
-		} else {
-			bar_y = 0;
-			bar_height = height;
-		}
-
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-
-		if ((meeting_start_x + 2 >= x)
-		    && (meeting_start_x - 2 < x + width)) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x - 2 - x, bar_y,
-					    5, bar_height);
-		}
-
-		if ((meeting_end_x + 2 >= x)
-		    && (meeting_end_x - 2 < x + width)) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_end_x - 2 - x, bar_y,
-					    5, bar_height);
-		}
-	}
-}
-
-
-static void
-e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
-					    GdkDrawable *drawable, GDate *date,
-					    int x, int scroll_y,
-					    int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	GdkGC *gc;
-	GdkFont *font;
-	gint y, grid_x;
-	gchar buffer[128], *format;
-	gint hour, hour_x, hour_y;
-	GdkRectangle clip_rect;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-
-	/* Draw the horizontal lines. */
-	y = mts->row_height - 1 - scroll_y;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-	gdk_gc_set_foreground (gc, &mts->grid_shadow_color);
-	gdk_draw_line (drawable, gc, x, y + 1, x + mts->day_width - 1, y + 1);
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-	y += mts->row_height;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-	y += mts->row_height;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-
-
-	/* Draw the vertical grid lines. */
-	for (grid_x = mts->col_width - 1;
-	     grid_x < mts->day_width - mts->col_width;
-	     grid_x += mts->col_width) {
-		gdk_draw_line (drawable, gc,
-			       x + grid_x, mts->row_height * 2 - 4 - scroll_y,
-			       x + grid_x, height);
-	}
-	grid_x = mts->day_width - 2;
-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);
-	grid_x++;
-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	font = GTK_WIDGET (mts)->style->font;
-	if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_FULL)
-		/* This is a strftime() format string %A = full weekday name,
-		   %B = full month name, %d = month day, %Y = full year. */
-		format = _("%A, %B %d, %Y");
-	else if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY)
-		/* This is a strftime() format string %a = abbreviated weekday
-		   name, %m = month number, %d = month day, %Y = full year. */
-		format = _("%a %m/%d/%Y");
-	else
-		/* This is a strftime() format string %m = month number,
-		   %d = month day, %Y = full year. */
-		format = _("%m/%d/%Y");
-
-	g_date_strftime (buffer, sizeof (buffer), format, date);
-
-	clip_rect.x = x;
-	clip_rect.y = -scroll_y;
-	clip_rect.width = mts->day_width - 2;
-	clip_rect.height = mts->row_height - 2;
-	gdk_gc_set_clip_rectangle (gc, &clip_rect);
-	gdk_draw_string (drawable, font, gc,
-			 x + 2, 4 + font->ascent - scroll_y, buffer);
-	gdk_gc_set_clip_rectangle (gc, NULL);
-
-	/* Draw the hours. */
-	hour = mts->first_hour_shown;
-	hour_x = x + 2;
-	hour_y = mts->row_height + 4 + font->ascent - scroll_y;
-	while (hour < mts->last_hour_shown) {
-		if (calendar_config_get_24_hour_format ())
-			gdk_draw_string (drawable, font, gc,
-					 hour_x, hour_y,
-					 EMeetingTimeSelectorHours[hour]);
-		else
-			gdk_draw_string (drawable, font, gc,
-					 hour_x, hour_y,
-					 EMeetingTimeSelectorHours12[hour]);
-
-		hour += mts->zoomed_out ? 3 : 1;
-		hour_x += mts->col_width;
-	}
-}
-
-
-/* This paints the colored bars representing busy periods for the combined
-   list of attendees. For now we just paint the bars for each attendee of
-   each other. If we want to speed it up we could optimise it later. */
-static void
-e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingAttendee *ia;
-	EMeetingFreeBusyType busy_type;
-	gint row, y;
-	GdkGC *gc;
-	gint *first_periods;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Calculate the y coordinate to paint the row at in the drawable. */
-	y = 2 * mts->row_height - scroll_y - 1;
-
-	/* Get the first visible busy periods for all the attendees. */
-	first_periods = g_new (gint, e_meeting_model_count_actual_attendees (mts->model));
-	for (row = 0; row < e_meeting_model_count_actual_attendees (mts->model); row++) {
-		ia = e_meeting_model_find_attendee_at_row (mts->model, row);
-		first_periods[row] = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);
-	}
-
-	for (busy_type = 0;
-	     busy_type < E_MEETING_FREE_BUSY_LAST;
-	     busy_type++) {
-		gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-		for (row = 0; row < e_meeting_model_count_actual_attendees (mts->model); row++) {
-			if (first_periods[row] == -1)
-				continue;
-			e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, row, first_periods[row], busy_type);
-		}
-	}
-
-	g_free (first_periods);
-}
-
-
-static void
-e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
-					GdkDrawable *drawable, GDate *date,
-					int x, int scroll_y,
-					int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	GdkGC *gc;
-	gint grid_x, grid_y, attendee_index, unused_y;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Draw the grid lines. The grid lines around unused rows are drawn in
-	   a different color. */
-
-	/* Draw the horizontal grid lines. */
-	attendee_index = scroll_y / mts->row_height;
-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM
-	for (grid_y = mts->row_height - 1 - (scroll_y % mts->row_height);
-#else
-	for (grid_y = - (scroll_y % mts->row_height);
-#endif
-	     grid_y < height;
-	     grid_y += mts->row_height)
-	  {
-		  if (attendee_index <= e_meeting_model_count_actual_attendees (mts->model)) {
-			  gdk_gc_set_foreground (gc, &mts->grid_color);
-			  gdk_draw_line (drawable, gc, 0, grid_y,
-					 width, grid_y);
-		  } else {
-			  gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-			  gdk_draw_line (drawable, gc, 0, grid_y,
-					 width, grid_y);
-		  }
-		  attendee_index++;
-	  }
-
-	/* Draw the vertical grid lines. */
-	unused_y = (e_meeting_model_count_actual_attendees (mts->model) * mts->row_height) - scroll_y;
-	if (unused_y >= 0) {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		for (grid_x = mts->col_width - 1;
-		     grid_x < mts->day_width - mts->col_width;
-		     grid_x += mts->col_width)
-			{
-				gdk_draw_line (drawable, gc,
-					       x + grid_x, 0,
-					       x + grid_x, unused_y - 1);
-			}
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    x + mts->day_width - 2, 0,
-				    2, unused_y);
-	}
-
-	if (unused_y < height) {
-		gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-		for (grid_x = mts->col_width - 1;
-		     grid_x < mts->day_width - mts->col_width;
-		     grid_x += mts->col_width)
-			{
-				gdk_draw_line (drawable, gc,
-					       x + grid_x, unused_y,
-					       x + grid_x, height);
-			}
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    x + mts->day_width - 2, unused_y,
-				    2, height - unused_y);
-	}
-
-
-}
-
-
-/* This paints the colored bars representing busy periods for the individual
-   attendees. */
-static void
-e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingFreeBusyType busy_type;
-	ETable *real_table;
-	gint row, model_row, y, first_period;
-	GdkGC *gc;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));
-
-	/* Calculate the first visible attendee row. */
-	row = scroll_y / mts->row_height;
-
-	/* Calculate the y coordinate to paint the row at in the drawable. */
-	y = row * mts->row_height - scroll_y;
-
-	/* Step through the attendees painting the busy periods. */
-	while (y < height && row < e_meeting_model_count_actual_attendees (mts->model)) {
-		model_row = e_meeting_model_etable_view_to_model_row (real_table, mts->model, row);
-
-		/* Find the first visible busy period. */
-		first_period = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, model_row);
-		if (first_period != -1) {
-			/* Paint the different types of busy periods, in
-			   reverse order of precedence, so the highest
-			   precedences are displayed. */
-			for (busy_type = 0;
-			     busy_type < E_MEETING_FREE_BUSY_LAST;
-			     busy_type++) {
-				gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-				e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, model_row, first_period, busy_type);
-			}
-		}
-		y += mts->row_height;
-		row++;
-	}
-}
-
-
-/* This subtracts the attendees longest_period_in_days from the given date,
-   and does a binary search of the attendee's busy periods array to find the
-   first one which could possible end on the given day or later.
-   If none are found it returns -1. */
-static gint
-e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingAttendee *ia;
-	const GArray *busy_periods;
-	EMeetingFreeBusyPeriod *period;
-	gint period_num;
-
-	mts = mts_item->mts;
-
-	ia = e_meeting_model_find_attendee_at_row (mts->model, row);
-
-	period_num = e_meeting_attendee_find_first_busy_period (ia, date);
-	if (period_num == -1)
-		return -1;
-
-	/* Check if the period starts after the end of the current canvas
-	   scroll area. */
-	busy_periods = e_meeting_attendee_get_busy_periods (ia);
-	period = &g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num);
-	if (g_date_compare (&mts->last_date_shown, &period->start.date) < 0)
-		return -1;
-
-	return period_num;
-}
-
-
-/* This paints the visible busy periods for one attendee which are of a certain
-   busy type, e.g out of office. It is passed the index of the first visible
-   busy period of the attendee and continues until it runs off the screen. */
-static void
-e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int x, int y, int width, int row, int first_period, EMeetingFreeBusyType busy_type)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingAttendee *ia;
- 	const GArray *busy_periods;
-	EMeetingFreeBusyPeriod *period;
-	GdkGC *gc;
-	gint period_num, x1, x2, x2_within_day, x2_within_col;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	ia = e_meeting_model_find_attendee_at_row (mts->model, row);
-
-	busy_periods = e_meeting_attendee_get_busy_periods (ia);
-	for (period_num = first_period;
-	     period_num < busy_periods->len;
-	     period_num++) {
-		period = &g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num);
-
-		if (period->busy_type != busy_type)
-			continue;
-
-		/* Convert the period start and end times to x coordinates. */
-		x1 = e_meeting_time_selector_calculate_time_position (mts, &period->start);
-		/* If the period is off the right of the area being drawn, we
-		   are finished. */
-		if (x1 >= x + width)
-			return;
-
-		x2 = e_meeting_time_selector_calculate_time_position (mts, &period->end);
-		/* If the period is off the left edge of the area skip it. */
-		if (x2 <= x)
-			continue;
-
-		/* We paint from x1 to x2 - 1, so that for example a time
-		   from 5:00-6:00 is distinct from 6:00-7:00.
-		   We never finish on a grid line separating days, and we only
-		   ever paint on a normal vertical grid line if the period is
-		   only 1 pixel wide. */
-		x2_within_day = x2 % mts->day_width;
-		if (x2_within_day == 0) {
-			x2 -= 2;
-		} else if (x2_within_day == mts->day_width - 1) {
-			x2 -= 1;
-		} else {
-			x2_within_col = x2_within_day % mts->col_width;
-			if (x2_within_col == 0 && x2 > x1 + 1)
-				x2 -= 1;
-		}
-
-		/* Paint the rectangle. We leave a gap of 2 pixels at the
-		 top and bottom, remembering that the grid is painted along
-		 the top/bottom line of each row. */
-		if (x2 - x1 > 0) {
-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x1 - x, y + 2,
-					    x2 - x1, mts->row_height - 5);
-#else
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x1 - x, y + 3,
-					    x2 - x1, mts->row_height - 5);
-#endif
-		}
-	}
-}
-
-
-/*
- * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem.
- */
-
-/* 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_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,
-				    int cx, int cy,
-				    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_meeting_time_selector_item_button_press (mts_item,
-								  event);
-	case GDK_BUTTON_RELEASE:
-		return e_meeting_time_selector_item_button_release (mts_item,
-								    event);
-	case GDK_MOTION_NOTIFY:
-		return e_meeting_time_selector_item_motion_notify (mts_item,
-								   event);
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-/* This handles all button press events for the item. If the cursor is over
-   one of the meeting time vertical bars we start a drag. If not we set the
-   meeting time to the nearest half-hour interval.
-   Note that GnomeCanvas converts the event coords to world coords,
-   i.e. relative to the entire canvas scroll area. */
-static gint
-e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
-					   GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTime start_time, end_time;
-	EMeetingTimeSelectorPosition position;
-	GDate *start_date, *end_date;
-	gint x, y;
-
-	mts = mts_item->mts;
-	x = (gint) event->button.x;
-	y = (gint) event->button.y;
-
-	/* Check if we are starting a drag of the vertical meeting time bars.*/
-	position = e_meeting_time_selector_item_get_drag_position (mts_item,
-								   x, y);
-	if (position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (mts_item),
-					    GDK_POINTER_MOTION_MASK
-					    | GDK_BUTTON_RELEASE_MASK,
-					    mts_item->resize_cursor,
-					    event->button.time) == 0 /*Success*/) {
-			mts->dragging_position = position;
-			return TRUE;
-		}
-	}
-
-	/* Convert the x coordinate into a EMeetingTimeSelectorTime. */
-	e_meeting_time_selector_calculate_time (mts, x, &start_time);
-	start_date = &start_time.date;
-	end_date = &end_time.date;
-
-	/* Find the nearest half-hour or hour interval, depending on whether
-	   zoomed_out is set. */
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			start_time.minute = 0;
-			end_time = start_time;
-			end_time.hour += 1;
-		} else {
-			start_time.minute -= start_time.minute % 30;
-			end_time = start_time;
-			end_time.minute += 30;
-		}
-	} else {
-		start_time.hour = 0;
-		start_time.minute = 0;
-		end_time = start_time;
-		g_date_add_days (&end_time.date, 1);
-	}
-	
-	/* Fix any overflows. */
-	e_meeting_time_selector_fix_time_overflows (&end_time);
-
-	/* Set the new meeting time. */
-	e_meeting_time_selector_set_meeting_time (mts_item->mts,
-						  g_date_year (start_date),
-						  g_date_month (start_date),
-						  g_date_day (start_date),
-						  start_time.hour,
-						  start_time.minute,
-						  g_date_year (end_date),
-						  g_date_month (end_date),
-						  g_date_day (end_date),
-						  end_time.hour,
-						  end_time.minute);
-
-
-	return FALSE;
-}
-
-
-/* This handles all button release events for the item. If we were dragging,
-   we finish the drag. */
-static gint
-e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
-					     GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = mts_item->mts;
-
-	/* Reset any drag. */
-	if (mts->dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-		e_meeting_time_selector_remove_timeout (mts);
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (mts_item),
-					  event->button.time);
-	}
-
-	return FALSE;
-}
-
-
-/* This handles all motion notify events for the item. If button1 is pressed
-   we check if a drag is in progress. If not, we set the cursor if we are over
-   the meeting time vertical bars. Note that GnomeCanvas doesn't use motion
-   hints, which may affect performance. */
-static gint
-e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
-					    GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorPosition position;
-	GdkCursor *cursor;
-	gint x, y;
-
-	mts = mts_item->mts;
-	x = (gint) event->motion.x;
-	y = (gint) event->motion.y;
-
-	if (mts->dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		e_meeting_time_selector_drag_meeting_time (mts, x);
-		return TRUE;
-	}
-
-	position = e_meeting_time_selector_item_get_drag_position (mts_item,
-								   x, y);
-
-	/* Determine which cursor should be used. */
-	if (position == E_MEETING_TIME_SELECTOR_POS_NONE)
-		cursor = mts_item->normal_cursor;
-	else
-		cursor = mts_item->resize_cursor;
-
-	/* Only set the cursor if it is different to the last one we set. */
-	if (mts_item->last_cursor_set != cursor) {
-		mts_item->last_cursor_set = cursor;
-		gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas)->window, cursor);
-	}
-
-	return FALSE;
-}
-
-
-static EMeetingTimeSelectorPosition
-e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item,
-						gint x, gint y)
-{
-	EMeetingTimeSelector *mts;
-	gboolean is_display_top;
-	gint meeting_start_x, meeting_end_x;
-
-	mts = mts_item->mts;
-
-	is_display_top = (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas) == mts->display_top) ? TRUE : FALSE;
-
-	if (is_display_top && y < mts->row_height * 2)
-		return E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	if (!e_meeting_time_selector_get_meeting_time_positions (mts, &meeting_start_x, &meeting_end_x))
-		return E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	if (x >= meeting_end_x - 2 && x <= meeting_end_x + 2)
-		return E_MEETING_TIME_SELECTOR_POS_END;
-
-	if (x >= meeting_start_x - 2 && x <= meeting_start_x + 2)
-		return E_MEETING_TIME_SELECTOR_POS_START;
-
-	return E_MEETING_TIME_SELECTOR_POS_NONE;
-}
-
-
-static gboolean
-e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
-						   gint row,
-						   gint x,
-						   gint width,
-						   gint *start_x,
-						   gint *end_x)
-{
-	EMeetingAttendee *ia;
-	EMeetingTime busy_periods_start;
-	EMeetingTime busy_periods_end;
-	
-	ia = e_meeting_model_find_attendee_at_row (mts->model, row);
-	busy_periods_start = e_meeting_attendee_get_start_busy_range (ia);
-	busy_periods_end = e_meeting_attendee_get_end_busy_range (ia);
-	
-	*start_x = -1;
-	*end_x = -1;
-
-	if (!g_date_valid (&busy_periods_start.date)
-	    || !g_date_valid (&busy_periods_end.date))
-		return FALSE;
-
-	*start_x = e_meeting_time_selector_calculate_time_position (mts, &busy_periods_start) - x - 1;
-
-	*end_x = e_meeting_time_selector_calculate_time_position (mts, &busy_periods_end) - x;
-
-	return TRUE;
-}
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
deleted file mode 100644
index 11b355dfa0..0000000000
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * MeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
- */
-
-#ifndef _E_MEETING_TIME_SELECTOR_ITEM_H_
-#define _E_MEETING_TIME_SELECTOR_ITEM_H_
-
-#include "e-meeting-time-sel.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_MEETING_TIME_SELECTOR_ITEM(obj)          (GTK_CHECK_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
-#define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
-#define IS_E_MEETING_TIME_SELECTOR_ITEM(o)         (GTK_CHECK_TYPE((o), e_meeting_time_selector_item_get_type ()))
-
-
-typedef struct _EMeetingTimeSelectorItem       EMeetingTimeSelectorItem;
-typedef struct _EMeetingTimeSelectorItemClass  EMeetingTimeSelectorItemClass;
-
-struct _EMeetingTimeSelectorItem
-{
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EMeetingTimeSelector widget. */
-	EMeetingTimeSelector *mts;
-
-	/* This GC is used for most of the drawing. The fg/bg colors are
-	   changed for each bit. */
-	GdkGC *main_gc;
-	GdkGC *stipple_gc;
-
-	/* The normal & resize cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *resize_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set;
-};
-
-
-struct _EMeetingTimeSelectorItemClass
-{
-	GnomeCanvasItemClass parent_class;
-};
-
-GtkType e_meeting_time_selector_item_get_type (void);
-
-
-#endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
deleted file mode 100644
index 50ba2af777..0000000000
--- a/calendar/gui/e-meeting-time-sel.c
+++ /dev/null
@@ -1,2884 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "e-meeting-time-sel.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvscrollbar.h>
-#include <libgnomeui/gnome-dateedit.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-widget.h>
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-font.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-header-item.h>
-#include <gal/e-table/e-table-header-utils.h>
-
-#include <widgets/misc/e-dateedit.h>
-#include "component-factory.h"
-#include "calendar-config.h"
-#include "e-meeting-utils.h"
-#include "e-meeting-time-sel-item.h"
-
-/* An array of hour strings for 24 hour time, "0:00" .. "23:00". */
-const gchar *EMeetingTimeSelectorHours[24] = {
-	"0:00", "1:00", "2:00", "3:00", "4:00", "5:00", "6:00", "7:00", 
-	"8:00", "9:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", 
-	"16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00"
-};
-
-/* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
-const gchar *EMeetingTimeSelectorHours12[24] = {
-	"12:00am", "1:00am", "2:00am", "3:00am", "4:00am", "5:00am", "6:00am", 
-	"7:00am", "8:00am", "9:00am", "10:00am", "11:00am", "12:00pm", 
-	"1:00pm", "2:00pm", "3:00pm", "4:00pm", "5:00pm", "6:00pm", "7:00pm",
-	"8:00pm", "9:00pm", "10:00pm", "11:00pm"
-};
-
-/* The number of days shown in the entire canvas. */
-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN		365
-#define E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE	 60
-#define E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE            7
-#define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER            28
-
-/* This is the number of pixels between the mouse has to move before the
-   scroll speed is incremented. */
-#define E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH	10
-
-/* This is the maximum scrolling speed. */
-#define E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED	4
-
-/* Signals */
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-
-static gint mts_signals [LAST_SIGNAL] = { 0 };
-
-static void e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass);
-static void e_meeting_time_selector_init (EMeetingTimeSelector * mts);
-static void e_meeting_time_selector_destroy (GtkObject *object);
-static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-						       const char *name, GdkColor *c);
-static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
-						   GtkWidget *hbox,
-						   gchar *label_text,
-						   GdkColor *color);
-static gint e_meeting_time_selector_expose_key_color (GtkWidget *darea,
-						      GdkEventExpose *event,
-						      GdkColor *color);
-static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
-							   GtkMenu   *menu);
-static void e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
-							    GtkMenu   *menu);
-static void e_meeting_time_selector_realize (GtkWidget *widget);
-static void e_meeting_time_selector_unrealize (GtkWidget *widget);
-static void e_meeting_time_selector_style_set (GtkWidget *widget,
-					       GtkStyle  *previous_style);
-static gint e_meeting_time_selector_expose_event (GtkWidget *widget,
-						  GdkEventExpose *event);
-static void e_meeting_time_selector_draw (GtkWidget    *widget,
-					  GdkRectangle *area);
-static void e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_table_vadjustment_changed (GtkAdjustment *adjustment,
-							       EMeetingTimeSelector *mts);
-
-static void e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
-							EMeetingTimeSelector *mts);
-
-static void e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
-							       EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
-								    gint *x,
-								    gint *y,
-								    gpointer user_data);
-static void e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *button,
-							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_working_hours_toggled (GtkWidget *button,
-							      EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
-								     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
-								EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
-								     gint *x,
-								     gint *y,
-								     gpointer user_data);
-static void e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
-								EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
-							    EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
-							    EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
-					      gboolean forward);
-static void e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
-							       EMeetingTime*end,
-							       gint *days,
-							       gint *hours,
-							       gint *minutes);
-static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-							   EMeetingTime*start_time,
-							   EMeetingTime*end_time,
-							   gint days, gint hours, gint mins);
-static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-								    EMeetingTime *start_time,
-								    EMeetingTime *end_time,
-								    gint days, gint hours, gint mins);
-static void e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,
-						 gint days, gint hours, gint minutes);
-static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-									EMeetingAttendee *attendee,
-									EMeetingTime *start_time,
-									EMeetingTime *end_time);
-
-
-static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
-						   EMeetingTime *mtstime);
-static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-						      EMeetingTime*mtstime);
-static void e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
-							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
-							     GtkAllocation *allocation,
-							     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts);
-static gboolean e_meeting_time_selector_timeout_handler (gpointer data);
-static void e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts);
-
-static void rows_inserted_cb (ETableModel *etm, int row, int count, gpointer data);
-static void cell_changed_cb (ETableModel *etm, int row, int col, gpointer data);
-static void rows_deleted_cb (ETableModel *etm, int row, int count, gpointer data);
-static void sort_info_changed_cb (ETableSortInfo *info, gpointer data);
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_meeting_time_selector_get_type (void)
-{
-	static guint e_meeting_time_selector_type = 0;
-
-	if (!e_meeting_time_selector_type) {
-		GtkTypeInfo e_meeting_time_selector_info =
-		{
-			"EMeetingTimeSelector",
-			sizeof (EMeetingTimeSelector),
-			sizeof (EMeetingTimeSelectorClass),
-			(GtkClassInitFunc) e_meeting_time_selector_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		e_meeting_time_selector_type = gtk_type_unique (GTK_TYPE_TABLE,
-								&e_meeting_time_selector_info);
-	}
-	return e_meeting_time_selector_type;
-}
-
-
-static void
-e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	parent_class = gtk_type_class (gtk_table_get_type());
-	object_class = (GtkObjectClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
-
-	mts_signals [CHANGED] = 
-		gtk_signal_new ("changed", GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMeetingTimeSelectorClass, 
-						   changed),
-				gtk_signal_default_marshaller,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, mts_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy = e_meeting_time_selector_destroy;
-
-	widget_class->realize      = e_meeting_time_selector_realize;
-	widget_class->unrealize    = e_meeting_time_selector_unrealize;
-	widget_class->style_set    = e_meeting_time_selector_style_set;
-	widget_class->expose_event = e_meeting_time_selector_expose_event;
-	widget_class->draw	   = e_meeting_time_selector_draw;
-}
-
-
-static void
-e_meeting_time_selector_init (EMeetingTimeSelector * mts)
-{
-	/* The shadow is drawn in the border so it must be >= 2 pixels. */
-	gtk_container_set_border_width (GTK_CONTAINER (mts), 2);
-
-	mts->accel_group = gtk_accel_group_new ();
-
-	mts->working_hours_only = TRUE;
-	mts->day_start_hour = 9;
-	mts->day_start_minute = 0;
-	mts->day_end_hour = 18;
-	mts->day_end_minute = 0;
-	mts->zoomed_out = TRUE;
-	mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	mts->etable = NULL;
-}
-
-
-void
-e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *emm)
-{
-	GtkWidget *hbox, *vbox, *separator, *button, *label, *table;
-	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
-	GSList *group;
-	GdkVisual *visual;
-	GdkColormap *colormap;
-	guint accel_key;
-	GtkAccelGroup *menu_accel_group;
-	time_t meeting_start_time;
-	struct tm *meeting_start_tm;
-	char *filename;
-	ETable *real_table;
-	guchar stipple_bits[] = {
-		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-	};
-
-	/* The default meeting time is the nearest half-hour interval in the
-	   future, in working hours. */
-	meeting_start_time = time (NULL);
-	g_date_clear (&mts->meeting_start_time.date, 1);
-	g_date_set_time (&mts->meeting_start_time.date, meeting_start_time);
-	meeting_start_tm = localtime (&meeting_start_time);
-	mts->meeting_start_time.hour = meeting_start_tm->tm_hour;
-	mts->meeting_start_time.minute = meeting_start_tm->tm_min;
-
-	e_meeting_time_selector_find_nearest_interval (mts, &mts->meeting_start_time,
-						       &mts->meeting_end_time,
-						       0, 0, 30);
-
-	e_meeting_time_selector_update_dates_shown (mts);
-
-	mts->meeting_positions_valid = FALSE;
-
-	mts->row_height = 19;
-	mts->col_width = 55;
-	mts->day_width = 55 * 24 + 1;
-
-	mts->auto_scroll_timeout_id = 0;
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_table_attach (GTK_TABLE (mts),
-			  vbox, 0, 1, 0, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (vbox);
-
-	mts->attendees_vbox_spacer = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox_spacer, FALSE, FALSE, 0);
-	gtk_widget_show (mts->attendees_vbox_spacer);
-	
-	mts->attendees_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox, TRUE, TRUE, 0);
-	gtk_widget_show (mts->attendees_vbox);
-
-	/* build the etable */
-	filename = g_strdup_printf ("%s/config/et-header-meeting-time-sel", evolution_dir);
-	mts->model = emm;
-	if (mts->model)
-		gtk_object_ref (GTK_OBJECT (mts->model));
-
-	gtk_signal_connect (GTK_OBJECT (mts->model), "model_rows_inserted",
-			    GTK_SIGNAL_FUNC (rows_inserted_cb), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->model), "model_cell_changed",
-			    GTK_SIGNAL_FUNC (cell_changed_cb), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->model), "model_rows_deleted",
-			    GTK_SIGNAL_FUNC (rows_deleted_cb), mts);
-
-	mts->etable = GTK_WIDGET (e_meeting_model_etable_from_model (mts->model,
-								EVOLUTION_ETSPECDIR "/e-meeting-time-sel.etspec",
-								filename));
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (mts->etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-	e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (mts->etable), 0);
-
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));
-	gtk_signal_connect (GTK_OBJECT (real_table->sort_info), "sort_info_changed",
-			    GTK_SIGNAL_FUNC (sort_info_changed_cb), mts);
-
-	gtk_box_pack_start (GTK_BOX (mts->attendees_vbox), mts->etable, TRUE, TRUE, 2);
-	gtk_widget_show (mts->etable);
-	g_free (filename);
-
-	/* The free/busy information */
-	mts->display_top = gnome_canvas_new ();
-	gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_top),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					mts->row_height * 3);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->display_top,
-			  1, 4, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->display_top);
-	gtk_signal_connect (GTK_OBJECT (mts->display_top), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-
-	mts->display_main = gnome_canvas_new ();
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->display_main,
-			  1, 4, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (mts->display_main);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_size_allocate), mts);
-
-	mts->hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts->display_main)->hadjustment);
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
-	gtk_table_attach (GTK_TABLE (mts), mts->hscrollbar,
-			  1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->hscrollbar);
-
-	mts->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (mts->display_main)->vadjustment);
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-	gtk_table_attach (GTK_TABLE (mts), mts->vscrollbar,
-			  4, 5, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (mts->vscrollbar);
-
-	/* Create the item in the top canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
-			       e_meeting_time_selector_item_get_type (),
-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
-			       NULL);
-
-	/* Create the item in the main canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
-			       e_meeting_time_selector_item_get_type (),
-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
-			       NULL);
-
-	/* Create the hbox containing the color key. */
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  1, 4, 3, 4, GTK_FILL, 0, 0, 8);
-	gtk_widget_show (hbox);
-
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Tentative"), &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Busy"), &mts->busy_colors[E_MEETING_FREE_BUSY_BUSY]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Out of Office"), &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("No Information"),
-					       NULL);
-
-	separator = gtk_hseparator_new ();
-	gtk_table_attach (GTK_TABLE (mts), separator,
-			  0, 5, 4, 5, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (separator);
-
-	/* Create the Invite Others & Options buttons on the left. */
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  0, 1, 3, 4, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (hbox);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _("_Invite Others..."));
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_invite_others_button_clicked), mts);
-
-	mts->options_button = gtk_button_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), mts->options_button, TRUE, TRUE, 0);
-	gtk_widget_show (mts->options_button);
-
-	gtk_signal_connect (GTK_OBJECT (mts->options_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_options_button_clicked), mts);
-
-	child_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (mts->options_button), child_hbox);
-	gtk_widget_show (child_hbox);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Options"));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->options_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	/* Create the Options menu. */
-	mts->options_menu = gtk_menu_new ();
-	gtk_menu_attach_to_widget (GTK_MENU (mts->options_menu), mts->options_button,
-				   e_meeting_time_selector_options_menu_detacher);
-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts->options_menu));
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _Only Working Hours"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					mts->working_hours_only);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_working_hours_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _Zoomed Out"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					mts->zoomed_out);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_zoomed_out_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_menu_item_new ();
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_widget_set_sensitive (menuitem, FALSE);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Update Free/Busy"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_update_free_busy), mts);
-	gtk_widget_show (menuitem);
-
-	/* Create the 3 AutoPick buttons on the left. */
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  0, 1, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (hbox);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _("_<<"));
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_prev_button_clicked), mts);
-
-	mts->autopick_button = gtk_button_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 0);
-	gtk_widget_show (mts->autopick_button);
-
-	child_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (mts->autopick_button), child_hbox);
-	gtk_widget_show (child_hbox);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Autopick"));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->autopick_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (mts->autopick_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_button_clicked), mts);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _(">_>"));
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_next_button_clicked), mts);
-
-	/* Create the Autopick menu. */
-	mts->autopick_menu = gtk_menu_new ();
-	gtk_menu_attach_to_widget (GTK_MENU (mts->autopick_menu), mts->autopick_button,
-				   e_meeting_time_selector_autopick_menu_detacher);
-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts->autopick_menu));
-
-	menuitem = gtk_radio_menu_item_new_with_label (NULL, "");
-	mts->autopick_all_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_All People and Resources"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_all_people_one_resource_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("All _People and One Resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_required_people_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Required People"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_required_people_one_resource_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Required People and _One Resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	/* Create the date entry fields on the right. */
-	alignment = gtk_alignment_new (0.0, 0.5, 0, 0);
-	gtk_table_attach (GTK_TABLE (mts), alignment,
-			  1, 4, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (alignment);
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-	gtk_container_add (GTK_CONTAINER (alignment), table);
-	gtk_widget_show (table);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
-					   _("Meeting _start time:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1, 0, 1, GTK_FILL, 0, 4, 0);
-	gtk_widget_show (label);
-
-	mts->start_date_edit = e_date_edit_new ();
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->start_date_edit), TRUE);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (mts->start_date_edit),
-					    calendar_config_get_24_hour_format ());
-	
-	gtk_table_attach (GTK_TABLE (table), mts->start_date_edit,
-			  1, 2, 0, 1, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->start_date_edit);
-	gtk_signal_connect (GTK_OBJECT (mts->start_date_edit), "changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
-					   _("Meeting _end time:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1, 1, 2, GTK_FILL, 0, 4, 0);
-	gtk_widget_show (label);
-
-	mts->end_date_edit = e_date_edit_new ();
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->end_date_edit), TRUE);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (mts->end_date_edit),
-					    calendar_config_get_24_hour_format ());
-
-	gtk_table_attach (GTK_TABLE (table), mts->end_date_edit,
-			  1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->end_date_edit);
-	gtk_signal_connect (GTK_OBJECT (mts->end_date_edit), "changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-
-	gtk_table_set_col_spacing (GTK_TABLE (mts), 0, 4);
-	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
-
-	/* Allocate the colors. */
-	visual = gtk_widget_get_visual (GTK_WIDGET (mts));
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
-	mts->color_context = gdk_color_context_new (visual, colormap);
-	e_meeting_time_selector_alloc_named_color (mts, "gray75", &mts->bg_color);
-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->all_attendees_bg_color);
-	gdk_color_black (colormap, &mts->grid_color);
-	gdk_color_white (colormap, &mts->grid_shadow_color);
-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->grid_unused_color);
-	gdk_color_white (colormap, &mts->meeting_time_bg_color);
-	gdk_color_white (colormap, &mts->stipple_bg_color);
-	gdk_color_white (colormap, &mts->attendee_list_bg_color);
-
-	e_meeting_time_selector_alloc_named_color (mts, "LightSkyBlue2", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
-	e_meeting_time_selector_alloc_named_color (mts, "blue", &mts->busy_colors[E_MEETING_FREE_BUSY_BUSY]);
-	e_meeting_time_selector_alloc_named_color (mts, "HotPink3", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
-
-	/* Create the stipple, for attendees with no data. */
-	mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits,
-						    8, 8);
-
-	/* Connect handlers to the adjustments  scroll the other items. */
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->hadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_hadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-
-	gtk_signal_connect (GTK_OBJECT (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable))), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_table_vadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable))), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_table_vadjustment_changed), mts);
-
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);	
-	e_meeting_time_selector_update_date_popup_menus (mts);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This adds a color to the color key beneath the main display. If color is
-   NULL, it displays the No Info stipple instead. */
-static void
-e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
-				       GtkWidget *hbox,
-				       gchar *label_text, GdkColor *color)
-{
-	GtkWidget *child_hbox, *darea, *label;
-
-	child_hbox = gtk_hbox_new (FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (hbox), child_hbox, TRUE, TRUE, 0);
-	gtk_widget_show (child_hbox);
-
-	darea = gtk_drawing_area_new ();
-	gtk_box_pack_start (GTK_BOX (child_hbox), darea, FALSE, FALSE, 0);
-	gtk_object_set_user_data (GTK_OBJECT (darea), mts);
-	gtk_widget_set_usize (darea, 14, 14);
-	gtk_widget_show (darea);
-
-	label = gtk_label_new (label_text);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-
-	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_key_color),
-			    color);
-}
-
-static gint
-e_meeting_time_selector_expose_key_color (GtkWidget *darea,
-					  GdkEventExpose *event,
-					  GdkColor *color)
-{
-	EMeetingTimeSelector * mts;
-	GdkGC *gc;
-	gint width, height;
-
-	mts = gtk_object_get_user_data (GTK_OBJECT (darea));
-	gc = mts->color_key_gc;
-	width = darea->allocation.width;
-	height = darea->allocation.height;
-
-	gtk_draw_shadow (darea->style, darea->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, 0, 0, width, height);
-
-	if (color) {
-		gdk_gc_set_foreground (gc, color);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
-	} else {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		gdk_gc_set_background (gc, &mts->stipple_bg_color);
-		gdk_gc_set_stipple (gc, mts->stipple);
-		gdk_gc_set_fill (gc, GDK_OPAQUE_STIPPLED);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
-		gdk_gc_set_fill (gc, GDK_SOLID);
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-					   const char *name, GdkColor *c)
-{
-	int failed;
-	
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (c != NULL);
-
-	gdk_color_parse (name, c);
-	c->pixel = 0;
-	c->pixel = gdk_color_context_get_pixel (mts->color_context,
-						c->red, c->green, c->blue,
-						&failed);
-	if (failed)
-		g_warning ("Failed to allocate color: %s\n", name);
-}
-
-
-static void
-e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
-					       GtkMenu   *menu)
-{
-  EMeetingTimeSelector *mts;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
-
-  mts = E_MEETING_TIME_SELECTOR (widget);
-  g_return_if_fail (mts->options_menu == (GtkWidget*) menu);
-
-  mts->options_menu = NULL;
-}
-
-
-static void
-e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
-						GtkMenu   *menu)
-{
-  EMeetingTimeSelector *mts;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
-
-  mts = E_MEETING_TIME_SELECTOR (widget);
-  g_return_if_fail (mts->autopick_menu == (GtkWidget*) menu);
-
-  mts->autopick_menu = NULL;
-}
-
-
-GtkWidget *
-e_meeting_time_selector_new (EMeetingModel *emm)
-{
-	GtkWidget *mts;
-
-	mts = GTK_WIDGET (gtk_type_new (e_meeting_time_selector_get_type ()));
-
-	e_meeting_time_selector_construct (E_MEETING_TIME_SELECTOR (mts), emm);
-	
-	return mts;
-}
-
-
-static void
-e_meeting_time_selector_destroy (GtkObject *object)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (object);
-
-	e_meeting_time_selector_remove_timeout (mts);
-
-	gdk_color_context_free (mts->color_context);
-	gdk_bitmap_unref (mts->stipple);
-
-	if (mts->model)
-		gtk_object_unref (GTK_OBJECT (mts->model));
-		
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_realize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	mts->color_key_gc = gdk_gc_new (widget->window);
-}
-
-
-static void
-e_meeting_time_selector_unrealize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	gdk_gc_unref (mts->color_key_gc);
-	mts->color_key_gc = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-static void
-e_meeting_time_selector_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTime saved_time;
-	ETable *real_table;
-	ETableHeader *eth;
-	GdkFont *font;
-	EFont *efont;
-	int hour, max_hour_width;
-	int numcols, col;
-	int maxheight;      
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-	font = widget->style->font;
-	efont = e_font_from_gdk_font (font);
-	
-	/* Calculate the widths of the hour strings in the style's font. */
-	max_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		if (calendar_config_get_24_hour_format ())
-			mts->hour_widths[hour] = gdk_string_width (font, EMeetingTimeSelectorHours[hour]);
-		else
-			mts->hour_widths[hour] = gdk_string_width (font, EMeetingTimeSelectorHours12[hour]);
-		max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]);
-	}
-              
-	/* FIXME the 5 is for the padding etable adds on */
-	mts->row_height = e_font_height (efont) + 5;
-	mts->col_width = max_hour_width + 6;
-
-	e_font_unref (efont);
-              
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-              
-	gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3);
-
-	/* Calculate header height */
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));
-	eth = real_table->full_header;
-	numcols = e_table_header_count (eth);
-	maxheight = 0;
-	for (col = 0; col < numcols; col++) {
-		ETableCol *ecol = e_table_header_get_column (eth, col);
-		int height;
-
-		height = e_table_header_compute_height (ecol, widget->style, font);
-
-		if (height > maxheight)
-			maxheight = height;
-	}
-	/* FIXME the 5 is for the padding etable adds on */
-	gtk_widget_set_usize (mts->attendees_vbox_spacer, 1, mts->row_height * 3 - maxheight - 5);
-
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-}
-
-/* This draws a shadow around the top display and main display. */
-static gint
-e_meeting_time_selector_expose_event (GtkWidget *widget,
-				      GdkEventExpose *event)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	e_meeting_time_selector_draw_shadow (mts);
-
-	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-
-static void
-e_meeting_time_selector_draw (GtkWidget    *widget,
-			      GdkRectangle *area)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	e_meeting_time_selector_draw_shadow (mts);
-
-	if (GTK_WIDGET_CLASS (parent_class)->draw)
-		(*GTK_WIDGET_CLASS (parent_class)->draw)(widget, area);
-}
-
-
-static void
-e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)
-{
-	GtkWidget *widget;
-	gint x, y, w, h;
-
-	widget = GTK_WIDGET (mts);
-
-	/* Draw the shadow around the graphical displays. */
-	x = mts->display_top->allocation.x - 2;
-	y = mts->display_top->allocation.y - 2;
-	w = mts->display_top->allocation.width + 4;
-	h = mts->display_top->allocation.height + mts->display_main->allocation.height + 4;
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, x, y, w, h);
-}
-
-
-/* When the main canvas scrolls, we scroll the other canvases. */
-static void
-e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
-					     EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = GTK_LAYOUT (mts->display_top)->hadjustment;
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-static void
-e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
-					     EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable));
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-static void
-e_meeting_time_selector_table_vadjustment_changed (GtkAdjustment *adjustment,
-						   EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = GTK_LAYOUT (mts->display_main)->vadjustment;
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-void
-e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
-					  gint *start_year,
-					  gint *start_month,
-					  gint *start_day,
-					  gint *start_hour,
-					  gint *start_minute,
-					  gint *end_year,
-					  gint *end_month,
-					  gint *end_day,
-					  gint *end_hour,
-					  gint *end_minute)
-{
-	*start_year = g_date_year (&mts->meeting_start_time.date);
-	*start_month = g_date_month (&mts->meeting_start_time.date);
-	*start_day = g_date_day (&mts->meeting_start_time.date);
-	*start_hour = mts->meeting_start_time.hour;
-	*start_minute = mts->meeting_start_time.minute;
-
-	*end_year = g_date_year (&mts->meeting_end_time.date);
-	*end_month = g_date_month (&mts->meeting_end_time.date);
-	*end_day = g_date_day (&mts->meeting_end_time.date);
-	*end_hour = mts->meeting_end_time.hour;
-	*end_minute = mts->meeting_end_time.minute;
-}
-
-
-gboolean
-e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
-					  gint start_year,
-					  gint start_month,
-					  gint start_day,
-					  gint start_hour,
-					  gint start_minute,
-					  gint end_year,
-					  gint end_month,
-					  gint end_day,
-					  gint end_hour,
-					  gint end_minute)
-{
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year)
-	    || !g_date_valid_dmy (end_day, end_month, end_year)
-	    || start_hour < 0 || start_hour > 23
-	    || end_hour < 0 || end_hour > 23
-	    || start_minute < 0 || start_minute > 59
-	    || end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_set_dmy (&mts->meeting_start_time.date, start_day, start_month,
-			start_year);
-	mts->meeting_start_time.hour = start_hour;
-	mts->meeting_start_time.minute = start_minute;
-	g_date_set_dmy (&mts->meeting_end_time.date, end_day, end_month,
-			end_year);
-	mts->meeting_end_time.hour = end_hour;
-	mts->meeting_end_time.minute = end_minute;
-
-	mts->meeting_positions_valid = FALSE;
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Set the times in the EDateEdit widgets. */
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-
-	return TRUE;
-}
-
-void
-e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,
-				     gboolean all_day)
-{
-	EMeetingTime saved_time;
-
-	mts->all_day = all_day;
-	
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->start_date_edit),
-				   !all_day);
-	e_date_edit_set_show_time (E_DATE_EDIT (mts->end_date_edit),
-				   !all_day);
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						gboolean working_hours_only)
-{
-	EMeetingTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->working_hours_only == working_hours_only)
-		return;
-
-	mts->working_hours_only = working_hours_only;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
-					   gint day_start_hour,
-					   gint day_start_minute,
-					   gint day_end_hour,
-					   gint day_end_minute)
-{
-	EMeetingTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->day_start_hour == day_start_hour
-	    && mts->day_start_minute == day_start_minute
-	    && mts->day_end_hour == day_end_hour
-	    && mts->day_end_minute == day_end_minute)
-		return;
-
-	mts->day_start_hour = day_start_hour;
-	mts->day_start_minute = day_start_minute;
-	mts->day_end_hour = day_end_hour;
-	mts->day_end_minute = day_end_minute;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
-					gboolean zoomed_out)
-{
-	EMeetingTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->zoomed_out == zoomed_out)
-		return;
-
-	mts->zoomed_out = zoomed_out;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-static void
-e_meeting_time_selector_refresh_cb (gpointer data) 
-{
-	EMeetingTimeSelector *mts = data;
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-static void
-e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all)
-{
-	EMeetingTime start, end;
-	
-	start = mts->meeting_start_time;
-	g_date_subtract_days (&start.date, E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE);
-	start.hour = 0;
-	start.minute = 0;
-	end = mts->meeting_end_time;
-	g_date_add_days (&end.date, E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER);
-	end.hour = 0;
-	end.minute = 0;	
-
-	if (all)
-		e_meeting_model_refresh_all_busy_periods (mts->model, &start, &end, 
-							  e_meeting_time_selector_refresh_cb, mts);
-	else
-		e_meeting_model_refresh_busy_periods (mts->model, row, &start, &end, 
-						      e_meeting_time_selector_refresh_cb, mts);
-}
-
-EMeetingTimeSelectorAutopickOption
-e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)
-{
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_item)->active)
-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item)->active)
-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item)->active)
-		return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE;
-	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;
-}
-
-
-void
-e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
-					     EMeetingTimeSelectorAutopickOption autopick_option)
-{
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	switch (autopick_option) {
-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_all_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_one_resource_item), TRUE);
-		break;
-	}
-}
-#if 0
-void
-e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-						      gint row,
-						      gboolean send_meeting_to)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	attendee->send_meeting_to = send_meeting_to;
-}
-#endif
-
-/*
- * DEBUGGING ROUTINES - functions to output various bits of data.
- */
-
-#ifdef E_MEETING_TIME_SELECTOR_DEBUG
-
-/* Debugging function to dump information on all attendees. */
-void
-e_meeting_time_selector_dump (EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	gint row, period_num;
-	gchar buffer[128];
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	g_print ("\n\nAttendee Information:\n");
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		g_print ("Attendee: %s\n", attendee->name);
-		g_print ("  Longest Busy Period: %i days\n",
-			 attendee->longest_period_in_days);
-
-		e_meeting_time_selector_attendee_ensure_periods_sorted (mts, attendee);
-#if 1
-		for (period_num = 0;
-		     period_num < attendee->busy_periods->len;
-		     period_num++) {
-			period = &g_array_index (attendee->busy_periods,
-						 EMeetingTimeSelectorPeriod,
-						 period_num);
-
-			/* These are just for debugging so don't need i18n. */
-			g_date_strftime (buffer, sizeof (buffer),
-					 "%A, %B %d, %Y", &period->start.date);
-			g_print ("  Start: %s %i:%02i\n", buffer,
-				 period->start.hour, period->start.minute);
-
-			g_date_strftime (buffer, sizeof (buffer),
-					 "%A, %B %d, %Y", &period->end.date);
-			g_print ("  End  : %s %i:%02i\n", buffer,
-				 period->end.hour, period->end.minute);
-		}
-#endif
-	}
-
-}
-
-
-/* This formats a EMeetingTimein a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_time (EMeetingTime*mtstime)
-{
-	static gchar buffer[128];
-
-	gchar buffer2[128];
-
-	/* This is just for debugging so doesn't need i18n. */
-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y",
-			 &mtstime->date);
-	sprintf (buffer2, " at %i:%02i", (gint) mtstime->hour,
-		 (gint) mtstime->minute);
-	strcat (buffer, buffer2);
-
-	return buffer;
-}
-
-
-/* This formats a GDate in a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_date (GDate *date)
-{
-	static gchar buffer[128];
-
-	/* This is just for debugging so doesn't need i18n. */
-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y", date);
-	return buffer;
-}
-
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-
-static void
-e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
-							 EMeetingTimeSelector *mts)
-{
-	e_meeting_model_invite_others_dialog (mts->model);
-}
-
-
-static void
-e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
-						   EMeetingTimeSelector *mts)
-{
-	gtk_menu_popup (GTK_MENU (mts->options_menu), NULL, NULL,
-			e_meeting_time_selector_options_menu_position_callback,
-			mts, 1, GDK_CURRENT_TIME);
-}
-
-
-static void
-e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
-							gint *x,
-							gint *y,
-							gpointer user_data)
-{
-	EMeetingTimeSelector *mts;
-	GtkRequisition menu_requisition;
-	gint max_x, max_y;
-
-	mts = E_MEETING_TIME_SELECTOR (user_data);
-
-	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->options_button->window, x, y);
-	*y += mts->options_button->allocation.height;
-
-	/* Now make sure we are on the screen. */
-	gtk_widget_size_request (mts->options_menu, &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-static void
-e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
-					     EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);
-}
-
-
-static void
-e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
-						    EMeetingTimeSelector *mts)
-{
-	gtk_menu_popup (GTK_MENU (mts->autopick_menu), NULL, NULL,
-			e_meeting_time_selector_autopick_menu_position_callback,
-			mts, 1, GDK_CURRENT_TIME);
-}
-
-
-static void
-e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
-							 gint *x,
-							 gint *y,
-							 gpointer user_data)
-{
-	EMeetingTimeSelector *mts;
-	GtkRequisition menu_requisition;
-	gint max_x, max_y;
-
-	mts = E_MEETING_TIME_SELECTOR (user_data);
-
-	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->autopick_button->window, x, y);
-	*y += mts->autopick_button->allocation.height;
-
-	/* Now make sure we are on the screen. */
-	gtk_widget_size_request (mts->autopick_menu, &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-
-static void
-e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
-						    EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->autopick_menu))
-		gtk_menu_popdown (GTK_MENU (mts->autopick_menu));
-}
-
-
-static void
-e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
-						EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_autopick (mts, FALSE);
-}
-
-
-static void
-e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
-						EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_autopick (mts, TRUE);
-}
-
-
-/* This tries to find the previous or next meeting time for which all
-   attendees will be available. */
-static void
-e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
-				  gboolean forward)
-{
-	EMeetingTime start_time, end_time, *resource_free;
-	EMeetingAttendee *attendee;
-	EMeetingFreeBusyPeriod *period;
-	EMeetingTimeSelectorAutopickOption autopick_option;
-	gint duration_days, duration_hours, duration_minutes, row;
-	gboolean meeting_time_ok, skip_optional = FALSE;
-	gboolean need_one_resource = FALSE, found_resource;
-
-	/* Get the current meeting duration in days + hours + minutes. */
-	e_meeting_time_selector_calculate_time_difference (&mts->meeting_start_time, &mts->meeting_end_time, &duration_days, &duration_hours, &duration_minutes);
-	
-	/* Find the first appropriate start time. */
-	start_time = mts->meeting_start_time;
-	if (forward)
-		e_meeting_time_selector_find_nearest_interval (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-	else
-		e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-
-	/* Determine if we can skip optional people and if we only need one
-	   resource based on the autopick option. */
-	autopick_option = e_meeting_time_selector_get_autopick_option (mts);
-	if (autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE
-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)
-		skip_optional = TRUE;
-	if (autopick_option == E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE
-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)
-		need_one_resource = TRUE;
-
-	/* Keep moving forward or backward until we find a possible meeting
-	   time. */
-	for (;;) {
-		meeting_time_ok = TRUE;
-		found_resource = FALSE;
-		resource_free = NULL;
-
-		/* Step through each attendee, checking if the meeting time
-		   intersects one of the attendees busy periods. */
-		for (row = 0; row <  e_meeting_model_count_actual_attendees (mts->model); row++) {
-			attendee = e_meeting_model_find_attendee_at_row (mts->model, row);
-
-			/* Skip optional people if they don't matter. */
-			if (skip_optional && e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_OPTIONAL_PERSON)
-				continue;
-
-			period = e_meeting_time_selector_find_time_clash (mts, attendee, &start_time, &end_time);
-
-			if (need_one_resource && e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_RESOURCE) {
-				if (period) {
-					/* We want to remember the closest
-					   prev/next time that one resource is
-					   available, in case we don't find any
-					   free resources. */
-					if (forward) {
-						if (!resource_free || e_meeting_time_compare_times (resource_free, &period->end) > 0)
-							resource_free = &period->end;
-					} else {
-						if (!resource_free || e_meeting_time_compare_times (resource_free, &period->start) < 0)
-							resource_free = &period->start;
-					}
-
-				} else {
-					found_resource = TRUE;
-				}
-			} else if (period) {
-				/* Skip the period which clashed. */
-				if (forward) {
-					start_time = period->end;
-				} else {
-					start_time = period->start;
-					e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-				}
-				meeting_time_ok = FALSE;
-				break;
-			}
-		}
-
-		/* Check that we found one resource if necessary. If not, skip
-		   to the closest time that a resource is free. Note that if
-		   there are no resources, resource_free will never get set,
-		   so we assume the meeting time is OK. */
-		if (meeting_time_ok && need_one_resource && !found_resource
-		    && resource_free) {
-			if (forward) {
-				start_time = *resource_free;
-			} else {
-				start_time = *resource_free;
-				e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-				}
-			meeting_time_ok = FALSE;
-		}
-
-		if (meeting_time_ok) {
-			mts->meeting_start_time = start_time;
-			mts->meeting_end_time = end_time;
-			mts->meeting_positions_valid = FALSE;
-			gtk_widget_queue_draw (mts->display_top);
-			gtk_widget_queue_draw (mts->display_main);
-
-			/* Make sure the time is shown. */
-			e_meeting_time_selector_ensure_meeting_time_shown (mts);
-
-			/* Set the times in the EDateEdit widgets. */
-			e_meeting_time_selector_update_start_date_edit (mts);
-			e_meeting_time_selector_update_end_date_edit (mts);
-
-			gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-
-			return;
-		}
-
-		/* Move forward to the next possible interval. */
-		if (forward)
-			e_meeting_time_selector_find_nearest_interval (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-		else
-			e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-	}
-}
-
-
-static void
-e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
-						   EMeetingTime*end,
-						   gint *days,
-						   gint *hours,
-						   gint *minutes)
-{
-	*days = g_date_julian (&end->date) - g_date_julian (&start->date);
-	*hours = end->hour - start->hour;
-	*minutes = end->minute - start->minute;
-	if (*minutes < 0) {
-		*minutes += 60;
-		*hours = *hours - 1;
-	}
-	if (*hours < 0) {
-		*hours += 24;
-		*days = *days - 1;
-	}
-}
-
-
-/* This moves the given time forward to the next suitable start of a meeting.
-   If zoomed_out is set, this means every hour. If not every half-hour. */
-static void
-e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-					       EMeetingTime*start_time,
-					       EMeetingTime*end_time,
-					       gint days, gint hours, gint mins)
-{
-	gint minutes_shown;
-	gboolean set_to_start_of_working_day = FALSE;
-
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			start_time->hour++;
-			start_time->minute = 0;
-		} else {
-			start_time->minute += 30;
-			start_time->minute -= start_time->minute % 30;
-		}
-	} else {
-		g_date_add_days (&start_time->date, 1);
-		start_time->hour = 0;
-		start_time->minute = 0;	
-	}
-	e_meeting_time_selector_fix_time_overflows (start_time);
-	
-	*end_time = *start_time;
-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-
-	/* Check if the interval is less than a day as seen in the display.
-	   If it isn't we don't worry about the working day. */
-	if (!mts->working_hours_only || days > 0)
-		return;
-	minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60;
-	minutes_shown += mts->day_end_minute - mts->day_start_minute;
-	if (hours * 60 + mins > minutes_shown)
-		return;
-
-	/* If the meeting time finishes past the end of the working day, move
-	   onto the start of the next working day. If the meeting time starts
-	   before the working day, move it on as well. */
-	if (start_time->hour > mts->day_end_hour
-	    || (start_time->hour == mts->day_end_hour
-		&& start_time->minute > mts->day_end_minute)
-	    || end_time->hour > mts->day_end_hour
-	    || (end_time->hour == mts->day_end_hour
-		&& end_time->minute > mts->day_end_minute)) {
-		g_date_add_days (&start_time->date, 1);
-		set_to_start_of_working_day = TRUE;
-	} else if (start_time->hour < mts->day_start_hour
-		   || (start_time->hour == mts->day_start_hour
-		       && start_time->minute < mts->day_start_minute)) {
-		set_to_start_of_working_day = TRUE;
-	}
-
-	if (set_to_start_of_working_day) {
-		start_time->hour = mts->day_start_hour;
-		start_time->minute = mts->day_start_minute;
-
-		if (mts->zoomed_out) {
-			if (start_time->minute > 0) {
-				start_time->hour++;
-				start_time->minute = 0;
-			}
-		} else {
-			start_time->minute += 29;
-			start_time->minute -= start_time->minute % 30;
-		}
-		
-		e_meeting_time_selector_fix_time_overflows (start_time);
-
-		*end_time = *start_time;
-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-	}
-}
-
-
-/* This moves the given time backward to the next suitable start of a meeting.
-   If zoomed_out is set, this means every hour. If not every half-hour. */
-static void
-e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-							EMeetingTime*start_time,
-							EMeetingTime*end_time,
-							gint days, gint hours, gint mins)
-{
-	gint new_hour, minutes_shown;
-	gboolean set_to_end_of_working_day = FALSE;
-
-	if (!mts->all_day) {
-		new_hour = start_time->hour;
-		if (mts->zoomed_out) {
-			if (start_time->minute == 0)
-				new_hour--;
-			start_time->minute = 0;
-		} else {
-			if (start_time->minute == 0) {
-				start_time->minute = 30;
-				new_hour--;
-			} else if (start_time->minute <= 30)
-				start_time->minute = 0;
-			else
-				start_time->minute = 30;
-		}
-		if (new_hour < 0) {
-			new_hour += 24;
-			g_date_subtract_days (&start_time->date, 1);
-		}
-		start_time->hour = new_hour;
-	} else {
-		g_date_subtract_days (&start_time->date, 1);
-		start_time->hour = 0;
-		start_time->minute = 0;	
-	}
-
-	*end_time = *start_time;
-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-
-	/* Check if the interval is less than a day as seen in the display.
-	   If it isn't we don't worry about the working day. */
-	if (!mts->working_hours_only || days > 0)
-		return;
-	minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60;
-	minutes_shown += mts->day_end_minute - mts->day_start_minute;
-	if (hours * 60 + mins > minutes_shown)
-		return;
-
-	/* If the meeting time finishes past the end of the working day, move
-	   back to the end of the working day. If the meeting time starts
-	   before the working day, move it back to the end of the previous
-	   working day. */
-	if (start_time->hour > mts->day_end_hour
-	    || (start_time->hour == mts->day_end_hour
-		&& start_time->minute > mts->day_end_minute)
-	    || end_time->hour > mts->day_end_hour
-	    || (end_time->hour == mts->day_end_hour
-		&& end_time->minute > mts->day_end_minute)) {
-		set_to_end_of_working_day = TRUE;
-	} else if (start_time->hour < mts->day_start_hour
-		   || (start_time->hour == mts->day_start_hour
-		       && start_time->minute < mts->day_start_minute)) {
-		g_date_subtract_days (&end_time->date, 1);
-		set_to_end_of_working_day = TRUE;
-	}
-
-	if (set_to_end_of_working_day) {
-		end_time->hour = mts->day_end_hour;
-		end_time->minute = mts->day_end_minute;
-		*start_time = *end_time;
-		e_meeting_time_selector_adjust_time (start_time, -days, -hours, -mins);
-
-		if (mts->zoomed_out) {
-			start_time->minute = 0;
-		} else {
-			start_time->minute -= start_time->minute % 30;
-		}
-		
-		*end_time = *start_time;
-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-	}
-}
-
-
-/* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime.
-   It is used to calculate the end of a period given a start & duration.
-   Days, hours & minutes can be negative, to move backwards, but they should
-   be within normal ranges, e.g. hours should be between -23 and 23. */
-static void
-e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,
-				     gint days, gint hours, gint minutes)
-{
-	gint new_hours, new_minutes;
-
-	/* We have to handle negative values for hous and minutes here, since
-	   EMeetingTimeuses guint8s to store them. */
-	new_minutes = mtstime->minute + minutes;
-	if (new_minutes < 0) {
-		new_minutes += 60;
-		hours -= 1;
-	}
-
-	new_hours = mtstime->hour + hours;
-	if (new_hours < 0) {
-		new_hours += 24;
-		days -= 1;
-	}
-
-	g_date_add_days (&mtstime->date, days);
-	mtstime->hour = new_hours;
-	mtstime->minute = new_minutes;
-
-	e_meeting_time_selector_fix_time_overflows (mtstime);
-}
-
-
-/* This looks for any busy period of the given attendee which clashes with
-   the start and end time. It uses a binary search. */
-static EMeetingFreeBusyPeriod *
-e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-					 EMeetingAttendee *attendee,
-					 EMeetingTime*start_time,
-					 EMeetingTime*end_time)
-{
-	EMeetingFreeBusyPeriod *period;
-	const GArray *busy_periods;
-	gint period_num;
-
-	busy_periods = e_meeting_attendee_get_busy_periods (attendee);
-	period_num = e_meeting_attendee_find_first_busy_period (attendee, &start_time->date);
-
-	if (period_num == -1)
-		return NULL;
-
-	/* Step forward through the busy periods until we find a clash or we
-	   go past the end_time. */
-	while (period_num < busy_periods->len) {
-		period = &g_array_index (busy_periods,  EMeetingFreeBusyPeriod, period_num);
-
-		/* If the period starts at or after the end time, there is no
-		   clash and we are finished. The busy periods are sorted by
-		   their start times, so all the rest will be later. */
-		if (e_meeting_time_compare_times (&period->start, end_time) >= 0)
-			return NULL;
-
-		/* If the period ends after the start time, we have found a
-		   clash. From the above test we already know the busy period
-		   isn't completely after the meeting time. */
-		if (e_meeting_time_compare_times (&period->end, start_time) > 0)
-			return period;
-
-		period_num++;
-	}
-
-	return NULL;
-}
-
-static void
-e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,
-					       EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_set_zoomed_out (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
-}
-
-
-static void
-e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
-						  EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_set_working_hours_only (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
-}
-
-
-/* This recalculates day_width, first_hour_shown and last_hour_shown. */
-static void
-e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
-{
-	if (mts->working_hours_only) {
-		mts->first_hour_shown = mts->day_start_hour;
-		mts->last_hour_shown = mts->day_end_hour;
-		if (mts->day_end_minute != 0)
-			mts->last_hour_shown += 1;
-	} else {
-		mts->first_hour_shown = 0;
-		mts->last_hour_shown = 24;
-	}
-
-	/* In the brief view we use the nearest hours divisible by 3. */
-	if (mts->zoomed_out) {
-		mts->first_hour_shown -= mts->first_hour_shown % 3;
-		mts->last_hour_shown += 2;
-		mts->last_hour_shown -= mts->last_hour_shown % 3;
-	}
-
-	mts->day_width = mts->col_width	* (mts->last_hour_shown - mts->first_hour_shown);
-	if (mts->zoomed_out)
-		mts->day_width /= 3;
-
-	/* Add one pixel for the extra vertical grid line. */
-	mts->day_width++;
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_top),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					mts->row_height * 3);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	e_meeting_time_selector_recalc_date_format (mts);
-	mts->meeting_positions_valid = FALSE;
-}
-
-
-/* This saves the first visible time in the given EMeetingTimeSelectorTime. */
-static void
-e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
-				       EMeetingTime*mtstime)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime);
-}
-
-
-/* This restores a saved position. */
-static void
-e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-					  EMeetingTime*mtstime)
-{
-	gint scroll_x, scroll_y, new_scroll_x;
-
-	new_scroll_x = e_meeting_time_selector_calculate_time_position (mts,
-								      mtstime);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				new_scroll_x, scroll_y);
-}
-
-
-/* This returns the x pixel coords of the meeting time in the entire scroll
-   region. It recalculates them if they have been marked as invalid.
-   If it returns FALSE then no meeting time is set or the meeting time is
-   not visible in the current scroll area. */
-gboolean
-e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
-						    gint *start_x,
-						    gint *end_x)
-{
-	if (mts->meeting_positions_valid) {
-		if (mts->meeting_positions_in_scroll_area) {
-			*start_x = mts->meeting_start_x;
-			*end_x = mts->meeting_end_x;
-			return TRUE;
-		} else {
-			return FALSE;
-		}
-	}
-
-	mts->meeting_positions_valid = TRUE;
-
-	/* Check if the days aren't in our current range. */
-	if (g_date_compare (&mts->meeting_start_time.date, &mts->last_date_shown) > 0
-	    || g_date_compare (&mts->meeting_end_time.date, &mts->first_date_shown) < 0) {
-		mts->meeting_positions_in_scroll_area = FALSE;
-		return FALSE;
-	}
-
-	mts->meeting_positions_in_scroll_area = TRUE;
-	*start_x = mts->meeting_start_x = e_meeting_time_selector_calculate_time_position (mts, &mts->meeting_start_time);
-	*end_x = mts->meeting_end_x = e_meeting_time_selector_calculate_time_position (mts, &mts->meeting_end_time);
-
-	return TRUE;
-}
-
-
-/* This recalculates the date format to used, by computing the width of the
-   longest date strings in the widget's font and seeing if they fit. */
-static void
-e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
-{
-	/* 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 };
-	GDate date;
-	gint max_date_width, longest_weekday_width, longest_month_width, width;
-	gint day, longest_weekday, month, longest_month;
-	gchar buffer[128];
-	GdkFont *font;
-
-	font = GTK_WIDGET (mts)->style->font;
-
-	/* Calculate the maximum date width we can fit into the display. */
-	max_date_width = mts->day_width - 2;
-
-	/* Find the biggest full weekday name. We start on a particular
-	   Monday and go through seven days. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */
-	longest_weekday_width = 0;
-	longest_weekday = G_DATE_MONDAY;
-	for (day = G_DATE_MONDAY; day <= G_DATE_SUNDAY; day++) {
-		g_date_strftime (buffer, sizeof (buffer), "%A", &date);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday = day;
-			longest_weekday_width = width;
-		}
-		g_date_add_days (&date, 1);
-	}
-
-	/* Now find the biggest month name. */
-	longest_month_width = 0;
-	longest_month = G_DATE_JANUARY;
-	for (month = G_DATE_JANUARY; month <= G_DATE_DECEMBER; month++) {
-		g_date_set_month (&date, month);
-		g_date_strftime (buffer, sizeof (buffer), "%B", &date);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_month_width) {
-			longest_month = month;
-			longest_month_width = width;
-		}
-	}
-
-	/* See if we can use the full date. We want to use a date with a
-	   month day > 20 and also the longest weekday. We use a
-	   pre-calculated array of days for each month and add on the
-	   weekday (which is 1 (Mon) to 7 (Sun). */
-	g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday,
-			longest_month, 2000);
-	/* This is a strftime() format string %A = full weekday name,
-	   %B = full month name, %d = month day, %Y = full year. */
-	g_date_strftime (buffer, sizeof (buffer), _("%A, %B %d, %Y"), &date);
-
-#if 0
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-#endif
-
-	if (gdk_string_width (font, buffer) < max_date_width) {
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_FULL;
-		return;
-	}
-
-	/* Now try it with abbreviated weekday names. */
-	longest_weekday_width = 0;
-	longest_weekday = G_DATE_MONDAY;
-	g_date_set_dmy (&date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */
-	for (day = G_DATE_MONDAY; day <= G_DATE_SUNDAY; day++) {
-		g_date_strftime (buffer, sizeof (buffer), "%a", &date);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday = day;
-			longest_weekday_width = width;
-		}
-		g_date_add_days (&date, 1);
-	}
-
-	g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday,
-			longest_month, 2000);
-	/* This is a strftime() format string %a = abbreviated weekday name,
-	   %m = month number, %d = month day, %Y = full year. */
-	g_date_strftime (buffer, sizeof (buffer), _("%a %m/%d/%Y"), &date);
-
-#if 0
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-#endif
-
-	if (gdk_string_width (font, buffer) < max_date_width)
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY;
-	else
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_SHORT;
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
-					    EMeetingTimeSelector *mts)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/* This is called when the meeting start time GnomeDateEdit is changed,
-   either via the "date_changed". "time_changed" or "activate" signals on one
-   of the GtkEntry widgets. So don't use the widget parameter since it may be
-   one of the child GtkEntry widgets. */
-static void
-e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
-					       EMeetingTimeSelector *mts)
-{
-	gint duration_days, duration_hours, duration_minutes;
-	EMeetingTime mtstime;
-	gint hour = 0, minute = 0;
-	time_t newtime;
-
-	/* Date */
-	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->start_date_edit));
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-
-	/* Time */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (mts->start_date_edit), &hour, &minute);
-	mtstime.hour = hour;
-	mtstime.minute = minute;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_compare_times (&mtstime, &mts->meeting_start_time) == 0)
-		return;
-
-	/* Calculate the current meeting duration. */
-	e_meeting_time_selector_calculate_time_difference (&mts->meeting_start_time, &mts->meeting_end_time, &duration_days, &duration_hours, &duration_minutes);
-
-	/* Set the new start time. */
-	mts->meeting_start_time = mtstime;
-
-	/* Update the end time so the meeting duration stays the same. */
-	mts->meeting_end_time = mts->meeting_start_time;
-	e_meeting_time_selector_adjust_time (&mts->meeting_end_time, duration_days, duration_hours, duration_minutes);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	mts->meeting_positions_valid = FALSE;
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This is called when the meeting end time GnomeDateEdit is changed,
-   either via the "date_changed", "time_changed" or "activate" signals on one
-   of the GtkEntry widgets. So don't use the widget parameter since it may be
-   one of the child GtkEntry widgets. */
-static void
-e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
-					     EMeetingTimeSelector *mts)
-{
-	EMeetingTime mtstime;
-	gint hour = 0, minute = 0;
-	time_t newtime;
-
-	/* Date */
-	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->end_date_edit));
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-	if (mts->all_day)
-		g_date_add_days (&mtstime.date, 1);
-
-	/* Time */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (mts->end_date_edit), &hour, &minute);
-	mtstime.hour = hour;
-	mtstime.minute = minute;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_compare_times (&mtstime, &mts->meeting_end_time) == 0)
-		return;
-
-	/* Set the new end time. */
-	mts->meeting_end_time = mtstime;
-
-	/* If the start time is after the end time, set it to the same time. */
-	if (e_meeting_time_compare_times (&mtstime, &mts->meeting_start_time) <= 0) {
-		/* We set it first, before updating the widget, so the signal
-		   handler will just return. */
-		mts->meeting_start_time = mtstime;
-		if (mts->all_day)
-			g_date_subtract_days (&mts->meeting_start_time.date, 1);
-		e_meeting_time_selector_update_start_date_edit (mts);
-	}
-
-	mts->meeting_positions_valid = FALSE;
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This updates the ranges shown in the GnomeDateEdit popup menus, according
-   to working_hours_only etc. */
-static void
-e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts)
-{
-	EDateEdit *start_edit, *end_edit;
-	gint low_hour, high_hour;
-
-	start_edit = E_DATE_EDIT (mts->start_date_edit);
-	end_edit = E_DATE_EDIT (mts->end_date_edit);
-
-	if (mts->working_hours_only) {
-		low_hour = mts->day_start_hour;
-		high_hour = mts->day_end_hour;
-	} else {
-		low_hour = 0;
-		high_hour = 23;
-	}
-
-	e_date_edit_set_time_popup_range (start_edit, low_hour, high_hour);
-	e_date_edit_set_time_popup_range (end_edit, low_hour, high_hour);
-}
-
-
-static void
-e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
-						 GtkAllocation *allocation,
-						 EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-}
-
-/* This updates the canvas scroll regions according to the number of attendees.
-   If the total height needed is less than the height of the canvas, we must
-   use the height of the canvas, or it causes problems. */
-static void
-e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts)
-{
-	gint height, canvas_height;
-
-	height = mts->row_height * (e_meeting_model_count_actual_attendees (mts->model) + 2);
-	canvas_height = GTK_WIDGET (mts->display_main)->allocation.height;
-
-	height = MAX (height,  canvas_height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_main),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					height);
-}
-
-
-/* This changes the meeting time based on the given x coordinate and whether
-   we are dragging the start or end bar. It returns the new position, which
-   will be swapped if the start bar is dragged past the end bar or vice versa.
-   It make sure the meeting time is never dragged outside the visible canvas
-   area. */
-void
-e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
-					   gint x)
-{
-	EMeetingTime first_time, last_time, drag_time, *time_to_set;
-	gint scroll_x, scroll_y, canvas_width;
-	gboolean set_both_times = FALSE;
-
-	/* Get the x coords of visible part of the canvas. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-
-	/* Save the x coordinate for the timeout handler. */
-	mts->last_drag_x = (x < scroll_x) ? x - scroll_x
-		: x - scroll_x - canvas_width + 1;
-
-	/* Check if the mouse is off the edge of the canvas. */
-	if (x < scroll_x || x > scroll_x + canvas_width) {
-		/* If we haven't added a timeout function, add one. */
-		if (mts->auto_scroll_timeout_id == 0) {
-			mts->auto_scroll_timeout_id = g_timeout_add (60, e_meeting_time_selector_timeout_handler, mts);
-			mts->scroll_count = 0;
-
-			/* Call the handler to start scrolling now. */
-			e_meeting_time_selector_timeout_handler (mts);
-			return;
-		}
-	} else {
-		e_meeting_time_selector_remove_timeout (mts);
-	}
-
-	/* Calculate the minimum & maximum times we can use, based on the
-	   scroll offsets and whether zoomed_out is set. */
-	e_meeting_time_selector_calculate_time (mts, scroll_x, &first_time);
-	e_meeting_time_selector_calculate_time (mts, scroll_x + canvas_width - 1,
-						&last_time);
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			if (first_time.minute > 30)
-				first_time.hour++;
-			first_time.minute = 0;
-			last_time.minute = 0;
-		} else {
-			first_time.minute += 15;
-			first_time.minute -= first_time.minute % 30;
-			last_time.minute -= last_time.minute % 30;
-		}
-	} else {
-		if (first_time.hour > 0 || first_time.minute > 0)
-			g_date_add_days (&first_time.date, 1);
-		first_time.hour = 0;
-		first_time.minute = 0;
-		last_time.hour = 0;
-		last_time.minute = 0;
-	}
-	e_meeting_time_selector_fix_time_overflows (&first_time);
-	e_meeting_time_selector_fix_time_overflows (&last_time);
-
-	/* Calculate the time from x coordinate. */
-	e_meeting_time_selector_calculate_time (mts, x, &drag_time);
-
-	/* Calculate the nearest half-hour or hour, depending on whether
-	   zoomed_out is set. */
-	if (!mts->all_day) {
-		if (mts->zoomed_out) {
-			if (drag_time.minute > 30)
-				drag_time.hour++;
-			drag_time.minute = 0;
-		} else {
-			drag_time.minute += 15;
-			drag_time.minute -= drag_time.minute % 30;
-		}
-	} else {
-		if (drag_time.hour > 12)
-			g_date_add_days (&drag_time.date, 1);
-		drag_time.hour = 0;
-		drag_time.minute = 0;		
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Now make sure we are between first_time & last_time. */
-	if (e_meeting_time_compare_times (&drag_time, &first_time) < 0)
-		drag_time = first_time;
-	if (e_meeting_time_compare_times (&drag_time, &last_time) > 0)
-		drag_time = last_time;
-
-	/* Set the meeting start or end time to drag_time. */
-	if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		time_to_set = &mts->meeting_start_time;
-	else
-		time_to_set = &mts->meeting_end_time;
-
-	/* If the time is unchanged, just return. */
-	if (e_meeting_time_compare_times (time_to_set, &drag_time) == 0)
-		return;
-
-	/* Don't let an empty occur for all day events */
-	if (mts->all_day
-	    && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START
-	    && e_meeting_time_compare_times (&mts->meeting_end_time, &drag_time) == 0)
-		return;
-	else if (mts->all_day
-		&& mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-		&& e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
-		return;
-	
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_compare_times (&mts->meeting_start_time,
-						   &mts->meeting_end_time) > 0) {
-		drag_time = mts->meeting_start_time;
-		mts->meeting_start_time = mts->meeting_end_time;
-		mts->meeting_end_time = drag_time;
-
-		if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_END;
-		else
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_START;
-
-		set_both_times = TRUE;
-	}
-	
-
-	/* Mark the calculated positions as invalid. */
-	mts->meeting_positions_valid = FALSE;
-
-	/* Redraw the canvases. */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		e_meeting_time_selector_update_start_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END)
-		e_meeting_time_selector_update_end_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-}
-
-
-/* This is the timeout function which handles auto-scrolling when the user is
-   dragging one of the meeting time vertical bars outside the left or right
-   edge of the canvas. */
-static gboolean
-e_meeting_time_selector_timeout_handler (gpointer data)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTime drag_time, *time_to_set;
-	gint scroll_x, max_scroll_x, scroll_y, canvas_width;
-	gint scroll_speed, scroll_offset;
-	gboolean set_both_times = FALSE;
-
-	mts = E_MEETING_TIME_SELECTOR (data);
-
-	GDK_THREADS_ENTER ();
-
-	/* Return if we don't need to scroll yet. */
-	if (mts->scroll_count-- > 0) {
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	/* Get the x coords of visible part of the canvas. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-
-	/* Calculate the scroll delay, between 0 and MAX_SCROLL_SPEED. */
-	scroll_speed = abs (mts->last_drag_x / E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH);
-	scroll_speed = MIN (scroll_speed,
-			    E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED);
-
-	/* Reset the scroll count. */
-	mts->scroll_count = E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED - scroll_speed;
-
-	/* Calculate how much we need to scroll. */
-	if (mts->last_drag_x >= 0)
-		scroll_offset = mts->col_width;
-	else
-		scroll_offset = -mts->col_width;
-
-	scroll_x += scroll_offset;
-	max_scroll_x = (mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN)
-		- canvas_width;
-	scroll_x = CLAMP (scroll_x, 0, max_scroll_x);
-
-	/* Calculate the minimum or maximum visible time in the canvas, which
-	   we will now set the dragged time to. */
-	if (scroll_offset > 0) {
-		e_meeting_time_selector_calculate_time (mts,
-						      scroll_x + canvas_width - 1,
-						      &drag_time);
-		if (!mts->all_day) {
-			if (mts->zoomed_out) {
-				drag_time.minute = 0;
-			} else {
-				drag_time.minute -= drag_time.minute % 30;
-			}
-		} else {
-			drag_time.hour = 0;
-			drag_time.minute = 0;
-		}
-	} else {
-		e_meeting_time_selector_calculate_time (mts, scroll_x,
-							&drag_time);
-		if (!mts->all_day) {
-			if (mts->zoomed_out) {
-				if (drag_time.minute > 30)
-					drag_time.hour++;
-				drag_time.minute = 0;
-			} else {
-				drag_time.minute += 15;
-				drag_time.minute -= drag_time.minute % 30;
-			}
-		} else {
-			if (drag_time.hour > 0 || drag_time.minute > 0)
-				g_date_add_days (&drag_time.date, 1);
-			drag_time.hour = 0;
-			drag_time.minute = 0;
-		}
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Set the meeting start or end time to drag_time. */
-	if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		time_to_set = &mts->meeting_start_time;
-	else
-		time_to_set = &mts->meeting_end_time;
-
-	/* If the time is unchanged, just return. */
-	if (e_meeting_time_compare_times (time_to_set, &drag_time) == 0) {
-		GDK_THREADS_LEAVE ();
-		goto scroll;
-	}
-
-	/* Don't let an empty occur for all day events */
-	if (mts->all_day
-	    && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START
-	    && e_meeting_time_compare_times (&mts->meeting_end_time, &drag_time) == 0)
-		goto scroll;
-	else if (mts->all_day
-		&& mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-		&& e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
-		goto scroll;
-
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_compare_times (&mts->meeting_start_time, &mts->meeting_end_time) > 0) {
-		drag_time = mts->meeting_start_time;
-		mts->meeting_start_time = mts->meeting_end_time;
-		mts->meeting_end_time = drag_time;
-
-		if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_END;
-		else
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_START;
-
-		set_both_times = TRUE;
-	}
-
-	/* Mark the calculated positions as invalid. */
-	mts->meeting_positions_valid = FALSE;
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		e_meeting_time_selector_update_start_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END)
-		e_meeting_time_selector_update_end_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
-
- scroll:
-	/* Redraw the canvases. We freeze and thaw the layouts so that they
-	   get redrawn completely. Otherwise the pixels get scrolled left or
-	   right which is not good for us (since our vertical bars have been
-	   moved) and causes flicker. */
-	gtk_layout_freeze (GTK_LAYOUT (mts->display_main));
-	gtk_layout_freeze (GTK_LAYOUT (mts->display_top));
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				scroll_x, scroll_y);
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_top),
-				scroll_x, scroll_y);
-	gtk_layout_thaw (GTK_LAYOUT (mts->display_main));
-	gtk_layout_thaw (GTK_LAYOUT (mts->display_top));
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-/* This removes our auto-scroll timeout function, if we have one installed. */
-void
-e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
-{
-	if (mts->auto_scroll_timeout_id) {
-		g_source_remove (mts->auto_scroll_timeout_id);
-		mts->auto_scroll_timeout_id = 0;
-	}
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting start time. */
-static void
-e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
-{
-	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->start_date_edit),
-					      g_date_year (&mts->meeting_start_time.date),
-					      g_date_month (&mts->meeting_start_time.date),
-					      g_date_day (&mts->meeting_start_time.date),
-					      mts->meeting_start_time.hour,
-					      mts->meeting_start_time.minute);
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting end time. */
-static void
-e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
-{
-	GDate date;
-	
-	date = mts->meeting_end_time.date;
-	if (mts->all_day)
-		g_date_subtract_days (&date, 1);
-
-	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->end_date_edit),
-					      g_date_year (&date),
-					      g_date_month (&date),
-					      g_date_day (&date),
-					      mts->meeting_end_time.hour,
-					      mts->meeting_end_time.minute);
-}
-
-
-/* This ensures that the meeting time is shown on screen, by scrolling the
-   canvas and possibly by changing the range of dates shown in the canvas. */
-static void
-e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
-{
-	gint start_x, end_x, scroll_x, scroll_y, canvas_width;
-	gint new_scroll_x;
-	gboolean fits_in_canvas;
-
-	/* Check if we need to change the range of dates shown. */
-	if (g_date_compare (&mts->meeting_start_time.date,
-			    &mts->first_date_shown) < 0
-	    || g_date_compare (&mts->meeting_end_time.date,
-			       &mts->last_date_shown) > 0) {
-		e_meeting_time_selector_update_dates_shown (mts);
-		gtk_widget_queue_draw (mts->display_top);
-		gtk_widget_queue_draw (mts->display_main);
-	}
-
-	/* If all of the meeting time is visible, just return. */
-	e_meeting_time_selector_get_meeting_time_positions (mts, &start_x,
-							    &end_x);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-	if (start_x > scroll_x && end_x <= scroll_x + canvas_width)
-		return;
-
-	fits_in_canvas = end_x - start_x < canvas_width ? TRUE : FALSE;
-
-	/* If the meeting is not entirely visible, either center it if it is
-	   smaller than the canvas, or show the start of it if it is big. */
-	if (fits_in_canvas) {
-		new_scroll_x = (start_x + end_x - canvas_width) / 2;
-	} else {
-		new_scroll_x = start_x;
-	}
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				new_scroll_x, scroll_y);
-}
-
-
-/* This updates the range of dates shown in the canvas, to make sure that the
-   currently selected meeting time is in the range. */
-static void
-e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts)
-{
-	mts->first_date_shown = mts->meeting_start_time.date;
-	g_date_subtract_days (&mts->first_date_shown,
-			      E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE);
-
-	mts->last_date_shown = mts->first_date_shown;
-	g_date_add_days (&mts->last_date_shown,
-			 E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1);
-}
-
-
-/* This checks if the time's hour is over 24 or its minute is over 60 and if
-   so it updates the day/hour appropriately. Note that hours and minutes are
-   stored in guint8's so they can't overflow by much. */
-void
-e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime)
-{
-	gint hours_to_add, days_to_add;
-
-	hours_to_add = mtstime->minute / 60;
-	if (hours_to_add > 0) {
-		mtstime->minute -= hours_to_add * 60;
-		mtstime->hour += hours_to_add;
-	}
-
-	days_to_add = mtstime->hour / 24;
-	if (days_to_add > 0) {
-		mtstime->hour -= days_to_add * 24;
-		g_date_add_days (&mtstime->date, days_to_add);
-	}
-}
-
-/*
- * CONVERSION ROUTINES - functions to convert between different coordinate
- *			 spaces and dates.
- */
-
-/* This takes an x pixel coordinate within the entire canvas scroll region and
-   returns the date in which it falls. If day_position is not NULL it also
-   returns the x coordinate within the date, relative to the visible part of
-   the canvas. It is used when painting the days in the item_draw function.
-   Note that it must handle negative x coordinates in case we are dragging off
-   the edge of the canvas. */
-void
-e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
-						    gint x,
-						    GDate *date,
-						    gint *day_position)
-{
-	gint days_from_first_shown;
-
-	*date = mts->first_date_shown;
-
-	if (x >= 0) {
-		days_from_first_shown = x / mts->day_width;
-		g_date_add_days (date, days_from_first_shown);
-		if (day_position)
-			*day_position = - x % mts->day_width;
-	} else {
-		days_from_first_shown = -x / mts->day_width + 1;
-		g_date_subtract_days (date, days_from_first_shown);
-		if (day_position)
-			*day_position = -mts->day_width - x % mts->day_width;
-	}
-}
-
-
-/* This takes an x pixel coordinate within a day, and converts it to hours
-   and minutes, depending on working_hours_only and zoomed_out. */
-void
-e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes)
-{
-	if (mts->zoomed_out)
-		day_position *= 3;
-
-	/* Calculate the hours & minutes from the first displayed. */
-	*hours = day_position / mts->col_width;
-	*minutes = (day_position % mts->col_width) * 60 / mts->col_width;
-
-	/* Now add on the first hour shown. */
-	*hours += mts->first_hour_shown;
-}
-
-
-/* This takes an x pixel coordinate within the entire canvas scroll region and
-   returns the time in which it falls. Note that it won't be extremely
-   accurate since hours may only be a few pixels wide in the display.
-   With zoomed_out set each pixel may represent 5 minutes or more, depending
-   on how small the font is. */
-void
-e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
-					gint x,
-					EMeetingTime*time)
-{
-	gint day_position;
-
-	/* First get the day and the x position within the day. */
-	e_meeting_time_selector_calculate_day_and_position (mts, x, &time->date,
-							    NULL);
-
-	/* Now convert the day_position into an hour and minute. */
-	if (x >= 0)
-		day_position = x % mts->day_width;
-	else
-		day_position = mts->day_width + x % mts->day_width;
-
-	e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &time->hour, &time->minute);
-}
-
-
-/* This takes a EMeetingTime and calculates the x pixel coordinate
-   within the entire canvas scroll region. It is used to draw the selected
-   meeting time and all the busy periods. */
-gint
-e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						 EMeetingTime *mtstime)
-{
-	gint x, date_offset, day_offset;
-
-	/* Calculate the number of days since the first date shown in the
-	   entire canvas scroll region. */
-	date_offset = g_date_julian (&mtstime->date) - g_date_julian (&mts->first_date_shown);
-
-	/* Calculate the x pixel coordinate of the start of the day. */
-	x = date_offset * mts->day_width;
-
-	/* Add on the hours and minutes, depending on whether zoomed_out and
-	   working_hours_only are set. */
-	day_offset = (mtstime->hour - mts->first_hour_shown) * 60
-		+ mtstime->minute;
-	/* The day width includes an extra vertical grid line so subtract 1. */
-	day_offset *= (mts->day_width - 1);
-	day_offset /= (mts->last_hour_shown - mts->first_hour_shown) * 60;
-
-	/* Clamp the day_offset in case the time isn't actually visible. */
-	x += CLAMP (day_offset, 0, mts->day_width);
-
-	return x;
-}
-
-static void
-rows_inserted_cb (ETableModel *etm, int row, int count, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-	int i;
-	
-	/* Update the scroll region. */
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	/* Redraw */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Get the latest free/busy info */
-	for (i = 0; i < count; i++)
-		e_meeting_time_selector_refresh_free_busy (mts, row + i, FALSE);
-}
-
-static void
-cell_changed_cb (ETableModel *etm, int col, int row, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-
-	if (col != E_MEETING_MODEL_ADDRESS_COL)
-		return;
-
-	/* Get the latest free/busy info */
-	e_meeting_time_selector_refresh_free_busy (mts, row, FALSE);
-}
-
-static void
-rows_deleted_cb (ETableModel *etm, int row, int count, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-
-	/* Update the scroll region. */
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	/* Redraw */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-static void
-sort_info_changed_cb (ETableSortInfo *info, gpointer data)
-{
-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-
-	/* Redraw */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
diff --git a/calendar/gui/e-meeting-time-sel.etspec b/calendar/gui/e-meeting-time-sel.etspec
deleted file mode 100644
index c0b5c721dd..0000000000
--- a/calendar/gui/e-meeting-time-sel.etspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-
-  <ETableState>
-     <column source="0"/>
-     <column source="2"/>
-     <column source="7"/>
-     <grouping></grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
deleted file mode 100644
index 30c1abefa7..0000000000
--- a/calendar/gui/e-meeting-time-sel.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_TIME_SELECTOR_H_
-#define _E_MEETING_TIME_SELECTOR_H_
-
-#include <glib.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwidget.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table.h>
-#include "e-meeting-model.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EMeetingTimeSelector displays a list of attendees for a meeting and a
- * graphical summary of the times which they are free and busy, allowing the
- * user to select an appropriate time for a meeting.
- */
-
-/* Define this to include the debugging functions. */
-#undef E_MEETING_TIME_SELECTOR_DEBUG
-
-/* This is the width of the icon column in the attendees list. */
-#define E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH	24
-
-#define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3
-#define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2
-
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Sunday, September 12, 1999'. The abbreviated format
-   is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
-   format used is determined in e_meeting_time_selector_style_set(), once we
-   know the font being used. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_DATE_FULL,
-	E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY,
-	E_MEETING_TIME_SELECTOR_DATE_SHORT
-} EMeetingTimeSelectorDateFormat;
-
-
-/* This is used to specify a position regarding the vertical bars around the
-   current meeting time, so we know which one is being dragged. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_POS_NONE,
-	E_MEETING_TIME_SELECTOR_POS_START,
-	E_MEETING_TIME_SELECTOR_POS_END
-} EMeetingTimeSelectorPosition;
-
-
-/* This is used to specify the autopick option, which determines how we choose
-   the previous/next appropriate meeting time. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES,
-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE,
-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE,
-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE
-} EMeetingTimeSelectorAutopickOption;
-
-/* An array of hour strings for 24 hour time, "0:00" .. "23:00". */
-extern const gchar *EMeetingTimeSelectorHours[24];
-/* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
-extern const gchar *EMeetingTimeSelectorHours12[24];
-
-
-#define E_MEETING_TIME_SELECTOR(obj)          GTK_CHECK_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
-#define E_MEETING_TIME_SELECTOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
-#define IS_E_MEETING_TIME_SELECTOR(obj)       GTK_CHECK_TYPE (obj, e_meeting_time_selector_get_type ())
-
-
-typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;
-typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;
-
-struct _EMeetingTimeSelector
-{
-	/* We subclass a GtkTable which makes it easy to add extra widgets
-	   if neccesary. */
-	GtkTable table;
-
-	/*
-	 * User Interface stuff - widgets, colors etc.
-	 */
-
-	/* This contains our keyboard accelerators, which need to be added to
-	   the toplevel window. */
-	GtkAccelGroup *accel_group;
-
-	/* The vbox in the top-left corner, containing the 'All Attendees'
-	   title bar packed at the end. Extra widgets can be added here
-	   with PACK_START if necessary. */
-	GtkWidget *attendees_vbox;
-	GtkWidget *attendees_vbox_spacer;
-	
-	/* The etable and model */
-	EMeetingModel *model;
-	GtkWidget *etable;
-	
-	/* The canvas displaying the dates, times, and the summary
-	   'All Attendees' free/busy display. */
-	GtkWidget *display_top;
-
-	/* The canvas containing the free/busy displays of individual
-	   attendees. This is separate from display_top since it also scrolls
-	   vertically. */
-	GtkWidget *display_main;
-
-	/* This is the 'Options' button & menu. */
-	GtkWidget *options_button;
-	GtkWidget *options_menu;
-
-	/* This is the 'Autopick' button, menu & radio menu items. */
-	GtkWidget *autopick_button;
-	GtkWidget *autopick_menu;
-	GtkWidget *autopick_all_item;
-	GtkWidget *autopick_all_people_one_resource_item;
-	GtkWidget *autopick_required_people_item;
-	GtkWidget *autopick_required_people_one_resource_item;
-
-	/* The horizontal scrollbar which scrolls display_top & display_main.*/
-	GtkWidget *hscrollbar;
-
-	/* The vertical scrollbar which scrolls attendees & display_main. */
-	GtkWidget *vscrollbar;
-
-	/* The 2 EDateEdit widgets for the meeting start & end times. */
-	GtkWidget *start_date_edit;
-	GtkWidget *end_date_edit;
-
-	/* Colors. */
-	GdkColorContext *color_context;
-	GdkColor bg_color;
-	GdkColor all_attendees_bg_color;
-	GdkColor meeting_time_bg_color;
-	GdkColor stipple_bg_color;
-	GdkColor attendee_list_bg_color;
-	GdkColor grid_color;
-	GdkColor grid_shadow_color;
-	GdkColor grid_unused_color;
-	GdkColor busy_colors[E_MEETING_FREE_BUSY_LAST];
-
-	/* The stipple used for attendees with no data. */
-	GdkPixmap *stipple;
-
-	/* GC for drawing the color key. */
-	GdkGC *color_key_gc;
-
-	/* Width of the hours strings (e.g. "1:00") in the current font. */
-	gint hour_widths[24];
-
-	/* Whether we are using the full, abbreviated or short date format. */
-	EMeetingTimeSelectorDateFormat date_format;
-
-	/*
-	 * Option Settings.
-	 */
-
-	/* True if we are selecting all day events */
-	gboolean all_day;
-	
-	/* If this is TRUE we only show hours between day_start_hour and
-	   day_end_hour, defaults to TRUE (9am-6pm). */
-	gboolean working_hours_only;
-	gint day_start_hour;
-	gint day_start_minute;
-	gint day_end_hour;
-	gint day_end_minute;
-
-	/* If TRUE, view is compressed, with one cell for every 3 hours rather
-	   than every hour. Defaults to FALSE. */
-	gboolean zoomed_out;
-
-
-	/*
-	 * Internal Data.
-	 */
-
-	/* These are the first & last dates shown in the current scroll area.
-	   We show E_MEETING_TIME_SELECTOR_DAYS_SHOWN days at a time. */
-	GDate first_date_shown;
-	GDate last_date_shown;
-
-	/* This is the current selection of the meeting time. */
-	EMeetingTime meeting_start_time;
-	EMeetingTime meeting_end_time;
-
-	/* These are the x pixel coordinates in the entire scroll region of
-	   the start and end times. Set to meeting_positions_valid to FALSE to
-	   invalidate. They will then be recomputed when needed. Always access
-	   with e_meeting_time_selector_get_meeting_time_positions(). */
-	gint meeting_positions_valid;
-	gint meeting_positions_in_scroll_area;
-	gint meeting_start_x;
-	gint meeting_end_x;
-
-	/* These are the width and height of the cells, including the grid
-	   lines which are displayed on the right and top or bottom of cells.*/
-	gint row_height;
-	gint col_width;
-
-	/* This is the width of a day in the display, which depends on
-	   col_width, working_hours_only and zoomed_out. */
-	gint day_width;
-
-	/* These are the first and last hour of each day we display, depending
-	   on working_hours_only and zoomed_out. */
-	gint first_hour_shown;
-	gint last_hour_shown;
-
-	/* The id of the source function for auto-scroll timeouts. */
-	guint auto_scroll_timeout_id;
-
-	/* This specifies if we are dragging one of the vertical bars around
-	   the meeting time. */
-	EMeetingTimeSelectorPosition dragging_position;
-
-	/* The last x coordinate of the mouse, relative to either the left or
-	   right edge of the canvas. Used in the auto_scroll_timeout function
-	   to determine which way to scroll and how fast. */
-	gint last_drag_x;
-
-	/* This is used to determine the delay between scrolls. */
-	gint scroll_count;
-};
-
-
-struct _EMeetingTimeSelectorClass
-{
-	GtkTableClass parent_class;
-
-	void (* changed) (EMeetingTimeSelector *mts);
-};
-
-
-/*
- * PUBLIC INTERFACE - note that this interface will probably change, when I
- * know where the data is coming from. This is mainly just for testing for now.
- */
-
-GtkType e_meeting_time_selector_get_type (void);
-GtkWidget* e_meeting_time_selector_new (EMeetingModel *emm);
-void e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *emm);
-
-/* This returns the currently selected meeting time.
-   Note that months are 1-12 and days are 1-31. The start time is guaranteed to
-   be before or equal to the end time. You may want to check if they are equal
-   if that if it is a problem. */
-void e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
-					       gint *start_year,
-					       gint *start_month,
-					       gint *start_day,
-					       gint *start_hour,
-					       gint *start_minute,
-					       gint *end_year,
-					       gint *end_month,
-					       gint *end_day,
-					       gint *end_hour,
-					       gint *end_minute);
-
-/* This sets the meeting time, returning TRUE if it is valid. */
-gboolean e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
-						   gint start_year,
-						   gint start_month,
-						   gint start_day,
-						   gint start_hour,
-						   gint start_minute,
-						   gint end_year,
-						   gint end_month,
-						   gint end_day,
-						   gint end_hour,
-						   gint end_minute);
-
-void e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,
-					  gboolean all_day);
-void e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						     gboolean working_hours_only);
-void e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
-						gint day_start_hour,
-						gint day_start_minute,
-						gint day_end_hour,
-						gint day_end_minute);
-
-void e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
-					     gboolean zoomed_out);
-
-EMeetingTimeSelectorAutopickOption e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts);
-void e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
-						  EMeetingTimeSelectorAutopickOption autopick_option);
-
-void e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-							   gint row,
-							   gboolean send_meeting_to);
-
-/* Clears all busy times for the given attendee. */
-void e_meeting_time_selector_attendee_clear_busy_periods (EMeetingTimeSelector *mts,
-							  gint row);
-/* Adds one busy time for the given attendee. */
-gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector *mts,
-							   gint row,
-							   gint start_year,
-							   gint start_month,
-							   gint start_day,
-							   gint start_hour,
-							   gint start_minute,
-							   gint end_year,
-							   gint end_month,
-							   gint end_day,
-							   gint end_hour,
-							   gint end_minute,
-							   EMeetingFreeBusyType busy_type);
-
-
-
-/*
- * INTERNAL ROUTINES - functions to communicate with the canvas items within
- *		       the EMeetingTimeSelector.
- */
-
-/* This returns the x pixel coordinates of the meeting start and end times,
-   in the entire canvas scroll area. If it returns FALSE, then the meeting
-   time isn't in the current scroll area (which shouldn't really happen). */
-gboolean e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
-							     gint *start_x,
-							     gint *end_x);
-
-void e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
-						gint x);
-
-void e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts);
-
-void e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime);
-
-void e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
-							 gint x,
-							 GDate *date,
-							 gint *day_position);
-void e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes);
-void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
-					     gint x,
-					     EMeetingTime*time);
-gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						      EMeetingTime *mtstime);
-
-/* Debugging function to dump information on all attendees. */
-#ifdef E_MEETING_TIME_SELECTOR_DEBUG
-void e_meeting_time_selector_dump (EMeetingTimeSelector *mts);
-gchar* e_meeting_time_selector_dump_time (EMeetingTime*mtstime);
-gchar* e_meeting_time_selector_dump_date (GDate *date);
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_TIME_SELECTOR_H_ */
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
deleted file mode 100644
index ab330a6d40..0000000000
--- a/calendar/gui/e-meeting-types.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-attendee.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifndef _E_MEETING_TYPES_H_
-#define _E_MEETING_TYPES_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include "e-meeting-types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-
-typedef struct _EMeetingTime               EMeetingTime;
-typedef struct _EMeetingFreeBusyPeriod     EMeetingFreeBusyPeriod;
-
-/* These are used to specify whether an attendee is free or busy at a
-   particular time. We'll probably replace this with a global calendar type.
-   These should be ordered in increasing order of preference. Higher precedence
-   busy periods will be painted over lower precedence ones. These are also
-   used as for loop counters, so they should start at 0 and be ordered. */
-typedef enum
-{
-	E_MEETING_FREE_BUSY_TENTATIVE       = 0,
-	E_MEETING_FREE_BUSY_OUT_OF_OFFICE	= 1,
-	E_MEETING_FREE_BUSY_BUSY		= 2,
-
-	E_MEETING_FREE_BUSY_LAST		= 3
-} EMeetingFreeBusyType;
-
-/* This is our representation of a time. We use a GDate to store the day,
-   and guint8s for the hours and minutes. */
-struct _EMeetingTime
-{
-	GDate	date;
-	guint8	hour;
-	guint8	minute;
-};
-
-/* This represents a busy period. */
-struct _EMeetingFreeBusyPeriod
-{
-	EMeetingTime start;
-	EMeetingTime end;
-	EMeetingFreeBusyType busy_type;
-};
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_TYPES_H_ */
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
deleted file mode 100644
index 496bb8ebaa..0000000000
--- a/calendar/gui/e-meeting-utils.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-model.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-meeting-utils.h"
-
-gint
-e_meeting_time_compare_times (EMeetingTime*time1,
-			      EMeetingTime*time2)
-{
-	gint day_comparison;
-
-	day_comparison = g_date_compare (&time1->date,
-					 &time2->date);
-	if (day_comparison != 0)
-		return day_comparison;
-
-	if (time1->hour < time2->hour)
-		return -1;
-	if (time1->hour > time2->hour)
-		return 1;
-
-	if (time1->minute < time2->minute)
-		return -1;
-	if (time1->minute > time2->minute)
-		return 1;
-
-	/* The start times are exactly the same. */
-	return 0;
-}
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
deleted file mode 100644
index 4c2798fcf0..0000000000
--- a/calendar/gui/e-meeting-utils.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* itip-attendee.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: JP Rosevear
- */
-
-#ifndef _E_MEETING_UTILS_H_
-#define _E_MEETING_UTILS_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include "e-meeting-types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-
-gint e_meeting_time_compare_times (EMeetingTime *time1,
-				   EMeetingTime *time2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_UTILS_H_ */
-
-
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
deleted file mode 100644
index 23bd46f34f..0000000000
--- a/calendar/gui/e-tasks.c
+++ /dev/null
@@ -1,831 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/menus/gal-view-instance.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include "e-util/e-url.h"
-#include "widgets/menus/gal-view-menus.h"
-#include "dialogs/task-editor.h"
-#include "cal-search-bar.h"
-#include "calendar-config.h"
-#include "component-factory.h"
-
-#include "e-tasks.h"
-
-/* A list of all of the ETasks widgets in use. We use this to update the
-   user preference settings. This will change when we switch to GConf. */
-static GList *all_tasks = NULL;
-
-
-/* Private part of the GnomeCalendar structure */
-struct _ETasksPrivate {
-	/* The calendar client object we monitor */
-	CalClient   *client;
-	CalQuery    *query;
-	
-	/* The ECalendarTable showing the tasks. */
-	GtkWidget   *tasks_view;
-
-	/* Calendar search bar for tasks */
-	GtkWidget *search_bar;
-
-	/* View instance and the view menus handler */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-};
-
-
-static void e_tasks_class_init (ETasksClass *class);
-static void e_tasks_init (ETasks *tasks);
-static void setup_widgets (ETasks *tasks);
-static void e_tasks_destroy (GtkObject *object);
-
-static void cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data);
-
-static char* e_tasks_get_config_filename (ETasks *tasks);
-
-/* Signal IDs */
-enum {
-	SELECTION_CHANGED,
-	LAST_SIGNAL
-};
-
-static GtkTableClass *parent_class;
-static guint e_tasks_signals[LAST_SIGNAL] = { 0 };
-
-
-E_MAKE_TYPE (e_tasks, "ETasks", ETasks,
-	     e_tasks_class_init, e_tasks_init,
-	     GTK_TYPE_TABLE)
-
-
-/* Class initialization function for the gnome calendar */
-static void
-e_tasks_class_init (ETasksClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_TABLE);
-
-	e_tasks_signals[SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETasksClass, selection_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_tasks_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_tasks_destroy;
-
-	class->selection_changed = NULL;
-}
-
-
-/* Object initialization function for the gnome calendar */
-static void
-e_tasks_init (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-
-	priv = g_new0 (ETasksPrivate, 1);
-	tasks->priv = priv;
-
-	priv->client = NULL;
-	priv->query = NULL;
-	priv->view_instance = NULL;
-	priv->view_menus = NULL;
-}
-
-/* Callback used when the selection changes in the table. */
-static void
-table_selection_change_cb (ETable *etable, gpointer data)
-{
-	ETasks *tasks;
-	int n_selected;
-
-	tasks = E_TASKS (data);
-
-	n_selected = e_table_selected_count (etable);
-	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SELECTION_CHANGED],
-			 n_selected);
-}
-
-/* Callback used when the sexp in the search bar changes */
-static void
-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	CalendarModel *model;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	calendar_model_set_query (model, sexp);
-}
-
-/* Callback used when the selected category in the search bar changes */
-static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	CalendarModel *model;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	calendar_model_set_default_category (model, category);
-}
-
-#define E_TASKS_TABLE_DEFAULT_STATE					\
-	"<?xml version=\"1.0\"?>"					\
-	"<ETableState>"							\
-	"<column source=\"13\"/>"					\
-	"<column source=\"14\"/>"					\
-	"<column source=\"9\"/>"					\
-	"<column source=\"5\"/>"					\
-	"<grouping/>"							\
-	"</ETableState>"
-
-
-static void
-setup_widgets (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ETable *etable;
-	CalendarModel *model;
-
-	priv = tasks->priv;
-
-	priv->search_bar = cal_search_bar_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "sexp_changed",
-			    GTK_SIGNAL_FUNC (search_bar_sexp_changed_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "category_changed",
-			    GTK_SIGNAL_FUNC (search_bar_category_changed_cb), tasks);
-
-	gtk_table_attach (GTK_TABLE (tasks), priv->search_bar, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
-	gtk_widget_show (priv->search_bar);
-
-	priv->tasks_view = e_calendar_table_new ();
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	calendar_model_set_new_comp_vtype (model, CAL_COMPONENT_TODO);
-
-	etable = e_table_scrolled_get_table (
-		E_TABLE_SCROLLED (E_CALENDAR_TABLE (priv->tasks_view)->etable));
-	e_table_set_state (etable, E_TASKS_TABLE_DEFAULT_STATE);
-	gtk_table_attach (GTK_TABLE (tasks), priv->tasks_view, 0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (priv->tasks_view);
-
-	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv->tasks_view));
-
-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",
-			    GTK_SIGNAL_FUNC (table_selection_change_cb), tasks);
-}
-
-/* Callback used when the set of categories changes in the calendar client */
-static void
-client_categories_changed_cb (CalClient *client, GPtrArray *categories, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	cal_search_bar_set_categories (CAL_SEARCH_BAR (priv->search_bar), categories);
-}
-
-GtkWidget *
-e_tasks_construct (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	CalendarModel *model;
-
-	g_return_val_if_fail (tasks != NULL, NULL);
-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);
-
-	priv = tasks->priv;
-
-	setup_widgets (tasks);
-
-	priv->client = cal_client_new ();
-	if (!priv->client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), tasks);
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	g_assert (model != NULL);
-
-	calendar_model_set_cal_client (model, priv->client, CALOBJ_TYPE_TODO);
-
-	return GTK_WIDGET (tasks);
-}
-
-
-GtkWidget *
-e_tasks_new (void)
-{
-	ETasks *tasks;
-
-	tasks = gtk_type_new (e_tasks_get_type ());
-
-	if (!e_tasks_construct (tasks)) {
-		g_message ("e_tasks_new(): Could not construct the tasks GUI");
-		gtk_object_unref (GTK_OBJECT (tasks));
-		return NULL;
-	}
-
-	all_tasks = g_list_prepend (all_tasks, tasks);
-
-	return GTK_WIDGET (tasks);
-}
-
-
-void
-e_tasks_set_ui_component (ETasks *tasks,
-			  BonoboUIComponent *ui_component)
-{
-	g_return_if_fail (E_IS_TASKS (tasks));
-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
-
-	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks->priv->search_bar), ui_component);
-}
-
-
-static void
-e_tasks_destroy (GtkObject *object)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	char *config_filename;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TASKS (object));
-
-	tasks = E_TASKS (object);
-	priv = tasks->priv;
-
-	/* Save the ETable layout. */
-	config_filename = e_tasks_get_config_filename (tasks);
-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv->tasks_view),
-				     config_filename);
-	g_free (config_filename);
-
-	if (priv->client) {
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	g_free (priv);
-	tasks->priv = NULL;
-
-	all_tasks = g_list_remove (all_tasks, tasks);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-set_status_message (ETasks *tasks, const char *message)
-{
-	ETasksPrivate *priv;
-	CalendarModel *model;
-	
-	priv = tasks->priv;
-	
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	calendar_model_set_status_message (model, message);
-}
-
-gboolean
-e_tasks_open			(ETasks		*tasks,
-				 char		*file)
-{
-	ETasksPrivate *priv;
-	char *config_filename;
-	char *message;
-	EUri *uri;
-	char *real_uri;
-
-	g_return_val_if_fail (tasks != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);
-	g_return_val_if_fail (file != NULL, FALSE);
-
-	priv = tasks->priv;
-
-	uri = e_uri_new (file);
-	if (!uri || !g_strncasecmp (uri->protocol, "file", 4))
-		real_uri = g_concat_dir_and_file (file, "tasks.ics");
-	else
-		real_uri = g_strdup (file);
-
-	message = g_strdup_printf (_("Opening tasks at %s"), real_uri);
-	set_status_message (tasks, message);
-	g_free (message);
-
-	if (!cal_client_open_calendar (priv->client, real_uri, FALSE)) {
-		g_message ("e_tasks_open(): Could not issue the request");
-		g_free (real_uri);
-		e_uri_free (uri);
-
-		return FALSE;
-	}
-
-	config_filename = e_tasks_get_config_filename (tasks);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->tasks_view),
-				     config_filename);
-	g_free (config_filename);
-	g_free (real_uri);
-	e_uri_free (uri);
-
-	return TRUE;
-}
-
-
-/* Displays an error to indicate that loading a calendar failed */
-static void
-load_error				(ETasks		*tasks,
-					 const char	*uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not load the tasks in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that the specified URI method is not supported */
-static void
-method_error				(ETasks		*tasks,
-					 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 (tasks))));
-	g_free (msg);
-}
-
-/* Callback from the calendar client when a calendar is opened */
-static void
-cal_opened_cb				(CalClient	*client,
-					 CalClientOpenStatus status,
-					 gpointer	 data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	char *location;
-	icaltimezone *zone;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	set_status_message (tasks, NULL);
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		/* Everything is OK */
-
-		/* Set the client's default timezone, if we have one. */
-		location = calendar_config_get_timezone ();
-		zone = icaltimezone_get_builtin_timezone (location);
-		if (zone)
-			cal_client_set_default_timezone (client, zone);
-		return;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		load_error (tasks, cal_client_get_uri (client));
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* bullshit; we did not specify only_if_exists */
-		g_assert_not_reached ();
-		return;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (tasks, cal_client_get_uri (client));
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-
-static char*
-e_tasks_get_config_filename		(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	char *url, *filename;
-
-	priv = tasks->priv;
-
-	url = g_strdup (cal_client_get_uri (priv->client));
-
-	/* This turns all funny characters into '_', in the string itself. */
-	e_filename_make_safe (url);
-	
-	filename = g_strdup_printf ("%s/config/et-header-%s", evolution_dir,
-				    url);
-	g_free (url);
-	
-	return filename;
-}
-
-
-/**
- * e_tasks_get_cal_client:
- * @tasks: An #ETasks.
- *
- * Queries the calendar client interface object that a tasks view is using.
- *
- * Return value: A calendar client interface object.
- **/
-CalClient *
-e_tasks_get_cal_client			(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-
-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);
-
-	priv = tasks->priv;
-
-	return priv->client;
-}
-
-
-void
-e_tasks_new_task			(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	TaskEditor *tedit;
-	CalComponent *comp;
-	const char *category;
-
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	tedit = task_editor_new ();
-	comp_editor_set_cal_client (COMP_EDITOR (tedit), priv->client);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv->search_bar));
-	cal_component_set_categories (comp, category);
-
-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	comp_editor_focus (COMP_EDITOR (tedit));
-}
-
-/**
- * e_tasks_complete_selected:
- * @tasks: A tasks control widget
- * 
- * Marks the selected tasks complete
- **/
-void
-e_tasks_complete_selected (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-
-	set_status_message (tasks, _("Completing tasks..."));
-	e_calendar_table_complete_selected (cal_table);
-	set_status_message (tasks, NULL);
-}
-
-/**
- * e_tasks_delete_selected:
- * @tasks: A tasks control widget.
- * 
- * Deletes the selected tasks in the task list.
- **/
-void
-e_tasks_delete_selected (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-	set_status_message (tasks, _("Deleting selected objects..."));
-	e_calendar_table_delete_selected (cal_table);
-	set_status_message (tasks, NULL);
-}
-
-static char *
-create_sexp (void)
-{
-	char *sexp;
-
-	sexp = g_strdup ("(and (= (get-vtype) \"VTODO\") (is-completed?))");
-#if 0
-	g_print ("Calendar model sexp:\n%s\n", sexp);
-#endif
-
-	return sexp;
-}
-
-/* Callback used when a component is updated in the live query */
-static void
-query_obj_updated_cb (CalQuery *query, const char *uid,
-		      gboolean query_in_progress, int n_scanned, int total,
-		      gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-	
-	cal_client_remove_object (priv->client, uid);
-}
-
-/* Callback used when an evaluation error occurs when running a query */
-static void
-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-	
-	g_warning ("eval error: %s\n", error_str);
-
-	set_status_message (tasks, NULL);
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->query), tasks);
-	gtk_object_unref (GTK_OBJECT (priv->query));
-	priv->query = NULL;
-}
-
-static void
-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-	
-	if (status != CAL_QUERY_DONE_SUCCESS)
-		g_warning ("query done: %s\n", error_str);
-
-	set_status_message (tasks, NULL);
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->query), tasks);
-	gtk_object_unref (GTK_OBJECT (priv->query));
-	priv->query = NULL;
-}
-/**
- * e_tasks_expunge:
- * @tasks: A tasks control widget
- * 
- * Removes all tasks marked as completed
- **/
-void
-e_tasks_delete_completed (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	char *sexp;
-	
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	/* If we have a query, we are already expunging */
-	if (priv->query)
-		return;
-
-	sexp = create_sexp ();
-
-	set_status_message (tasks, _("Expunging"));
-	priv->query = cal_client_get_query (priv->client, sexp);
-	g_free (sexp);
-
-	if (!priv->query) {
-		set_status_message (tasks, NULL);
-		g_message ("update_query(): Could not create the query");
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), tasks);
-}
-
-/* Callback used from the view collection when we need to display a new view */
-static void
-display_view_cb (GalViewInstance *instance, GalView *view, gpointer data)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-
-	if (GAL_IS_VIEW_ETABLE (view)) {
-		e_table_set_state_object (e_table_scrolled_get_table (E_TABLE_SCROLLED (E_CALENDAR_TABLE (tasks->priv->tasks_view)->etable)),
-					  GAL_VIEW_ETABLE (view)->state);
-	}
-}
-
-/**
- * e_tasks_setup_view_menus:
- * @tasks: A tasks widget.
- * @uic: UI controller to use for the menus.
- * 
- * Sets up the #GalView menus for a tasks control.  This function should be
- * called from the Bonobo control activation callback for this tasks control.
- * Also, the menus should be discarded using e_tasks_discard_view_menus().
- **/
-void
-e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
-{
-	ETasksPrivate *priv;
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *dir;
-	static GalViewCollection *collection = NULL;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	priv = tasks->priv;
-
-	g_return_if_fail (priv->view_instance == NULL);
-
-	g_assert (priv->view_instance == NULL);
-	g_assert (priv->view_menus == NULL);
-
-	/* Create the view instance */
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new ();
-
-		dir = gnome_util_prepend_user_home ("/evolution/views/tasks/");
-		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_DATADIR "/evolution/views/tasks/",
-							     dir);
-		g_free (dir);
-
-		/* Create the views */
-
-		spec = e_table_specification_new ();
-		e_table_specification_load_from_file (spec, 
-						      EVOLUTION_ETSPECDIR "/e-calendar-table.etspec");
-
-		factory = gal_view_factory_etable_new (spec);
-		gtk_object_unref (GTK_OBJECT (spec));
-		gal_view_collection_add_factory (collection, factory);
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		/* Load the collection and create the menus */
-
-		gal_view_collection_load (collection);
-	}
-
-	priv->view_instance = gal_view_instance_new (collection, cal_client_get_uri (priv->client));
-
-	priv->view_menus = gal_view_menus_new (priv->view_instance);
-	gal_view_menus_apply (priv->view_menus, uic, NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->view_instance), "display_view",
-			    GTK_SIGNAL_FUNC (display_view_cb), tasks);
-	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), tasks);
-}
-
-/**
- * e_tasks_discard_view_menus:
- * @tasks: A tasks widget.
- * 
- * Discards the #GalView menus used by a tasks control.  This function should be
- * called from the Bonobo control deactivation callback for this tasks control.
- * The menus should have been set up with e_tasks_setup_view_menus().
- **/
-void
-e_tasks_discard_view_menus (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	g_return_if_fail (priv->view_instance != NULL);
-
-	g_assert (priv->view_instance != NULL);
-	g_assert (priv->view_menus != NULL);
-
-	gtk_object_unref (GTK_OBJECT (priv->view_instance));
-	priv->view_instance = NULL;
-
-	gtk_object_unref (GTK_OBJECT (priv->view_menus));
-	priv->view_menus = NULL;
-}
-
-/**
- * e_tasks_get_calendar_table:
- * @tasks: A tasks widget.
- * 
- * Queries the #ECalendarTable contained in a tasks widget.
- * 
- * Return value: The #ECalendarTable that the tasks widget uses to display its
- * information.
- **/
-ECalendarTable *
-e_tasks_get_calendar_table (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-
-	g_return_val_if_fail (tasks != NULL, NULL);
-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);
-
-	priv = tasks->priv;
-	return E_CALENDAR_TABLE (priv->tasks_view);
-}
-
-/* This updates all the preference settings for all the ETasks widgets in use.
- */
-void
-e_tasks_update_all_config_settings	(void)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	GList *elem;
-	char *location;
-	icaltimezone *zone;
-
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	for (elem = all_tasks; elem; elem = elem->next) {
-		tasks = E_TASKS (elem->data);
-		priv = tasks->priv;
-
-		calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv->tasks_view));
-
-		if (zone)
-			cal_client_set_default_timezone (priv->client, zone);
-	}
-}
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
deleted file mode 100644
index b88e495dcc..0000000000
--- a/calendar/gui/e-tasks.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _E_TASKS_H_
-#define _E_TASKS_H_
-
-#include <gtk/gtktable.h>
-#include <cal-client/cal-client.h>
-#include "e-calendar-table.h"
-
-#define E_TYPE_TASKS            (e_tasks_get_type ())
-#define E_TASKS(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TASKS, ETasks))
-#define E_TASKS_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_TASKS, \
-				 ETasksClass))
-#define E_IS_TASKS(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TASKS))
-#define E_IS_TASKS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TASKS))
-
-typedef struct _ETasks ETasks;
-typedef struct _ETasksClass ETasksClass;
-typedef struct _ETasksPrivate ETasksPrivate;
-
-struct _ETasks {
-	GtkTable table;
-
-	/* Private data */
-	ETasksPrivate *priv;
-};
-
-struct _ETasksClass {
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* selection_changed) (ETasks *tasks, int n_selected);
-};
-
-
-GtkType    e_tasks_get_type        (void);
-GtkWidget *e_tasks_construct       (ETasks *tasks);
-
-GtkWidget *e_tasks_new             (void);
-
-void  e_tasks_set_ui_component  (ETasks            *tasks,
-				 BonoboUIComponent *ui_component);
-
-gboolean   e_tasks_open            (ETasks            *tasks,
-				    char              *file);
-
-CalClient *e_tasks_get_cal_client  (ETasks            *tasks);
-
-void       e_tasks_new_task          (ETasks            *tasks);
-void       e_tasks_complete_selected (ETasks            *tasks);
-void       e_tasks_delete_selected   (ETasks            *tasks);
-void       e_tasks_delete_completed  (ETasks            *tasks);
-
-
-void e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic);
-void e_tasks_discard_view_menus (ETasks *tasks);
-
-ECalendarTable *e_tasks_get_calendar_table (ETasks *tasks);
-
-/* This updates all the preference settings for all the ETasks widgets in use.
- */
-void	   e_tasks_update_all_config_settings	(void);
-
-#endif /* _E_TASKS_H_ */
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
deleted file mode 100644
index 84c512b574..0000000000
--- a/calendar/gui/e-timezone-entry.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ETimezoneEntry - a field for setting a timezone. It shows the timezone in
- * a GtkEntry with a '...' button beside it which shows a dialog for changing
- * the timezone. The dialog contains a map of the world with a point for each
- * timezone, and an option menu as an alternative way of selecting the
- * timezone.
- */
-
-#include <config.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include "e-timezone-entry.h"
-
-/* The timezone icon for the button. */
-#include "art/timezone-16.xpm"
-
-struct _ETimezoneEntryPrivate {
-	/* This is the timezone set in e_timezone_entry_set_timezone().
-	   Note that we don't copy it or use a ref count - we assume it is
-	   never destroyed for the lifetime of this widget. */
-	icaltimezone *zone;
-	
-	/* This is TRUE if the timezone has been changed since being set.
-	   If it hasn't, we can just return zone, If it has, we return the
-	   builtin timezone with tzid. (It can only be changed to a builtin
-	   timezone, or to 'local time', i.e. no timezone.) */
-	gboolean changed;
-
-	GtkWidget *entry;
-	GtkWidget *button;
-
-	/* This can be set to the default timezone. If the current timezone
-	   setting in the ETimezoneEntry matches this, then the entry field
-	   is hidden. This makes the user interface simpler. */
-	icaltimezone *default_zone;
-};
-
-
-enum {
-  CHANGED,
-  LAST_SIGNAL
-};
-
-
-static void e_timezone_entry_class_init	(ETimezoneEntryClass	*class);
-static void e_timezone_entry_init	(ETimezoneEntry	*tentry);
-static void e_timezone_entry_destroy	(GtkObject	*object);
-
-static void on_entry_changed		(GtkEntry	*entry,
-					 ETimezoneEntry *tentry);
-static void on_button_clicked		(GtkWidget	*widget,
-					 ETimezoneEntry	*tentry);
-
-static char* e_timezone_entry_get_display_name	(ETimezoneEntry *tentry,
-						 icaltimezone	*zone);
-
-static void e_timezone_entry_set_entry_visibility (ETimezoneEntry *tentry);
-
-
-static GtkHBoxClass *parent_class;
-static guint timezone_entry_signals[LAST_SIGNAL] = { 0 };
-
-
-/**
- * e_timezone_entry_get_type:
- *
- * Returns the GtkType for the ETimezoneEntry widget
- */
-guint
-e_timezone_entry_get_type		(void)
-{
-	static guint timezone_entry_type = 0;
-
-	if (!timezone_entry_type){
-		GtkTypeInfo timezone_entry_info = {
-			"ETimezoneEntry",
-			sizeof (ETimezoneEntry),
-			sizeof (ETimezoneEntryClass),
-			(GtkClassInitFunc) e_timezone_entry_class_init,
-			(GtkObjectInitFunc) e_timezone_entry_init,
-			NULL,
-			NULL,
-		};
-
-		timezone_entry_type = gtk_type_unique (gtk_hbox_get_type (), &timezone_entry_info);
-	}
-	
-	return timezone_entry_type;
-}
-
-
-static void
-e_timezone_entry_class_init		(ETimezoneEntryClass	*class)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) class;
-
-	object_class = (GtkObjectClass*) class;
-
-	parent_class = gtk_type_class (gtk_hbox_get_type ());
-
-	timezone_entry_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETimezoneEntryClass,
-						   changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, timezone_entry_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy		= e_timezone_entry_destroy;
-
-	class->changed = NULL;
-}
-
-
-static void
-e_timezone_entry_init		(ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	GdkColormap *colormap;
-	GdkPixmap *timezone_icon;
-	GdkBitmap *timezone_mask;
-	GtkWidget *pixmap;
-
-	tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
-
-	priv->zone = NULL;
-	priv->changed = FALSE;
-	priv->default_zone = NULL;
-
-	priv->entry  = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (priv->entry), FALSE);
-	/*gtk_widget_set_usize (priv->date_entry, 90, 0);*/
-	gtk_box_pack_start (GTK_BOX (tentry), priv->entry, TRUE, TRUE, 0);
-	gtk_widget_show (priv->entry);
-	gtk_signal_connect (GTK_OBJECT (priv->entry), "changed",
-			    GTK_SIGNAL_FUNC (on_entry_changed), tentry);
-	
-	priv->button = gtk_button_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->button), "clicked",
-			    GTK_SIGNAL_FUNC (on_button_clicked), tentry);
-	gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 0);
-	gtk_widget_show (priv->button);
-
-	colormap = gtk_widget_get_colormap (priv->button);
-	timezone_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &timezone_mask, NULL, timezone_16_xpm);
-
-	pixmap = gtk_pixmap_new (timezone_icon, timezone_mask);
-	gtk_container_add (GTK_CONTAINER (priv->button), pixmap);
-	gtk_widget_show (pixmap);
-}
-
-
-/**
- * e_timezone_entry_new:
- *
- * Description: Creates a new #ETimezoneEntry widget which can be used
- * to provide an easy to use way for entering dates and times.
- * 
- * Returns: a new #ETimezoneEntry widget.
- */
-GtkWidget *
-e_timezone_entry_new			(void)
-{
-	ETimezoneEntry *tentry;
-
-	tentry = gtk_type_new (e_timezone_entry_get_type ());
-
-	return GTK_WIDGET (tentry);
-}
-
-
-static void
-e_timezone_entry_destroy		(GtkObject	*object)
-{
-	ETimezoneEntry *tentry;
-	ETimezoneEntryPrivate *priv;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (object));
-
-	tentry = E_TIMEZONE_ENTRY (object);
-	priv = tentry->priv;
-
-	g_free (tentry->priv);
-	tentry->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* The arrow button beside the date field has been clicked, so we show the
-   popup with the ECalendar in. */
-static void
-on_button_clicked		(GtkWidget	*widget,
-				 ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	ETimezoneDialog *timezone_dialog;
-	GtkWidget *dialog;
-	char *tzid = NULL, *display_name, *old_display_name;
-
-	priv = tentry->priv;
-
-	display_name = gtk_entry_get_text (GTK_ENTRY (priv->entry));
-
-	if (priv->zone)
-		tzid = icaltimezone_get_tzid (priv->zone);
-
-	timezone_dialog = e_timezone_dialog_new ();
-	e_timezone_dialog_set_timezone (timezone_dialog, tzid, display_name);
-
-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
-
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0) {
-		tzid = e_timezone_dialog_get_timezone (E_TIMEZONE_DIALOG (timezone_dialog), &display_name);
-		old_display_name = gtk_entry_get_text (GTK_ENTRY (priv->entry));
-		/* See if the timezone has been changed. It can only have been
-		   changed to a builtin timezone, in which case the returned
-		   TZID will be NULL. */
-		if (strcmp (old_display_name, display_name)
-		    || (!tzid && priv->zone)) {
-			priv->changed = TRUE;
-			priv->zone = NULL;
-		}
-
-		gtk_entry_set_text (GTK_ENTRY (priv->entry), display_name);
-		e_timezone_entry_set_entry_visibility (tentry);
-	}
-
-	gtk_object_unref (GTK_OBJECT (timezone_dialog));
-}
-
-
-static void
-on_entry_changed			(GtkEntry	*entry,
-					 ETimezoneEntry *tentry)
-{
-	gtk_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED]);
-}
-
-
-icaltimezone*
-e_timezone_entry_get_timezone		(ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	char *display_name;
-
-	g_return_val_if_fail (E_IS_TIMEZONE_ENTRY (tentry), NULL);
-
-	priv = tentry->priv;
-
-	/* If the timezone hasn't been change, we can just return the same
-	   zone we were passed in. */
-	if (!priv->changed)
-		return priv->zone;
-
-	/* If the timezone has changed, it can only have been changed to a
-	   builtin timezone or 'local time' (i.e. no timezone). */
-	display_name = gtk_entry_get_text (GTK_ENTRY (priv->entry));
-
-	return e_timezone_dialog_get_builtin_timezone (display_name);
-}
-
-
-void
-e_timezone_entry_set_timezone		(ETimezoneEntry	*tentry,
-					 icaltimezone	*zone)
-{
-	ETimezoneEntryPrivate *priv;
-	gchar *display_name;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));
-
-	priv = tentry->priv;
-
-	priv->zone = zone;
-	priv->changed = FALSE;
-
-	display_name = e_timezone_entry_get_display_name (tentry, zone);
-	gtk_entry_set_text (GTK_ENTRY (priv->entry),
-			    display_name ? display_name : "");
-	g_free (display_name);
-
-	e_timezone_entry_set_entry_visibility (tentry);
-}
-
-
-/* Returns the timezone name to display to the user, in the locale's encoding.
-   We prefer to use the Olson city name, but fall back on the TZNAME, or
-   finally the TZID. We don't want to use "" as it may be wrongly interpreted
-   as a 'local time'. If zone is NULL, NULL is returned. The returned string
-   should be freed. */
-static char*
-e_timezone_entry_get_display_name	(ETimezoneEntry *tentry,
-					 icaltimezone	*zone)
-{
-	char *display_name;
-
-	if (!zone)
-		return NULL;
-
-	/* Get the UTF-8 display name from the icaltimezone. */
-	display_name = icaltimezone_get_display_name (zone);
-
-	/* We check if it is one of our builtin timezone names, in which case
-	   we call gettext to translate it. If it isn't a builtin timezone
-	   name, we need to convert it to the GTK+ encoding. */
-	if (icaltimezone_get_builtin_timezone (display_name)) {
-		return g_strdup (_(display_name));
-	} else {
-		return e_utf8_to_gtk_string (GTK_WIDGET (tentry),
-					     display_name);
-	}
-}
-
-
-/* Sets the default timezone. If the current timezone matches this, then the
-   entry field is hidden. This is useful since most people do not use timezones
-   so it makes the user interface simpler. */
-void
-e_timezone_entry_set_default_timezone	(ETimezoneEntry	*tentry,
-					 icaltimezone	*zone)
-{
-	ETimezoneEntryPrivate *priv;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));
-
-	priv = tentry->priv;
-
-	priv->default_zone = zone;
-
-	e_timezone_entry_set_entry_visibility (tentry);
-}
-
-
-static void
-e_timezone_entry_set_entry_visibility (ETimezoneEntry	*tentry)
-{
-	ETimezoneEntryPrivate *priv;
-	icaltimezone *zone;
-	gboolean show_entry = TRUE;
-
-	priv = tentry->priv;
-
-	if (priv->default_zone) {
-		zone = e_timezone_entry_get_timezone (tentry);
-		if (zone == priv->default_zone)
-			show_entry = FALSE;
-	}
-
-	if (show_entry)
-		gtk_widget_show (priv->entry);
-	else
-		gtk_widget_hide (priv->entry);
-}
-
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
deleted file mode 100644
index 4a057f681f..0000000000
--- a/calendar/gui/e-timezone-entry.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ETimezoneEntry - a field for setting a timezone. It shows the timezone in
- * a GtkEntry with a '...' button beside it which shows a dialog for changing
- * the timezone. The dialog contains a map of the world with a point for each
- * timezone, and an option menu as an alternative way of selecting the
- * timezone.
- */
-
-#ifndef __E_TIMEZONE_ENTRY_H_
-#define __E_TIMEZONE_ENTRY_H_ 
-
-#include <gtk/gtkhbox.h>
-#include <libgnome/gnome-defs.h>
-#include <cal-client/cal-client.h>
- 
-BEGIN_GNOME_DECLS
-
-
-#define E_TYPE_TIMEZONE_ENTRY            (e_timezone_entry_get_type ())
-#define E_TIMEZONE_ENTRY(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))
-#define E_TIMEZONE_ENTRY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))
-#define E_IS_TIMEZONE_ENTRY(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))
-#define E_IS_TIMEZONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))
-
-
-typedef struct _ETimezoneEntry        ETimezoneEntry;
-typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate;
-typedef struct _ETimezoneEntryClass   ETimezoneEntryClass;
-
-struct _ETimezoneEntry {
-	GtkHBox hbox;
-
-	/*< private >*/
-	ETimezoneEntryPrivate *priv;
-};
-
-struct _ETimezoneEntryClass {
-	GtkHBoxClass parent_class;
-
-	void (* changed)      (ETimezoneEntry    *tentry);
-};
-
-guint      e_timezone_entry_get_type		(void);
-GtkWidget* e_timezone_entry_new			(void);
-
-icaltimezone*   e_timezone_entry_get_timezone	(ETimezoneEntry	*tentry);
-void		e_timezone_entry_set_timezone	(ETimezoneEntry	*tentry,
-						 icaltimezone	*zone);
-
-/* Sets the default timezone. If the current timezone matches this, then the
-   entry field is hidden. This is useful since most people do not use timezones
-   so it makes the user interface simpler. */
-void	   e_timezone_entry_set_default_timezone(ETimezoneEntry	*tentry,
-						 icaltimezone	*zone);
-
-END_GNOME_DECLS
-
-#endif /* __E_TIMEZONE_ENTRY_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 4d532be5bf..0000000000
--- a/calendar/gui/e-week-view-event-item.c
+++ /dev/null
@@ -1,901 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "e-util/e-categories-config.h"
-#include "e-week-view-event-item.h"
-
-#include <gtk/gtksignal.h>
-#include <gal/e-text/e-text.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_draw_time		(EWeekView	*week_view,
-						 GdkDrawable	*drawable,
-						 gint		 time_x,
-						 gint		 time_y,
-						 gint		 hour,
-						 gint		 minute);
-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 gboolean e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,
-						     GdkEvent		*bevent);
-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 *gc;
-	gint x1, y1, x2, y2, time_x, time_y;
-	gint icon_x, icon_y, time_width, min_end_time_x, max_icon_x;
-	gint rect_x, rect_w, rect_x2;
-	gboolean one_day_event, editing_span = FALSE;
-	gint start_hour, start_minute, end_hour, end_minute;
-	gboolean draw_start, draw_end;
-	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;
-	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_x = 0;
-	icon_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;
-
-	/* Get the start & end times in 24-hour format. */
-	start_hour = event->start_minute / 60;
-	start_minute = event->start_minute % 60;
-	end_hour = event->end_minute / 60;
-	end_minute = event->end_minute % 60;
-
-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;
-
-	time_width = e_week_view_get_time_string_width (week_view);
-
-	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;
-
-		/* Draw the start and end times, as required. */
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_BOTH:
-			draw_start = TRUE;
-			draw_end = TRUE;
-			break;
-
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_START:
-			draw_start = TRUE;
-			draw_end = FALSE;
-			break;
-
-		case E_WEEK_VIEW_TIME_NONE:
-			draw_start = FALSE;
-			draw_end = FALSE;
-			break;
-		default:
-			g_assert_not_reached();
-			draw_start = FALSE;
-			draw_end = FALSE;
-			break;
-		}
-
-		if (draw_start) {
-			e_week_view_draw_time (week_view, drawable,
-					       time_x, time_y,
-					       start_hour, start_minute);
-			time_x += time_width;
-		}
-
-		if (draw_end) {
-			time_x += E_WEEK_VIEW_EVENT_TIME_SPACING;
-			e_week_view_draw_time (week_view, drawable,
-					       time_x, time_y,
-					       end_hour, end_minute);
-			time_x += time_width;
-		}
-
-		icon_x = time_x;
-		if (draw_start)
-			icon_x += E_WEEK_VIEW_EVENT_TIME_X_PAD;
-
-		/* 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.
-		   They also use the first few pixels at the edge of the
-		   event so we update rect_x & rect_w so we don't draw over
-		   them. */
-		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 they are not on day
-		   boundaries. The start time would always be shown if it was
-		   needed, though it may be clipped as the window shrinks.
-		   The end time is only displayed if there is enough room.
-		   We calculate the minimum position for the end time, which
-		   depends on whether the start time is displayed. If the end
-		   time doesn't fit, then we don't draw it. */
-		min_end_time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-			+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-		if (!editing_span
-		    && event->start > week_view->day_starts[span->start_day]) {
-			time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_EDGE_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 (gc, &clip_rect);
-
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT]);
-
-			e_week_view_draw_time (week_view, drawable,
-					       time_x, time_y,
-					       start_hour, start_minute);
-
-			gdk_gc_set_clip_rectangle (gc, NULL);
-
-			/* We don't want the end time to be drawn over the
-			   start time, so we increase the minimum position. */
-			min_end_time_x += time_width
-				+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-		}
-
-		max_icon_x = x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD
-			- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			- E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-
-		if (!editing_span
-		    && event->end < week_view->day_starts[span->start_day
-							 + span->num_days]) {
-			/* Calculate where the end time should be displayed. */
-			time_x = x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD
-				- time_width;
-
-			/* Draw the end time, if the position is greater than
-			   the minimum calculated above. */
-			if (time_x >= min_end_time_x) {
-				e_week_view_draw_time (week_view, drawable,
-						       time_x, time_y,
-						       end_hour, end_minute);
-				max_icon_x -= time_width
-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-			}
-		}
-
-		/* Draw the icons. */
-		if (span->text_item
-		    && (week_view->editing_event_num != wveitem->event_num
-			|| week_view->editing_span_num != wveitem->span_num)) {
-			icon_x = span->text_item->x1 - E_WEEK_VIEW_ICON_R_PAD - x;
-			e_week_view_event_item_draw_icons (wveitem, drawable,
-							   icon_x, icon_y,
-							   max_icon_x, TRUE);
-		}
-	}
-}
-
-
-static void
-e_week_view_draw_time	(EWeekView	*week_view,
-			 GdkDrawable	*drawable,
-			 gint		 time_x,
-			 gint		 time_y,
-			 gint		 hour,
-			 gint		 minute)
-{
-	GtkStyle *style;
-	GdkGC *gc;
-	GdkFont *font, *small_font;
-	gint hour_to_display, suffix_width;
-	gint time_y_normal_font, time_y_small_font;
-	gchar buffer[128], *suffix;
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	small_font = week_view->small_font;
-	gc = week_view->main_gc;
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT]);
-
-	time_y_normal_font = time_y_small_font = time_y + font->ascent;
-	if (small_font)
-		time_y_small_font = time_y + small_font->ascent;
-
-	e_week_view_convert_time_to_display (week_view, hour, &hour_to_display,
-					     &suffix, &suffix_width);
-
-	if (week_view->use_small_font && week_view->small_font) {
-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i",
-			    hour_to_display, minute);
-
-		/* Draw the hour. */
-		if (hour_to_display < 10)
-			gdk_draw_text (drawable, font, gc,
-				       time_x + week_view->digit_width,
-				       time_y_normal_font, buffer + 1, 1);
-		else
-			gdk_draw_text (drawable, font, gc,
-				       time_x, time_y_normal_font, buffer, 2);
-
-		time_x += week_view->digit_width * 2;
-
-		/* Draw the start minute, in the small font. */
-		gdk_draw_text (drawable, week_view->small_font, gc,
-			       time_x, time_y_small_font, buffer + 3, 2);
-
-		time_x += week_view->small_digit_width * 2;
-
-		/* Draw the 'am'/'pm' suffix, if 12-hour format. */
-		if (!week_view->use_24_hour_format) {
-			gdk_draw_string (drawable, font, gc,
-					 time_x, time_y_normal_font, suffix);
-		}
-	} else {
-		/* Draw the start time in one go. */
-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i%s",
-			    hour_to_display, minute, suffix);
-		if (hour_to_display < 10)
-			gdk_draw_string (drawable, font, gc,
-					 time_x + week_view->digit_width,
-					 time_y_normal_font, buffer + 1);
-		else
-			gdk_draw_string (drawable, font, gc,
-					 time_x, time_y_normal_font,
-					 buffer);
-
-	}
-}
-
-
-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;
-	gboolean draw_timezone_icon = FALSE;
-	GSList *categories_list, *elem;
-
-	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++;
-	}
-
-	if (event->different_timezone) {
-		draw_timezone_icon = TRUE;
-		num_icons++;
-	}
-
-	cal_component_get_categories_list (comp, &categories_list);
-	num_icons += g_slist_length (categories_list);
-
-	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;
-	}
-
-	if (draw_timezone_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->timezone_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->timezone_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	/* draw categories icons */
-	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		GdkPixmap *pixmap = NULL;
-		GdkBitmap *mask = NULL;
-
-		category = (char *) elem->data;
-		e_categories_config_get_icon_for (category, &pixmap, &mask);
-		if (pixmap == NULL)
-			continue;
-
-		if (icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			if (mask != NULL)
-				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
-					 pixmap,
-					 0, 0, icon_x, icon_y,
-					 E_WEEK_VIEW_ICON_WIDTH,
-					 E_WEEK_VIEW_ICON_HEIGHT);
-			icon_x += icon_x_inc;
-		}
-		gdk_pixmap_unref (pixmap);
-		if (mask != NULL)
-			gdk_bitmap_unref (mask);
-	}
-
-	cal_component_free_categories_list (categories_list);
-
-	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_2BUTTON_PRESS:
-		return e_week_view_event_item_double_click (wveitem, event);
-	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;
-
-	if (bevent->button.button == 1) {
-		week_view->pressed_event_num = wveitem->event_num;
-		week_view->pressed_span_num = wveitem->span_num;
-
-		/* 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.
-		 */
-
-		return TRUE;
-	} 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;
-	}
-
-	return FALSE;
-}
-
-
-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 gboolean
-e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,
-				     GdkEvent		*bevent)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	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);
-
-	e_week_view_stop_editing_event (week_view);
-
-	if (week_view->calendar)
-		gnome_calendar_edit_object (week_view->calendar, event->comp, FALSE);
-	else
-		g_warning ("Calendar not set");
-
-	return TRUE;
-}
-
-
-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_EDGE_X_PAD)
-			return E_WEEK_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item->x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD
-		    - E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    - E_WEEK_VIEW_EVENT_EDGE_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 20cace0132..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-layout.c b/calendar/gui/e-week-view-layout.c
deleted file mode 100644
index 4ab1cf1fd9..0000000000
--- a/calendar/gui/e-week-view-layout.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * Lays out events for the Week & Month views of the calendar. It is also
- * used for printing.
- */
-
-#include <config.h>
-
-#include "e-week-view-layout.h"
-
-
-static void e_week_view_layout_event	(EWeekViewEvent	*event,
-					 guint8		*grid,
-					 GArray		*spans,
-					 GArray		*old_spans,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gboolean	 compress_weekend,
-					 gint		 start_weekday,
-					 time_t		*day_starts,
-					 gint		*rows_per_day);
-static gint e_week_view_find_day	(time_t		 time_to_find,
-					 gboolean	 include_midnight_in_prev_day,
-					 gint		 days_shown,
-					 time_t		*day_starts);
-static gint e_week_view_find_span_end	(gboolean	 multi_week_view,
-					 gboolean	 compress_weekend,
-					 gint		 display_start_day,
-					 gint		 day);
-
-
-GArray*
-e_week_view_layout_events	(GArray		*events,
-				 GArray		*old_spans,
-				 gboolean	 multi_week_view,
-				 gint		 weeks_shown,
-				 gboolean	 compress_weekend,
-				 gint		 start_weekday,
-				 time_t		*day_starts,
-				 gint		*rows_per_day)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint num_days, day, event_num, span_num;
-	guint8 *grid;
-	GArray *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 = multi_week_view ? weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-		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 < events->len; event_num++) {
-		event = &g_array_index (events, EWeekViewEvent, event_num);
-		e_week_view_layout_event (event, grid, spans, old_spans,
-					  multi_week_view,
-					  weeks_shown, compress_weekend,
-					  start_weekday, day_starts,
-					  rows_per_day);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* 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);
-	}
-
-	return spans;
-}
-
-
-static void
-e_week_view_layout_event	(EWeekViewEvent	*event,
-				 guint8		*grid,
-				 GArray		*spans,
-				 GArray		*old_spans,
-				 gboolean	 multi_week_view,
-				 gint		 weeks_shown,
-				 gboolean	 compress_weekend,
-				 gint		 start_weekday,
-				 time_t		*day_starts,
-				 gint		*rows_per_day)
-{
-	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, days_shown;
-	EWeekViewEventSpan span, *old_span;
-
-	days_shown = multi_week_view ? weeks_shown * 7 : 7;
-	start_day = e_week_view_find_day (event->start, FALSE, days_shown,
-					  day_starts);
-	end_day = e_week_view_find_day (event->end, TRUE, days_shown,
-					day_starts);
-	start_day = CLAMP (start_day, 0, days_shown - 1);
-	end_day = CLAMP (end_day, 0, days_shown - 1);
-
-#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 (multi_week_view,
-							  compress_weekend,
-							  start_weekday,
-							  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;
-				rows_per_day[day] = MAX (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 (old_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;
-}
-
-
-/* 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		(time_t		 time_to_find,
-				 gboolean	 include_midnight_in_prev_day,
-				 gint		 days_shown,
-				 time_t		*day_starts)
-{
-	gint day;
-
-	if (time_to_find < day_starts[0])
-		return -1;
-	if (time_to_find > day_starts[days_shown])
-		return days_shown;
-
-	for (day = 1; day <= days_shown; 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 days_shown;
-}
-
-
-/* This returns the last possible 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 we have to break a span up
-   on Saturday, use a separate span for Sunday, and start again on Monday. */
-static gint
-e_week_view_find_span_end	(gboolean	 multi_week_view,
-				 gboolean	 compress_weekend,
-				 gint		 display_start_day,
-				 gint		 day)
-{
-	gint week, col, sat_col, end_col;
-
-	if (multi_week_view) {
-		week = day / 7;
-		col = day % 7;
-
-		/* We default to the last column in the row. */
-		end_col = 6;
-
-		/* If the weekend is compressed we must end any spans on
-		   Saturday and Sunday. */
-		if (compress_weekend) {
-			sat_col = (5 + 7 - display_start_day) % 7;
-			if (col <= sat_col)
-				end_col = sat_col;
-			else if (col == sat_col + 1)
-				end_col = sat_col + 1;
-		}
-
-		return week * 7 + end_col;
-	} else {
-		return day;
-	}
-}
-
-
-void
-e_week_view_layout_get_day_position	(gint		 day,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gint		 display_start_day,
-					 gboolean	 compress_weekend,
-					 gint		*day_x,
-					 gint		*day_y,
-					 gint		*rows)
-{
-	gint week, day_of_week, row, col, weekend_col, box, weekend_box;
-
-	*day_x = *day_y = *rows = 0;
-	g_return_if_fail (day >= 0);
-
-	if (multi_week_view) {
-		g_return_if_fail (day < weeks_shown * 7);
-
-		week = day / 7;
-		col = day % 7;
-		day_of_week = (display_start_day + day) % 7;
-		if (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 * 2;
-				*rows = 1;
-			} else {
-				*day_y = week * 2 + 1;
-				*rows = 1;
-				col--;
-			}
-			/* Both Saturday and Sunday are in the same column. */
-			*day_x = col;
-		} else {
-			/* If the weekend is compressed and the day is after
-			   the weekend we have to move back a column. */
-			if (compress_weekend) {
-				/* Calculate where the weekend column is.
-				   Note that 5 is Saturday. */
-				weekend_col = (5 + 7 - display_start_day) % 7;
-				if (col > weekend_col)
-					col--;
-			}
-
-			*day_y = week * 2;
-			*rows = 2;
-			*day_x = col;
-		}
-	} else {
-		g_return_if_fail (day < 7);
-
-		/* Calculate which box to place the day in, from 0-5.
-		   Note that in the week view the weekends are always
-		   compressed and share a box. */
-		box = day;
-		day_of_week = (display_start_day + day) % 7;
-		weekend_box = (5 + 7 - display_start_day) % 7;
-		if (box > weekend_box)
-			box--;
-
-		if (box < 3)
-			*day_x = 0;
-		else
-			*day_x = 1;
-
-		row = (box % 3) * 2;
-		if (day_of_week < 5) {
-			*day_y = row;
-			*rows = 2;
-		} else if (day_of_week == 5) {
-			/* Saturday. */
-			*day_y = row;
-			*rows = 1;
-
-		} else {
-			/* Sunday. */
-			*day_y = row + 1;
-			*rows = 1;
-		}
-	}
-}
-
-
-/* Returns TRUE if the event span is visible or FALSE if it isn't.
-   It also returns the number of days of the span that are visible.
-   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_layout_get_span_position	(EWeekViewEvent *event,
-					 EWeekViewEventSpan *span,
-					 gint		 rows_per_cell,
-					 gint		 rows_per_compressed_cell,
-					 gint		 display_start_day,
-					 gboolean	 multi_week_view,
-					 gboolean	 compress_weekend,
-					 gint		*span_num_days)
-{
-	gint end_day_of_week;
-
-	if (span->row >= rows_per_cell)
-		return FALSE;
-
-	end_day_of_week = (display_start_day + span->start_day
-			   + span->num_days - 1) % 7;
-	*span_num_days = span->num_days;
-	/* Check if the row will not be visible in compressed cells. */
-	if (span->row >= rows_per_compressed_cell) {
-		if (multi_week_view) {
-			if (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 (*span_num_days == 1) {
-						return FALSE;
-					} else {
-						(*span_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;
-		}
-	}
-
-	return TRUE;
-}
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
deleted file mode 100644
index 2c6d5a29d8..0000000000
--- a/calendar/gui/e-week-view-layout.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_LAYOUT_H_
-#define _E_WEEK_VIEW_LAYOUT_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* I've split these functions away from EWeekView so we can use them for
-   printing. */
-
-GArray* e_week_view_layout_events	(GArray		*events,
-					 GArray		*old_spans,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gboolean	 compress_weekend,
-					 gint		 start_weekday,
-					 time_t		*day_starts,
-					 gint		*rows_per_day);
-
-/* Returns which 'cell' in the table the day appears in. Note that most days
-   have a height of 2 rows, but Sat/Sun are sometimes compressed so they have
-   a height of only 1 row. */
-void e_week_view_layout_get_day_position(gint		 day,
-					 gboolean	 multi_week_view,
-					 gint		 weeks_shown,
-					 gint		 display_start_day,
-					 gboolean	 compress_weekend,
-					 gint		*cell_x,
-					 gint		*cell_y,
-					 gint		*rows);
-
-gboolean e_week_view_layout_get_span_position (EWeekViewEvent *event,
-					       EWeekViewEventSpan *span,
-					       gint	 rows_per_cell,
-					       gint	 rows_per_compressed_cell,
-					       gint	 display_start_day,
-					       gboolean	 multi_week_view,
-					       gboolean	 compress_weekend,
-					       gint	*span_num_days);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_LAYOUT_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 60d71f0631..0000000000
--- a/calendar/gui/e-week-view-main-item.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.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 *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;
-	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_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_GRID]);
-	gdk_draw_line (drawable, gc,
-		       right_edge, y, right_edge, bottom_edge);
-	gdk_draw_line (drawable, 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) {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
-		if (week_view->multi_week_view) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5,
-					    E_WEEK_VIEW_DATE_T_PAD - 1
-					    + font->ascent + font->descent);
-		} else {
-			gdk_draw_rectangle (drawable, 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) {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED]);
-	} else if (week_view->multi_week_view) {
-		struct icaltimetype tt;
-
-		/* Check if we are drawing today */		
-		tt = icaltime_from_timet_with_zone (time (NULL), FALSE, week_view->zone);
-		if (g_date_year (date) == tt.year 
-		    && g_date_month (date) == tt.month
-		    && g_date_day (date) == tt.day)
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
-		else
-			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES]);
-	} else {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES]);
-	}
-	
-	gdk_draw_string (drawable, font, 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_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_GRID]);
-		gdk_draw_line (drawable, 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 35740479da..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 d201a50e35..0000000000
--- a/calendar/gui/e-week-view-titles-item.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-	gint weekday;
-
-#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);
-	/* Note that 20th March 2000 is a Monday. We only care about the
-	   weekday. */
-	weekday = week_view->display_start_day;
-	g_date_set_dmy (&date, 20 + weekday, 3, 2000);
-	for (col = 0; col < week_view->columns; col++) {
-		if (weekday == 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 (weekday == 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[weekday];
-		else
-			date_width = week_view->abbr_day_widths[weekday];
-
-		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);
-		}
-
-		if (weekday == 5 && week_view->compress_weekend)
-			weekday += 2;
-		else
-			weekday++;
-
-		weekday = weekday % 7;
-
-		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 77fed506c8..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@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 f0913e3e28..0000000000
--- a/calendar/gui/e-week-view.c
+++ /dev/null
@@ -1,4379 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "e-week-view.h"
-
-#include <math.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-dialog-utils.h>
-#include "dialogs/delete-comp.h"
-#include "dialogs/send-comp.h"
-#include "comp-util.h"
-#include "itip-utils.h"
-#include "cal-util/timeutil.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "print.h"
-#include "goto.h"
-#include "e-week-view-event-item.h"
-#include "e-week-view-layout.h"
-#include "e-week-view-main-item.h"
-#include "e-week-view-titles-item.h"
-#include "misc.h"
-
-/* Images */
-#include "art/bell.xpm"
-#include "art/recur.xpm"
-#include "art/timezone-16.xpm"
-#include "art/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-*"
-
-#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
-
-/* The timeout before we do a layout, so we don't do a layout for each event
-   we get from the server. */
-#define E_WEEK_VIEW_LAYOUT_TIMEOUT	100
-
-/* Used for the status bar messages */
-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "evolution-calendar-mini.png"
-static GdkPixbuf *progress_icon[2] = { NULL, NULL };
-
-/* Signal IDs */
-enum {
-	SELECTION_CHANGED,
-	LAST_SIGNAL
-};
-static guint e_week_view_signals[LAST_SIGNAL] = { 0 };
-
-
-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_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_ensure_events_sorted (EWeekView *week_view);
-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 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_new_event       (GtkWidget *widget,
-					   gpointer data);
-static void e_week_view_on_new_meeting (GtkWidget *widget,
-					gpointer data);
-static void e_week_view_on_new_task (GtkWidget *widget,
-				     gpointer data);
-static void e_week_view_on_goto_today      (GtkWidget *widget,
-					   gpointer data);
-static void e_week_view_on_goto_date       (GtkWidget *widget,
-					   gpointer data);
-static void e_week_view_on_edit_appointment (GtkWidget *widget,
-					     gpointer data);
-static void e_week_view_on_save_as (GtkWidget *widget,
-				    gpointer data);
-static void e_week_view_on_print (GtkWidget *widget,
-				  gpointer data);
-static void e_week_view_on_print_event (GtkWidget *widget,
-					gpointer data);
-static void e_week_view_on_meeting (GtkWidget *widget,
-				    gpointer data);
-static void e_week_view_on_forward (GtkWidget *widget,
-				    gpointer data);
-static void e_week_view_on_publish (GtkWidget *widget,
-				    gpointer data);
-static void e_week_view_on_settings (GtkWidget *widget,
-				     gpointer data);
-static void e_week_view_on_pilot_settings (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_cut (GtkWidget *widget, gpointer data);
-static void e_week_view_on_copy (GtkWidget *widget, gpointer data);
-static void e_week_view_on_paste (GtkWidget *widget, gpointer data);
-static void e_week_view_on_unrecur_appointment (GtkWidget *widget,
-						gpointer data);
-
-static gboolean e_week_view_update_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-static gboolean e_week_view_remove_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-static gboolean e_week_view_recalc_display_start_day	(EWeekView	*week_view);
-
-static void invisible_destroyed   (GtkWidget *invisible, EWeekView *week_view);
-static void selection_get         (GtkWidget *invisible,
-				   GtkSelectionData *selection_data,
-				   guint info,
-				   guint time_stamp,
-				   EWeekView *week_view);
-static void selection_clear_event (GtkWidget *invisible,
-				   GdkEventSelection *event,
-				   EWeekView *week_view);
-static void selection_received    (GtkWidget *invisible,
-				   GtkSelectionData *selection_data,
-				   guint time,
-				   EWeekView *week_view);
-
-static void e_week_view_queue_layout (EWeekView *week_view);
-static void e_week_view_cancel_layout (EWeekView *week_view);
-static gboolean e_week_view_layout_timeout_cb (gpointer data);
-
-
-static GtkTableClass *parent_class;
-static GdkAtom clipboard_atom = GDK_NONE;
-
-
-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;
-
-	e_week_view_signals[SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EWeekViewClass, selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_week_view_signals, LAST_SIGNAL);
-
-	/* 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;
-
-	class->selection_changed = NULL;
-
-	/* clipboard atom */
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-
-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->sexp = g_strdup ("#t"); /* match all by default */
-	week_view->query = 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->layout_timeout_id = 0;
-
-	week_view->spans = NULL;
-
-	week_view->zone = 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;
-	week_view->show_event_end_times = TRUE;
-	week_view->week_start_day = 0;		/* Monday. */
-	week_view->display_start_day = 0;	/* Monday. */
-
-	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;
-
-	week_view->default_category = 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");
-
-	/* String to use in 12-hour time format for times in the morning. */
-	week_view->am_string = _("am");
-
-	/* String to use in 12-hour time format for times in the afternoon. */
-	week_view->pm_string = _("pm");
-
-
-	/*
-	 * 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);
-	}
-	gdk_pixbuf_unref (pixbuf);
-
-	/*
-	 * 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_LEFT_PTR);
-	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;
-
-	/* Set up the inivisible widget for the clipboard selections */
-	week_view->invisible = gtk_invisible_new ();
-	gtk_selection_add_target (week_view->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    (gpointer) week_view);
-	week_view->clipboard_selection = NULL;
-
-	week_view->activity = 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_cancel_layout (week_view);
-
-	e_week_view_free_events (week_view);
-	g_array_free (week_view->events, TRUE);
-	week_view->events = NULL;
-
-	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->sexp) {
-		g_free (week_view->sexp);
-		week_view->sexp = NULL;
-	}
-
-	if (week_view->query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->query), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->query));
-		week_view->query = NULL;
-	}
-
-	if (week_view->small_font) {
-		gdk_font_unref (week_view->small_font);
-		week_view->small_font = NULL;
-	}
-
-	if (week_view->default_category) {
-		g_free (week_view->default_category);
-		week_view->default_category = NULL;
-	}
-
-	gdk_cursor_destroy (week_view->normal_cursor);
-	gdk_cursor_destroy (week_view->move_cursor);
-	gdk_cursor_destroy (week_view->resize_width_cursor);
-
-	if (week_view->invisible)
-		gtk_widget_destroy (week_view->invisible);
-	if (week_view->clipboard_selection) {
-		g_free (week_view->clipboard_selection);
-		week_view->clipboard_selection = NULL;
-	}
-
-	if (week_view->activity) {
-		gtk_object_unref (GTK_OBJECT (week_view->activity));
-		week_view->activity = NULL;
-	}
-
-	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   = 0xe0e0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xe0e0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xe0e0;
-
-	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   = 213 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 213 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 213 * 257;
-
-	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;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].red   = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].blue  = 0;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID].red   = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID].green = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID].blue  = 0 * 257;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED].red   = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED].green = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED].blue  = 156 * 257;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES].red   = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES].green = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES].blue  = 0 * 257;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].green = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].blue  = 65535;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_TODAY].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_TODAY].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_TODAY].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);
-	week_view->timezone_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->timezone_mask, NULL, timezone_16_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;
-	EWeekViewEventSpan *span;
-	GdkFont *font;
-	gint day, day_width, max_day_width, max_abbr_day_width;
-	gint month, month_width, max_month_width, max_abbr_month_width;
-	gint span_num;
-	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);
-
-	/* Check that the small font is smaller than the default font.
-	   If it isn't, we won't use it. */
-	if (week_view->small_font) {
-		if (font->ascent + font->descent <= week_view->small_font->ascent + week_view->small_font->descent)
-			week_view->use_small_font = FALSE;
-	}
-
-	/* 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;
-
-	week_view->am_string_width = gdk_string_width (font,
-						       week_view->am_string);
-	week_view->pm_string_width = gdk_string_width (font,
-						       week_view->pm_string);
-
-	/* Set the font of all the EText 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->text_item)
-				gnome_canvas_item_set (span->text_item,
-						       "font_gdk", font,
-						       NULL);
-		}
-	}
-}
-
-
-/* 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];
-
-	time_width = e_week_view_get_time_string_width (week_view);
-
-	week_view->time_format = E_WEEK_VIEW_TIME_NONE;
-	if (week_view->use_small_font && week_view->small_font) {
-		if (week_view->show_event_end_times
-		    && width / 2 > time_width * 2 + E_WEEK_VIEW_EVENT_TIME_SPACING)
-			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 {
-		if (week_view->show_event_end_times
-		    && width / 2 > time_width * 2 + E_WEEK_VIEW_EVENT_TIME_SPACING)
-			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;
-}
-
-
-/* Callback used when a component is updated in the live query */
-static void
-query_obj_updated_cb (CalQuery *query, const char *uid,
-		      gboolean query_in_progress, int n_scanned, int total,
-		      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;
-	}
-
-	/* 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)) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		if (!cal_component_has_recurrences (comp)
-		    && !cal_component_has_recurrences (event->comp)
-		    && cal_component_event_dates_match (comp, event->comp)) {
-#if 0
-			g_print ("updated object's dates unchanged\n");
-#endif
-			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;
-		}
-
-		/* 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_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,
-				      cal_client_resolve_tzid_cb, week_view->client,
-				      week_view->zone);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_week_view_queue_layout (week_view);
-}
-
-/* Callback used when a component is removed from the live query */
-static void
-query_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);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_check_layout (week_view);
-}
-
-/* Callback used when a query ends */
-static void
-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* FIXME */
-
-	e_week_view_set_status_message (week_view, NULL);
-
-	if (status != CAL_QUERY_DONE_SUCCESS)
-		fprintf (stderr, "query done: %s\n", error_str);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* Callback used when an evaluation error occurs when running a query */
-static void
-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* FIXME */
-
-	e_week_view_set_status_message (week_view, NULL);
-
-	fprintf (stderr, "eval error: %s\n", error_str);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* Builds a complete query sexp for the week view by adding the predicates to
- * filter only for VEVENTS that fit in the week view's time range.
- */
-static char *
-adjust_query_sexp (EWeekView *week_view, const char *sexp)
-{
-	int num_days;
-	char *start, *end;
-	char *new_sexp;
-
-	/* If the dates have not been set yet, we just want an empty query. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return NULL;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	start = isodate_from_time_t (week_view->day_starts[0]);
-	end = isodate_from_time_t (week_view->day_starts[num_days]);
-
-	new_sexp = g_strdup_printf ("(and (= (get-vtype) \"VEVENT\")"
-				    "     (occur-in-time-range? (make-time \"%s\")"
-				    "                           (make-time \"%s\"))"
-				    "     %s)",
-				    start, end,
-				    sexp);
-
-	g_free (start);
-	g_free (end);
-
-	return new_sexp;
-}
-
-/* Restarts a query for the week view */
-static void
-update_query (EWeekView *week_view)
-{
-	CalQuery *old_query;
-	char *real_sexp;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_free_events (week_view);
-	e_week_view_queue_layout (week_view);
-
-	if (!(week_view->client
-	      && cal_client_get_load_state (week_view->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	old_query = week_view->query;
-	week_view->query = NULL;
-
-	if (old_query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), week_view);
-		gtk_object_unref (GTK_OBJECT (old_query));
-	}
-
-	g_assert (week_view->sexp != NULL);
-
-	real_sexp = adjust_query_sexp (week_view, week_view->sexp);
-	if (!real_sexp) {
-		return; /* No time range is set, so don't start a query */
-	}
-
-	e_week_view_set_status_message (week_view, _("Searching"));
-	week_view->query = cal_client_get_query (week_view->client, real_sexp);
-	g_free (real_sexp);
-
-	if (!week_view->query) {
-		g_message ("update_query(): Could not create the query");
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "obj_removed",
-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), week_view);
-}
-
-/* Callback used when the calendar client finishes opening */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	update_query (week_view);
-}
-
-/**
- * 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) {
-		if (cal_client_get_load_state (week_view->client) == CAL_CLIENT_LOAD_LOADED)
-			update_query (week_view);
-		else
-			gtk_signal_connect (GTK_OBJECT (week_view->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), week_view);
-	}
-}
-
-/**
- * e_week_view_set_query:
- * @week_view: A week view.
- * @sexp: S-expression that defines the query.
- *
- * Sets the query sexp that the week view will use for filtering the displayed
- * events.
- **/
-void
-e_week_view_set_query (EWeekView *week_view, const char *sexp)
-{
-	g_return_if_fail (week_view != NULL);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-	g_return_if_fail (sexp != NULL);
-
-	if (week_view->sexp)
-		g_free (week_view->sexp);
-
-	week_view->sexp = g_strdup (sexp);
-
-	update_query (week_view);
-}
-
-
-/**
- * e_week_view_set_default_category:
- * @week_view: A week view.
- * @category: Default category name or NULL for no category.
- *
- * Sets the default category that will be used when creating new calendar
- * components from the week view.
- **/
-void
-e_week_view_set_default_category (EWeekView *week_view, const char *category)
-{
-	g_return_if_fail (week_view != NULL);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->default_category)
-		g_free (week_view->default_category);
-
-	week_view->default_category = g_strdup (category);
-}
-
-
-/* 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, weekday, week_start_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	time_to_gdate_with_zone (&date, start_time, week_view->zone);
-
-	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 week which starts at or before the start of
-		   the month. */
-		base_date = date;
-		g_date_set_day (&base_date, 1);
-
-		/* Calculate the weekday of the 1st of the month, 0 = Mon. */
-		weekday = g_date_weekday (&base_date) - 1;
-
-		/* Convert it to an offset from the start of the display. */
-		week_start_offset = (weekday + 7 - week_view->display_start_day) % 7;
-
-		/* Add it to the day offset so we go back to the 1st week at
-		   or before the start of the month. */
-		day_offset += week_start_offset;
-	} else {
-		/* Calculate the weekday of the given date, 0 = Mon. */
-		weekday = g_date_weekday (&date) - 1;
-
-		/* Convert it to an offset from the start of the display. */
-		week_start_offset = (weekday + 7 - week_view->display_start_day) % 7;
-
-		/* Set the day_offset to the result, so we move back to the
-		   start of the week. */
-		day_offset = week_start_offset;
-	}
-
-	/* 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_with_zone (start_time, -day_offset,
-						     week_view->zone);
-		start_time = time_day_begin_with_zone (start_time,
-						       week_view->zone);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		update_query (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_with_zone (start_time, 1,
-						   week_view->zone))
-		week_view->selection_end_day = week_view->selection_start_day;
-	else {
-		time_to_gdate_with_zone (&end_date, end_time - 60, week_view->zone);
-		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 weekday, day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	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;
-	}
-
-	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (date) - 1;
-
-	/* Convert it to an offset from the start of the display. */
-	day_offset = (weekday + 7 - week_view->display_start_day) % 7;
-
-	/* 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_tt.year = g_date_year (&base_date);
-		start_tt.month = g_date_month (&base_date);
-		start_tt.day = g_date_day (&base_date);
-
-		start_time = icaltime_as_timet_with_zone (start_tt,
-							  week_view->zone);
-
-		e_week_view_recalc_day_starts (week_view, start_time);
-		update_query (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_with_zone (tmp_time, 1,
-						   week_view->zone);
-		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);
-
-	e_week_view_recalc_cell_sizes (week_view);
-
-	if (g_date_valid (&week_view->first_day_shown))
-		e_week_view_set_first_day_shown (week_view,
-						 &week_view->first_day_shown);
-}
-
-
-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);
-
-		e_week_view_recalc_cell_sizes (week_view);
-
-		if (g_date_valid (&week_view->first_day_shown))
-			e_week_view_set_first_day_shown (week_view, &week_view->first_day_shown);
-
-		update_query (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)
-{
-	gboolean need_reload = FALSE;
-
-	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);
-
-	need_reload = e_week_view_recalc_display_start_day (week_view);
-
-	/* If the display_start_day has changed we need to recalculate the
-	   date range shown and reload all events, otherwise we only need to
-	   do a reshape. */
-	if (need_reload) {
-		/* Recalculate the days shown and reload if necessary. */
-		if (g_date_valid (&week_view->first_day_shown))
-			e_week_view_set_first_day_shown (week_view, &week_view->first_day_shown);
-	} else {
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-}
-
-
-/* Whether we display event end times. */
-gboolean
-e_week_view_get_show_event_end_times	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), TRUE);
-
-	return week_view->show_event_end_times;
-}
-
-
-void
-e_week_view_set_show_event_end_times	(EWeekView	*week_view,
-					 gboolean	 show)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->show_event_end_times != show) {
-		week_view->show_event_end_times = show;
-		e_week_view_recalc_cell_sizes (week_view);
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-}
-
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint
-e_week_view_get_week_start_day	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 0);
-
-	return week_view->week_start_day;
-}
-
-
-void
-e_week_view_set_week_start_day	(EWeekView	*week_view,
-				 gint		 week_start_day)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-	g_return_if_fail (week_start_day >= 0);
-	g_return_if_fail (week_start_day < 7);
-
-	if (week_view->week_start_day == week_start_day)
-		return;
-
-	week_view->week_start_day = week_start_day;
-
-	e_week_view_recalc_display_start_day (week_view);
-
-	/* Recalculate the days shown and reload if necessary. */
-	if (g_date_valid (&week_view->first_day_shown))
-		e_week_view_set_first_day_shown (week_view,
-						 &week_view->first_day_shown);
-}
-
-
-/* Whether we use 12-hour or 24-hour format. */
-gboolean
-e_week_view_get_24_hour_format	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->use_24_hour_format;
-}
-
-
-void
-e_week_view_set_24_hour_format	(EWeekView	*week_view,
-				 gboolean	 use_24_hour)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->use_24_hour_format == use_24_hour)
-		return;
-
-	week_view->use_24_hour_format = use_24_hour;
-
-	/* We need to re-layout the events since the time format affects the
-	   sizes. */
-	e_week_view_recalc_cell_sizes (week_view);
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* The current timezone. */
-icaltimezone*
-e_week_view_get_timezone		(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), NULL);
-
-	return week_view->zone;
-}
-
-
-void
-e_week_view_set_timezone		(EWeekView	*week_view,
-					 icaltimezone	*zone)
-{
-	icaltimezone *old_zone;
-	struct icaltimetype tt = icaltime_null_time ();
-	time_t lower;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	old_zone = week_view->zone;
-	if (old_zone == zone)
-		return;
-
-	week_view->zone = zone;
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Recalculate the new start of the first week. We just use exactly
-	   the same time, but with the new timezone. */
-	tt.year = g_date_year (&week_view->first_day_shown);
-	tt.month = g_date_month (&week_view->first_day_shown);
-	tt.day = g_date_day (&week_view->first_day_shown);
-
-	lower = icaltime_as_timet_with_zone (tt, zone);
-
-	e_week_view_recalc_day_starts (week_view, lower);
-	update_query (week_view);
-}
-
-
-void
-e_week_view_cut_clipboard (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	const char *uid;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->editing_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->editing_event_num);
-	if (event == NULL)
-		return;
-
-	e_week_view_set_status_message (week_view, _("Deleting selected objects"));
-
-	e_week_view_copy_clipboard (week_view);
-	cal_component_get_uid (event->comp, &uid);
-	cal_client_remove_object (week_view->client, uid);
-
-	e_week_view_set_status_message (week_view, NULL);
-}
-
-void
-e_week_view_copy_clipboard (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	char *comp_str;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->editing_event_num);
-	if (event == NULL)
-		return;
-
-	comp_str = cal_component_get_as_string (event->comp);
-	if (week_view->clipboard_selection != NULL)
-		g_free (week_view->clipboard_selection);
-	week_view->clipboard_selection = comp_str;
-	gtk_selection_owner_set (week_view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-e_week_view_paste_clipboard (EWeekView *week_view)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	gtk_selection_convert (week_view->invisible,
-			       clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-
-static gboolean
-e_week_view_recalc_display_start_day	(EWeekView	*week_view)
-{
-	gint display_start_day;
-
-	/* The display start day defaults to week_start_day, but we have
-	   to use Saturday if the weekend is compressed and week_start_day
-	   is Sunday. */
-	display_start_day = week_view->week_start_day;
-
-	if (display_start_day == 6
-	    && (!week_view->multi_week_view || week_view->compress_weekend))
-		display_start_day = 5;
-
-	if (week_view->display_start_day != display_start_day) {
-		week_view->display_start_day = display_start_day;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-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;
-}
-
-
-/* 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 cell_x, cell_y, cell_h;
-
-	e_week_view_layout_get_day_position (day,
-					     week_view->multi_week_view,
-					     week_view->weeks_shown,
-					     week_view->display_start_day,
-					     week_view->compress_weekend,
-					     &cell_x, &cell_y, &cell_h);
-
-	*day_x = week_view->col_offsets[cell_x];
-	*day_y = week_view->row_offsets[cell_y];
-
-	*day_w = week_view->col_widths[cell_x];
-	*day_h = week_view->row_heights[cell_y];
-	if (cell_h == 2)
-		*day_h += week_view->row_heights[cell_y + 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.
-   The bounding box includes the entire width of the days in the view (but
-   not the vertical line down the right of the last day), though the displayed
-   event doesn't normally extend to the edges of the day.
-   It returns FALSE if the span isn't visible. */
-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 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 (!e_week_view_layout_get_span_position (event, span,
-						   week_view->rows_per_cell,
-						   week_view->rows_per_compressed_cell,
-						   week_view->display_start_day,
-						   week_view->multi_week_view,
-						   week_view->compress_weekend,
-						   &num_days)) {
-		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 - 1;
-	} 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 + end_w - start_x - 1;
-	}
-
-	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");
-	if (event->type == GDK_2BUTTON_PRESS)
-		g_print (" is a double-click\n");
-	if (week_view->pressed_event_num != -1)
-		g_print (" item is pressed\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;
-	}
-
-	/* 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;
-
-	/* If an event is pressed just return. */
-	if (week_view->pressed_event_num != -1)
-		return FALSE;
-
-	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
-		time_t dtstart, dtend;
-
-		dtstart = week_view->day_starts[day];
-		dtend = week_view->day_starts[day + 1];
-		gnome_calendar_new_appointment_for (week_view->calendar,
-						    dtstart, dtend,
-						    TRUE, FALSE);
-		return TRUE;
-	}
-
-	if (event->button == 1) {
-		/* Start the selection drag. */
-		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];
-
-		if (week_view->calendar)
-			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;
-	gint weekend_col, box, weekend_box;
-
-	/* 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;
-		day = grid_x;
-
-		if (week_view->compress_weekend) {
-			weekend_col = (5 + 7 - week_view->display_start_day) % 7;
-			if (grid_x > weekend_col
-			    || (grid_x == weekend_col && grid_y % 2 == 1))
-				day++;
-		}
-	} else {
-		week = 0;
-
-		box = grid_x * 3 + grid_y / 2;
-		weekend_box = (5 + 7 - week_view->display_start_day) % 7;
-		day = box;
-		if (box > weekend_box
-		    ||( box == weekend_box && grid_y % 2 == 1))
-			day++;
-	}
-
-	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);
-	}
-}
-
-
-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;
-	}
-
-	/* Hide all the jump buttons. */
-	for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-		gnome_canvas_item_hide (week_view->jump_buttons[day]);
-	}
-}
-
-
-/* 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 icaltimetype start_tt, end_tt;
-
-	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_tt = icaltime_from_timet_with_zone (start, FALSE,
-						  week_view->zone);
-	end_tt = icaltime_from_timet_with_zone (end, FALSE,
-						week_view->zone);
-
-	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_tt.hour * 60 + start_tt.minute;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	event.different_timezone = FALSE;
-	if (!cal_comp_util_compare_event_timezones (comp, week_view->client,
-						    week_view->zone))
-		event.different_timezone = TRUE;
-
-	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)
-		week_view->spans = e_week_view_layout_events
-			(week_view->events, week_view->spans,
-			 week_view->multi_week_view,
-			 week_view->weeks_shown,
-			 week_view->compress_weekend,
-			 week_view->display_start_day,
-			 week_view->day_starts,
-			 week_view->rows_per_day);
-
-	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_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;
-	}
-}
-
-
-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 = ((week_view->display_start_day + 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 we are editing a long event we don't show the icons and the EText
-	   item uses the maximum width available. */
-	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;
-	}
-
-	/* Calculate how many icons we need to show. */
-	num_icons = 0;
-	if (show_icons) {
-		GSList *categories_list;
-
-		if (cal_component_has_alarms (comp))
-			num_icons++;
-		if (cal_component_has_recurrences (comp))
-			num_icons++;
-		if (event->different_timezone)
-			num_icons++;
-
-		cal_component_get_categories_list (comp, &categories_list);
-		num_icons += g_slist_length (categories_list);
-
-		cal_component_free_categories_list (categories_list);
-	}
-
-	/* 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,
-					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-					       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". */
-	time_width = e_week_view_get_time_string_width (week_view);
-
-	/* Calculate the space needed for the icons. */
-	icons_width = (E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD)
-		* num_icons - E_WEEK_VIEW_ICON_X_PAD + E_WEEK_VIEW_ICON_R_PAD;
-
-	/* 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) {
-		/* Note that 1-day events don't have a border. Although we
-		   still use the border height to position the events
-		   vertically so they still line up neatly (see above),
-		   we don't use the border width or edge padding at all. */
-		text_x = span_x	+ E_WEEK_VIEW_EVENT_L_PAD;
-
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_BOTH:
-			/* These have 2 time strings with a small space between
-			   them and some space before the EText item. */
-			text_x += time_width * 2
-				+ E_WEEK_VIEW_EVENT_TIME_SPACING
-				+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_START:
-			/* These have just 1 time string with some space
-			   before the EText item. */
-			text_x += time_width + E_WEEK_VIEW_EVENT_TIME_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_NONE:
-			break;
-		}
-
-		/* The icons_width includes space on the right of the icons. */
-		text_x += icons_width;
-
-		/* The width of the EText item extends right to the edge of the
-		   event, just inside the border. */
-		text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD - text_x;
-
-	} else {
-		if (use_max_width) {
-			/* When we are editing the event we use all the
-			   available width. */
-			text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
-			text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD - text_x;
-		} else {
-			/* Get the width of the text of the event. This is a
-			   bit of a hack. It would be better if EText could
-			   tell us this. */
-			gtk_object_get (GTK_OBJECT (span->text_item),
-					"text", &text,
-					NULL);
-			text_width = 0;
-			if (text) {
-				/* It should only have one line of text in it.
-				   I'm not sure we need this any more. */
-				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, which centers the icons + text. */
-			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_EDGE_X_PAD;
-			/* See if we will want to display the start time, and
-			   if so take that into account. */
-			if (event->start > week_view->day_starts[span->start_day])
-				min_text_x += time_width
-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;
-
-			/* Now make sure we don't go to the left of the minimum
-			   position. */
-			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_EDGE_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_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;
-		}
-	}
-
-	/* Make sure we don't try to use a negative 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);
-}
-
-
-static void
-e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-				   EWeekView *week_view)
-{
-	GDate date;
-	gint week_offset;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	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. */
-	start_tt.year = g_date_year (&date);
-	start_tt.month = g_date_month (&date);
-	start_tt.day = g_date_day (&date);
-
-	lower = icaltime_as_timet_with_zone (start_tt, week_view->zone);
-
-	e_week_view_recalc_day_starts (week_view, lower);
-	update_query (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];
-		if (week_view->calendar)
-			gnome_calendar_set_selected_time_range (week_view->calendar, start, end);
-	}
-}
-
-
-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);
-	}
-
-	/* FIXME: This implicitly stops any edit of another item, causing it
-	   to be sent to the server and resulting in a call to obj_updated_cb()
-	   which may reload all the events and so our span and text item may
-	   actually be destroyed. So we often get a SEGV. */
-	e_canvas_item_grab_focus (span->text_item, TRUE);
-
-	/* 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);
-}
-
-
-/* Cancels the current edition by resetting the appointment's text to its original value */
-static void
-cancel_editing (EWeekView *week_view)
-{
-	int event_num, span_num;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	CalComponentText summary;
-
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-
-	g_assert (event_num != -1);
-
-	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 text to what was in the component */
-
-	cal_component_get_summary (event->comp, &summary);
-	gtk_object_set (GTK_OBJECT (span->text_item),
-			"text", summary.value ? summary.value : "",
-			NULL);
-
-	/* Stop editing */
-	e_week_view_stop_editing_event (week_view);
-}
-
-/* Callback used when a component is destroyed.  Expects the closure data to be
- * a pointer to a boolean; will set it to TRUE.
- */
-static void
-comp_destroy_cb (GtkObject *object, gpointer data)
-{
-	gboolean *destroyed;
-
-	destroyed = data;
-	*destroyed = TRUE;
-}
-
-
-static gboolean
-e_week_view_on_text_item_event (GnomeCanvasItem *item,
-				GdkEvent *gdkevent,
-				EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num;
-
-#if 0
-	g_print ("In e_week_view_on_text_item_event\n");
-#endif
-
-	switch (gdkevent->type) {
-	case GDK_KEY_PRESS:
-		if (gdkevent && gdkevent->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;
-		} else if (gdkevent->key.keyval == GDK_Escape) {
-			cancel_editing (week_view);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-			return TRUE;
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		if (week_view->calendar)
-			gnome_calendar_edit_object (week_view->calendar,
-						    event->comp, FALSE);
-		else
-			g_warning ("Calendar not set");
-
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
-		return TRUE;
-	case GDK_BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		if (gdkevent->button.button == 3) {
-			EWeekViewEvent *e;
-			gboolean destroyed;
-			int id;
-
-			e = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-			destroyed = FALSE;
-			id = gtk_signal_connect (GTK_OBJECT (e->comp), "destroy",
-						 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
-
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-				gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-			if (!destroyed) {
-				gtk_signal_disconnect (GTK_OBJECT (e->comp), id);
-
-				e_week_view_show_popup_menu (week_view,
-							     (GdkEventButton*) gdkevent,
-							     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 (gdkevent) {
-				week_view->drag_event_x = gdkevent->button.x;
-				week_view->drag_event_y = gdkevent->button.y;
-			} else
-				g_warning ("No GdkEvent");
-
-			/* FIXME: Remember the day offset from the start of
-			   the event, for DnD. */
-
-			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 (gdkevent->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);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (week_view),
-			 e_week_view_signals[SELECTION_CHANGED]);
-}
-
-
-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);
-	g_assert (text != NULL);
-
-	if (string_is_empty (text)) {
-		ConfirmDeleteEmptyCompResult result;
-
-		result = cal_comp_confirm_delete_empty_comp (event->comp, week_view->client,
-							     GTK_WIDGET (week_view));
-
-		switch (result) {
-		case EMPTY_COMP_REMOVE_LOCALLY: {
-			const char *uid;
-
-			cal_component_get_uid (event->comp, &uid);
-
-			e_week_view_foreach_event_with_uid (week_view, uid,
-							    e_week_view_remove_event_cb, NULL);
-			gtk_widget_queue_draw (week_view->main_canvas);
-			e_week_view_check_layout (week_view);
-			goto out; }
-
-		case EMPTY_COMP_REMOVED_FROM_SERVER:
-			goto out;
-
-		case EMPTY_COMP_DO_NOT_REMOVE:
-			/* But we cannot keep an empty summary, so make the
-			 * canvas item refresh itself from the text that the
-			 * component already had.
-			 */
-
-			gtk_object_ref (GTK_OBJECT (event->comp));
-			e_week_view_update_event_cb (week_view, event_num, event->comp);
-			gtk_object_unref (GTK_OBJECT (event->comp));
-			goto out;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		g_assert_not_reached ();
-	}
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (summary.value && !strcmp (text, summary.value)) {
-		if (!e_week_view_is_one_day_event (week_view, event_num))
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-	} else {
-		summary.value = text;
-		summary.altrep = NULL;
-		cal_component_set_summary (event->comp, &summary);
-
-		if (cal_client_update_object (week_view->client, event->comp)) {
-			if (cal_component_has_attendees (event->comp) && send_component_dialog (event->comp, FALSE))
-				itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp,
-						week_view->client, NULL);
-		} else {
-			g_message ("e_week_view_on_editing_stopped(): Could not update the object!");
-		}
-	}
-
- out:
-
-	g_free (text);
-
-	gtk_signal_emit (GTK_OBJECT (week_view),
-			 e_week_view_signals[SELECTION_CHANGED]);
-}
-
-
-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->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
-		   || (event->length == 0)
-		   || (event->keyval == GDK_Tab)) {
-		return FALSE;
-	} else
-		initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);
-
-	/* Add a new event covering the selected range. */
-	comp = cal_comp_event_new_with_defaults ();
-
-	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;
-
-	/* We use DATE values now, so we don't need the timezone. */
-	/*date.tzid = icaltimezone_get_tzid (week_view->zone);*/
-
-	*date.value = icaltime_from_timet_with_zone (dtstart, TRUE,
-						     week_view->zone);
-	cal_component_set_dtstart (comp, &date);
-
-	*date.value = icaltime_from_timet_with_zone (dtend, TRUE,
-						     week_view->zone);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_set_categories (comp, week_view->default_category);
-
-	/* We add the event locally and start editing it. We don't send it
-	   to the server until the user finishes editing it. */
-	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");
-	}
-
-	if (initial_text)
-		g_free (initial_text);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-enum {
-	/*
-	 * This is used to "flag" events that can not be editted
-	 */
-	MASK_EDITABLE = 1,
-
-	/*
-	 * To disable recurring actions to be displayed
-	 */
-	MASK_RECURRING = 2,
-
-	/*
-	 * To disable actions for non-recurring items to be displayed
-	 */
-	MASK_SINGLE   = 4,
-
-	/*
-	 * This is used to when an event is currently being edited
-	 * in another window and we want to disable the event
-	 * from being edited twice
-	 */
-	MASK_EDITING  = 8
-};
-
-static EPopupMenu main_items [] = {
-	E_POPUP_ITEM (N_("New _Appointment..."), e_week_view_on_new_appointment, 0),
-	E_POPUP_ITEM (N_("New All Day _Event"), e_week_view_on_new_event, 0),
-	E_POPUP_ITEM (N_("New Meeting"), e_week_view_on_new_meeting, 0),
-	E_POPUP_ITEM (N_("New Task"), e_week_view_on_new_task, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_SUBMENU (N_("Current View"), NULL, 0),
-	
-	E_POPUP_ITEM (N_("Go to _Today"), e_week_view_on_goto_today, 0),
-	E_POPUP_ITEM (N_("_Go to Date..."), e_week_view_on_goto_date, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Publish Free/Busy Information"), e_week_view_on_publish, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Configure..."), e_week_view_on_settings, 0),
-	E_POPUP_ITEM (N_("_Configure Pilot..."), e_week_view_on_pilot_settings, 0),
-
-	E_POPUP_TERMINATOR
-};
-
-static EPopupMenu child_items [] = {
-	E_POPUP_ITEM (N_("_Open"), e_week_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Save As..."), e_week_view_on_save_as, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print_event, MASK_EDITABLE | MASK_EDITING),
-
-	/* Only show this separator if one of the above is shown. */
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("C_ut"), e_week_view_on_cut, MASK_EDITING | MASK_EDITABLE),
-	E_POPUP_ITEM (N_("_Copy"), e_week_view_on_copy, MASK_EDITING | MASK_EDITABLE),
-	E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Schedule Meeting..."), e_week_view_on_meeting, MASK_EDITABLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_week_view_on_forward, MASK_EDITABLE | MASK_EDITING),
-
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Delete this Appointment"), e_week_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),
-	E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_week_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING),
-	E_POPUP_ITEM (N_("Delete this _Occurrence"), e_week_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING),
-	E_POPUP_ITEM (N_("Delete _All Occurrences"), e_week_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING),
-
-	E_POPUP_TERMINATOR
-};
-
-static void
-free_view_popup (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	if (week_view->view_menu == NULL)
-		return;
-	
-	gnome_calendar_discard_view_popup (week_view->calendar, week_view->view_menu);
-	week_view->view_menu = NULL;
-}
-
-void
-e_week_view_show_popup_menu (EWeekView	     *week_view,
-			     GdkEventButton  *bevent,
-			     gint	      event_num)
-{
-	EWeekViewEvent *event;
-	int have_selection;
-	gboolean being_edited;
-	guint32 disable_mask = 0, hide_mask = 0;
-	EPopupMenu *context_menu;
-	GtkMenu *popup;
-	
-	have_selection = GTK_WIDGET_HAS_FOCUS (week_view)
-		&& week_view->selection_start_day != -1;
-
-	/*
-	 * 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.
-	 */
-	being_edited = FALSE;
-
-	if (event_num == -1) {
-		week_view->view_menu = gnome_calendar_setup_view_popup (week_view->calendar);
-		main_items[9].submenu = week_view->view_menu;
-		context_menu = main_items;
-	} else {
-		context_menu = child_items;
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_num);
-		if (cal_component_has_recurrences (event->comp))
-			hide_mask |= MASK_SINGLE;
-		else
-			hide_mask |= MASK_RECURRING;
-	}
-
-	if (being_edited)
-		disable_mask |= MASK_EDITING;
-	week_view->popup_event_num = event_num;
-
-	popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, week_view);
-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",
-			    GTK_SIGNAL_FUNC (free_view_popup), week_view);
-	e_popup_menu (popup, (GdkEvent *) bevent);
-}
-
-static void
-e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-
-	/* Edit a new event. If only one day is selected we set the time to
-	   the first 1/2-hour of the working day. */
-	if (week_view->selection_start_day == week_view->selection_end_day) {
-		dtstart = week_view->day_starts[week_view->selection_start_day];
-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,
-						     week_view->zone);
-		itt.hour = calendar_config_get_day_start_hour ();
-		itt.minute = calendar_config_get_day_start_minute ();
-		dtstart = icaltime_as_timet_with_zone (itt, week_view->zone);
-
-		icaltime_adjust (&itt, 0, 0, 30, 0);
-		dtend = icaltime_as_timet_with_zone (itt, week_view->zone);
-	} else {
-		dtstart = week_view->day_starts[week_view->selection_start_day];
-		dtend = week_view->day_starts[week_view->selection_end_day + 1];
-	}
-
-	gnome_calendar_new_appointment_for (
-		week_view->calendar, dtstart, dtend, FALSE, FALSE);
-}
-
-static void
-e_week_view_on_new_event (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-	time_t dtstart, dtend;
-
-	dtstart = week_view->day_starts[week_view->selection_start_day];
-	dtend = week_view->day_starts[week_view->selection_end_day + 1];
-	gnome_calendar_new_appointment_for (
-		week_view->calendar, dtstart, dtend, TRUE, FALSE);
-}
-
-static void
-e_week_view_on_new_meeting (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-
-	if (week_view->selection_start_day == week_view->selection_end_day) {
-		dtstart = week_view->day_starts[week_view->selection_start_day];
-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,
-						     week_view->zone);
-		itt.hour = calendar_config_get_day_start_hour ();
-		itt.minute = calendar_config_get_day_start_minute ();
-		dtstart = icaltime_as_timet_with_zone (itt, week_view->zone);
-
-		icaltime_adjust (&itt, 0, 0, 30, 0);
-		dtend = icaltime_as_timet_with_zone (itt, week_view->zone);
-	} else {
-		dtstart = week_view->day_starts[week_view->selection_start_day];
-		dtend = week_view->day_starts[week_view->selection_end_day + 1];
-	}
-
-	gnome_calendar_new_appointment_for (
-		week_view->calendar, dtstart, dtend, FALSE, TRUE);
-}
-
-static void
-e_week_view_on_new_task (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	gnome_calendar_new_task (week_view->calendar);
-}
-
-static void
-e_week_view_on_goto_date (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	goto_dialog (week_view->calendar);
-}
-
-static void
-e_week_view_on_goto_today (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	calendar_goto_today (week_view->calendar);
-}
-
-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);
-
-	if (week_view->calendar)
-		gnome_calendar_edit_object (week_view->calendar, event->comp, 
-					    FALSE);
-	else
-		g_warning ("Calendar not set");
-}
-
-static void
-e_week_view_on_print (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	time_t start;
-	GnomeCalendarViewType view_type;
-	PrintView print_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	gnome_calendar_get_current_time_range (week_view->calendar, &start, NULL);
-	view_type = gnome_calendar_get_view (week_view->calendar);
-
-	switch (view_type) {
-	case GNOME_CAL_WEEK_VIEW:
-		print_view = PRINT_VIEW_WEEK;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		print_view = PRINT_VIEW_MONTH;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	print_calendar (week_view->calendar, FALSE, start, print_view);
-}
-
-static void
-e_week_view_on_save_as (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-
-	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);
-	
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	ical_string = cal_client_get_component_as_string (week_view->client, event->comp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
-	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
-	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
-}
-
-static void
-e_week_view_on_print_event (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);
-
-	print_comp (event->comp, week_view->client, FALSE);
-}
-
-static void
-e_week_view_on_meeting (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);
-
-	if (week_view->calendar)
-		gnome_calendar_edit_object (week_view->calendar, event->comp, TRUE);
-	else
-		g_warning ("Calendar not set");
-}
-
-static void
-e_week_view_on_forward (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);
-
-	itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, event->comp, 
-			week_view->client, NULL);
-}
-
-static void
-e_week_view_on_publish (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	icaltimezone *utc;
-	time_t start = time (NULL), end;
-	GList *comp_list;
-
-	week_view = E_WEEK_VIEW (data);
-
-	utc = icaltimezone_get_utc_timezone ();
-	start = time_day_begin_with_zone (start, utc);
-	end = time_add_week_with_zone (start, 6, utc);
-
-	comp_list = cal_client_get_free_busy (week_view->client, NULL, start, end);
-	if (comp_list) {
-		GList *l;
-
-		for (l = comp_list; l; l = l->next) {
-			CalComponent *comp = CAL_COMPONENT (l->data);
-			itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp, 
-					week_view->client, NULL);
-
-			gtk_object_unref (GTK_OBJECT (comp));
-		}
-
- 		g_list_free (comp_list);
-	}
-}
-
-static void
-e_week_view_on_settings (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	control_util_show_settings (week_view->calendar);
-}
-
-static void
-e_week_view_on_pilot_settings (GtkWidget *widget, gpointer data)
-{
-        char *args[] = {
-                "gpilotd-control-applet",
-                NULL
-        };
-        int pid;
-
-        args[0] = gnome_is_program_in_path ("gpilotd-control-applet");
-        if (!args[0]) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("The GNOME Pilot tools do not appear to be installed on this system."));
-		return;
-        }
-
-        pid = gnome_execute_async (NULL, 4, args);
-        if (pid == -1)
-                e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]);
-
-        g_free (args[0]);
-}
-
-static void
-e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp;
-
-	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_comp_util_add_exdate (comp, event->start, week_view->zone);
-
-	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_delete_event_internal (EWeekView *week_view, gint event_num)
-{
-	CalComponentVType vtype;
-	EWeekViewEvent *event;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				event_num);
-
-	vtype = cal_component_get_vtype (event->comp);
-
-	if (delete_component_dialog (event->comp, FALSE, 1, vtype,
-				     GTK_WIDGET (week_view))) {
-		const char *uid;
-
-		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_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	e_week_view_delete_event_internal (week_view,
-					   week_view->popup_event_num);
-}
-
-
-void
-e_week_view_delete_event		(EWeekView       *week_view)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->editing_event_num == -1)
-		return;
-
-	e_week_view_delete_event_internal (week_view,
-					   week_view->editing_event_num);
-}
-
-
-static void
-e_week_view_on_cut (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	const char *uid;
-
-	week_view = E_WEEK_VIEW (data);
-
-	e_week_view_on_copy (widget, 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);
- 	cal_client_remove_object (week_view->client, uid);
-}
-
-static void
-e_week_view_on_copy (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	char *comp_str;
-
-	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);
-
-	comp_str = cal_component_get_as_string (event->comp);
-	if (week_view->clipboard_selection)
-		g_free (week_view->clipboard_selection);
-	week_view->clipboard_selection = comp_str;
-
-	gtk_selection_owner_set (week_view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-static void
-e_week_view_on_paste (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	gtk_selection_convert (week_view->invisible,
-			       clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-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;
-
-	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);
-
-	/* For the recurring object, we add a exception to get rid of the
-	   instance. */
-	comp = cal_component_clone (event->comp);
-	cal_comp_util_add_exdate (comp, event->start, week_view->zone);
-
-	/* 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 = &itt;
-	date.tzid = icaltimezone_get_tzid (week_view->zone);
-
-	*date.value = icaltime_from_timet_with_zone (event->start, FALSE,
-						     week_view->zone);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet_with_zone (event->end, FALSE,
-						     week_view->zone);
-	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]) {
-				if (week_view->calendar)
-					gnome_calendar_dayjump
-						(week_view->calendar,
-						 week_view->day_starts[day]);
-				else
-					g_warning ("Calendar not set");
-				return TRUE;
-			}
-		}
-
-	}
-
-	return FALSE;
-}
-
-
-/* Converts an hour from 0-23 to the preferred time format, and returns the
-   suffix to add and the width of it in the normal font. */
-void
-e_week_view_convert_time_to_display	(EWeekView	*week_view,
-					 gint		 hour,
-					 gint		*display_hour,
-					 gchar	       **suffix,
-					 gint		*suffix_width)
-{
-	/* Calculate the actual hour number to display. For 12-hour
-	   format we convert 0-23 to 12-11am/12-11pm. */
-	*display_hour = hour;
-	if (week_view->use_24_hour_format) {
-		*suffix = "";
-		*suffix_width = 0;
-	} else {
-		if (hour < 12) {
-			*suffix = week_view->am_string;
-			*suffix_width = week_view->am_string_width;
-		} else {
-			*display_hour -= 12;
-			*suffix = week_view->pm_string;
-			*suffix_width = week_view->pm_string_width;
-		}
-
-		/* 12-hour uses 12:00 rather than 0:00. */
-		if (*display_hour == 0)
-			*display_hour = 12;
-	}
-}
-
-
-gint
-e_week_view_get_time_string_width	(EWeekView	*week_view)
-{
-	gint time_width;
-
-	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;
-
-	if (!week_view->use_24_hour_format)
-		time_width += MAX (week_view->am_string_width,
-				   week_view->pm_string_width);
-
-	return time_width;
-}
-
-static void
-invisible_destroyed (GtkWidget *invisible, EWeekView *week_view)
-{
-	week_view->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       EWeekView *week_view)
-{
-	if (week_view->clipboard_selection != NULL) {
-		gtk_selection_data_set (selection_data,
-					GDK_SELECTION_TYPE_STRING,
-					8,
-					week_view->clipboard_selection,
-					strlen (week_view->clipboard_selection));
-	}
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       EWeekView *week_view)
-{
-	if (week_view->clipboard_selection != NULL) {
-		g_free (week_view->clipboard_selection);
-		week_view->clipboard_selection = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    EWeekView *week_view)
-{
-	char *comp_str;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-	CalComponent *comp;
-	time_t selected_time;
-	struct icaltimetype itime;
-	struct icaltimetype tmp_itime;
-	time_t tt_start, tt_end;
-	struct icaldurationtype ic_dur;
-	char *uid;
-	CalComponentDateTime ccdt;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (selection_data->length < 0 ||
-	    selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	}
-
-	comp_str = (char *) selection_data->data;
-	icalcomp = icalparser_parse_string ((const char *) comp_str);
-	if (!icalcomp)
-		return;
-
-	/* check the type of the component */
-	kind = icalcomponent_isa (icalcomp);
-	if (kind != ICAL_VCALENDAR_COMPONENT &&
-	    kind != ICAL_VEVENT_COMPONENT &&
-	    kind != ICAL_VTODO_COMPONENT &&
-	    kind != ICAL_VJOURNAL_COMPONENT) {
-		return;
-	}
-
-	e_week_view_set_status_message (week_view, _("Updating objects"));
-	selected_time = week_view->day_starts[week_view->selection_start_day];
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-
-		subcomp = icalcomponent_get_first_component (
-			icalcomp, ICAL_ANY_COMPONENT);
-		while (subcomp) {
-			child_kind = icalcomponent_isa (subcomp);
-			if (child_kind == ICAL_VEVENT_COMPONENT ||
-			    child_kind == ICAL_VTODO_COMPONENT ||
-			    child_kind == ICAL_VJOURNAL_COMPONENT) {
-				icalcomponent *new_icalcomp;
-
-				new_icalcomp = icalcomponent_new_clone (subcomp);
-				comp = cal_component_new ();
-
-				/* change the day for the event */
-				tt_start = icaltime_as_timet (
-					icalcomponent_get_dtstart (new_icalcomp));
-				tt_end = icaltime_as_timet (
-					icalcomponent_get_dtend (new_icalcomp));
-				ic_dur = icaldurationtype_from_int (tt_end - tt_start);
-
-				tmp_itime = icaltime_from_timet_with_zone (
-					selected_time, FALSE, week_view->zone);
-				itime = icalcomponent_get_dtstart (new_icalcomp);
-				itime.year = tmp_itime.year;
-				itime.month = tmp_itime.month;
-				itime.day = tmp_itime.day;
-
-				cal_component_set_icalcomponent (comp, new_icalcomp);
-				ccdt.value = &itime;
-				ccdt.tzid = icaltimezone_get_tzid (week_view->zone);
-				cal_component_set_dtstart (comp, &ccdt);
-
-				itime = icaltime_add (itime, ic_dur);
-				ccdt.value = &itime;
-				cal_component_set_dtend (comp, &ccdt);
-
-				uid = cal_component_gen_uid ();
-				cal_component_set_uid (comp, uid);
-
-				cal_client_update_object (week_view->client, comp);
-
-				g_free (uid);
-				gtk_object_unref (GTK_OBJECT (comp));
-			}
-			subcomp = icalcomponent_get_next_component (
-				icalcomp, ICAL_ANY_COMPONENT);
-		}
-
-		icalcomponent_free (icalcomp);
-
-	}
-	else {
-		comp = cal_component_new ();
-
-		/* change the day for the event */
-		tt_start = icaltime_as_timet (icalcomponent_get_dtstart (icalcomp));
-		tt_end = icaltime_as_timet (icalcomponent_get_dtend (icalcomp));
-		ic_dur = icaldurationtype_from_int (tt_end - tt_start);
-
-		tmp_itime = icaltime_from_timet_with_zone (
-			selected_time, FALSE, week_view->zone);
-		itime = icalcomponent_get_dtstart (icalcomp);
-		itime.year = tmp_itime.year;
-		itime.month = tmp_itime.month;
-		itime.day = tmp_itime.day;
-
-		cal_component_set_icalcomponent (comp, icalcomp);
-		ccdt.value = &itime;
-		ccdt.tzid = icaltimezone_get_tzid (week_view->zone);
-		cal_component_set_dtstart (comp, &ccdt);
-
-		itime = icaltime_add (itime, ic_dur);
-		ccdt.value = &itime;
-		cal_component_set_dtend (comp, &ccdt);
-
-		uid = cal_component_gen_uid ();
-		cal_component_set_uid (comp, (const char *) uid);
-
-		cal_client_update_object (week_view->client, comp);
-
-		g_free (uid);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	e_week_view_set_status_message (week_view, NULL);
-}
-
-
-/* Gets the visible time range. Returns FALSE if no time range has been set. */
-gboolean
-e_week_view_get_visible_time_range	(EWeekView	*week_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint num_days;
-
-	/* If we don't have a valid date set yet, return FALSE. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return FALSE;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	*start_time = week_view->day_starts[0];
-	*end_time = week_view->day_starts[num_days];
-
-	return TRUE;
-}
-
-
-/* Queues a layout, unless one is already queued. */
-static void
-e_week_view_queue_layout (EWeekView *week_view)
-{
-	if (week_view->layout_timeout_id == 0) {
-		week_view->layout_timeout_id = g_timeout_add (E_WEEK_VIEW_LAYOUT_TIMEOUT, e_week_view_layout_timeout_cb, week_view);
-	}
-}
-
-
-/* Removes any queued layout. */
-static void
-e_week_view_cancel_layout (EWeekView *week_view)
-{
-	if (week_view->layout_timeout_id != 0) {
-		gtk_timeout_remove (week_view->layout_timeout_id);
-		week_view->layout_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_week_view_layout_timeout_cb (gpointer data)
-{
-	EWeekView *week_view = E_WEEK_VIEW (data);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	e_week_view_check_layout (week_view);
-
-	week_view->layout_timeout_id = 0;
-	return FALSE;
-}
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint
-e_week_view_get_num_events_selected (EWeekView *week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 0);
-
-	return (week_view->editing_event_num != -1) ? 1 : 0;
-}
-
-/* Displays a message on the activity client. */
-void
-e_week_view_set_status_message (EWeekView *week_view, const char *message)
-{
-	extern EvolutionShellClient *global_shell_client; /* ugly */
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (!message || !*message) {
-		if (week_view->activity) {
-			gtk_object_unref (GTK_OBJECT (week_view->activity));
-			week_view->activity = NULL;
-		}
-	}
-	else if (!week_view->activity) {
-		int display;
-		char *client_id = g_strdup_printf ("%p", week_view);
-
-		if (progress_icon[0] == NULL)
-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CALENDAR_PROGRESS_IMAGE);
-		week_view->activity = evolution_activity_client_new (
-			global_shell_client, client_id,
-			progress_icon, message, TRUE, &display);
-
-		g_free (client_id);
-	}
-	else
-		evolution_activity_client_update (week_view->activity, message, -1.0);
-}
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
deleted file mode 100644
index 689874cc25..0000000000
--- a/calendar/gui/e-week-view.h
+++ /dev/null
@@ -1,511 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gal/widgets/e-popup-menu.h>
-
-#include "gnome-cal.h"
-#include "evolution-activity-client.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.
-   X_PAD is the padding between icons. R_PAD is the padding on the right of
-   the last icon, before the event text. */
-#define E_WEEK_VIEW_ICON_WIDTH		16
-#define E_WEEK_VIEW_ICON_HEIGHT		16
-#define E_WEEK_VIEW_ICON_X_PAD		1
-#define E_WEEK_VIEW_ICON_Y_PAD		1
-#define E_WEEK_VIEW_ICON_R_PAD		1
-
-/* The space on the left & right outside 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		2
-
-/* The vertical spacing between rows of events. */
-#define E_WEEK_VIEW_EVENT_Y_SPACING	1
-
-/* The size of the border around long events. */
-#define E_WEEK_VIEW_EVENT_BORDER_WIDTH	1
-#define E_WEEK_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on the top and bottom of the event text. */
-#define E_WEEK_VIEW_EVENT_TEXT_Y_PAD	1
-
-/* The space between the start and end times. */
-#define E_WEEK_VIEW_EVENT_TIME_SPACING	2
-
-/* The space between the time and the event text or icons. */
-#define E_WEEK_VIEW_EVENT_TIME_X_PAD	2
-
-/* The space between the borders of long events and any text of icons. */
-#define E_WEEK_VIEW_EVENT_EDGE_X_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
-
-/* 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
-
-/* 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_EVENT_TEXT,
-	E_WEEK_VIEW_COLOR_GRID,
-	E_WEEK_VIEW_COLOR_SELECTED,
-	E_WEEK_VIEW_COLOR_DATES,
-	E_WEEK_VIEW_COLOR_DATES_SELECTED,
-	E_WEEK_VIEW_COLOR_TODAY,
-	
-	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;
-	guint8 num_spans;
-
-	/* TRUE if the event is at a different UTC offset than our current
-	   timezone, i.e. it is in a different timezone. */
-	guint different_timezone : 1;
-};
-
-
-#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;
-
-	/* S-expression for query and the query object */
-	char *sexp;
-	CalQuery *query;
-
-	/* The array of EWeekViewEvent elements. */
-	GArray *events;
-	gboolean events_sorted;
-	gboolean events_need_layout;
-	gboolean events_need_reshape;
-
-	/* The ID of the timeout function for doing a new layout. */
-	gint layout_timeout_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 timezone. */
-	icaltimezone *zone;
-
-	/* 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;
-
-	/* Whether we use show event end times. */
-	gboolean show_event_end_times;
-
-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-	gint week_start_day;
-
-	/* Whether we use 12-hour of 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* The first day of the week we display, 0 (Monday) to 6 (Sunday).
-	   This will usually be week_start_day, but if the weekend is
-	   compressed, and week_start_day is Sunday we have to use Saturday. */
-	gint display_start_day;
-
-	/* 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;
-	GdkPixmap *timezone_icon;
-	GdkBitmap *timezone_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;
-	EPopupMenu *view_menu;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* "am" and "pm" in the current locale, and their widths. */
-	gchar *am_string;
-	gchar *pm_string;
-	gint am_string_width;
-	gint pm_string_width;
-
-	/* the invisible widget to manage the clipboard selections */
-	GtkWidget *invisible;
-	gchar *clipboard_selection;
-
-	/* The default category for new events */
-	char *default_category;
-
-	/* The activity client used to show messages on the status bar. */
-	EvolutionActivityClient *activity;
-};
-
-struct _EWeekViewClass
-{
-	GtkTableClass parent_class;
-
-	/* Notification signals */
-	void (* selection_changed) (EWeekView *week_view);
-};
-
-
-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);
-
-void       e_week_view_set_query		(EWeekView	*week_view,
-						 const char	*sexp);
-
-void       e_week_view_set_default_category	(EWeekView	*week_view,
-						 const char	*category);
-
-/* 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);
-
-/* Gets the visible time range. Returns FALSE if no time range has been set. */
-gboolean   e_week_view_get_visible_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);
-
-/* Whether we display event end times. */
-gboolean   e_week_view_get_show_event_end_times	(EWeekView	*week_view);
-void	   e_week_view_set_show_event_end_times	(EWeekView	*week_view,
-						 gboolean	 show);
-
-/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-gint	   e_week_view_get_week_start_day	(EWeekView	*week_view);
-void	   e_week_view_set_week_start_day	(EWeekView	*week_view,
-						 gint		 week_start_day);
-
-/* Whether we use 12-hour or 24-hour format. */
-gboolean   e_week_view_get_24_hour_format	(EWeekView	*week_view);
-void	   e_week_view_set_24_hour_format	(EWeekView	*week_view,
-						 gboolean	 use_24_hour);
-
-/* The current timezone. */
-icaltimezone* e_week_view_get_timezone		(EWeekView	*week_view);
-void	      e_week_view_set_timezone		(EWeekView	*week_view,
-						 icaltimezone	*zone);
-
-/* Clipboard related functions */
-void       e_week_view_cut_clipboard            (EWeekView      *week_view);
-void       e_week_view_copy_clipboard           (EWeekView      *week_view);
-void       e_week_view_paste_clipboard          (EWeekView      *week_view);
-
-void       e_week_view_delete_event		(EWeekView      *week_view);
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint	   e_week_view_get_num_events_selected	(EWeekView	*week_view);
-
-/*
- * 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);
-
-void	   e_week_view_convert_time_to_display	(EWeekView	*week_view,
-						 gint		 hour,
-						 gint		*display_hour,
-						 gchar	       **suffix,
-						 gint		*suffix_width);
-gint	   e_week_view_get_time_string_width	(EWeekView	*week_view);
-
-gint	   e_week_view_event_sort_func		(const void	*arg1,
-						 const void	*arg2);
-
-void       e_week_view_set_status_message       (EWeekView      *week_view,
-						 const char     *message);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_H_ */
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
deleted file mode 100644
index ad6b485a6c..0000000000
--- a/calendar/gui/gnome-cal.c
+++ /dev/null
@@ -1,2893 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <unistd.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/e-paned/e-hpaned.h>
-#include <gal/e-paned/e-vpaned.h>
-#include "e-util/e-url.h"
-#include <cal-util/timeutil.h>
-#include "widgets/menus/gal-view-menus.h"
-#include "dialogs/event-editor.h"
-#include "dialogs/task-editor.h"
-#include "comp-util.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "evolution-calendar.h"
-#include "gnome-cal.h"
-#include "component-factory.h"
-#include "cal-search-bar.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "calendar-view.h"
-#include "calendar-view-factory.h"
-#include "tag-calendar.h"
-
-
-
-/* Private part of the GnomeCalendar structure */
-struct _GnomeCalendarPrivate {
-	/*
-	 * The Calendar Folder.
-	 */
-
-	/* The calendar client object we monitor */
-	CalClient *client;
-
-	/* Set of categories from the calendar client */
-	GPtrArray *cal_categories;
-
-	/*
-	 * The TaskPad Folder.
-	 */
-
-	/* The calendar client object we monitor */
-	CalClient   *task_pad_client;
-
-	/* Set of categories from the tasks client */
-	GPtrArray *tasks_categories;
-
-	/*
-	 * Fields for the calendar view
-	 */
-
-	/* 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   *search_bar;
-
-	GtkWidget   *hpane;
-	GtkWidget   *notebook;
-	GtkWidget   *vpane;
-	ECalendar   *date_navigator;
-	GtkWidget   *todo;
-
-	GtkWidget   *day_view;
-	GtkWidget   *work_week_view;
-	GtkWidget   *week_view;
-	GtkWidget   *month_view;
-
-	/* Calendar query for the date navigator */
-	CalQuery    *dn_query;
-	char        *sexp;
-
-	/* 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. */
-	GnomeCalendarViewType 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;
-
-	/* View instance and menus for the control */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-
-	/* Whether we are being destroyed and should not mess with the object
-	 * editor hash table.
-	 */
-	guint in_destroy : 1;
-
-	/* Our current timezone. */
-	icaltimezone *zone;
-
-	/* The dates currently shown. If they are -1 then we have no dates
-	   shown. We only use these to check if we need to emit a
-	   'dates-shown-changed' signal.*/
-	time_t visible_start;
-	time_t visible_end;
-};
-
-/* Signal IDs */
-
-enum {
-	DATES_SHOWN_CHANGED,
-	CALENDAR_SELECTION_CHANGED,
-	TASKPAD_SELECTION_CHANGED,
-	CALENDAR_FOCUS_CHANGE,
-	TASKPAD_FOCUS_CHANGE,
-	LAST_SIGNAL
-};
-
-/* Used to indicate who has the focus within the calendar view */
-typedef enum {
-	FOCUS_CALENDAR,
-	FOCUS_TASKPAD,
-	FOCUS_OTHER
-} FocusLocation;
-
-static guint gnome_calendar_signals[LAST_SIGNAL];
-
-
-
-
-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_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 void gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal);
-
-static void update_query (GnomeCalendar *gcal);
-
-
-static GtkVBoxClass *parent_class;
-
-
-
-
-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);
-
-	gnome_calendar_signals[DATES_SHOWN_CHANGED] =
-		gtk_signal_new ("dates_shown_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass,
-						   dates_shown_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gnome_calendar_signals[CALENDAR_SELECTION_CHANGED] =
-		gtk_signal_new ("calendar_selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gnome_calendar_signals[TASKPAD_SELECTION_CHANGED] =
-		gtk_signal_new ("taskpad_selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gnome_calendar_signals[CALENDAR_FOCUS_CHANGE] =
-		gtk_signal_new ("calendar_focus_change",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_focus_change),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gnome_calendar_signals[TASKPAD_FOCUS_CHANGE] =
-		gtk_signal_new ("taskpad_focus_change",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_focus_change),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class,
-				      gnome_calendar_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy = gnome_calendar_destroy;
-
-	class->dates_shown_changed = NULL;
-	class->calendar_selection_changed = NULL;
-	class->taskpad_selection_changed = NULL;
-	class->calendar_focus_change = NULL;
-	class->taskpad_focus_change = NULL;
-}
-
-/* Callback used when the calendar query reports of an updated object */
-static void
-dn_query_obj_updated_cb (CalQuery *query, const char *uid,
-			 gboolean query_in_progress, int n_scanned, int total,
-			 gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	/* If this is an update that is not part of an ongoing query, we have to
-	 * retag the whole thing:  an event may change dates and the
-	 * tag_calendar_by_comp() below would not know how to untag the old
-	 * dates.
-	 */
-	if (!query_in_progress) {
-		update_query (gcal);
-		return;
-	}
-
-	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 ("dn_query_obj_updated_cb(): Syntax error while getting object `%s'", uid);
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	tag_calendar_by_comp (priv->date_navigator, comp, priv->client, FALSE,
-			      TRUE);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Callback used when the calendar query reports of a removed object */
-static void
-dn_query_obj_removed_cb (CalQuery *query, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* Just retag the whole thing */
-	update_query (gcal);
-}
-
-/* Callback used when the calendar query is done */
-static void
-dn_query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str,
-			gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* FIXME */
-
-	if (status != CAL_QUERY_DONE_SUCCESS)
-		fprintf (stderr, "query done: %s\n", error_str);
-}
-
-/* Callback used when the calendar query reports an evaluation error */
-static void
-dn_query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* FIXME */
-
-	fprintf (stderr, "eval error: %s\n", error_str);
-}
-
-/* Returns the current view widget, a EDayView or EWeekView. */
-static GtkWidget*
-gnome_calendar_get_current_view_widget (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *retval = NULL;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		retval = priv->day_view;
-		break;
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		retval = priv->work_week_view;
-		break;
-	case GNOME_CAL_WEEK_VIEW:
-		retval = priv->week_view;
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-		retval = priv->month_view;
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	return retval;
-}
-
-/* Gets the focus location based on who is the focused widget within the
- * calendar view.
- */
-static FocusLocation
-get_focus_location (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ETable *etable;
-
-	priv = gcal->priv;
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-
-	if (GTK_WIDGET_HAS_FOCUS (etable->table_canvas))
-		return FOCUS_TASKPAD;
-	else {
-		GtkWidget *widget;
-		EDayView *dv;
-		EWeekView *wv;
-
-		widget = gnome_calendar_get_current_view_widget (gcal);
-
-		switch (priv->current_view_type) {
-		case GNOME_CAL_DAY_VIEW:
-		case GNOME_CAL_WORK_WEEK_VIEW:
-			dv = E_DAY_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (dv->top_canvas)
-			    || GTK_WIDGET_HAS_FOCUS (dv->main_canvas))
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		case GNOME_CAL_WEEK_VIEW:
-		case GNOME_CAL_MONTH_VIEW:
-			wv = E_WEEK_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (wv->main_canvas))
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		default:
-			g_assert_not_reached ();
-			return FOCUS_OTHER;
-		}
-	}
-}
-
-/* Computes the range of time that the date navigator is showing */
-static void
-get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct icaltimetype start_tt;
-	struct icaltimetype end_tt;
-
-	priv = gcal->priv;
-
-	start_tt = icaltime_null_time ();
-	end_tt = icaltime_null_time ();
-
-	if (!e_calendar_item_get_date_range (priv->date_navigator->calitem,
-					     &start_year, &start_month, &start_day,
-					     &end_year, &end_month, &end_day)) {
-		*start_time = -1;
-		*end_time = -1;
-		return;
-	}
-
-	start_tt.year = start_year;
-	start_tt.month = start_month + 1;
-	start_tt.day = start_day;
-
-	end_tt.year = end_year;
-	end_tt.month = end_month + 1;
-	end_tt.day = end_day;
-
-	icaltime_adjust (&end_tt, 1, 0, 0, 0);
-
-	*start_time = icaltime_as_timet_with_zone (start_tt, priv->zone);
-	*end_time = icaltime_as_timet_with_zone (end_tt, priv->zone);
-}
-
-/* Adjusts a given query sexp with the time range of the date navigator */
-static char *
-adjust_query_sexp (GnomeCalendar *gcal, const char *sexp)
-{
-	time_t start_time, end_time;
-	char *start, *end;
-	char *new_sexp;
-
-	get_date_navigator_range (gcal, &start_time, &end_time);
-	if (start_time == -1 || end_time == -1)
-		return NULL;
-
-	start = isodate_from_time_t (start_time);
-	end = isodate_from_time_t (end_time);
-
-	new_sexp = g_strdup_printf ("(and (= (get-vtype) \"VEVENT\")"
-				    "     (occur-in-time-range? (make-time \"%s\")"
-				    "                           (make-time \"%s\"))"
-				    "     %s)",
-				    start, end,
-				    sexp);
-
-	g_free (start);
-	g_free (end);
-
-	return new_sexp;
-}
-
-/* Restarts a query for the date navigator in the calendar */
-static void
-update_query (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	CalQuery *old_query;
-	char *real_sexp;
-
-	priv = gcal->priv;
-
-	e_calendar_item_clear_marks (priv->date_navigator->calitem);
-
-	if (!(priv->client
-	      && cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	old_query = priv->dn_query;
-	priv->dn_query = NULL;
-
-	if (old_query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), gcal);
-		gtk_object_unref (GTK_OBJECT (old_query));
-	}
-
-	g_assert (priv->sexp != NULL);
-
-	real_sexp = adjust_query_sexp (gcal, priv->sexp);
-	if (!real_sexp)
-		return; /* No time range is set, so don't start a query */
-
-	priv->dn_query = cal_client_get_query (priv->client, real_sexp);
-	g_free (real_sexp);
-
-	if (!priv->dn_query) {
-		g_message ("update_query(): Could not create the query");
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "obj_updated",
-			    GTK_SIGNAL_FUNC (dn_query_obj_updated_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "obj_removed",
-			    GTK_SIGNAL_FUNC (dn_query_obj_removed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "query_done",
-			    GTK_SIGNAL_FUNC (dn_query_query_done_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "eval_error",
-			    GTK_SIGNAL_FUNC (dn_query_eval_error_cb), gcal);
-}
-
-/**
- * gnome_calendar_set_query:
- * @gcal: A calendar.
- * @sexp: Sexp that defines the query.
- * 
- * Sets the query sexp for all the views in a calendar.
- **/
-void
-gnome_calendar_set_query (GnomeCalendar *gcal, const char *sexp)
-{
-	GnomeCalendarPrivate *priv;
-	CalendarModel *model;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (sexp != NULL);
-
-	priv = gcal->priv;
-
-	/* Set the query on the date navigator */
-
-	if (priv->sexp)
-		g_free (priv->sexp);
-
-	priv->sexp = g_strdup (sexp);
-
-	update_query (gcal);
-
-	/* Set the query on the main view */
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		e_day_view_set_query (E_DAY_VIEW (priv->day_view), sexp);
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		e_day_view_set_query (E_DAY_VIEW (priv->work_week_view), sexp);
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_set_query (E_WEEK_VIEW (priv->week_view), sexp);
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		e_week_view_set_query (E_WEEK_VIEW (priv->month_view), sexp);
-		break;
-
-	default:
-		g_warning ("A penguin bit my hand!");
-		g_assert_not_reached ();
-	}
-
-	/* Set the query on the task pad */
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	calendar_model_set_query (model, sexp);
-}
-
-/* Returns the current time, for the ECalendarItem. */
-static struct tm
-get_current_time (ECalendarItem *calitem, gpointer data)
-{
-	GnomeCalendar *cal = data;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	g_return_val_if_fail (cal != NULL, tmp_tm);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (cal), tmp_tm);
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					    cal->priv->zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm = icaltimetype_to_tm (&tt);
-
-	return tmp_tm;
-}
-
-/* Callback used when the sexp changes in the calendar search bar */
-static void
-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	gnome_calendar_set_query (gcal, sexp);
-}
-
-/* Callback used when the selected category in the search bar changes */
-static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	CalendarModel *model;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	e_day_view_set_default_category (E_DAY_VIEW (priv->day_view), category);
-	e_day_view_set_default_category (E_DAY_VIEW (priv->work_week_view), category);
-	e_week_view_set_default_category (E_WEEK_VIEW (priv->week_view), category);
-	e_week_view_set_default_category (E_WEEK_VIEW (priv->month_view), category);
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	calendar_model_set_default_category (model, category);
-}
-
-static void
-view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
-{
-	gtk_signal_emit (GTK_OBJECT (gcal),
-			 gnome_calendar_signals[CALENDAR_SELECTION_CHANGED]);
-}
-
-
-/* Callback used when the taskpad receives a focus event.  We emit the
- * corresponding signal so that parents can change the menus as appropriate.
- */
-static gint
-table_canvas_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [TASKPAD_FOCUS_CHANGE],
-			 event->in ? TRUE : FALSE);
-
-	return FALSE;
-}
-
-static gint
-calendar_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [CALENDAR_FOCUS_CHANGE],
-			 event->in ? TRUE : FALSE);
-
-	return FALSE;
-}
-
-/* Connects to the focus change signals of a day view widget */
-static void
-connect_day_view_focus (GnomeCalendar *gcal, EDayView *dv)
-{
-	gtk_signal_connect (GTK_OBJECT (dv->top_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (dv->top_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-
-	gtk_signal_connect (GTK_OBJECT (dv->main_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (dv->main_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-}
-
-/* Connects to the focus change signals of a week view widget */
-static void
-connect_week_view_focus (GnomeCalendar *gcal, EWeekView *wv)
-{
-	gtk_signal_connect (GTK_OBJECT (wv->main_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (wv->main_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-}
-
-/* Callback used when the selection in the taskpad table changes.  We just proxy
- * the signal with our own one.
- */
-static void
-table_selection_change_cb (ETable *etable, gpointer data)
-{
-	GnomeCalendar *gcal;
-	int n_selected;
-
-	gcal = GNOME_CALENDAR (data);
-
-	n_selected = e_table_selected_count (etable);
-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[TASKPAD_SELECTION_CHANGED]);
-}
-
-static void
-setup_widgets (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *w;
-	gchar *filename;
-	CalendarModel *model;
-	ETable *etable;
-
-	priv = gcal->priv;
-
-	priv->search_bar = cal_search_bar_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "sexp_changed",
-			    GTK_SIGNAL_FUNC (search_bar_sexp_changed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "category_changed",
-			    GTK_SIGNAL_FUNC (search_bar_category_changed_cb), gcal);
-
-	gtk_widget_show (priv->search_bar);
-	gtk_box_pack_start (GTK_BOX (gcal), priv->search_bar, FALSE, FALSE, 0);
-
-	/* 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);
-	e_calendar_item_set_days_start_week_sel (priv->date_navigator->calitem, 9);
-	e_calendar_item_set_max_days_sel (priv->date_navigator->calitem, 42);
-	gtk_widget_show (w);
-	e_calendar_item_set_get_time_callback (priv->date_navigator->calitem,
-					       (ECalendarItemGetTimeCallback) get_current_time,
-					       gcal, NULL);
-
-	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 ();
-	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv->todo));
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	calendar_model_set_new_comp_vtype (model, CAL_COMPONENT_TODO);
-	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);
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	gtk_signal_connect (GTK_OBJECT (etable->table_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (table_canvas_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (etable->table_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (table_canvas_focus_change_cb), gcal);
-
-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",
-			    GTK_SIGNAL_FUNC (table_selection_change_cb), gcal);
-
-	/* 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 (""));
-	gtk_signal_connect (GTK_OBJECT (priv->day_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
-
-	connect_day_view_focus (gcal, E_DAY_VIEW (priv->day_view));
-
-	/* 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 (""));
-	gtk_signal_connect (GTK_OBJECT (priv->work_week_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
-
-	connect_day_view_focus (gcal, E_DAY_VIEW (priv->work_week_view));
-
-	/* 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 (""));
-	gtk_signal_connect (GTK_OBJECT (priv->week_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
-
-	connect_week_view_focus (gcal, E_WEEK_VIEW (priv->week_view));
-
-	/* 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 (""));
-	gtk_signal_connect (GTK_OBJECT (priv->month_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
-
-	connect_week_view_focus (gcal, E_WEEK_VIEW (priv->month_view));
-
-	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->cal_categories = NULL;
-	priv->tasks_categories = NULL;
-
-	priv->object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->current_view_type = GNOME_CAL_DAY_VIEW;
-	priv->range_selected = FALSE;
-
-	setup_widgets (gcal);
-	priv->dn_query = NULL;
-	priv->sexp = g_strdup ("#t"); /* Match all */
-
-	priv->selection_start_time = time_day_begin_with_zone (time (NULL),
-							       priv->zone);
-	priv->selection_end_time = time_add_day_with_zone (priv->selection_start_time, 1, priv->zone);
-
-	priv->view_instance = NULL;
-	priv->view_menus = NULL;
-
-	priv->visible_start = -1;
-	priv->visible_end = -1;
-}
-
-/* Frees a set of categories */
-static void
-free_categories (GPtrArray *categories)
-{
-	int i;
-
-	if (!categories)
-		return;
-
-	for (i = 0; i < categories->len; i++)
-		g_free (categories->pdata[i]);
-
-	g_ptr_array_free (categories, TRUE);
-}
-
-/* Used from g_hash_table_foreach(); frees an UID string */
-static void
-destroy_editor_cb (gpointer key, gpointer value, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (value);
-	gtk_object_unref (GTK_OBJECT (ee));
-}
-
-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;
-
-	free_categories (priv->cal_categories);
-	priv->cal_categories = NULL;
-
-	free_categories (priv->tasks_categories);
-	priv->tasks_categories = NULL;
-
-	/* 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);
-
-	if (priv->dn_query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->dn_query), gcal);
-		gtk_object_unref (GTK_OBJECT (priv->dn_query));
-		priv->dn_query = NULL;
-	}
-
-	if (priv->sexp) {
-		g_free (priv->sexp);
-		priv->sexp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->task_pad_client) {
-		gtk_object_unref (GTK_OBJECT (priv->task_pad_client));
-		priv->task_pad_client = NULL;
-	}
-
-	priv->in_destroy = TRUE;
-	g_hash_table_foreach (priv->object_editor_hash, destroy_editor_cb, NULL);
-	g_hash_table_destroy (priv->object_editor_hash);
-	priv->object_editor_hash = NULL;
-
-	if (priv->view_instance) {
-		gtk_object_unref (GTK_OBJECT (priv->view_instance));
-		priv->view_instance = NULL;
-	}
-
-	if (priv->view_menus) {
-		gtk_object_unref (GTK_OBJECT (priv->view_menus));
-		priv->view_menus = NULL;
-	}
-
-	g_free (priv);
-	gcal->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-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_with_zone (new_time,
-							       priv->zone);
-	priv->selection_end_time = time_add_day_with_zone (priv->selection_start_time, 1, priv->zone);
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (gcal);
-}
-
-
-static void
-gnome_calendar_update_view_times (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		e_day_view_set_selected_time_range (E_DAY_VIEW (priv->day_view),
-						    priv->selection_start_time,
-						    priv->selection_end_time);
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		e_day_view_set_selected_time_range (E_DAY_VIEW (priv->work_week_view),
-						    priv->selection_start_time,
-						    priv->selection_end_time);
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_set_selected_time_range (E_WEEK_VIEW (priv->week_view),
-						     priv->selection_start_time,
-						     priv->selection_end_time);
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		e_week_view_set_selected_time_range (E_WEEK_VIEW (priv->month_view),
-						     priv->selection_start_time,
-						     priv->selection_end_time);
-		break;
-
-	default:
-		g_warning ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-static void
-gnome_calendar_direction (GnomeCalendar *gcal, int direction)
-{
-	GnomeCalendarPrivate *priv;
-	time_t start_time, end_time;
-
-	priv = gcal->priv;
-
-	start_time = priv->selection_start_time;
-	end_time = priv->selection_end_time;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		start_time = time_add_day_with_zone (start_time, direction,
-						     priv->zone);
-		end_time = time_add_day_with_zone (end_time, direction,
-						   priv->zone);
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		start_time = time_add_week_with_zone (start_time, direction,
-						      priv->zone);
-		end_time = time_add_week_with_zone (end_time, direction,
-						    priv->zone);
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		start_time = time_add_week_with_zone (start_time, direction,
-						      priv->zone);
-		end_time = time_add_week_with_zone (end_time, direction,
-						    priv->zone);
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		start_time = time_add_month_with_zone (start_time, direction,
-						       priv->zone);
-		end_time = time_add_month_with_zone (end_time, direction,
-						     priv->zone);
-		break;
-
-	default:
-		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);
-	gnome_calendar_notify_dates_shown_changed (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_with_zone (time,
-							       priv->zone);
-	priv->selection_end_time = time_add_day_with_zone (priv->selection_start_time, 1, priv->zone);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW, FALSE, TRUE);
-}
-
-static void
-focus_current_view (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		gtk_widget_grab_focus (priv->day_view);
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		gtk_widget_grab_focus (priv->work_week_view);
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		gtk_widget_grab_focus (priv->week_view);
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		gtk_widget_grab_focus (priv->month_view);
-		break;
-
-	default:
-		g_warning ("A penguin fell on its face!");
-		g_assert_not_reached ();
-	}
-}
-
-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));
-	focus_current_view (gcal);
-}
-
-/**
- * gnome_calendar_get_view:
- * @gcal: A calendar.
- *
- * Queries the type of the view that is being shown in a calendar.
- *
- * Return value: Type of the view that is currently shown.
- **/
-GnomeCalendarViewType
-gnome_calendar_get_view (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, GNOME_CAL_DAY_VIEW);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), GNOME_CAL_DAY_VIEW);
-
-	priv = gcal->priv;
-	return priv->current_view_type;
-}
-
-/* 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
-set_view (GnomeCalendar	*gcal, GnomeCalendarViewType view_type,
-	  gboolean range_selected, gboolean grab_focus)
-{
-	GnomeCalendarPrivate *priv;
-	gboolean round_selection;
-	GtkWidget *focus_widget;
-	const char *view_id;
-	
-	priv = gcal->priv;
-
-	round_selection = FALSE;
-	focus_widget = NULL;
-
-	switch (view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		view_id = "Day_View";
-		focus_widget = priv->day_view;
-		
-		if (!range_selected)
-			e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), 1);
-
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		view_id = "Work_Week_View";
-		focus_widget = priv->work_week_view;
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		view_id = "Week_View";
-		focus_widget = priv->week_view;
-		round_selection = TRUE;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		view_id = "Month_View";
-		focus_widget = priv->month_view;
-
-		if (!range_selected)
-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 5);
-
-		round_selection = TRUE;
-		break;
-
-	default:
-		g_warning ("A penguin is loose!");
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->current_view_type = view_type;
-	priv->range_selected = range_selected;
-
-	g_assert (focus_widget != NULL);
-
-	calendar_config_set_default_view (view_type);
-
-	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), (int) view_type);
-	gal_view_instance_set_current_view_id (priv->view_instance, view_id);
-
-	if (grab_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);
-}
-
-/**
- * gnome_calendar_set_view:
- * @gcal: A calendar.
- * @view_type: Type of view to show.
- * @range_selected: If false, the range of days/weeks shown will be reset to the
- * default value (1 for day view, 5 for week view, respectively).  If true, the
- * currently displayed range will be kept.
- * @grab_focus: Whether the view widget should grab the focus.
- *
- * Sets the view that should be shown in a calendar.  If @reset_range is true,
- * this function will automatically set the number of days or weeks shown in
- * the view; otherwise the last configuration will be kept.
- **/
-void
-gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type,
-			 gboolean range_selected, gboolean grab_focus)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	set_view (gcal, view_type, range_selected, grab_focus);
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (gcal);
-}
-
-/* Callback used when the view collection asks us to display a particular view */
-static void
-display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
-{
-	GnomeCalendar *gcal;
-	CalendarView *cal_view;
-
-	gcal = GNOME_CALENDAR (data);
-
-	if (!IS_CALENDAR_VIEW (view))
-		g_error ("display_view_cb(): Unknown type of view for GnomeCalendar");
-
-	cal_view = CALENDAR_VIEW (view);
-
-	gnome_calendar_set_view (gcal, calendar_view_get_view_type (cal_view), FALSE, TRUE);
-}
-
-/**
- * gnome_calendar_setup_view_menus:
- * @gcal: A calendar.
- * @uic: UI controller to use for the menus.
- * 
- * Sets up the #GalView menus for a calendar.  This function should be called
- * from the Bonobo control activation callback for this calendar.  Also, the
- * menus should be discarded using gnome_calendar_discard_view_menus().
- **/
-void
-gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
-{
-	GnomeCalendarPrivate *priv;
-	char *path;
-	CalendarViewFactory *factory;
-	static GalViewCollection *collection = NULL;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	priv = gcal->priv;
-
-	g_return_if_fail (priv->view_instance == NULL);
-
-	g_assert (priv->view_instance == NULL);
-	g_assert (priv->view_menus == NULL);
-
-	/* Create the view instance */
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new ();
-
-		path = gnome_util_prepend_user_home ("/evolution/views/calendar/");
-		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_DATADIR "/evolution/views/calendar/",
-							     path);
-		g_free (path);
-
-		/* Create the views */
-
-		factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		factory = calendar_view_factory_new (GNOME_CAL_WORK_WEEK_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		factory = calendar_view_factory_new (GNOME_CAL_WEEK_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		factory = calendar_view_factory_new (GNOME_CAL_MONTH_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		/* Load the collection and create the menus */
-
-		gal_view_collection_load (collection);
-	}
-
-	priv->view_instance = gal_view_instance_new (collection, cal_client_get_uri (priv->client));
-
-	priv->view_menus = gal_view_menus_new (priv->view_instance);
-	gal_view_menus_apply (priv->view_menus, uic, NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->view_instance), "display_view",
-			    GTK_SIGNAL_FUNC (display_view_cb), gcal);
-	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), gcal);
-}
-
-/**
- * gnome_calendar_discard_view_menus:
- * @gcal: A calendar.
- * 
- * Discards the #GalView menus used by a calendar.  This function should be
- * called from the Bonobo control deactivation callback for this calendar.  The
- * menus should have been set up with gnome_calendar_setup_view_menus().
- **/
-void
-gnome_calendar_discard_view_menus (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-
-	priv = gcal->priv;
-
-	g_return_if_fail (priv->view_instance != NULL);
-
-	g_assert (priv->view_instance != NULL);
-	g_assert (priv->view_menus != NULL);
-
-	gtk_object_unref (GTK_OBJECT (priv->view_instance));
-	priv->view_instance = NULL;
-
-	gtk_object_unref (GTK_OBJECT (priv->view_menus));
-	priv->view_menus = NULL;
-}
-
-EPopupMenu *
-gnome_calendar_setup_view_popup (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;
-
-	g_return_val_if_fail (priv->view_instance != NULL, NULL);
-
-	return gal_view_instance_get_popup_menu (priv->view_instance);
-}
-
-void
-gnome_calendar_discard_view_popup (GnomeCalendar *gcal, EPopupMenu *popup)
-{
-
-
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	g_return_if_fail (priv->view_instance != NULL);
-
-	gal_view_instance_free_popup_menu (priv->view_instance, popup);
-}
-
-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 == GNOME_CAL_MONTH_VIEW && !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);
-}
-
-/* Displays an error to indicate that opening a calendar failed */
-static void
-open_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not open the folder 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 open `%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
-client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), NULL);
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		/* If this is the main CalClient, update the Date Navigator. */
-		if (client == priv->client) {
-			update_query (gcal);
-		}
-
-		/* Set the client's default timezone, if we have one. */
-		if (priv->zone) {
-			cal_client_set_default_timezone (client, priv->zone);
-		}
-		break;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		open_error (gcal, cal_client_get_uri (client));
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* bullshit; we did not specify only_if_exists */
-		g_assert_not_reached ();
-		return;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (gcal, cal_client_get_uri (client));
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-}
-
-/* Duplicates an array of categories */
-static GPtrArray *
-copy_categories (GPtrArray *categories)
-{
-	GPtrArray *c;
-	int i;
-
-	c = g_ptr_array_new ();
-	g_ptr_array_set_size (c, categories->len);
-
-	for (i = 0; i < categories->len; i++)
-		c->pdata[i] = g_strdup (categories->pdata[i]);
-
-	return c;
-}
-
-/* Adds the categories from an array to a hash table if they don't exist there
- * already.
- */
-static void
-add_categories (GHashTable *categories, GPtrArray *c)
-{
-	int i;
-
-	if (!c)
-		return;
-
-	for (i = 0; i < c->len; i++) {
-		const char *cat;
-		const char *str;
-
-		cat = c->pdata[i];
-		str = g_hash_table_lookup (categories, cat);
-
-		if (!str)
-			g_hash_table_insert (categories, (char *) cat, NULL);
-	}
-}
-
-/* Used to append categories from a hash table to an array */
-struct append_category_closure {
-	GPtrArray *c;
-
-	int i;
-};
-
-/* Appends a category from the hash table to the array */
-static void
-append_category_cb (gpointer key, gpointer value, gpointer data)
-{
-	struct append_category_closure *closure;
-	const char *category;
-
-	category = key;
-	closure = data;
-
-	closure->c->pdata[closure->i] = g_strdup (category);
-	closure->i++;
-}
-
-/* Creates the union of two sets of categories */
-static GPtrArray *
-merge_categories (GPtrArray *a, GPtrArray *b)
-{
-	GHashTable *categories;
-	int n;
-	GPtrArray *c;
-	struct append_category_closure closure;
-
-	categories = g_hash_table_new (g_str_hash, g_str_equal);
-
-	add_categories (categories, a);
-	add_categories (categories, b);
-
-	n = g_hash_table_size (categories);
-
-	c = g_ptr_array_new ();
-	g_ptr_array_set_size (c, n);
-
-	closure.c = c;
-	closure.i = 0;
-	g_hash_table_foreach (categories, append_category_cb, &closure);
-	g_hash_table_destroy (categories);
-
-	return c;
-}
-
-/* Callback from the calendar client when the set of categories changes.  We
- * have to merge the categories of the calendar and tasks clients.
- */
-static void
-client_categories_changed_cb (CalClient *client, GPtrArray *categories, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	GPtrArray *merged;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	if (client == priv->client) {
-		free_categories (priv->cal_categories);
-		priv->cal_categories = copy_categories (categories);
-	} else if (client == priv->task_pad_client) {
-		free_categories (priv->tasks_categories);
-		priv->tasks_categories = copy_categories (categories);
-	} else
-		g_assert_not_reached ();
-
-	merged = merge_categories (priv->cal_categories, priv->tasks_categories);
-	cal_search_bar_set_categories (CAL_SEARCH_BAR (priv->search_bar), merged);
-	free_categories (merged);
-}
-
-GtkWidget *
-gnome_calendar_construct (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GnomeCalendarViewType view_type;
-	CalendarModel *model;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	/*
-	 * Calendar Folder Client.
-	 */
-	priv->client = cal_client_new ();
-	if (!priv->client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (client_cal_opened_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), gcal);
-
-	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);
-
-	/*
-	 * TaskPad Folder Client.
-	 */
-	priv->task_pad_client = cal_client_new ();
-	if (!priv->task_pad_client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (client_cal_opened_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), gcal);
-
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	g_assert (model != NULL);
-
-	calendar_model_set_cal_client (model, priv->task_pad_client, CALOBJ_TYPE_TODO);
-
-	/* Get the default view to show. */
-	view_type = calendar_config_get_default_view ();
-	if (view_type < GNOME_CAL_DAY_VIEW || view_type > GNOME_CAL_MONTH_VIEW)
-		view_type = GNOME_CAL_DAY_VIEW;
-
-	gnome_calendar_set_view (gcal, view_type, 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);
-}
-
-void
-gnome_calendar_set_ui_component (GnomeCalendar *gcal,
-				 BonoboUIComponent *ui_component)
-{
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
-
-	e_search_bar_set_ui_component (E_SEARCH_BAR (gcal->priv->search_bar), ui_component);
-}
-
-/**
- * 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;
-}
-
-/**
- * gnome_calendar_get_task_pad_cal_client:
- * @gcal: A calendar view.
- *
- * Queries the calendar client interface object that a calendar view is using
- * for the Task Pad.
- *
- * Return value: A calendar client interface object.
- **/
-CalClient *
-gnome_calendar_get_task_pad_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->task_pad_client;
-}
-
-/* Adds the specified URI to the alarm notification service */
-static void
-add_alarms (const char *uri)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_AlarmNotify an;
-
-	/* Activate the alarm notification service */
-
-	CORBA_exception_init (&ev);
-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("add_alarms(): Could not activate the alarm notification service");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Ask the service to load the URI */
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_AlarmNotify_addCalendar (an, uri, &ev);
-
-	if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI))
-		g_message ("add_calendar(): Invalid URI reported from the "
-			   "alarm notification service");
-	else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError))
-		g_message ("add_calendar(): The alarm notification service could "
-			   "not contact the backend");		
-	else if (BONOBO_EX (&ev))
-		g_message ("add_calendar(): Could not issue the addCalendar request");
-
-	CORBA_exception_free (&ev);
-
-	/* Get rid of the service */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (an, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("add_alarms(): Could not unref the alarm notification service");
-
-	CORBA_exception_free (&ev);
-}
-
-gboolean
-gnome_calendar_open (GnomeCalendar *gcal, const char *str_uri)
-{
-	GnomeCalendarPrivate *priv;
-	char *tasks_uri;
-	gboolean success;
-	EUri *uri;
-	char *message;
-	char *real_uri;
-
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (str_uri != NULL, FALSE);
-
-	priv = gcal->priv;
-
-	g_return_val_if_fail (
-		cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_NOT_LOADED,
-		FALSE);
-
-	g_return_val_if_fail (
-		cal_client_get_load_state (priv->task_pad_client) == CAL_CLIENT_LOAD_NOT_LOADED,
-		FALSE);
-
-	uri = e_uri_new (str_uri);
-	if (!uri || !g_strncasecmp (uri->protocol, "file", 4))
-		real_uri = g_concat_dir_and_file (str_uri, "calendar.ics");
-	else
-		real_uri = g_strdup (str_uri);
-
-	message = g_strdup_printf (_("Opening calendar at %s"), real_uri);
-	e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), message);
-	g_free (message);
-
-	if (!cal_client_open_calendar (priv->client, real_uri, FALSE)) {
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		g_free (real_uri);
-		e_uri_free (uri);
-
-		return FALSE;
-	}
-
-	add_alarms (real_uri);
-
-	/* Open the appropriate Tasks folder to show in the TaskPad */
-
-	if (!uri) {
-		tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
-		success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
-		g_free (tasks_uri);
-	}
-	else {
-		if (!g_strncasecmp (uri->protocol, "file", 4)) {
-			tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
-			success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
-			g_free (tasks_uri);
-		}
-		else {
-			success = cal_client_open_default_tasks (priv->task_pad_client, FALSE);
-		}
-	}
-
-	g_free (real_uri);
-	e_uri_free (uri);
-
-	if (success)
-		add_alarms (cal_client_get_uri (priv->task_pad_client));
-	else {
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* 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;
-	char *location;
-
-	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 ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	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);
-
-	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);
-	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);
-
-	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 ();
-	e_day_view_set_show_event_end_times (E_DAY_VIEW (priv->day_view),
-					     show_event_end);
-	e_day_view_set_show_event_end_times (E_DAY_VIEW (priv->work_week_view),
-					     show_event_end);
-	e_week_view_set_show_event_end_times (E_WEEK_VIEW (priv->week_view),
-					      show_event_end);
-	e_week_view_set_show_event_end_times (E_WEEK_VIEW (priv->month_view),
-					      show_event_end);
-
-	compress_weekend = calendar_config_get_compress_weekend ();
-	e_week_view_set_compress_weekend (E_WEEK_VIEW (priv->month_view),
-					  compress_weekend);
-
-	calendar_config_configure_e_calendar (E_CALENDAR (priv->date_navigator));
-
-	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv->todo));
-
-	location = calendar_config_get_timezone ();
-	priv->zone = icaltimezone_get_builtin_timezone (location);
-
-	if (priv->client
-	    && cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED) {
-		cal_client_set_default_timezone (priv->client, priv->zone);
-	}
-	if (priv->task_pad_client
-	    && cal_client_get_load_state (priv->task_pad_client) == CAL_CLIENT_LOAD_LOADED) {
-		cal_client_set_default_timezone (priv->task_pad_client,
-						 priv->zone);
-	}
-
-	e_day_view_set_timezone (E_DAY_VIEW (priv->day_view), priv->zone);
-	e_day_view_set_timezone (E_DAY_VIEW (priv->work_week_view), priv->zone);
-	e_week_view_set_timezone (E_WEEK_VIEW (priv->week_view), priv->zone);
-	e_week_view_set_timezone (E_WEEK_VIEW (priv->month_view), priv->zone);
-
-	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);
-	}
-
-	/* The range of days shown may have changed, so we update the date
-	   navigator if needed. */
-	gnome_calendar_update_date_navigator (gcal);
-	gnome_calendar_notify_dates_shown_changed (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_notify_dates_shown_changed (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 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;
-
-	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;
-
-	if (!priv->in_destroy)
-		g_hash_table_remove (priv->object_editor_hash, orig_uid);
-
-	g_free (orig_uid);
-
-	g_free (ec);
-}
-
-void
-gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp, 
-			    gboolean meeting)
-{
-	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);
-
-		comp_editor_set_cal_client (COMP_EDITOR (ee), priv->client);
-		comp_editor_edit_comp (COMP_EDITOR (ee), comp);
-		if (meeting)
-			event_editor_show_meeting (ee);
-	}
-
-	comp_editor_focus (COMP_EDITOR (ee));
-}
-
-/**
- * gnome_calendar_new_appointment_for:
- * @gcal: An Evolution calendar.
- * @dtstart: a Unix time_t that marks the beginning of the appointment.
- * @dtend: a Unix time_t that marks the end of the appointment.
- * @all_day: if true, the dtstart and dtend are expanded to cover the entire
- * day, and the event is set to TRANSPARENT.
- *
- * Opens an event editor dialog for a new appointment.
- *
- **/
-void
-gnome_calendar_new_appointment_for (GnomeCalendar *cal,
-				    time_t dtstart, time_t dtend,
-				    gboolean all_day,
-				    gboolean meeting)
-{
-	GnomeCalendarPrivate *priv;
-	struct icaltimetype itt;
-	CalComponentDateTime dt;
-	CalComponent *comp;
-	CalComponentTransparency transparency;
-	const char *category;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (cal));
-
-	priv = cal->priv;
-
-	dt.value = &itt;
-	if (all_day)
-		dt.tzid = NULL;
-	else
-		dt.tzid = icaltimezone_get_tzid (priv->zone);
-
-	comp = cal_comp_event_new_with_defaults ();
-
-	/* DTSTART, DTEND */
-
-	itt = icaltime_from_timet_with_zone (dtstart, FALSE, priv->zone);
-	if (all_day) {
-		itt.hour = itt.minute = itt.second = 0;
-		itt.is_date = TRUE;
-	}
-	cal_component_set_dtstart (comp, &dt);
-
-	itt = icaltime_from_timet_with_zone (dtend, FALSE, priv->zone);
-	if (all_day) {
-		/* We round it up to the end of the day, unless it is already
-		   set to midnight. */
-		if (itt.hour != 0 || itt.minute != 0 || itt.second != 0) {
-			icaltime_adjust (&itt, 1, 0, 0, 0);
-		}
-		itt.hour = itt.minute = itt.second = 0;
-		itt.is_date = TRUE;
-	}
-	cal_component_set_dtend (comp, &dt);
-
-	transparency = all_day ? CAL_COMPONENT_TRANSP_TRANSPARENT
-		: CAL_COMPONENT_TRANSP_OPAQUE;
-	cal_component_set_transparency (comp, transparency);
-
-
-	/* Category */
-
-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv->search_bar));
-	cal_component_set_categories (comp, category);
-
-	/* Edit! */
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (cal, comp, meeting);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/**
- * 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)
-{
-	time_t dtstart, dtend;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
-	gnome_calendar_new_appointment_for (gcal, dtstart, dtend, FALSE, FALSE);
-}
-
-/**
- * gnome_calendar_new_task:
- * @gcal: An Evolution calendar.
- *
- * Opens a task editor dialog for a new task.
- **/
-void
-gnome_calendar_new_task		(GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	TaskEditor *tedit;
-	CalComponent *comp;
-	const char *category;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	tedit = task_editor_new ();
-	comp_editor_set_cal_client (COMP_EDITOR (tedit), priv->task_pad_client);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv->search_bar));
-	cal_component_set_categories (comp, category);
-
-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	comp_editor_focus (COMP_EDITOR (tedit));
-}
-
-
-/* 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;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		e_day_view_get_selected_time_range (E_DAY_VIEW (priv->day_view),
-						    start_time, end_time);
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		e_day_view_get_selected_time_range (E_DAY_VIEW (priv->work_week_view),
-						    start_time, end_time);
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		e_week_view_get_selected_time_range (E_WEEK_VIEW (priv->week_view),
-						     start_time, end_time);
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		e_week_view_get_selected_time_range (E_WEEK_VIEW (priv->month_view),
-						     start_time, end_time);
-		break;
-
-	default:
-		g_message ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-
-/* Gets the visible time range for the current view. Returns FALSE if no
-   time range has been set yet. */
-gboolean
-gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,
-				       time_t	 *start_time,
-				       time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	gboolean retval = FALSE;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		retval = e_day_view_get_visible_time_range (E_DAY_VIEW (priv->day_view), start_time, end_time);
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		retval = e_day_view_get_visible_time_range (E_DAY_VIEW (priv->work_week_view), start_time, end_time);
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		retval = e_week_view_get_visible_time_range (E_WEEK_VIEW (priv->week_view), start_time, end_time);
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		retval = e_week_view_get_visible_time_range (E_WEEK_VIEW (priv->month_view), start_time, end_time);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	return retval;
-}
-
-
-
-static void
-get_days_shown (GnomeCalendar *gcal, GDate *start_date, gint *days_shown)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		time_to_gdate_with_zone (start_date,
-					 E_DAY_VIEW (priv->day_view)->lower,
-					 priv->zone);
-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (priv->day_view));
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		time_to_gdate_with_zone (start_date,
-					 E_DAY_VIEW (priv->work_week_view)->lower,
-					 priv->zone);
-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (priv->work_week_view));
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		*start_date = E_WEEK_VIEW (priv->week_view)->first_day_shown;
-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (priv->week_view)))
-			*days_shown = e_week_view_get_weeks_shown (
-				E_WEEK_VIEW (priv->week_view)) * 7;
-		else
-			*days_shown = 7;
-
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		*start_date = E_WEEK_VIEW (priv->month_view)->first_day_shown;
-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (priv->month_view)))
-			*days_shown = e_week_view_get_weeks_shown (
-				E_WEEK_VIEW (priv->month_view)) * 7;
-		else
-			*days_shown = 7;
-
-		break;
-
-	default:
-		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;
-
-	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 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;
-	gboolean starts_on_week_start_day;
-
-	priv = gcal->priv;
-
-	starts_on_week_start_day = FALSE;
-
-	get_days_shown (gcal, &start_date, &days_shown);
-
-	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;
-
-	/* If a complete week is selected we show the Week view.
-	   Note that if weekends are compressed and the week start day is set
-	   to Sunday we don't actually show complete weeks in the Week view,
-	   so this may need tweaking. */
-	if (g_date_weekday (&new_start_date) % 7 == calendar_config_get_week_start_day ())
-		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);
-
-		set_view (gcal, GNOME_CAL_MONTH_VIEW, TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-		gnome_calendar_notify_dates_shown_changed (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);
-
-		set_view (gcal, GNOME_CAL_WEEK_VIEW, TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-		gnome_calendar_notify_dates_shown_changed (gcal);
-	} else {
-		gint start_year, start_month, start_day;
-		gint end_year, end_month, end_day;
-		struct icaltimetype tt;
-
-		start_year = g_date_year (&new_start_date);
-		start_month = g_date_month (&new_start_date);
-		start_day = g_date_day (&new_start_date);
-		end_year = g_date_year (&new_end_date);
-		end_month = g_date_month (&new_end_date);
-		end_day = g_date_day (&new_end_date);
-
-		tt = icaltime_null_time ();
-		tt.year = start_year;
-		tt.month  = start_month;
-		tt.day = start_day;
-		priv->selection_start_time = icaltime_as_timet_with_zone (tt, priv->zone);
-
-		tt = icaltime_null_time ();
-		tt.year = end_year;
-		tt.month  = end_month;
-		tt.day = end_day;
-		icaltime_adjust (&tt, 1, 0, 0, 0);
-		priv->selection_end_time = icaltime_as_timet_with_zone (tt, priv->zone);
-
-		e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), new_days_shown);
-		gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW, TRUE, FALSE);
-	}
-
-	focus_current_view (gcal);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-						     GnomeCalendar *gcal)
-{
-	update_query (gcal);
-}
-
-
-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;
-
-	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
-	   set_view(). */
-	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 == GNOME_CAL_MONTH_VIEW && !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_cut_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		switch (priv->current_view_type) {
-		case GNOME_CAL_DAY_VIEW :
-			e_day_view_cut_clipboard (E_DAY_VIEW (priv->day_view));
-			break;
-		case GNOME_CAL_WORK_WEEK_VIEW :
-			e_day_view_cut_clipboard (E_DAY_VIEW (priv->work_week_view));
-			break;
-		case GNOME_CAL_WEEK_VIEW :
-			e_week_view_cut_clipboard (E_WEEK_VIEW (priv->week_view));
-			break;
-		case GNOME_CAL_MONTH_VIEW :
-			e_week_view_cut_clipboard (E_WEEK_VIEW (priv->month_view));
-			break;
-		default:
-			g_assert_not_reached ();
-		}
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_cut_clipboard (E_CALENDAR_TABLE (priv->todo));
-	else
-		g_assert_not_reached ();
-}
-
-void
-gnome_calendar_copy_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		switch (priv->current_view_type) {
-		case GNOME_CAL_DAY_VIEW :
-			e_day_view_copy_clipboard (E_DAY_VIEW (priv->day_view));
-			break;
-		case GNOME_CAL_WORK_WEEK_VIEW :
-			e_day_view_copy_clipboard (E_DAY_VIEW (priv->work_week_view));
-			break;
-		case GNOME_CAL_WEEK_VIEW :
-			e_week_view_copy_clipboard (E_WEEK_VIEW (priv->week_view));
-			break;
-		case GNOME_CAL_MONTH_VIEW :
-			e_week_view_copy_clipboard (E_WEEK_VIEW (priv->month_view));
-			break;
-		default:
-			g_assert_not_reached ();
-		}
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_copy_clipboard (E_CALENDAR_TABLE (priv->todo));
-	else
-		g_assert_not_reached ();
-}
-
-void
-gnome_calendar_paste_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		switch (priv->current_view_type) {
-		case GNOME_CAL_DAY_VIEW :
-			e_day_view_paste_clipboard (E_DAY_VIEW (priv->day_view));
-			break;
-		case GNOME_CAL_WORK_WEEK_VIEW :
-			e_day_view_paste_clipboard (E_DAY_VIEW (priv->work_week_view));
-			break;
-		case GNOME_CAL_WEEK_VIEW :
-			e_week_view_paste_clipboard (E_WEEK_VIEW (priv->week_view));
-			break;
-		case GNOME_CAL_MONTH_VIEW :
-			e_week_view_paste_clipboard (E_WEEK_VIEW (priv->month_view));
-			break;
-		}
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_paste_clipboard (E_CALENDAR_TABLE (priv->todo));
-	else
-		g_assert_not_reached ();
-}
-
-
-/* Get the current timezone. */
-icaltimezone*
-gnome_calendar_get_timezone	(GnomeCalendar	*gcal)
-{
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	return gcal->priv->zone;
-}
-
-
-static void
-gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	time_t start_time, end_time;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	/* If no time range is set yet, just return. */
-	if (!gnome_calendar_get_visible_time_range (gcal, &start_time,
-						    &end_time))
-		return;
-
-	/* We check if the visible date range has changed, and only emit the
-	   signal if it has. (This makes sure we only change the folder title
-	   bar label in the shell when we need to.) */
-	if (priv->visible_start != start_time
-	    || priv->visible_end != end_time) {
-		priv->visible_start = start_time;
-		priv->visible_end = end_time;
-
-		gtk_signal_emit (GTK_OBJECT (gcal),
-				 gnome_calendar_signals[DATES_SHOWN_CHANGED]);
-	}
-}
-
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint
-gnome_calendar_get_num_events_selected (GnomeCalendar *gcal)
-{
-	GtkWidget *view;
-	gint retval = 0;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), 0);
-
-	view = gnome_calendar_get_current_view_widget (gcal);
-	if (E_IS_DAY_VIEW (view))
-		retval = e_day_view_get_num_events_selected (E_DAY_VIEW (view));
-	else
-		retval = e_week_view_get_num_events_selected (E_WEEK_VIEW (view));
-
-	return retval;
-}
-
-/**
- * gnome_calendar_get_num_tasks_selected:
- * @gcal: A calendar view.
- * 
- * Queries the number of tasks that are currently selected in the task pad of a
- * calendar view.
- * 
- * Return value: Number of selected tasks.
- **/
-gint
-gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ETable *etable;
-
-	g_return_val_if_fail (gcal != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), -1);
-
-	priv = gcal->priv;
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	return e_table_selected_count (etable);
-}
-
-
-void
-gnome_calendar_delete_selection		(GnomeCalendar  *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-	GtkWidget *view;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		view = gnome_calendar_get_current_view_widget (gcal);
-
-		if (E_IS_DAY_VIEW (view))
-			e_day_view_delete_event (E_DAY_VIEW (view));
-		else
-			e_week_view_delete_event (E_WEEK_VIEW (view));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_delete_selected (E_CALENDAR_TABLE (priv->todo));
-	else
-		g_assert_not_reached ();
-}
-
-
-ECalendarTable*
-gnome_calendar_get_task_pad	(GnomeCalendar *gcal)
-{
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	return E_CALENDAR_TABLE (gcal->priv->todo);
-}
-
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
deleted file mode 100644
index ebad45c99f..0000000000
--- a/calendar/gui/gnome-cal.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 GNOME_CALENDAR_APP_H
-#define GNOME_CALENDAR_APP_H
-
-#include <time.h>
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkvbox.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-#include "e-calendar-table.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;
-
-/* View types */
-typedef enum {
-	GNOME_CAL_DAY_VIEW,
-	GNOME_CAL_WORK_WEEK_VIEW,
-	GNOME_CAL_WEEK_VIEW,
-	GNOME_CAL_MONTH_VIEW
-} GnomeCalendarViewType;
-
-struct _GnomeCalendar {
-	GtkVBox vbox;
-
-	/* Private data */
-	GnomeCalendarPrivate *priv;
-};
-
-struct _GnomeCalendarClass {
-	GtkVBoxClass parent_class;
-
-	/* Notification signals */
-	void (* dates_shown_changed)    (GnomeCalendar *gcal);
-
-	void (* calendar_selection_changed) (GnomeCalendar *gcal);
-	void (* taskpad_selection_changed) (GnomeCalendar *gcal);
-
-	void (* calendar_focus_change)  (GnomeCalendar *gcal, gboolean in);
-	void (* taskpad_focus_change)   (GnomeCalendar *gcal, gboolean in);
-};
-
-
-GtkType    gnome_calendar_get_type         	(void);
-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
-
-GtkWidget *gnome_calendar_new			(void);
-
-void gnome_calendar_set_ui_component (GnomeCalendar *cal,
-				      BonoboUIComponent *ui_component);
-
-ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);
-
-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);
-CalClient *gnome_calendar_get_task_pad_cal_client(GnomeCalendar *gcal);
-
-gboolean   gnome_calendar_open                  (GnomeCalendar *gcal, const char *str_uri);
-
-void gnome_calendar_set_query (GnomeCalendar *gcal, const char *sexp);
-
-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);
-
-GnomeCalendarViewType gnome_calendar_get_view (GnomeCalendar *gcal);
-void gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type,
-			      gboolean range_selected, gboolean grab_focus);
-
-void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic);
-void gnome_calendar_discard_view_menus (GnomeCalendar *gcal);
-
-EPopupMenu *gnome_calendar_setup_view_popup (GnomeCalendar *gcal);
-void gnome_calendar_discard_view_popup (GnomeCalendar *gcal, EPopupMenu *popup);
-
-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,
-						 gboolean meeting);
-
-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);
-void       gnome_calendar_new_appointment_for   (GnomeCalendar *cal,
-						 time_t dtstart, time_t dtend,
-						 gboolean all_day,
-						 gboolean meeting);
-
-void       gnome_calendar_new_task		(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);
-
-/* Gets the visible time range for the current view. Returns FALSE if no
-   time range has been set yet. */
-gboolean   gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,
-						  time_t	 *start_time,
-						  time_t	 *end_time);
-
-/* Returns the number of selected events (0 or 1 at present). */
-gint	   gnome_calendar_get_num_events_selected (GnomeCalendar *gcal);
-
-/* Returns the number of selected tasks */
-gint       gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal);
-
-/* 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);
-
-/* Get the current timezone. */
-icaltimezone *gnome_calendar_get_timezone	(GnomeCalendar	*gcal);
-
-
-/* Clipboard operations */
-void       gnome_calendar_cut_clipboard         (GnomeCalendar  *gcal);
-void       gnome_calendar_copy_clipboard        (GnomeCalendar  *gcal);
-void       gnome_calendar_paste_clipboard       (GnomeCalendar  *gcal);
-
-void       gnome_calendar_delete_selection	(GnomeCalendar  *gcal);
-
-
-
-END_GNOME_DECLS
-
-#endif
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/goto-dialog.glade b/calendar/gui/goto-dialog.glade
deleted file mode 100644
index 289ad7ab69..0000000000
--- a/calendar/gui/goto-dialog.glade
+++ /dev/null
@@ -1,154 +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>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>goto-dialog</name>
-  <visible>False</visible>
-  <title>Go To Date</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>button4</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Go To Today</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_JUMP_TO</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button5</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>vbox</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox12</name>
-	<homogeneous>True</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>month</name>
-	  <can_focus>True</can_focus>
-	  <items>January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>year</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>True</numeric>
-	  <update_policy>GTK_UPDATE_IF_VALID</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>1969</value>
-	  <lower>1969</lower>
-	  <upper>2038</upper>
-	  <step>1</step>
-	  <page>5</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
deleted file mode 100644
index 06250a1a70..0000000000
--- a/calendar/gui/goto.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* Go to date dialog for Evolution
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- */
-
-#include <config.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwindow.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "tag-calendar.h"
-#include "goto.h"
-
-typedef struct 
-{
-	GladeXML *xml;
-	GtkWidget *dialog;	
-
-	GtkWidget *month;
-	GtkWidget *year;
-	ECalendar *ecal;
-	GtkWidget *vbox;
-
-	GnomeCalendar *gcal;
-	gint year_val;
-	gint month_val;
-	gint day_val;
-	
-} GoToDialog;
-
-GoToDialog *dlg = NULL;
-
-/* Callback used when the year adjustment is changed */
-static void
-year_changed (GtkAdjustment *adj, gpointer data)
-{
-	GoToDialog *dlg = data;
-
-	dlg->year_val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dlg->year));
-	e_calendar_item_set_first_month (dlg->ecal->calitem, dlg->year_val, dlg->month_val);
-}
-
-/* Callback used when a month button is toggled */
-static void
-month_changed (GtkToggleButton *toggle, gpointer data)
-{
-	GoToDialog *dlg = data;
-	GtkWidget *menu, *active;
-	
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
-	active = gtk_menu_get_active (GTK_MENU (menu));
-	dlg->month_val = g_list_index (GTK_MENU_SHELL (menu)->children, active);
-
-	e_calendar_item_set_first_month (dlg->ecal->calitem, dlg->year_val, dlg->month_val);
-}
-
-static void
-ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
-{
-	GoToDialog *dlg = user_data;
-	CalClient *client;
-	
-	client = gnome_calendar_get_cal_client (dlg->gcal);
-	if (client)
-		tag_calendar_by_client (dlg->ecal, client);
-}
-
-/* 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 void
-ecal_event (ECalendarItem *calitem, gpointer user_data)
-{
-	GoToDialog *dlg = user_data;
-	GDate start_date, end_date;
-	struct icaltimetype tt = icaltime_null_time ();
-	time_t et;
-	
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	tt.year = g_date_year (&start_date);
-	tt.month = g_date_month (&start_date);
-	tt.day = g_date_day (&start_date);
-
-	et = icaltime_as_timet_with_zone (tt, gnome_calendar_get_timezone (dlg->gcal));
-
-	gnome_calendar_goto (dlg->gcal, et);
-
-	gnome_dialog_close (GNOME_DIALOG (dlg->dialog));
-}
-
-/* Returns the current time, for the ECalendarItem. */
-static struct tm
-get_current_time (ECalendarItem *calitem, gpointer data)
-{
-	char *location;
-	icaltimezone *zone;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	/* Get the current timezone. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-/* Creates the ecalendar */
-static void
-create_ecal (GoToDialog *dlg)
-{
-	ECalendarItem *calitem;
-	
-	dlg->ecal = E_CALENDAR (e_calendar_new ());
-	calitem = dlg->ecal->calitem;
-	
-	e_calendar_item_set_display_popup (calitem, FALSE);
-	gtk_widget_show (GTK_WIDGET (dlg->ecal));
-	gtk_box_pack_start (GTK_BOX (dlg->vbox), GTK_WIDGET (dlg->ecal), TRUE, TRUE, 0);
-
-	e_calendar_item_set_first_month (calitem, dlg->year_val, dlg->month_val);
-	e_calendar_item_set_get_time_callback (calitem,
-					       get_current_time,
-					       dlg, NULL);
-	
-	ecal_date_range_changed (calitem, dlg);
-}
-
-static void
-goto_today (GoToDialog *dlg)
-{
-	gnome_calendar_goto_today (dlg->gcal);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (GoToDialog *dlg)
-{
-#define GW(name) glade_xml_get_widget (dlg->xml, name)
-
-	dlg->dialog = GW ("goto-dialog");
-
-	dlg->month = GW ("month");
-	dlg->year = GW ("year");
-	dlg->vbox = GW ("vbox");
-
-#undef GW
-
-	return (dlg->dialog
-		&& dlg->month
-		&& dlg->year
-		&& dlg->vbox);
-}
-
-static void
-goto_dialog_init_widgets (GoToDialog *dlg) 
-{
-	GtkWidget *menu;
-	GtkAdjustment *adj;
-	GList *l;
-	
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
-	for (l = GTK_MENU_SHELL (menu)->children; l != NULL; l = l->next)
-		gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-				    GTK_SIGNAL_FUNC (month_changed), dlg);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dlg->year));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    (GtkSignalFunc) year_changed, dlg);
-
-	gtk_signal_connect (GTK_OBJECT (dlg->ecal->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (ecal_date_range_changed),
-			    dlg);
-	gtk_signal_connect (GTK_OBJECT (dlg->ecal->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) ecal_event,
-			    dlg);
-}
-
-/* Creates a "goto date" dialog and runs it */
-void
-goto_dialog (GnomeCalendar *gcal)
-{
-	GtkWidget *menu;
-	time_t start_time;
-	struct icaltimetype tt;
-	int b;
-
-	if (dlg) {
-		return;
-	}
-		
-	dlg = g_new0 (GoToDialog, 1);
-	
-	/* Load the content widgets */
-	dlg->xml = glade_xml_new (EVOLUTION_GLADEDIR "/goto-dialog.glade", NULL);
-	if (!dlg->xml) {
-		g_message ("goto_dialog(): Could not load the Glade XML file!");
-		g_free (dlg);
-		return;
-	}
-
-	if (!get_widgets (dlg)) {
-		g_message ("goto_dialog(): Could not find all widgets in the XML file!");
-		g_free (dlg);
-		return;
-	}
-	dlg->gcal = gcal;
-
-	gnome_calendar_get_selected_time_range (dlg->gcal, &start_time, NULL);
-	tt = icaltime_from_timet_with_zone (start_time, FALSE, gnome_calendar_get_timezone (gcal));
-	dlg->year_val = tt.year;
-	dlg->month_val = tt.month - 1;
-	dlg->day_val = tt.day;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
-	gtk_option_menu_set_history (GTK_OPTION_MENU (dlg->month), dlg->month_val);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->year), dlg->year_val);
-	
-	create_ecal (dlg);
-
-	goto_dialog_init_widgets (dlg);
-
-	gnome_dialog_set_parent (GNOME_DIALOG (dlg->dialog),
-				 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-
-	b = gnome_dialog_run_and_close (GNOME_DIALOG (dlg->dialog));
-	if (b == 0)
-		goto_today (dlg);
-
-	gtk_object_unref (GTK_OBJECT (dlg->xml));
-	g_free (dlg);
-	dlg = NULL;
-}
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
deleted file mode 100644
index 9ecfeeeb83..0000000000
--- a/calendar/gui/goto.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Go To Date dialog
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 GOTO_DIALOG_H
-#define GOTO_DIALOG_H
-
-#include "gnome-cal.h"
-
-void goto_dialog (GnomeCalendar *gcal);
-
-#endif
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
deleted file mode 100644
index d05cee6d9a..0000000000
--- a/calendar/gui/itip-bonobo-control.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Jesse Pavel <jpavel@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-exception.h>
-#include <ical.h>
-
-#include "e-itip-control.h"
-#include "itip-control-factory.h"
-
-extern gchar *evolution_dir;
-
-enum E_ITIP_BONOBO_ARGS {
-	FROM_ADDRESS_ARG_ID,
-};
-
-/*
- * 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 (BONOBO_EX (&ev)) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-		length += buffer->_length;
-		data[length] = '\0';
-		
-		CORBA_free (buffer);
-#undef READ_CHUNK_SIZE
-	} 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)
-{
-	EItipControl *itip = data;
-	gchar *text;
-	
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {
-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
-		return;
-	}
-
-	if ((text = stream_read (stream)) == NULL) {
-		bonobo_exception_set (ev, ex_Bonobo_Persist_FileNotFound);
-		return;
-	}
-
-	e_itip_control_set_data (itip, text);
-	g_free (text);
-}
-/*
- * 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)
-{
-	EItipControl *itip = data;
-	gchar *text;
-	gint len;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
-		return;
-	}
-
-	text = e_itip_control_get_data (itip);
-	len = e_itip_control_get_data_size (itip);
-
-	bonobo_stream_client_write (stream, text, len, ev);
-	g_free (text);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EItipControl *itip = data;
-	gint len;
-	
-	len = e_itip_control_get_data_size (itip);
-	
-  	if (len > 0)
-		return len;
-
-	return 0L;
-}
-
-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 void
-get_prop (BonoboPropertyBag *bag, 
-	   BonoboArg *arg,
-	   guint arg_id, 	      
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControl *itip = user_data;
-
-	switch (arg_id) {
-	case FROM_ADDRESS_ARG_ID:
-		BONOBO_ARG_SET_STRING (arg, e_itip_control_get_from_address (itip));
-		break;
-	}
-}
-
-static void
-set_prop ( BonoboPropertyBag *bag, 
-	   const BonoboArg *arg,
-	   guint arg_id, 
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControl *itip = user_data;
-
-	switch (arg_id) {
-	case FROM_ADDRESS_ARG_ID:
-		e_itip_control_set_from_address (itip, BONOBO_ARG_GET_STRING (arg));
-		break;
-	}
-}
-
-
-static BonoboObject *
-itip_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl      *control;
-	BonoboPropertyBag *prop_bag;
-	BonoboPersistStream *stream;
-	GtkWidget *itip;
-
-	itip = e_itip_control_new ();
-	gtk_widget_show (itip);
-	control = bonobo_control_new (itip);
-	
-	/* create a property bag */
-	prop_bag = bonobo_property_bag_new (get_prop, set_prop, itip);
-	bonobo_property_bag_add (prop_bag, "from_address", FROM_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL,
-				 "from_address", 0 );
-
-	bonobo_control_set_properties (control, prop_bag);
-	bonobo_object_unref (BONOBO_OBJECT (prop_bag));
-
-	bonobo_control_set_automerge (control, TRUE);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    itip);
-
-	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
-itip_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory",
-		itip_control_factory, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));;
-	
-	if (factory == NULL)
-		g_error ("I could not register an iTip control factory.");
-}
-
diff --git a/calendar/gui/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h
deleted file mode 100644
index 6f8a95ec71..0000000000
--- a/calendar/gui/itip-bonobo-control.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: 
- *   Jesse Pavel <jpavel@ximian.com>
- *   JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 __ITIP_CONTROL_FACTORY_H__
-#define __ITIP_CONTROL_FACTORY_H__
-
-void             itip_control_factory_init (void);
-
-#endif /* __ITIP_CONTROL_H__ */
diff --git a/calendar/gui/itip-control-factory.c b/calendar/gui/itip-control-factory.c
deleted file mode 100644
index d05cee6d9a..0000000000
--- a/calendar/gui/itip-control-factory.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Jesse Pavel <jpavel@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-exception.h>
-#include <ical.h>
-
-#include "e-itip-control.h"
-#include "itip-control-factory.h"
-
-extern gchar *evolution_dir;
-
-enum E_ITIP_BONOBO_ARGS {
-	FROM_ADDRESS_ARG_ID,
-};
-
-/*
- * 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 (BONOBO_EX (&ev)) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-		length += buffer->_length;
-		data[length] = '\0';
-		
-		CORBA_free (buffer);
-#undef READ_CHUNK_SIZE
-	} 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)
-{
-	EItipControl *itip = data;
-	gchar *text;
-	
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {
-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
-		return;
-	}
-
-	if ((text = stream_read (stream)) == NULL) {
-		bonobo_exception_set (ev, ex_Bonobo_Persist_FileNotFound);
-		return;
-	}
-
-	e_itip_control_set_data (itip, text);
-	g_free (text);
-}
-/*
- * 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)
-{
-	EItipControl *itip = data;
-	gchar *text;
-	gint len;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
-		return;
-	}
-
-	text = e_itip_control_get_data (itip);
-	len = e_itip_control_get_data_size (itip);
-
-	bonobo_stream_client_write (stream, text, len, ev);
-	g_free (text);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EItipControl *itip = data;
-	gint len;
-	
-	len = e_itip_control_get_data_size (itip);
-	
-  	if (len > 0)
-		return len;
-
-	return 0L;
-}
-
-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 void
-get_prop (BonoboPropertyBag *bag, 
-	   BonoboArg *arg,
-	   guint arg_id, 	      
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControl *itip = user_data;
-
-	switch (arg_id) {
-	case FROM_ADDRESS_ARG_ID:
-		BONOBO_ARG_SET_STRING (arg, e_itip_control_get_from_address (itip));
-		break;
-	}
-}
-
-static void
-set_prop ( BonoboPropertyBag *bag, 
-	   const BonoboArg *arg,
-	   guint arg_id, 
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControl *itip = user_data;
-
-	switch (arg_id) {
-	case FROM_ADDRESS_ARG_ID:
-		e_itip_control_set_from_address (itip, BONOBO_ARG_GET_STRING (arg));
-		break;
-	}
-}
-
-
-static BonoboObject *
-itip_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl      *control;
-	BonoboPropertyBag *prop_bag;
-	BonoboPersistStream *stream;
-	GtkWidget *itip;
-
-	itip = e_itip_control_new ();
-	gtk_widget_show (itip);
-	control = bonobo_control_new (itip);
-	
-	/* create a property bag */
-	prop_bag = bonobo_property_bag_new (get_prop, set_prop, itip);
-	bonobo_property_bag_add (prop_bag, "from_address", FROM_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL,
-				 "from_address", 0 );
-
-	bonobo_control_set_properties (control, prop_bag);
-	bonobo_object_unref (BONOBO_OBJECT (prop_bag));
-
-	bonobo_control_set_automerge (control, TRUE);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    itip);
-
-	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
-itip_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory",
-		itip_control_factory, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));;
-	
-	if (factory == NULL)
-		g_error ("I could not register an iTip control factory.");
-}
-
diff --git a/calendar/gui/itip-control-factory.h b/calendar/gui/itip-control-factory.h
deleted file mode 100644
index 6f8a95ec71..0000000000
--- a/calendar/gui/itip-control-factory.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: 
- *   Jesse Pavel <jpavel@ximian.com>
- *   JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 __ITIP_CONTROL_FACTORY_H__
-#define __ITIP_CONTROL_FACTORY_H__
-
-void             itip_control_factory_init (void);
-
-#endif /* __ITIP_CONTROL_H__ */
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
deleted file mode 100644
index 7e9efdbb57..0000000000
--- a/calendar/gui/itip-utils.c
+++ /dev/null
@@ -1,820 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/bonobo-exception.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-object-client.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkwidget.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/util/e-util.h>
-#include <ical.h>
-#include <Evolution-Composer.h>
-#include <e-util/e-time-utils.h>
-#include <cal-util/timeutil.h>
-#include <cal-util/cal-util.h>
-#include "calendar-config.h"
-#include "itip-utils.h"
-
-#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-static gchar *itip_methods[] = {
-	"PUBLISH",
-	"REQUEST",
-	"REPLY",
-	"ADD",
-	"CANCEL",
-	"RERESH",
-	"COUNTER",
-	"DECLINECOUNTER"
-};
-
-static icalproperty_method itip_methods_enum[] = {
-    ICAL_METHOD_PUBLISH,
-    ICAL_METHOD_REQUEST,
-    ICAL_METHOD_REPLY,
-    ICAL_METHOD_ADD,
-    ICAL_METHOD_CANCEL,
-    ICAL_METHOD_REFRESH,
-    ICAL_METHOD_COUNTER,
-    ICAL_METHOD_DECLINECOUNTER,
-};
-
-static Bonobo_ConfigDatabase db = NULL;
-
-static ItipAddress *
-get_address (long num) 
-{
-	ItipAddress *a;
-	gchar *path;
-		
-	a = g_new0 (ItipAddress, 1);
-
-	/* get the identity info */
-	path = g_strdup_printf ("/Mail/Accounts/identity_name_%ld", num);
-	a->name = bonobo_config_get_string (db, path, NULL);
-	g_free (path);
-
-	path = g_strdup_printf ("/Mail/Accounts/identity_address_%ld", num);
-	a->address = bonobo_config_get_string (db, path, NULL);
-	a->address = g_strstrip (a->address);
-	g_free (path);
-
-	a->full = g_strdup_printf ("%s <%s>", a->name, a->address);
-
-	return a;
-}
-
-GList *
-itip_addresses_get (void)
-{
-
-	CORBA_Environment ev;
-	GList *addresses = NULL;
-	glong len, def, i;
-
-	if (db == NULL) {
-		CORBA_exception_init (&ev);
- 
-		db = bonobo_get_object ("wombat:", 
-					"Bonobo/ConfigDatabase", 
-					&ev);
-	
-		if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-		
-		CORBA_exception_free (&ev);
-	}
-	
-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);
-	def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL);
-
-	for (i = 0; i < len; i++) {
-		ItipAddress *a;
-
-		a = get_address (i);
-		if (i == def)
-			a->default_address = TRUE;
-
-		addresses = g_list_append (addresses, a);
-	}
-
-	return addresses;
-}
-
-ItipAddress *
-itip_addresses_get_default (void)
-{
-	CORBA_Environment ev;
-	ItipAddress *a;
-	glong def;
-
-	if (db == NULL) {
-		CORBA_exception_init (&ev);
- 
-		db = bonobo_get_object ("wombat:", 
-					"Bonobo/ConfigDatabase", 
-					&ev);
-	
-		if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-		
-		CORBA_exception_free (&ev);
-	}
-
-	def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL);
-	a = get_address (def);
-	a->default_address = TRUE;
-
-	return a;
-}
-
-void
-itip_address_free (ItipAddress *address) 
-{
-	g_free (address->name);
-	g_free (address->address);
-	g_free (address->full);
-	g_free (address);
-}
-
-void
-itip_addresses_free (GList *addresses)
-{
-	GList *l;
-	
-	for (l = addresses; l != NULL; l = l->next) {
-		ItipAddress *a = l->data;
-		itip_address_free (a);
-	}
-	g_list_free (addresses);
-}
-
-const gchar *
-itip_strip_mailto (const gchar *address) 
-{
-	if (address == NULL)
-		return NULL;
-	
-	if (!g_strncasecmp (address, "mailto:", 7))
-		address += 7;
-
-	return address;
-}
-
-typedef struct {
-	GHashTable *tzids;
-	icalcomponent *icomp;	
-	CalClient *client;
-	icalcomponent *zones;
-} ItipUtilTZData;
-
-static GNOME_Evolution_Composer_RecipientList *
-comp_to_list (CalComponentItipMethod method, CalComponent *comp)
-{
-	GNOME_Evolution_Composer_RecipientList *to_list;
-	GNOME_Evolution_Composer_Recipient *recipient;
-	CalComponentOrganizer organizer;
-	GSList *attendees, *l;
-	gint cntr, len;
-
-	switch (method) {
-	case CAL_COMPONENT_METHOD_REQUEST:
-	case CAL_COMPONENT_METHOD_CANCEL:
-		cal_component_get_attendee_list (comp, &attendees);
-		len = g_slist_length (attendees);
-		if (len <= 0) {
-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("At least one attendee is necessary"));
-			cal_component_free_attendee_list (attendees);
-			return NULL;
-		}
-		
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = len;
-		to_list->_length = len;
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);
-		
-		for (cntr = 0, l = attendees; cntr < len; cntr++, l = l->next) {
-			CalComponentAttendee *att = l->data;
-			
-			recipient = &(to_list->_buffer[cntr]);
-			if (att->cn)
-				recipient->name = CORBA_string_dup (att->cn);
-			else
-				recipient->name = CORBA_string_dup ("");
-			recipient->address = CORBA_string_dup (itip_strip_mailto (att->value));
-		}
-		cal_component_free_attendee_list (attendees);
-		break;
-
-	case CAL_COMPONENT_METHOD_REPLY:
-	case CAL_COMPONENT_METHOD_ADD:
-	case CAL_COMPONENT_METHOD_REFRESH:
-	case CAL_COMPONENT_METHOD_COUNTER:
-	case CAL_COMPONENT_METHOD_DECLINECOUNTER:
-		cal_component_get_organizer (comp, &organizer);
-		if (organizer.value == NULL) {
-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("An organizer must be set."));
-			return NULL;
-		}
-		
-		len = 1;
-
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = len;
-		to_list->_length = len;
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);
-		recipient = &(to_list->_buffer[0]);
-
-		if (organizer.cn != NULL)
-			recipient->name = CORBA_string_dup (organizer.cn);
-		else
-			recipient->name = CORBA_string_dup ("");
-		recipient->address = CORBA_string_dup (itip_strip_mailto (organizer.value));
-		break;
-
-	default:
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_list->_length = 0;
-		break;
-	}
-	CORBA_sequence_set_release (to_list, TRUE);
-
-	return to_list;	
-}
-	
-static CORBA_char *
-comp_subject (CalComponentItipMethod method, CalComponent *comp)
-{
-	CalComponentText caltext;
-	const char *description, *prefix = NULL;
-	GSList *alist;
-	int *sequence;
-	CORBA_char *subject;
-
-	cal_component_get_summary (comp, &caltext);
-	if (caltext.value != NULL)	
-		description = caltext.value;
-	else {
-		switch (cal_component_get_vtype (comp)) {
-		case CAL_COMPONENT_EVENT:
-			description = U_("Event information");
-		case CAL_COMPONENT_TODO:
-			description = U_("Task information");
-		case CAL_COMPONENT_JOURNAL:
-			description = U_("Journal information");
-		case CAL_COMPONENT_FREEBUSY:
-			description = U_("Free/Busy information");
-		default:
-			description = U_("Calendar information");
-		}
-	}
-
-	switch (method) {
-	case CAL_COMPONENT_METHOD_PUBLISH:
-	case CAL_COMPONENT_METHOD_REQUEST:
-		/* FIXME: If this is an update to a previous
-		 * PUBLISH or REQUEST, then
-			prefix = U_("Updated");
-		 */
-		break;
-
-	case CAL_COMPONENT_METHOD_REPLY:
-		cal_component_get_attendee_list (comp, &alist);
-		if (alist != NULL) {
-			CalComponentAttendee *a = alist->data;
-
-			switch (a->status) {
-			case ICAL_PARTSTAT_ACCEPTED:
-				prefix = U_("Accepted");
-				break;
-			case ICAL_PARTSTAT_TENTATIVE:
-				prefix = U_("Tentatively Accepted");
-				break;
-			case ICAL_PARTSTAT_DECLINED:
-				prefix = U_("Declined");
-				break;
-			default:
-				break;
-			}
-			cal_component_free_attendee_list (alist);
-		}
-		break;
-
-	case CAL_COMPONENT_METHOD_ADD:
-		prefix = U_("Updated");
-		break;
-
-	case CAL_COMPONENT_METHOD_CANCEL:
-		prefix = U_("Cancel");
-		break;
-
-	case CAL_COMPONENT_METHOD_REFRESH:
-		prefix = U_("Refresh");
-		break;
-
-	case CAL_COMPONENT_METHOD_COUNTER:
-		prefix = U_("Counter-proposal");
-		break;
-
-	case CAL_COMPONENT_METHOD_DECLINECOUNTER:
-		prefix = U_("Declined");
-		break;
-
-	default:
-		break;
-	}
-
-	if (prefix) {
-		subject = CORBA_string_alloc (strlen (description) +
-					      strlen (prefix) + 3);
-		sprintf (subject, "%s: %s", prefix, description);
-	} else
-		subject = CORBA_string_dup (description);
-
-	return subject;
-}
-
-static CORBA_char *
-comp_content_type (CalComponent *comp, CalComponentItipMethod method)
-{
-	char tmp[256];	
-
-	sprintf (tmp, "text/calendar; name=\"%s\"; charset=utf-8; METHOD=%s",
-		 cal_component_get_vtype (comp) == CAL_COMPONENT_FREEBUSY ?
-		 "freebusy.ifb" : "calendar.ics", itip_methods[method]);
-	return CORBA_string_dup (tmp);
-
-}
-
-static void
-foreach_tzid_callback (icalparameter *param, gpointer data)
-{
-	ItipUtilTZData *tz_data = data;	
-	const char *tzid;
-	icaltimezone *zone = NULL;
-	icalcomponent *vtimezone_comp;
-
-	/* Get the TZID string from the parameter. */
-	tzid = icalparameter_get_tzid (param);
-	if (!tzid || g_hash_table_lookup (tz_data->tzids, tzid))
-		return;
-
-	/* Look for the timezone */
-	if (tz_data->zones != NULL)
-		zone = icalcomponent_get_timezone (tz_data->zones, tzid);
-	if (zone == NULL)
-		zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (zone == NULL && tz_data->client != NULL)
-		cal_client_get_timezone (tz_data->client, tzid, &zone);
-	if (zone == NULL)
-		return;
-
-	/* Convert it to a string and add it to the hash. */
-	vtimezone_comp = icaltimezone_get_component (zone);
-	if (!vtimezone_comp)
-		return;
-
-	icalcomponent_add_component (tz_data->icomp, icalcomponent_new_clone (vtimezone_comp));
-	g_hash_table_insert (tz_data->tzids, (char *)tzid, (char *)tzid);	
-}
-
-static char *
-comp_string (CalComponentItipMethod method, CalComponent *comp, CalClient *client, icalcomponent *zones)
-{
-	icalcomponent *top_level, *icomp;
-	icalproperty *prop;
-	icalvalue *value;
-	gchar *ical_string;
-	ItipUtilTZData tz_data;
-		
-	top_level = cal_util_new_top_level ();
-
-	prop = icalproperty_new (ICAL_METHOD_PROPERTY);
-	value = icalvalue_new_method (itip_methods_enum[method]);
-	icalproperty_set_value (prop, value);
-	icalcomponent_add_property (top_level, prop);
-
-	icomp = cal_component_get_icalcomponent (comp);
-
-	if (method == CAL_COMPONENT_METHOD_REPLY) {
-		struct icaltimetype dtstamp;
-		gboolean add_it = FALSE;
-
-		/* workaround for Outlook expecting a X-MICROSOFT-CDO-REPLYTIME
-		   on every METHOD=REPLY message. If the component has any of
-		   the X-MICROSOFT-* properties, we add the REPLYTIME one */
-		prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);
-		while (prop) {
-			const char *x_name;
-
-			x_name = icalproperty_get_x_name (prop);
-			if (!strncmp (x_name, "X-MICROSOFT-", strlen ("X-MICROSOFT-"))) {
-				add_it = TRUE;
-				break;
-			}
-			prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY);
-		}
-
-		if (add_it) {
-			dtstamp = icaltime_from_timet_with_zone (
-				time (NULL), 0, icaltimezone_get_utc_timezone ());
-			prop = icalproperty_new_x (icaltime_as_ical_string (dtstamp));
-			icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");
-			icalcomponent_add_property (icomp, prop);
-		}
-	}
-		
-	/* Add the timezones */
-	tz_data.tzids = g_hash_table_new (g_str_hash, g_str_equal);
-	tz_data.icomp = top_level;
-	tz_data.client = client;
-	tz_data.zones = zones;
-	icalcomponent_foreach_tzid (icomp, foreach_tzid_callback, &tz_data);
-	g_hash_table_destroy (tz_data.tzids);
-
-	icalcomponent_add_component (top_level, icomp);
-	ical_string = icalcomponent_as_ical_string (top_level);
-	icalcomponent_remove_component (top_level, icomp);
-	
-	icalcomponent_free (top_level);
-	
-	return ical_string;	
-}
-
-static gboolean
-comp_limit_attendees (CalComponent *comp) 
-{
-	icalcomponent *icomp;
-	GList *addresses;
-	icalproperty *prop;
-	gboolean found = FALSE, match = FALSE;
-	GSList *l, *list = NULL;
-
-	icomp = cal_component_get_icalcomponent (comp);
-	addresses = itip_addresses_get ();	
-
-	for (prop = icalcomponent_get_first_property (icomp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (icomp, ICAL_ATTENDEE_PROPERTY))
-	{
-		icalvalue *value;
-		const char *attendee;
-		char *text;
-		GList *l;
-
-		/* If we've already found something, just erase the rest */
-		if (found) {
-			list = g_slist_prepend (list, prop);
-			continue;
-		}
-		
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-
-		text = g_strdup (itip_strip_mailto (attendee));
-		text = g_strstrip (text);
-		for (l = addresses; l != NULL; l = l->next) {
-			ItipAddress *a = l->data;
-
-			if (!g_strcasecmp (a->address, text))
-				found = match = TRUE;
-		}
-		g_free (text);
-		
-		if (!match)
-			list = g_slist_prepend (list, prop);
-		match = FALSE;
-	}
-
-	for (l = list; l != NULL; l = l->next) {
-		prop = l->data;
-
-		icalcomponent_remove_property (icomp, prop);
-		icalproperty_free (prop);
-	}
-	g_slist_free (list);
-
-	itip_addresses_free (addresses);
-
-	return found;
-}
-
-static void
-comp_sentby (CalComponent *comp)
-{
-	CalComponentOrganizer organizer;
-	GList *addresses, *l;
-	const char *strip;
-	gboolean is_user = FALSE;
-	
-	cal_component_get_organizer (comp, &organizer);
-	if (!organizer.value) {
-		ItipAddress *a = itip_addresses_get_default ();
-
-		organizer.value = g_strdup_printf ("MAILTO:%s", a->address);
-		organizer.sentby = NULL;
-		organizer.cn = a->name;
-		organizer.language = NULL;
-		
-		cal_component_set_organizer (comp, &organizer);
-		g_free ((char *) organizer.value);
-		itip_address_free (a);
-		
-		return;
-	}
-	
-	strip = itip_strip_mailto (organizer.value);
-
-	addresses = itip_addresses_get ();
-	for (l = addresses; l != NULL; l = l->next) {
-		ItipAddress *a = l->data;
-		
-		if (!strcmp (a->address, strip)) {
-			is_user = TRUE;
-			break;
-		}
-	}
-	if (!is_user) {
-		ItipAddress *a = itip_addresses_get_default ();
-		
-		organizer.value = g_strdup (organizer.value);
-		organizer.sentby = g_strdup_printf ("MAILTO:%s", a->address);
-		organizer.cn = g_strdup (organizer.cn);
-		organizer.language = g_strdup (organizer.language);
-		
-		cal_component_set_organizer (comp, &organizer);
-
-		g_free ((char *)organizer.value);
-		g_free ((char *)organizer.sentby);
-		g_free ((char *)organizer.cn);
-		g_free ((char *)organizer.language);
-		itip_address_free (a);
-	}
-	
-	itip_addresses_free (addresses);
-}
-static CalComponent *
-comp_minimal (CalComponent *comp, gboolean attendee)
-{
-	CalComponent *clone;
-	icalcomponent *icomp, *icomp_clone;
-	icalproperty *prop;
-	CalComponentOrganizer organizer;
-	const char *uid;
-	GSList *comments;
-	struct icaltimetype itt;
-	CalComponentRange recur_id;
-	
-	clone = cal_component_new ();
-	cal_component_set_new_vtype (clone, cal_component_get_vtype (comp));
-
-	if (attendee) {
-		GSList *attendees;
-		
-		cal_component_get_attendee_list (comp, &attendees);
-		cal_component_set_attendee_list (clone, attendees);
-
-		if (!comp_limit_attendees (clone)) {
-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("You must be an attendee of the event."));
-			goto error;
-		}
-	}
-	
-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					     icaltimezone_get_utc_timezone ());
-	cal_component_set_dtstamp (clone, &itt);
-
-	cal_component_get_organizer (comp, &organizer);
-	if (organizer.value == NULL)
-		goto error;
-	cal_component_set_organizer (clone, &organizer);
-
-	cal_component_get_uid (comp, &uid);
-	cal_component_set_uid (clone, uid);
-
-	cal_component_get_comment_list (comp, &comments);
-	if (g_slist_length (comments) <= 1) {
-		cal_component_set_comment_list (clone, comments);
-	} else {
-		GSList *l = comments;
-		
-		comments = g_slist_remove_link (comments, l);
-		cal_component_set_comment_list (clone, l);
-		cal_component_free_text_list (l);
-	}
-	cal_component_free_text_list (comments);
-	
-	cal_component_get_recurid (comp, &recur_id);
-	if (recur_id.datetime.value != NULL)
-		cal_component_set_recurid (clone, &recur_id);
-	
-	icomp = cal_component_get_icalcomponent (comp);
-	icomp_clone = cal_component_get_icalcomponent (clone);
-	for (prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY))
-	{
-		icalproperty *p;
-		
-		p = icalproperty_new_clone (prop);
-		icalcomponent_add_property (icomp_clone, p);
-	}
-
-	cal_component_rescan (clone);
-	
-	return clone;
-
- error:
-	gtk_object_unref (GTK_OBJECT (clone));
-	return NULL;
-}
-
-static CalComponent *
-comp_compliant (CalComponentItipMethod method, CalComponent *comp)
-{
-	CalComponent *clone, *temp_clone;
-	struct icaltimetype itt;
-	
-	clone = cal_component_clone (comp);
-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,
-					     icaltimezone_get_utc_timezone ());
-	cal_component_set_dtstamp (clone, &itt);
-
-	/* We delete incoming alarms anyhow, and this helps with outlook */
-	cal_component_remove_all_alarms (clone);
-
-	/* Comply with itip spec */
-	switch (method) {
-	case CAL_COMPONENT_METHOD_PUBLISH:
-		comp_sentby (clone);
-		cal_component_set_attendee_list (clone, NULL);
-		break;
-	case CAL_COMPONENT_METHOD_REQUEST:
-		comp_sentby (clone);
-		break;
-	case CAL_COMPONENT_METHOD_CANCEL:
-		comp_sentby (clone);
-		break;	
-	case CAL_COMPONENT_METHOD_REPLY:
-		break;
-	case CAL_COMPONENT_METHOD_ADD:
-		break;
-	case CAL_COMPONENT_METHOD_REFRESH:
-		/* Need to remove almost everything */
-		temp_clone = comp_minimal (clone, TRUE);
-		gtk_object_unref (GTK_OBJECT (clone));
-		clone = temp_clone;
-		break;
-	case CAL_COMPONENT_METHOD_COUNTER:
-		break;
-	case CAL_COMPONENT_METHOD_DECLINECOUNTER:
-		/* Need to remove almost everything */
-		temp_clone = comp_minimal (clone, FALSE);
-		gtk_object_unref (GTK_OBJECT (clone));
-		clone = temp_clone;
-		break;
-	default:
-	}
-
-	return clone;
-}
-
-void
-itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp,
-		CalClient *client, icalcomponent *zones)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CalComponent *comp = NULL;
-	GNOME_Evolution_Composer_RecipientList *to_list = NULL;
-	GNOME_Evolution_Composer_RecipientList *cc_list = NULL;
-	GNOME_Evolution_Composer_RecipientList *bcc_list = NULL;
-	CORBA_char *subject = NULL, *body = NULL, *content_type = NULL;
-	CORBA_char *filename = NULL, *description = NULL;
-	GNOME_Evolution_Composer_AttachmentData *attach_data = NULL;
-	char *ical_string;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-
-	/* Obtain an object reference for the Composer. */
-	bonobo_server = bonobo_object_activate (GNOME_EVOLUTION_COMPOSER_OAFIID, 0);
-	g_return_if_fail (bonobo_server != NULL);
-	composer_server = BONOBO_OBJREF (bonobo_server);
-
-	comp = comp_compliant (method, send_comp);
-	if (comp == NULL)
-		goto cleanup;
-	
-	to_list = comp_to_list (method, comp);
-	if (to_list == NULL)
-		goto cleanup;
-	
-	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	cc_list->_maximum = cc_list->_length = 0;
-	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	bcc_list->_maximum = bcc_list->_length = 0;
-	
-	/* Subject information */
-	subject = comp_subject (method, comp);
-	
-	/* Set recipients, subject */
-	GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
-	if (BONOBO_EX (&ev)) {		
-		g_warning ("Unable to set composer headers while sending iTip message");
-		goto cleanup;
-	}
-
-	/* Content type */
-	content_type = comp_content_type (comp, method);
-
-	ical_string = comp_string (method, comp, client, zones);
-	attach_data = GNOME_Evolution_Composer_AttachmentData__alloc ();
-	attach_data->_length = strlen (ical_string) + 1;
-	attach_data->_maximum = attach_data->_length;	
-	attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-	strcpy (attach_data->_buffer, ical_string);
-
-	GNOME_Evolution_Composer_setBody (composer_server, ical_string, content_type, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_warning ("Unable to attach data to the composer while sending iTip message");
-		goto cleanup;
-	}
-	
-	if (method == CAL_COMPONENT_METHOD_PUBLISH) {
-		GNOME_Evolution_Composer_show (composer_server, &ev);
-		if (BONOBO_EX (&ev))
-			g_warning ("Unable to show the composer while sending iTip message");
-	} else {		
-		GNOME_Evolution_Composer_send (composer_server, &ev);
-		if (BONOBO_EX (&ev))
-			g_warning ("Unable to send iTip message");
-	}
-	
- cleanup:
-	CORBA_exception_free (&ev);
-
-	if (comp != NULL)
-		gtk_object_unref (GTK_OBJECT (comp));
-		
-	if (to_list != NULL)
-		CORBA_free (to_list);
-	if (cc_list != NULL)
-		CORBA_free (cc_list);
-	if (bcc_list != NULL)
-		CORBA_free (bcc_list);
-
-	if (subject != NULL)
-		CORBA_free (subject);
-	if (body != NULL)
-		CORBA_free (body);
-	if (content_type != NULL)
-		CORBA_free (content_type);
-	if (filename != NULL)
-		CORBA_free (filename);
-	if (description != NULL)
-		CORBA_free (description);
-	if (attach_data != NULL)
-		CORBA_free (attach_data);
-}
-
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
deleted file mode 100644
index 2863d871e2..0000000000
--- a/calendar/gui/itip-utils.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#ifndef ITIP_UTILS_HEADER
-#define ITIP_UTILS_HEADER
-
-#include <ical.h>
-#include <string.h>
-#include <glib.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/cal-component.h>
-
-typedef enum {
-	CAL_COMPONENT_METHOD_PUBLISH,
-	CAL_COMPONENT_METHOD_REQUEST,
-	CAL_COMPONENT_METHOD_REPLY,
-	CAL_COMPONENT_METHOD_ADD,
-	CAL_COMPONENT_METHOD_CANCEL,
-	CAL_COMPONENT_METHOD_REFRESH,
-	CAL_COMPONENT_METHOD_COUNTER,
-	CAL_COMPONENT_METHOD_DECLINECOUNTER
-} CalComponentItipMethod;
-
-typedef struct {
-	gchar *name;
-	gchar *address;
-	gchar *full;
-
-	gboolean default_address;
-} ItipAddress;
-
-GList *itip_addresses_get (void);
-ItipAddress *itip_addresses_get_default (void);
-void itip_address_free (ItipAddress *address);
-void itip_addresses_free (GList *addresses);
-
-const gchar *itip_strip_mailto (const gchar *address);
-
-void itip_send_comp (CalComponentItipMethod method, CalComponent *comp,
-		     CalClient *client, icalcomponent *zones);
-
-
-#endif
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
deleted file mode 100644
index 5c7a2bc08f..0000000000
--- a/calendar/gui/main.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-exception.h>
-
-#include <gal/widgets/e-cursors.h>
-
-#include "alarm-notify/alarm.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "component-factory.h"
-#include "comp-editor-factory.h"
-#include "control-factory.h"
-#include "itip-control-factory.h"
-#include "tasks-control-factory.h"
-
-/* The component editor factory */
-static CompEditorFactory *comp_editor_factory = NULL;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (gnome_init_with_popt_table ("evolution-calendar", VERSION, argc, argv,
-					oaf_popt_options, 0, NULL) != 0)
-		g_error (_("Could not initialize GNOME"));
-
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-/* Factory function for the calendar component factory; just creates and
- * references a singleton service object.
- */
-static BonoboObject *
-comp_editor_factory_fn (BonoboGenericFactory *factory, void *data)
-{
-	if (!comp_editor_factory) {
-		comp_editor_factory = comp_editor_factory_new ();
-		if (!comp_editor_factory)
-			return NULL;
-	}
-
-	bonobo_object_ref (BONOBO_OBJECT (comp_editor_factory));
-	return BONOBO_OBJECT (comp_editor_factory);
-}
-
-/* Creates and registers the component editor factory */
-static void
-component_editor_factory_init (void)
-{
-	BonoboGenericFactory *factory;
-
-	factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory",
-		comp_editor_factory_fn, NULL);
-	if (!factory)
-		g_error (_("Could not create the component editor factory"));
-}
-
-/* Does a simple activation and unreffing of the alarm notification service so
- * that the daemon will be launched if it is not running yet.
- */
-static void
-launch_alarm_daemon (void)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_AlarmNotify an;
-
-	CORBA_exception_init (&ev);
-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("add_alarms(): Could not activate the alarm notification service");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Just get rid of it; what we are interested in is that it gets launched */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (an, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("add_alarms(): Could not unref the alarm notification service");
-
-	CORBA_exception_free (&ev);
-}
-
-int
-main (int argc, char **argv)
-{
-	free (malloc (8));
-
-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain(PACKAGE);
-
-	init_bonobo (argc, argv);
-
-	if (!gnome_vfs_init ())
-		g_error (_("Could not initialize gnome-vfs"));
-
-	glade_gnome_init ();
-	e_cursors_init ();
-
-#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
-
-	calendar_config_init ();
-
-	control_factory_init ();
-	component_factory_init ();
-	itip_control_factory_init ();
-	tasks_control_factory_init ();
-	component_editor_factory_init ();
-
-	launch_alarm_daemon ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	bonobo_main ();
-
-	alarm_done ();
-	calendar_config_write_on_exit ();
-
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
deleted file mode 100644
index 15dcf93e09..0000000000
--- a/calendar/gui/misc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Evolution calendar - Miscellaneous utility functions
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ctype.h>
-#include "misc.h"
-
-
-
-/**
- * string_is_empty:
- * @value: A string.
- * 
- * Returns whether a string is NULL, the empty string, or completely made up of
- * whitespace characters.
- * 
- * Return value: TRUE if the string is empty, FALSE otherwise.
- **/
-gboolean
-string_is_empty (const char *value)
-{
-	const char *p;
-	gboolean empty;
-
-	empty = TRUE;
-
-	if (value) {
-		p = value;
-		while (*p) {
-			if (!isspace ((unsigned char) *p)) {
-				empty = FALSE;
-				break;
-			}
-			p++;
-		}
-	}
-	return empty;
-
-}
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
deleted file mode 100644
index 81e2a13afe..0000000000
--- a/calendar/gui/misc.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Miscellaneous utility functions
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 MISC_H
-#define MISC_H
-
-#include <glib.h>
-
-gboolean string_is_empty (const char *value);
-
-#endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
deleted file mode 100644
index b353fc24fb..0000000000
--- a/calendar/gui/print.c
+++ /dev/null
@@ -1,2646 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/time.h>
-#include <math.h>
-#include <time.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-paper.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-paper-selector.h>
-#include <libgnomeui/gnome-stock.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 <e-util/e-time-utils.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "e-day-view.h"
-#include "e-day-view-layout.h"
-#include "e-week-view.h"
-#include "e-week-view-layout.h"
-#include "gnome-cal.h"
-#include "print.h"
-
-
-
-/*
- * Note that most dimensions are in points (1/72 of an inch) since that is
- * what gnome-print uses.
- */
-
-/* The font to use */
-#define DEFAULT_FONT "Times"
-
-/* The font size to use for normal text. */
-#define DAY_NORMAL_FONT_SIZE	12
-#define WEEK_NORMAL_FONT_SIZE	12
-#define MONTH_NORMAL_FONT_SIZE	8
-
-/* The height of the header bar across the top of the Day, Week & Month views,
-   which contains the dates shown and the 2 small calendar months. */
-#define HEADER_HEIGHT		80
-
-/* The width of the small calendar months, the space from the right edge of
-   the header rectangle, and the space between the months. */
-#define SMALL_MONTH_WIDTH	80
-#define SMALL_MONTH_PAD		4
-#define SMALL_MONTH_SPACING	12
-
-/* The minimum number of rows we leave space for for the long events in the
-   day view. */
-#define DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY	2
-
-/* The row height for long events in the day view. */
-#define DAY_VIEW_ROW_HEIGHT		20
-
-/* The minutes per row in the day view printout. */
-#define DAY_VIEW_MINS_PER_ROW		30
-
-#define DAY_VIEW_ROWS			((60 / DAY_VIEW_MINS_PER_ROW) * 24)
-
-/* The width of the column with all the times in it. */
-#define DAY_VIEW_TIME_COLUMN_WIDTH	36
-
-/* The space on the right of each event. */
-#define DAY_VIEW_EVENT_X_PAD		8
-
-/* Allowance for small errors in floating point comparisons. */
-#define EPSILON			0.01
-
-/* 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 SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-
-struct pdinfo
-{
-	gint days_shown;
-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];
-
-	GArray *long_events;
-	GArray *events[E_DAY_VIEW_MAX_DAYS];
-
-	gint start_hour;
-	gint end_hour;
-	gint start_minute_offset;
-	gint end_minute_offset;
-	gint rows;
-	gint mins_per_row;
-	gint8 cols_per_row[DAY_VIEW_ROWS];
-	gboolean use_24_hour_format;
-};
-
-struct psinfo
-{
-	gint days_shown;
-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];
-
-	GArray *events;
-
-	int rows_per_cell;
-	int rows_per_compressed_cell;
-	int display_start_weekday;
-	gboolean multi_week_view;
-	int weeks_shown;
-	int month;
-	gboolean compress_weekend;
-	gboolean use_24_hour_format;
-	double row_height;
-	double header_row_height;
-};
-
-struct ptinfo
-{
-	GList *todos;
-};
-
-struct einfo
-{
-	char *text;
-	time_t start;
-	time_t end;
-	int count;
-};
-
-static const GnomePaper *paper_info = NULL;
-
-
-/* Convenience function to help the transition to timezone functions.
-   It returns the current timezone. */
-static icaltimezone*
-get_timezone (void)
-{
-	char *location = calendar_config_get_timezone ();
-	return icaltimezone_get_builtin_timezone (location);
-}
-
-
-/* Convenience function to help the transition to timezone functions.
-   It converts a time_t to a struct tm. */
-static struct tm*
-convert_timet_to_struct_tm (time_t time, icaltimezone *zone)
-{
-	static struct tm my_tm;
-	struct icaltimetype tt;
-
-	/* Convert it to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Fill in the struct tm. */
-	my_tm.tm_year = tt.year - 1900;
-	my_tm.tm_mon = tt.month - 1;
-	my_tm.tm_mday = tt.day;
-	my_tm.tm_hour = tt.hour;
-	my_tm.tm_min = tt.minute;
-	my_tm.tm_sec = tt.second;
-	my_tm.tm_isdst = tt.is_daylight;
-
-	my_tm.tm_wday = time_day_of_week (tt.day, tt.month - 1, tt.year);
-
-	return &my_tm;
-}
-
-
-/* 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 *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week, week_start_day;
-
-	/* 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 = time_days_in_month (year, month);
-	/* Get the start weekday in the month, 0=Sun to 6=Sat. */
-	d_week = time_day_of_week (1, month, year);
-
-	/* Get the configuration setting specifying which weekday we put on
-	   the left column, 0=Sun to 6=Sat. */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Figure out which square we want to put the 1 in. */
-	d_week = (d_week + 7 - week_start_day) % 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;
-}
-
-static GnomeFont *
-get_font_for_size (double h, GnomeFontWeight weight, gboolean italic)
-{
-	GnomeFontFace *face;
-	GnomeFont *font;
-	double asc, desc, size;
-	
-	face = gnome_font_unsized_closest (DEFAULT_FONT, weight, italic);
-	asc = gnome_font_face_get_ascender (face);
-	desc = gnome_font_face_get_descender (face);
-	size = h * 1000 / (asc + desc);
-	g_print ("Print Info: %f, %f, %f\n", asc, desc, size);
-	
-	font = gnome_font_new_closest (DEFAULT_FONT, weight, italic, size);
-
-	gtk_object_unref (GTK_OBJECT (face));
-	
-	return font;
-}
-
-enum align_box {
-	ALIGN_LEFT=1,
-	ALIGN_RIGHT,
-	ALIGN_CENTER,
-	ALIGN_BORDER= 1<<8
-};
-
-
-/* Prints a rectangle, with or without a border, filled or outline, and
-   possibly with triangular arrows at one or both horizontal edges.
-   width      = width of border, -ve means no border.
-   fillcolor = shade of fill,   -ve means no fill.
-   left_triangle_width, right_triangle_width = width from edge of rectangle to
-          point of triangle, or -ve for no triangle. */
-static void
-print_border_with_triangles (GnomePrintContext *pc,
-			     double l, double r, double t, double b,
-			     double width, double fillcolor,
-			     double left_triangle_width,
-			     double right_triangle_width)
-{
-	gnome_print_gsave (pc);
-
-	/* Fill in the interior of the rectangle, if desired. */
-	if (fillcolor >= -EPSILON) {
-		gnome_print_moveto (pc, l, t);
-		if (left_triangle_width > 0.0)
-			gnome_print_lineto (pc, l - left_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, l, b);
-		gnome_print_lineto (pc, r, b);
-		if (right_triangle_width > 0.0)
-			gnome_print_lineto (pc, r + right_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, r, t);
-		gnome_print_closepath (pc);
-		gnome_print_setrgbcolor (pc, fillcolor, fillcolor,
-					 fillcolor);
-		gnome_print_fill (pc);
-	}
-
-	/* Draw the outline, if desired. */
-	if (width >= -EPSILON) {
-		gnome_print_moveto (pc, l, t);
-		if (left_triangle_width > 0.0)
-			gnome_print_lineto (pc, l - left_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, l, b);
-		gnome_print_lineto (pc, r, b);
-		if (right_triangle_width > 0.0)
-			gnome_print_lineto (pc, r + right_triangle_width,
-					    (t + b) / 2);
-		gnome_print_lineto (pc, r, t);
-		gnome_print_closepath (pc);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-		gnome_print_setlinewidth (pc, width);
-		gnome_print_stroke (pc);
-	}
-
-	gnome_print_grestore (pc);
-}
-
-
-/* Prints a rectangle, with or without a border, and filled or outline.
-   width      = width of border, -ve means no border.
-   fillcolor = shade of fill,   -ve means no fill. */
-static void
-print_border (GnomePrintContext *pc,
-	      double l, double r, double t, double b,
-	      double width, double fillcolor)
-{
-	print_border_with_triangles (pc, l, r, t, b, width, fillcolor,
-				     -1.0, -1.0);
-}
-
-
-/* Prints 1 line of aligned text in a box. It is centered vertically, and
-   the horizontal alignment can be either ALIGN_LEFT, ALIGN_RIGHT, or
-   ALIGN_CENTER. */
-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, y;
-
-	gnome_print_gsave (pc);
-
-	w = gnome_font_get_width_utf8 (font, text);
-
-	switch (align & 3) {
-	case ALIGN_LEFT:
-	default:
-		x = l;
-		break;
-	case ALIGN_RIGHT:
-		x = r - w;
-		break;
-	case ALIGN_CENTER:
-		x = l + ((r - l) - w) / 2;
-		break;
-	}
-
-	/* Make sure we don't go off the left edge. */
-	x = MAX (l, x);
-
-	/* Now calculate the baseline. */
-	y = t - gnome_font_get_ascender (font);
-	
-	/* Set a clipping rectangle. */
-	gnome_print_moveto (pc, l, t);
-	gnome_print_lineto (pc, r, t);
-	gnome_print_lineto (pc, r, b);
-	gnome_print_lineto (pc, l, b);
-	gnome_print_closepath (pc);
-	gnome_print_clip (pc);
-
-	gnome_print_newpath (pc);
-	gnome_print_moveto (pc, x, y);
-	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 book font */
-static void
-print_text_size(GnomePrintContext *pc, const char *text,
-		     enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = get_font_for_size (t - b, GNOME_FONT_BOOK, FALSE);
-	print_text(pc, font, text, align, l, r, t, b);
-	gtk_object_unref (GTK_OBJECT (font));
-}
-
-/* gets/frees the font for you, as a bold font */
-static void
-print_text_size_bold(GnomePrintContext *pc, const char *text,
-		     enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = get_font_for_size (t - b, GNOME_FONT_BOLD, FALSE);
-	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)
-{
-	double size;
-
-	size = gnome_font_get_size (font);
-
-	if (align & ALIGN_BORDER) {
-		print_border (pc, *l, *r, *t, *t - size * 1.4,
-			      linewidth, 0.9);
-		print_border (pc, *l, *r, *t - size * 1.4, *b,
-			      linewidth, -1.0);
-
-		*l += 2;
-		*r -= 2;
-		*b += 2;
-	}
-
-	print_text (pc, font, text, align, *l, *r, *t, *t - size * 1.4);
-	*t -= size * 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)
-{
-	icaltimezone *zone = get_timezone ();
-	char fmt[64];
-	struct tm tm;
-	char *utf_str;
-
-	tm = *convert_timet_to_struct_tm (time, zone);
-
-	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);
-	utf_str = e_utf8_from_locale_string (buffer);
-	strncpy (buffer, utf_str, bufflen - 1);
-	buffer[bufflen - 1] = '\0';
-	g_free (utf_str);
-	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)
-{
-	icaltimezone *zone = get_timezone ();
-	CalClient *client;
-	GnomeFont *font, *font_bold, *font_normal;
-	time_t now, next;
-	int x, y;
-	int days[42];
-	int day, weekday, week_start_day;
-	char buf[100];
-	struct tm tm;
-	double font_size, max_font_size;
-	double header_size, col_width, row_height, text_xpad, w;
-	double cell_top, cell_bottom, cell_left, cell_right, text_right;
-	char *daynames[] = { N_("Su"), N_("Mo"), N_("Tu"), N_("We"),
-			     N_("Th"), N_("Fr"), N_("Sa") };
-
-	/* Print the title, e.g. 'June 2001', in the top 16% of the area. */
-	format_date (month, titleflags, buf, 100);
-	header_size = (top - bottom) * 0.16;
-	font = get_font_for_size (header_size, GNOME_FONT_BOLD, FALSE);
-	if (bordertitle) {
-		print_border (pc, left, right, top, top - header_size,
-			      1.0, 0.9);
-	}
-	print_text (pc, font, buf, ALIGN_CENTER, left, right,
-		    top, top - header_size);
-	gtk_object_unref (GTK_OBJECT (font));
-
-	top -= header_size;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	col_width = (right - left) / 7;
-
-	/* The top row with the day abbreviations gets an extra bit of
-	   vertical space around it. */
-	row_height = (top - bottom) / 7.4;
-
-	/* First we need to calculate a reasonable font size. We start with a
-	   rough guess of just under the height of each row. */
-	font_size = row_height;
-
-	/* Check that it isn't going to be too wide. The characters are about
-	   twice as high as they are wide, but we need to fit two characters
-	   into each cell, so we don't want to go over col_width. */
-	max_font_size = col_width * 0.65;
-
-	font_size = row_height;
-
-	/* get month days */
-	tm = *convert_timet_to_struct_tm (month, zone);
-	build_month (tm.tm_mon, tm.tm_year + 1900, days, 0, 0);
-
-	font_normal = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-	font_bold = get_font_for_size (font_size, GNOME_FONT_BOLD, FALSE);
-
-	/* Get a reasonable estimate of the largest number we will need,
-	   and use it to calculate the offset from the right edge of the
-	   cell that we should put the numbers. */
-	w = gnome_font_get_width_utf8 (font_bold, "23");
-	text_xpad = (col_width - w) / 2;
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-	/* Print the abbreviated day names across the top in bold. */
-	week_start_day = calendar_config_get_week_start_day ();
-	weekday = week_start_day;
-	for (x = 0; x < 7; x++) {
-		print_text (pc, font_bold, U_(daynames[weekday]), ALIGN_CENTER,
-			    left + x * col_width, left + (x + 1) * col_width,
-			    top, top - row_height * 1.4);
-		weekday = (weekday + 1) % 7;
-	}
-
-	top -= row_height * 1.4;
-
-	now = time_month_begin_with_zone (month, zone);
-	for (y = 0; y < 6; y++) {
-
-		cell_top = top - y * row_height;
-		cell_bottom = cell_top - row_height;
-
-		for (x = 0; x < 7; x++) {
-
-			cell_left = left + x * col_width;
-			/* We add a 0.05 to make sure the cells meet up with
-			   each other. Otherwise you sometimes get lines
-			   between them which looks bad. Maybe I'm not using
-			   coords in the way gnome-print expects. */
-			cell_right = cell_left + col_width + 0.05;
-			text_right = cell_right - text_xpad;
-
-			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_with_zone (now, zone));
-				font = uids ? font_bold : font_normal;
-				cal_obj_uid_list_free (uids);
-
-				next = time_add_day_with_zone (now, 1, zone);
-				if ((now >= greystart && now < greyend)
-				    || (greystart >= now && greystart < next)) {
-					print_border (pc,
-						      cell_left, cell_right,
-						      cell_top, cell_bottom,
-						      -1.0, 0.75);
-				}
-				print_text (pc, font, buf, ALIGN_RIGHT,
-					    cell_left, text_right,
-					    cell_top, cell_bottom);
-
-				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_utf8_sized(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;
-}
-
-
-/* Draw the borders, lines, and times down the left of the day view. */
-static void
-print_day_background (GnomePrintContext *pc, GnomeCalendar *gcal,
-		      time_t whence, struct pdinfo *pdi,
-		      double left, double right, double top, double bottom)
-{
-	GnomeFont *font_hour, *font_minute;
-	double yinc, y;
-	double width = DAY_VIEW_TIME_COLUMN_WIDTH;
-	double font_size, max_font_size, hour_font_size, minute_font_size;
-	char buf[20];
-	const char *minute;
-	gboolean use_24_hour;
-	int i, hour, row;
-
-	/* Fill the time column in light-gray. */
-	print_border (pc, left, left + width, top, bottom, -1.0, 0.9);
-
-	/* Draw the border around the entire view. */
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	print_border (pc, left, right, top, bottom, 1.0, -1.0);
-
-	/* Draw the vertical line on the right of the time column. */
-	gnome_print_setlinewidth (pc, 0.0);
-	gnome_print_moveto (pc, left + width, bottom);
-	gnome_print_lineto (pc, left + width, top);
-	gnome_print_stroke (pc);
-
-	/* Calculate the row height. */
-	yinc = (top - bottom) / (pdi->end_hour - pdi->start_hour);
-
-        /* Get the 2 fonts we need. */
-	font_size = yinc * 0.6;
-	max_font_size = width * 0.5;
-	hour_font_size = MIN (font_size, max_font_size);
-	font_hour = get_font_for_size (hour_font_size, GNOME_FONT_BOLD, FALSE);
-
-	font_size = yinc * 0.33;
-	max_font_size = width * 0.25;
-	minute_font_size = MIN (font_size, max_font_size);
-	font_minute = get_font_for_size (minute_font_size, GNOME_FONT_BOLD, FALSE);
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	row = 0;
-	for (i = pdi->start_hour; i < pdi->end_hour; i++) {
-		y = top - yinc * (row + 1);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-		if (use_24_hour) {
-			hour = i;
-			minute = "00";
-		} else {
-			if (i < 12)
-				minute = U_("am");
-			else
-				minute = U_("pm");
-
-			hour = i % 12;
-			if (hour == 0)
-				hour = 12;
-		}
-
-		/* the hour label/minute */
-		sprintf (buf, "%d", hour);
-		print_text (pc, font_hour, buf, ALIGN_RIGHT,
-			    left, left + width * 0.58,
-			    y + yinc - 4, y + yinc - 4 - hour_font_size);
-		print_text (pc, font_minute, minute, ALIGN_RIGHT,
-			    left, left + width - 3,
-			    y + yinc - 3, y + yinc - 3 - minute_font_size);
-
-		/* Draw the horizontal line between hours, across the entire
-		   width of the day view. */
-		gnome_print_moveto (pc, left, y);
-		gnome_print_lineto (pc, right, y);
-		gnome_print_stroke (pc);
-
-		/* Draw the horizontal line for the 1/2-hours, across the
-		   entire width except for part of the time column. */
-		gnome_print_moveto (pc, left + width * 0.6, y + yinc / 2);
-		gnome_print_lineto (pc, right, y + yinc / 2);
-		gnome_print_stroke (pc);
-
-		row++;
-	}
-
-	gtk_object_unref (GTK_OBJECT (font_hour));
-	gtk_object_unref (GTK_OBJECT (font_minute));
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gint
-print_day_add_event (CalComponent *comp,
-		     time_t	    start,
-		     time_t	    end,
-		     gint	    days_shown,
-		     time_t	   *day_starts,
-		     GArray	   *long_events,
-		     GArray	  **events)
-
-{
-	icaltimezone *zone = get_timezone ();
-	EDayViewEvent event;
-	gint day, offset;
-	struct icaltimetype start_tt, end_tt;
-
-#if 0
-	g_print ("Day view lower: %s", ctime (&day_starts[0]));
-	g_print ("Day view upper: %s", ctime (&day_starts[days_shown]));
-	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, -1);
-	g_return_val_if_fail (start < day_starts[days_shown], -1);
-	g_return_val_if_fail (end > day_starts[0], -1);
-
-	start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
-	end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
-
-	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;*/
-	offset = 0;
-	event.start_minute = start_tt.hour * 60 + start_tt.minute - offset;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute - offset;
-
-	event.start_row_or_col = 0;
-	event.num_columns = 0;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < days_shown; day++) {
-		if (start >= day_starts[day] && end <= day_starts[day + 1]) {
-
-			/* Special case for when the appointment ends at
-			   midnight, i.e. the start of the next day. */
-			if (end == 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_starts[day])
-				    break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (events[day], event);
-			return day;
-		}
-	}
-
-	/* 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 (long_events, event);
-	return E_DAY_VIEW_LONG_EVENT;
-}
-
-
-static gboolean
-print_day_details_cb (CalComponent *comp, time_t istart, time_t iend,
-		      gpointer data)
-{
-	struct pdinfo *pdi = (struct pdinfo *)data;
-
-	print_day_add_event (comp, istart, iend,
-			     pdi->days_shown, pdi->day_starts,
-			     pdi->long_events, pdi->events);
-
-	return TRUE;
-}
-
-
-static void
-free_event_array (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);
-}
-
-
-static void
-print_day_long_event (GnomePrintContext *pc, GnomeFont *font,
-		      double left, double right, double top, double bottom,
-		      double row_height, EDayViewEvent *event,
-		      struct pdinfo *pdi)
-{
-	CalComponentText summary;
-	double x1, x2, y1, y2;
-	double left_triangle_width = -1.0, right_triangle_width = -1.0;
-	char *text;
-	char buffer[32];
-	struct tm date_tm;
-
-	/* If the event starts before the first day being printed, draw a
-	   triangle. (Note that I am assuming we are just showing 1 day at
-	   the moment.) */
-	if (event->start < pdi->day_starts[0])
-		left_triangle_width = 4;
-
-	/* If the event ends after the last day being printed, draw a
-	   triangle. */
-	if (event->end > pdi->day_starts[1])
-		right_triangle_width = 4;
-
-	x1 = left + 10;
-	x2 = right - 10;
-	y1 = top - event->start_row_or_col * row_height - 4;
-	y2 = y1 - row_height + 4;
-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, 0.95,
-				     left_triangle_width,
-				     right_triangle_width);
-
-	/* If the event starts after the first day being printed, we need to
-	   print the start time. */
-	if (event->start > pdi->day_starts[0]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->start_minute / 60;
-		date_tm.tm_min = event->start_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x1 += 4;
-		print_text (pc, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	/* If the event ends before the end of the last day being printed,
-	   we need to print the end time. */
-	if (event->end < pdi->day_starts[1]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->end_minute / 60;
-		date_tm.tm_min = event->end_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x2 -= 4;
-		print_text (pc, font, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	/* Print the text. */
-	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? (char*) summary.value : "";
-
-	x1 += 4;
-	x2 -= 4;
-	print_text (pc, font, text, ALIGN_CENTER, x1, x2, y1, y2);
-}
-
-
-static void
-print_day_event (GnomePrintContext *pc, GnomeFont *font,
-		 double left, double right, double top, double bottom,
-		 EDayViewEvent *event, struct pdinfo *pdi)
-{
-	CalComponentText summary;
-	double x1, x2, y1, y2, col_width, row_height;
-	int start_offset, end_offset, start_row, end_row;
-	char *text, start_buffer[32], end_buffer[32];
-	gboolean display_times = FALSE, free_text = FALSE;
-	struct tm date_tm;
-
-	if ((event->start_minute >= pdi->end_minute_offset)
-	    || (event->end_minute <= pdi->start_minute_offset))
-		return;
-
-	start_offset = event->start_minute - pdi->start_minute_offset;
-	end_offset = event->end_minute - pdi->start_minute_offset;
-
-	start_row = start_offset / pdi->mins_per_row;
-	start_row = MAX (0, start_row);
-	end_row = (end_offset - 1) / pdi->mins_per_row;
-	end_row = MIN (pdi->rows - 1, end_row);
-	col_width = (right - left) / pdi->cols_per_row[event->start_minute / pdi->mins_per_row];
-
-	if (start_offset != start_row * pdi->mins_per_row
-	    || end_offset != (end_row + 1) * pdi->mins_per_row)
-		display_times = TRUE;
-
-	x1 = left + event->start_row_or_col * col_width;
-	x2 = x1 + event->num_columns * col_width - DAY_VIEW_EVENT_X_PAD;
-
-	row_height = (top - bottom) / pdi->rows;
-	y1 = top - start_row * row_height;
-	y2 = top - (end_row + 1) * row_height;
-
-#if 0
-	g_print ("Event: %g,%g %g,%g\n  row_height: %g start_row: %i top: %g rows: %i\n",
-		 x1, y1, x2, y2, row_height, start_row, top, pdi->rows);
-#endif
-
-	print_border (pc, x1, x2, y1, y2, 1.0, 0.95);
-
-	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? (char*) summary.value : "";
-
-
-	if (display_times) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->start_minute / 60;
-		date_tm.tm_min = event->start_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    start_buffer, sizeof (start_buffer));
-
-		date_tm.tm_hour = event->end_minute / 60;
-		date_tm.tm_min = event->end_minute % 60;
-
-		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
-				    end_buffer, sizeof (end_buffer));
-
-		text = g_strdup_printf ("%s - %s %s ", start_buffer,
-					end_buffer, text);
-
-		free_text = TRUE;
-	}
-
-	bound_text (pc, font, text, x1 + 2, x2 - 2, y1, y2, 0);
-
-	if (free_text)
-		g_free (text);
-}
-
-
-static void
-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	CalClient *client;
-	EDayViewEvent *event;
-	GnomeFont *font;
-	time_t start, end;
-	struct pdinfo pdi;
-	gint rows_in_top_display, i;
-	double font_size, max_font_size;
-
-	start = time_day_begin_with_zone (whence, zone);
-	end = time_day_end_with_zone (start, zone);
-
-	pdi.days_shown = 1;
-	pdi.day_starts[0] = start;
-	pdi.day_starts[1] = end;
-	pdi.long_events = g_array_new (FALSE, FALSE, sizeof (EDayViewEvent));
-	pdi.events[0] = g_array_new (FALSE, FALSE, sizeof (EDayViewEvent));
-	pdi.start_hour = calendar_config_get_day_start_hour ();
-	pdi.end_hour = calendar_config_get_day_end_hour ();
-	if (calendar_config_get_day_end_minute () != 0)
-		pdi.end_hour++;
-	pdi.rows = (pdi.end_hour - pdi.start_hour) * 2;
-	pdi.mins_per_row = 30;
-	pdi.start_minute_offset = pdi.start_hour * 60;
-	pdi.end_minute_offset = pdi.end_hour * 60;
-	pdi.use_24_hour_format = calendar_config_get_24_hour_format ();
-
-	/* Get the events from the server. */
-	client = gnome_calendar_get_cal_client (gcal);
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_details_cb, &pdi);
-	qsort (pdi.long_events->data, pdi.long_events->len,
-	       sizeof (EDayViewEvent), e_day_view_event_sort_func);
-	qsort (pdi.events[0]->data, pdi.events[0]->len,
-	       sizeof (EDayViewEvent), e_day_view_event_sort_func);
-
-	/* Also print events outside of work hours */
-	if (pdi.events[0]->len > 0) {
-		icaltimezone *zone = get_timezone ();
-		struct icaltimetype tt;
-
-		event = &g_array_index (pdi.events[0], EDayViewEvent, 0);		
-		tt = icaltime_from_timet_with_zone (event->start, FALSE, zone);
-		if (tt.hour < pdi.start_hour)
-			pdi.start_hour = tt.hour;
-		pdi.start_minute_offset = pdi.start_hour * 60;
-
-		event = &g_array_index (pdi.events[0], EDayViewEvent, pdi.events[0]->len - 1);
-		tt = icaltime_from_timet_with_zone (event->end, FALSE, zone);
-		if (tt.hour > pdi.end_hour || tt.hour == 0) {
-			pdi.end_hour = tt.hour ? tt.hour : 24;
-			if (tt.minute > 0)
-				pdi.end_hour++;
-		}
-		pdi.end_minute_offset = pdi.end_hour * 60;
-
-		pdi.rows = (pdi.end_hour - pdi.start_hour) * 2;
-	}
-	
-	/* Lay them out the long events, across the top of the page. */
-	e_day_view_layout_long_events (pdi.long_events, pdi.days_shown,
-				       pdi.day_starts, &rows_in_top_display);
-
-	/* Print the long events. */
-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);
-	for (i = 0; i < pdi.long_events->len; i++) {
-		event = &g_array_index (pdi.long_events, EDayViewEvent, i);
-		print_day_long_event (pc, font, left, right, top, bottom,
-				      DAY_VIEW_ROW_HEIGHT, event, &pdi);
-	}
-	gtk_object_unref (GTK_OBJECT (font));
-
-	/* We always leave space for DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY in the
-	   top display, but we may have more rows than that, in which case
-	   the main display area will be compressed. */
-	rows_in_top_display = MAX (rows_in_top_display,
-				   DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY);
-
-	/* Draw the border around the long events. */
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	print_border (pc, left, right,
-		      top, top - rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 4,
-		      1.0, -1.0);
-
-	/* Adjust the area containing the main display. */
-	top -= rows_in_top_display * DAY_VIEW_ROW_HEIGHT + 4;
-
-	/* Draw the borders, lines, and times down the left. */
-	print_day_background (pc, gcal, whence, &pdi,
-			      left, right, top, bottom);
-
-	/* Now adjust to get rid of the time column. */
-	left += DAY_VIEW_TIME_COLUMN_WIDTH;
-
-	/* Lay out the short events, within the day. */
-	e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS,
-				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row);
-
-	/* Print the short events. */
-	max_font_size = ((top - bottom) / pdi.rows) - 4;
-	font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size);
-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-	for (i = 0; i < pdi.events[0]->len; i++) {
-		event = &g_array_index (pdi.events[0], EDayViewEvent, i);
-		print_day_event (pc, font, left, right, top, bottom,
-				 event, &pdi);
-	}
-	gtk_object_unref (GTK_OBJECT (font));
-
-	/* Free everything. */
-	free_event_array (pdi.long_events);
-	g_array_free (pdi.long_events, TRUE);
-	free_event_array (pdi.events[0]);
-	g_array_free (pdi.events[0], TRUE);
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-print_week_summary_cb (CalComponent *comp,
-		       time_t	  start,
-		       time_t	  end,
-		       gpointer	  data)
-
-{
-	icaltimezone *zone = get_timezone ();
-	EWeekViewEvent event;
-	struct icaltimetype start_tt, end_tt;
-
-	struct psinfo *psi = (struct psinfo *)data;
-
-	/* Check that the event times are valid. */
-
-#if 0
-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",
-		 psi->day_starts[0], psi->day_starts[psi->days_shown],
-		 start, end);
-#endif
-
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE);
-	g_return_val_if_fail (end > psi->day_starts[0], TRUE);
-
-	start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
-	end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
-
-	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_tt.hour * 60 + start_tt.minute;
-	event.end_minute = end_tt.hour * 60 + end_tt.minute;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	g_array_append_val (psi->events, event);
-
-	return TRUE;
-}
-
-
-/* Returns TRUE if the event is a one-day event (i.e. not a long event). */
-static gboolean
-print_is_one_day_week_event (EWeekViewEvent *event,
-			     EWeekViewEventSpan *span,
-			     time_t *day_starts)
-{
-	if (event->start == day_starts[span->start_day]
-	    && event->end == day_starts[span->start_day + 1])
-		return FALSE;
-
-	if (span->num_days == 1
-	    && event->start >= day_starts[span->start_day]
-	    && event->end <= day_starts[span->start_day + 1])
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static void
-print_week_long_event (GnomePrintContext *pc, GnomeFont *font,
-		       struct psinfo *psi,
-		       double x1, double x2, double y1, double y2,
-		       EWeekViewEvent *event, EWeekViewEventSpan *span,
-		       char *text)
-{
-	double left_triangle_width = -1.0, right_triangle_width = -1.0;
-	struct tm date_tm;
-	char buffer[32];
-
-	/* If the event starts before the first day of the span, draw a
-	   triangle to indicate it continues. */
-	if (event->start < psi->day_starts[span->start_day])
-		left_triangle_width = 4;
-
-	/* If the event ends after the last day of the span, draw a
-	   triangle. */
-	if (event->end > psi->day_starts[span->start_day + span->num_days])
-		right_triangle_width = 4;
-
-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, 0.9,
-				     left_triangle_width,
-				     right_triangle_width);
-
-	/* If the event starts after the first day being printed, we need to
-	   print the start time. */
-	if (event->start > psi->day_starts[span->start_day]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->start_minute / 60;
-		date_tm.tm_min = event->start_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x1 += 4;
-		print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	/* If the event ends before the end of the last day being printed,
-	   we need to print the end time. */
-	if (event->end < psi->day_starts[span->start_day + span->num_days]) {
-		date_tm.tm_year = 2001;
-		date_tm.tm_mon = 0;
-		date_tm.tm_mday = 1;
-		date_tm.tm_hour = event->end_minute / 60;
-		date_tm.tm_min = event->end_minute % 60;
-		date_tm.tm_sec = 0;
-		date_tm.tm_isdst = -1;
-
-		e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-
-		x2 -= 4;
-		print_text_size (pc, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_utf8 (font, buffer);
-	}
-
-	x1 += 4;
-	x2 -= 4;
-	print_text_size (pc, text, ALIGN_CENTER, x1, x2, y1, y2);
-}
-
-
-static void
-print_week_day_event (GnomePrintContext *pc, GnomeFont *font,
-		      struct psinfo *psi,
-		      double x1, double x2, double y1, double y2,
-		      EWeekViewEvent *event, EWeekViewEventSpan *span,
-		      char *text)
-{
-	struct tm date_tm;
-	char buffer[32];
-
-	date_tm.tm_year = 2001;
-	date_tm.tm_mon = 0;
-	date_tm.tm_mday = 1;
-	date_tm.tm_hour = event->start_minute / 60;
-	date_tm.tm_min = event->start_minute % 60;
-	date_tm.tm_sec = 0;
-	date_tm.tm_isdst = -1;
-
-	e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
-			    buffer, sizeof (buffer));
-
-	print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-	x1 += gnome_font_get_width_utf8 (font, buffer);
-
-	x1 += 4;
-	print_text_size (pc, text, ALIGN_LEFT, x1, x2, y1, y2);
-}
-
-
-static void
-print_week_event (GnomePrintContext *pc, GnomeFont *font,
-		  struct psinfo *psi,
-		  double left, double top,
-		  double cell_width, double cell_height,
-		  EWeekViewEvent *event, GArray *spans)
-{
-	EWeekViewEventSpan *span;
-	gint span_num;
-	CalComponentText summary;
-	char *text;
-	int num_days, start_x, start_y, start_h, end_x, end_y, end_h;
-	double x1, x2, y1, y2;
-
-	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? (char*) summary.value : "";
-
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (e_week_view_layout_get_span_position
-		    (event, span,
-		     psi->rows_per_cell,
-		     psi->rows_per_compressed_cell,
-		     psi->display_start_weekday,
-		     psi->multi_week_view,
-		     psi->compress_weekend,
-		     &num_days)) {
-
-			e_week_view_layout_get_day_position
-				(span->start_day,
-				 psi->multi_week_view,
-				 psi->weeks_shown,
-				 psi->display_start_weekday,
-				 psi->compress_weekend,
-				 &start_x, &start_y, &start_h);
-
-			if (num_days == 1) {
-				end_x = start_x;
-				end_y = start_y;
-				end_h = start_h;
-			} else {
-				e_week_view_layout_get_day_position
-					(span->start_day + num_days - 1,
-					 psi->multi_week_view,
-					 psi->weeks_shown,
-					 psi->display_start_weekday,
-					 psi->compress_weekend,
-					 &end_x, &end_y, &end_h);
-			}
-
-			x1 = left + start_x * cell_width + 6;
-			x2 = left + (end_x + 1) * cell_width - 6;
-			y1 = top - start_y * cell_height
-				- psi->header_row_height
-				- span->row * psi->row_height;
-			y2 = y1 - psi->row_height * 0.9;
-
-			if (print_is_one_day_week_event (event, span,
-							 psi->day_starts)) {
-				print_week_day_event (pc, font, psi,
-						      x1, x2, y1, y2,
-						      event, span, text);
-			} else {
-				print_week_long_event (pc, font, psi,
-						       x1, x2, y1, y2,
-						       event, span, text);
-			}
-		}
-	}
-}
-
-
-static void
-print_week_view_background (GnomePrintContext *pc, GnomeFont *font,
-			    struct psinfo *psi,
-			    double left, double top,
-			    double cell_width, double cell_height)
-{
-	icaltimezone *zone = get_timezone ();
-	int day, day_x, day_y, day_h;
-	double x1, x2, y1, y2, font_size, fillcolor;
-	struct tm tm;
-	char *format_string, buffer[128], *utf_str;
-
-	font_size = gnome_font_get_size (font);
-
-	for (day = 0; day < psi->days_shown; day++) {
-		e_week_view_layout_get_day_position
-			(day, psi->multi_week_view, psi->weeks_shown,
-			 psi->display_start_weekday, psi->compress_weekend,
-			 &day_x, &day_y, &day_h);
-
-		x1 = left + day_x * cell_width;
-		x2 = left + (day_x + 1) * cell_width;
-		y1 = top - day_y * cell_height;
-		y2 = y1 - day_h * cell_height;
-
-		tm = *convert_timet_to_struct_tm (psi->day_starts[day], zone);
-
-		/* In the month view we draw a grey background for the end
-		   of the previous month and the start of the following. */
-		fillcolor = -1.0;
-		if (psi->multi_week_view && (tm.tm_mon != psi->month))
-			fillcolor = 0.9;
-
-		print_border (pc, x1, x2, y1, y2, 1.0, fillcolor);
-
-		if (psi->multi_week_view) {
-			if (tm.tm_mday == 1)
-				format_string = _("%d %B");
-			else
-				format_string = "%d";
-		} else {
-			gnome_print_moveto (pc, x1 + 0.1 * cell_width,
-					    y1 - psi->header_row_height + 3);
-			gnome_print_lineto (pc, x2,
-					    y1 - psi->header_row_height + 3);
-			gnome_print_setrgbcolor (pc, 0, 0, 0);
-			gnome_print_setlinewidth (pc, 0.5);
-			gnome_print_stroke (pc);
-
-			/* 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");
-
-		}
-
-		strftime (buffer, sizeof (buffer), format_string, &tm);
-		utf_str = e_utf8_from_locale_string (buffer);
-		print_text_size (pc, utf_str, ALIGN_RIGHT,
-				 x1, x2 - 4, y1 - 2, y1 - 2 - font_size);
-		g_free (utf_str);
-	}
-}
-
-
-
-static void
-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal,
-		    time_t whence, gboolean multi_week_view, int weeks_shown,
-		    int month, double font_size,
-		    double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	CalClient *client;
-	EWeekViewEvent *event;
-	struct psinfo psi;
-	time_t day_start;
-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7], day, event_num;
-	GArray *spans;
-	GnomeFont *font;
-	double cell_width, cell_height;
-
-	psi.days_shown = weeks_shown * 7;
-	psi.events = g_array_new (FALSE, FALSE, sizeof (EWeekViewEvent));
-	psi.multi_week_view = multi_week_view;
-	psi.weeks_shown = weeks_shown;
-	psi.month = month;
-
-	/* Get a few config settings. */
-	if (multi_week_view)
-		psi.compress_weekend = calendar_config_get_compress_weekend ();
-	else
-		psi.compress_weekend = TRUE;
-	psi.use_24_hour_format = calendar_config_get_24_hour_format ();
-
-	/* We convert this from (0 = Sun, 6 = Sat) to (0 = Mon, 6 = Sun). */
-	psi.display_start_weekday = calendar_config_get_week_start_day ();
-	psi.display_start_weekday = (psi.display_start_weekday + 6) % 7;
-
-	/* If weekends are compressed then we can't start on a Sunday. */
-	if (psi.compress_weekend && psi.display_start_weekday == 6)
-		psi.display_start_weekday = 5;
-
-	day_start = time_day_begin_with_zone (whence, zone);
-	for (day = 0; day <= psi.days_shown; day++) {
-		psi.day_starts[day] = day_start;
-		day_start = time_add_day_with_zone (day_start, 1, zone);
-	}
-
-	/* Get the events from the server. */
-	client = gnome_calendar_get_cal_client (gcal);
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT,
-				       psi.day_starts[0],
-				       psi.day_starts[psi.days_shown],
-				       print_week_summary_cb, &psi);
-	qsort (psi.events->data, psi.events->len,
-	       sizeof (EWeekViewEvent), e_week_view_event_sort_func);
-
-	/* Layout the events. */
-	spans = e_week_view_layout_events (psi.events, NULL,
-					   psi.multi_week_view,
-					   psi.weeks_shown,
-					   psi.compress_weekend,
-					   psi.display_start_weekday,
-					   psi.day_starts, rows_per_day);
-
-	/* Calculate the size of the cells. */
-	if (multi_week_view) {
-		cell_width = (right - left) / (psi.compress_weekend ? 6 : 7);
-		cell_height = (top - bottom) / (weeks_shown * 2);
-	} else {
-		cell_width = (right - left) / 2;
-		cell_height = (top - bottom) / 6;
-	}
-
-	/* Calculate the row height, using the normal font and with room for
-	   space or a rectangle around it. */
-	psi.row_height = font_size * 1.2;
-	psi.header_row_height = font_size * 1.5;
-
-	/* Calculate how many rows we can fit into each type of cell. */
-	psi.rows_per_cell = ((cell_height * 2) - psi.header_row_height)
-		/ psi.row_height;
-	psi.rows_per_compressed_cell = (cell_height - psi.header_row_height)
-		/ psi.row_height;
-
-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-
-	/* Draw the grid and the day names/numbers. */
-	print_week_view_background (pc, font, &psi, left, top,
-				    cell_width, cell_height);
-
-	/* Print the events. */
-	for (event_num = 0; event_num < psi.events->len; event_num++) {
-		event = &g_array_index (psi.events, EWeekViewEvent, event_num);
-		print_week_event (pc, font, &psi, left, top,
-				  cell_width, cell_height, event, spans);
-	}
-
-	gtk_object_unref (GTK_OBJECT (font));
-
-	/* Free everything. */
-	for (event_num = 0; event_num < psi.events->len; event_num++) {
-		event = &g_array_index (psi.events, EWeekViewEvent, event_num);
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-	g_array_free (psi.events, TRUE);
-	g_array_free (spans, TRUE);
-}
-
-
-static void
-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom,
-		    int morerows)
-{
-	icaltimezone *zone = get_timezone ();
-	double row_height, col_width, l, r, t, b;
-	time_t now;
-	int col, row, rows, cols;
-
-	l = left;
-	t = top;
-
-	/* If morerows is set we do 4 rows and 3 columns instead of 3 rows and
-	   4 columns. This is useful if we switch paper orientation. */
-	if (morerows) {
-		rows = 4;
-		cols = 3;
-	} else {
-		rows = 3;
-		cols = 4;
-	}
-
-	row_height = (top - bottom) / rows;
-	col_width = (right - left) / cols;
-	r = l + col_width;
-	b = top - row_height;
-	now = time_year_begin_with_zone (whence, zone);
-
-	for (row = 0; row < rows; row++) {
-		t = top - row_height * row;
-		b = t - row_height;
-		for (col = 0; col < cols; col++) {
-			l = left + col_width * col;
-			r = l + col_width;
-			print_month_small (pc, gcal, now,
-					   l + 8, r - 8, t - 8, b + 8,
-					   DATE_MONTH, 0, 0, TRUE);
-			now = time_add_month_with_zone (now, 1, zone);
-		}
-	}
-}
-
-static void
-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		     double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	time_t date;
-	struct tm tm;
-	struct icaltimetype tt;
-	char buffer[100];
-	GnomeFont *font;
-	gboolean compress_weekend;
-	int columns, col, weekday, len, month;
-	double font_size, cell_width, x1, x2, y1, y2;
-
-	weekday = calendar_config_get_week_start_day ();
-	compress_weekend = calendar_config_get_compress_weekend ();
-
-	/* Remember which month we want. */
-	tt = icaltime_from_timet_with_zone (whence, FALSE, zone);
-	month = tt.month - 1;
-
-	/* Find the start of the month, and then the start of the week on
-	   or before that day. */
-	date = time_month_begin_with_zone (whence, zone);
-	date = time_week_begin_with_zone (date, weekday, zone);
-
-	/* If weekends are compressed then we can't start on a Sunday. */
-	if (compress_weekend && weekday == 0)
-		date = time_add_day_with_zone (date, -1, zone);
-
-	/* do day names ... */
-
-	/* We are only interested in outputting the weekday here, but we want
-	   to be able to step through the week without worrying about
-	   overflows making strftime choke, so we move near to the start of
-	   the month. */
-	tm = *convert_timet_to_struct_tm (date, zone);
-	tm.tm_mday = (tm.tm_mday % 7) + 7;
-
-	font = get_font_for_size (MONTH_NORMAL_FONT_SIZE, GNOME_FONT_BOLD, FALSE);
-	font_size = gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
-
-	columns = compress_weekend ? 6 : 7;
-	cell_width = (right - left) / columns;
-	y1 = top;
-	y2 = top - font_size * 1.5;
-
-	for (col = 0; col < columns; col++) {
-		char *utf_str;
-
-		if (tm.tm_wday == 6 && compress_weekend) {
-			strftime (buffer, sizeof (buffer), "%a/", &tm);
-			len = strlen (buffer);
-			tm.tm_mday++;
-			tm.tm_wday = (tm.tm_wday + 1) % 7;
-			strftime (buffer + len, sizeof (buffer) - len,
-				  "%a", &tm);
-		} else {
-			strftime (buffer, sizeof (buffer), "%A", &tm);
-		}
-
-		x1 = left + cell_width * col;
-		x2 = x1 + cell_width;
-
-		print_border (pc, x1, x2, y1, y2, 1.0, -1.0);
-		utf_str = e_utf8_from_locale_string (buffer);
-		print_text_size (pc, utf_str, ALIGN_CENTER, x1, x2, y1, y2);
-		g_free (utf_str);
-
-		tm.tm_mday++;
-		tm.tm_wday = (tm.tm_wday + 1) % 7;
-	}
-	gtk_object_unref (GTK_OBJECT (font));
-
-	top = y2;
-	print_week_summary (pc, gcal, date, TRUE, 6, month,
-			    MONTH_NORMAL_FONT_SIZE,
-			    left, right, top, bottom);
-}
-
-
-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;
-	GnomeFont *font_summary;
-	double y, yend, x, xend;
-	struct icaltimetype *tt;
-	ECalendarTable *task_pad;
-	ETable *table;
-	CalendarModel *model;
-	gint rows, row;
-
-	/* We get the tasks directly from the TaskPad ETable. This means we
-	   get them filtered & sorted for free. */
-	task_pad = gnome_calendar_get_task_pad (gcal);
-	table = e_calendar_table_get_table (task_pad);
-	model = e_calendar_table_get_model (task_pad);
-	client = gnome_calendar_get_task_pad_cal_client (gcal);
-
-	font_summary = get_font_for_size (10, GNOME_FONT_BOOK, FALSE);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
-
-	titled_box (pc, U_("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
-		    &left, &right, &top, &bottom, 1.0);
-
-	y = top - 3;
-	yend = bottom - 2;
-
-	rows = e_table_model_row_count (E_TABLE_MODEL (model));
-	for (row = 0; row < rows; row++) {
-		CalComponent *comp;
-		CalComponentText summary;
-		int model_row;
-
-		model_row = e_table_view_to_model_row (table, row);
-		comp = calendar_model_get_component (model, model_row);
-
-		cal_component_get_summary (comp, &summary);
-
-		if (!summary.value)
-			continue;
-
-		x = left;
-		xend = right - 2;
-
-		if (y < bottom)
-			break;
-
-		/* Print the box to put the tick in. */
-		print_border (pc, x + 2, x + 8, y - 3, y - 11, 0.1, -1.0);
-
-		/* If the task is complete, print a tick in the box. */
-		cal_component_get_completed (comp, &tt);
-		if (tt) {
-			cal_component_free_icaltimetype (tt);
-
-			gnome_print_setrgbcolor (pc, 0, 0, 0);
-			gnome_print_setlinewidth (pc, 1.0);
-			gnome_print_moveto (pc, x + 3, y - 8);
-			gnome_print_lineto (pc, x + 5, y - 10);
-			gnome_print_lineto (pc, x + 7, y - 3.5);
-			gnome_print_stroke (pc);
-		}
-
-		y = bound_text (pc, font_summary, summary.value,
-				x + 10, xend, y, yend, 0);
-		y += gnome_font_get_size (font_summary) - 6;
-		gnome_print_moveto (pc, x, y);
-		gnome_print_lineto (pc, xend, y);
-		gnome_print_stroke (pc);
-		y -= 3;
-	}
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-
-/* 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)
-{
-	icaltimezone *zone = get_timezone ();
-	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;
-	gint week_start_day;
-
-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-
-	tm = *convert_timet_to_struct_tm (at, zone);
-
-	/* Day */
-
-	strftime (text, sizeof (text), _("Selected 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_start_day = calendar_config_get_week_start_day ();
-	week_begin = time_week_begin_with_zone (at, week_start_day, zone);
-	/* If the week starts on a Sunday, we have to show the Saturday first,
-	   since the weekend is compressed. If the original date passed in was
-	   a Saturday, we need to move on to the next Saturday, else we move
-	   back to the last one. */
-	if (week_start_day == 0) {
-		if (tm.tm_wday == 6)
-			week_begin = time_add_day_with_zone (week_begin, 6, zone);
-		else
-			week_begin = time_add_day_with_zone (week_begin, -1, zone);
-	}
-	week_end = time_add_day_with_zone (week_begin, 6, zone);
-
-	week_begin_tm = *convert_timet_to_struct_tm (week_begin, zone);
-	week_end_tm = *convert_timet_to_struct_tm (week_end, zone);
-
-	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), _("Selected 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), _("Selected 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), _("Selected 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;
-}
-
-
-static void
-print_day_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	int i, days = 1;
-	double todo, header, l;
-	char buf[100];
-
-	for (i = 0; i < days; i++) {
-		todo = (right - left) * 0.75 + left;
-		header = top - HEADER_HEIGHT;
-
-		/* FIXME: What is the name supposed to be for? */
-		gnome_print_beginpage (pc, "Calendar Day View");
-
-		/* Print the main view with all the events in. */
-		print_day_details (pc, gcal, date,
-				   left, todo - 2.0, header, bottom);
-
-		/* Print the TaskPad down the right. */
-		print_todo_details (pc, gcal, 0, INT_MAX,
-				    todo, right, header, bottom);
-
-		/* Print the filled border around the header. */
-		print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);
-
-		/* Print the 2 mini calendar-months. */
-		l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
-			- SMALL_MONTH_SPACING;
-		print_month_small (pc, gcal, date,
-				   l, l + SMALL_MONTH_WIDTH,
-				   top - 4, header + 4,
-				   DATE_MONTH | DATE_YEAR, date, date, FALSE);
-
-		l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
-		print_month_small (pc, gcal,
-				   time_add_month_with_zone (date, 1, zone),
-				   l, l + SMALL_MONTH_WIDTH,
-				   top - 4, header + 4,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-		/* Print the date, e.g. '8th May, 2001'. */
-		format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,
-			     buf, 100);
-		print_text_size_bold (pc, buf, ALIGN_LEFT,
-				      left + 4, todo, top - 4, top - 4 - 24);
-
-		/* Print the day, e.g. 'Tuesday'. */
-		format_date (date, DATE_DAYNAME, buf, 100);
-		print_text_size_bold (pc, buf, ALIGN_LEFT,
-				 left + 4, todo, top - 32, top - 32 - 18);
-
-		gnome_print_showpage (pc);
-		date = time_add_day_with_zone (date, 1, zone);
-	}
-}
-
-
-static void
-print_week_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		 double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	double header, l;
-	char buf[100];
-	time_t when;
-	gint week_start_day;
-	struct tm tm;
-
-	header = top - HEADER_HEIGHT;
-
-	/* FIXME: What is the name supposed to be for? */
-	gnome_print_beginpage (pc, "Calendar Week View");
-
-	tm = *convert_timet_to_struct_tm (date, zone);
-	week_start_day = calendar_config_get_week_start_day ();
-	when = time_week_begin_with_zone (date, week_start_day, zone);
-	/* If the week starts on a Sunday, we have to show the Saturday first,
-	   since the weekend is compressed. */
-	if (week_start_day == 0) {
-		if (tm.tm_wday == 6)
-			when = time_add_day_with_zone (when, 6, zone);
-		else
-			when = time_add_day_with_zone (when, -1, zone);
-	}
-
-	/* Print the main week view. */
-	print_week_summary (pc, gcal, when, FALSE, 1, 0,
-			    WEEK_NORMAL_FONT_SIZE,
-			    left, right, header, bottom);
-
-	/* Print the border around the main view. */
-	print_border (pc, left, right, header, bottom, 1.0, -1.0);
-
-	/* Print the border around the header area. */
-	print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);
-
-	/* Print the 2 mini calendar-months. */
-	l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
-		- SMALL_MONTH_SPACING;
-	print_month_small (pc, gcal, when,
-			   l, l + SMALL_MONTH_WIDTH,
-			   top - 4, header + 4,
-			   DATE_MONTH | DATE_YEAR, when,
-			   time_add_week_with_zone (when, 1, zone), FALSE);
-
-	l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
-	print_month_small (pc, gcal,
-			   time_add_month_with_zone (when, 1, zone),
-			   l, l + SMALL_MONTH_WIDTH,
-			   top - 4, header + 4,
-			   DATE_MONTH | DATE_YEAR, when,
-			   time_add_week_with_zone (when, 1, zone), FALSE);
-
-	/* Print the start day of the week, e.g. '7th May 2001'. */
-	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_LEFT,
-			      left + 3, right, top - 4, top - 4 - 24);
-	
-	/* Print the end day of the week, e.g. '13th May 2001'. */
-	when = time_add_day_with_zone (when, 6, zone);
-	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_LEFT,
-			      left + 3, right, top - 24 - 3, top - 24 - 3 - 24);
-
-	gnome_print_showpage (pc);
-}
-
-
-static void
-print_month_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		  double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	double header;
-	char buf[100];
-
-	header = top - HEADER_HEIGHT;
-
-	/* FIXME: What is the name supposed to be for? */
-	gnome_print_beginpage (pc, "Calendar Month View");
-
-	/* Print the main month view. */
-	print_month_summary (pc, gcal, date, left, right, header, bottom);
-
-	/* Print the border around the header. */
-	print_border (pc, left, right, top, header, 1.0, 0.9);
-
-	/* Print the 2 mini calendar-months. */
-	print_month_small (pc, gcal,
-			   time_add_month_with_zone (date, 1, zone),
-			   right - (right - left) / 7 + 2, right - 8,
-			   top - 4, header,
-			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-	print_month_small (pc, gcal,
-			   time_add_month_with_zone (date, -1, zone),
-			   left + 8, left + (right - left) / 7 - 2,
-			   top - 4, header,
-			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-	/* Print the month, e.g. 'May 2001'. */
-	format_date (date, DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_CENTER,
-			      left + 3, right - 3, top - 3, top - 3 - 24);
-
-	gnome_print_showpage (pc);
-}
-
-
-static void
-print_year_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
-		 double left, double right, double top, double bottom)
-{
-	char buf[100];
-
-	/* FIXME: What is the name supposed to be for? */
-	gnome_print_beginpage (pc, "Calendar Year View");
-
-	print_year_summary (pc, gcal, date, left, right, top - 50, bottom,
-			    TRUE);
-
-	/* centered title */
-	format_date (date, DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_CENTER,
-			      left+3, right, top-3, top - 27);
-
-	gnome_print_showpage (pc);
-}
-
-static void
-write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)
-{
-	icaltimezone *zone = get_timezone ();
-	struct tm *tmp_tm;
-	int len;
-
-	tmp_tm = convert_timet_to_struct_tm (t, zone);
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	len = strlen (buffer);
-	e_time_format_date_and_time (tmp_tm,
-				     calendar_config_get_24_hour_format (),
-				     FALSE, FALSE,
-				     &buffer[len], size - len);
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-static icaltimezone*
-get_zone_from_tzid (CalClient *client, const char *tzid)
-{
-	icaltimezone *zone;
-
-	/* Note that the timezones may not be on the server, so we try to get
-	   the builtin timezone with the TZID first. */
-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (!zone) {
-		CalClientGetStatus status;
-
-		status = cal_client_get_timezone (client, tzid, &zone);
-		/* FIXME: Handle error better. */
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			g_warning ("Couldn't get timezone from server: %s",
-				   tzid ? tzid : "");
-	}
-
-	return zone;
-}
-
-static void
-print_date_label (GnomePrintContext *pc, CalComponent *comp, CalClient *client,
-		  double left, double right, double top, double bottom)
-{
-	icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone;
-	CalComponentDateTime datetime;
-	time_t start = 0, end = 0, complete = 0, due = 0;
-	static char buffer[1024], *utf_text;
-
-	cal_component_get_dtstart (comp, &datetime);
-	if (datetime.value) {
-		start_zone = get_zone_from_tzid (client, datetime.tzid);
-		start = icaltime_as_timet_with_zone (*datetime.value,
-						     start_zone);
-	}
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_dtend (comp, &datetime);
-	if (datetime.value) {
-		end_zone = get_zone_from_tzid (client, datetime.tzid);
-		end = icaltime_as_timet_with_zone (*datetime.value,
-						   end_zone);
-	}
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_due (comp, &datetime);
-	if (datetime.value) {
-		due_zone = get_zone_from_tzid (client, datetime.tzid);
-		due = icaltime_as_timet_with_zone (*datetime.value,
-						   due_zone);
-	}
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_completed (comp, &datetime.value);
-	if (datetime.value) {
-		completed_zone = icaltimezone_get_utc_timezone ();
-		complete = icaltime_as_timet_with_zone (*datetime.value,
-							completed_zone);
-		cal_component_free_icaltimetype (datetime.value);
-	}
-
-	buffer[0] = '\0';
-
-	if (start > 0)
-		write_label_piece (start, buffer, 1024, NULL, NULL);
-
-	if (end > 0 && start > 0)
-		write_label_piece (end, buffer, 1024, _(" to "), NULL);
-
-	if (complete > 0) {
-		if (start > 0)
-			write_label_piece (complete, buffer, 1024, _(" (Completed "), ")");
-		else
-			write_label_piece (complete, buffer, 1024, _("Completed "), NULL);
-	}
-
-	if (due > 0 && complete == 0) {
-		if (start > 0)
-			write_label_piece (due, buffer, 1024, _(" (Due "), ")");
-		else
-			write_label_piece (due, buffer, 1024, _("Due "), NULL);
-	}
-
-	utf_text = e_utf8_from_locale_string (buffer);
-	print_text_size_bold (pc, utf_text, ALIGN_LEFT,
-			      left, right, top, top - 15);
-	g_free (utf_text);
-}
-
-static void
-print_comp_item (GnomePrintContext *pc, CalComponent *comp, CalClient *client,
-		 double left, double right, double top, double bottom)
-{
-	GnomeFont *font;
-	CalComponentVType vtype;
-	CalComponentText text;
-	GSList *desc, *l;
-	const char *title, *categories;
-	char *categories_string;
-	GSList *contact_list, *elem;
-	gint header_size;
-
-	vtype = cal_component_get_vtype (comp);
-
-	/* We should only be asked to print VEVENTs or VTODOs. */
-	if (vtype == CAL_COMPONENT_EVENT)
-		title = U_("Appointment");
-	else if (vtype == CAL_COMPONENT_TODO)
-		title = U_("Task");
-	else
-		return;
-
-	/* Print the title in a box at the top of the page. */
-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
-	header_size = 50;
-	print_border (pc, left, right, top, top - header_size,
-		      1.0, 0.9);
-	print_text (pc, font, title, ALIGN_CENTER, left, right,
-		    top - header_size * 0.1, top - header_size);
-	gtk_object_unref (GTK_OBJECT (font));
-
-	top -= header_size + 10;
-
-	/* Summary */
-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
-	cal_component_get_summary (comp, &text);
-	top = bound_text (pc, font, text.value, left, right,
-			  top - 3, bottom, 0);
-	gtk_object_unref (GTK_OBJECT (font));
-
-	/* Date information */
-	print_date_label (pc, comp, client, left, right, top-3, top - 15);
-	top -= 20;
-
-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);
-
-	/* For a VTODO we print the Status, Priority, % Complete and URL. */
-	if (vtype == CAL_COMPONENT_TODO) {
-		icalproperty_status status;
-		const char *status_string = NULL;
-		int *percent;
-		int *priority;
-		const char *url;
-
-		/* Status */
-		cal_component_get_status (comp, &status);
-		if (status != ICAL_STATUS_NONE) {
-			switch (status) {
-			case ICAL_STATUS_NEEDSACTION:
-				status_string = U_("Not Started");
-				break;
-			case ICAL_STATUS_INPROCESS:
-				status_string = U_("In Progress");
-				break;
-			case ICAL_STATUS_COMPLETED:
-				status_string = U_("Completed");
-				break;
-			case ICAL_STATUS_CANCELLED:
-				status_string = U_("Cancelled");
-				break;
-			default:
-				break;
-			}
-
-			if (status_string) {
-				char *text = g_strdup_printf (U_("Status: %s"),
-							      status_string);
-				top = bound_text (pc, font, text,
-						  left, right, top, bottom, 0);
-				top += gnome_font_get_size (font) - 6;
-				g_free (text);
-			}
-		}
-
-		/* Priority */
-		cal_component_get_priority (comp, &priority);
-		if (priority && *priority >= 0) {
-			char *priority_string, *priority_utf8, *text;
-
-			priority_string = cal_util_priority_to_string (*priority);
-			cal_component_free_priority (priority);
-
-			priority_utf8 = e_utf8_from_locale_string (priority_string);
-			text = g_strdup_printf (U_("Priority: %s"),
-						priority_utf8);
-			top = bound_text (pc, font, text,
-					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
-			g_free (text);
-			g_free (priority_utf8);
-		}
-
-		/* Percent Complete */
-		cal_component_get_percent (comp, &percent);
-		if (percent) {
-			char *percent_string;
-
-			percent_string = g_strdup_printf (U_("Percent Complete: %i"), *percent);
-			cal_component_free_percent (percent);
-
-			top = bound_text (pc, font, percent_string,
-					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
-		}
-
-
-		/* URL */
-		cal_component_get_url (comp, &url);
-		if (url && url[0]) {
-			char *url_string = g_strdup_printf (U_("URL: %s"),
-							    url);
-
-			top = bound_text (pc, font, url_string,
-					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
-
-			g_free (url_string);
-		}
-	}
-
-	/* Categories */
-	cal_component_get_categories (comp, &categories);
-	if (categories && categories[0]) {
-		categories_string = g_strdup_printf (U_("Categories: %s"),
-						     categories);
-		top = bound_text (pc, font, categories_string,
-				  left, right, top, bottom, 0);
-		top += gnome_font_get_size (font) - 6;
-		g_free (categories_string);
-	}
-
-	/* Contacts */
-	cal_component_get_contact_list (comp, &contact_list);
-	if (contact_list) {
-		GString *contacts = g_string_new (U_("Contacts: "));
-		for (elem = contact_list; elem; elem = elem->next) {
-			CalComponentText *t = elem->data;
-			/* Put a comma between contacts. */
-			if (elem != contact_list)
-				g_string_append (contacts, ", ");
-			g_string_append (contacts, t->value);
-		}
-		cal_component_free_text_list (contact_list);
-
-		top = bound_text (pc, font, contacts->str,
-				  left, right, top, bottom, 0);
-		top += gnome_font_get_size (font) - 6;
-
-		g_string_free (contacts, TRUE);
-	}
-
-	top -= 16;
-
-	/* Description */
-	cal_component_get_description_list (comp, &desc);
-	for (l = desc; l != NULL; l = l->next) {
-		CalComponentText *text = l->data;
-
-		if (text->value != NULL)
-			top = bound_text (pc, font, text->value, left, right, top-3, bottom, 0);
-	}
-	cal_component_free_text_list (desc);
-	gtk_object_unref (GTK_OBJECT (font));
-
-	gnome_print_showpage (pc);
-}
-
-void
-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
-		PrintView default_view)
-{
-	GnomePrinter *printer;
-	GnomePrintMaster *gpm;
-	GnomePrintContext *pc;
-	int copies, collate;
-	double l, r, t, b;
-
-	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, date, &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 ();
-
-	if (paper_info == NULL)
-		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:
-		print_day_view (pc, gcal, date, l, r, t, b);
-		break;
-	case PRINT_VIEW_WEEK:
-		print_week_view (pc, gcal, date, l, r, t, b);
-		break;
-	case PRINT_VIEW_MONTH:
-		gnome_print_rotate (pc, 90);
-		gnome_print_translate (pc, 0,
-				       -gnome_paper_pswidth (paper_info));
-		print_month_view (pc, gcal, date, b, t, r, l);
-		break;
-	case PRINT_VIEW_YEAR:
-		print_year_view (pc, gcal, date, l, r, t, b);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	gnome_print_master_close (gpm);
-
-	if (preview) {
-		GnomePrintMasterPreview *gpmp;
-		gboolean landscape = FALSE;
-
-		if (default_view == PRINT_VIEW_MONTH)
-			landscape = TRUE;
-
-		gpmp = gnome_print_master_preview_new_with_orientation (gpm, _("Print Preview"), landscape);
-		gtk_widget_show (GTK_WIDGET (gpmp));
-	} else {
-		gnome_print_master_print (gpm);
-	}
-
-	gtk_object_unref (GTK_OBJECT (gpm));
-}
-
-
-void
-print_comp (CalComponent *comp, CalClient *client, gboolean preview)
-{
-	GnomePrinter *printer;
-	GnomePrintMaster *gpm;
-	GnomePrintContext *pc;
-	int copies, collate;
-	double l, r, t, b;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	printer = NULL;
-	copies = 1;
-	collate = FALSE;
-
-	if (!preview) {
-		GtkWidget *gpd;
-
-		gpd = gnome_print_dialog_new (_("Print Item"),
-					      GNOME_PRINT_DIALOG_COPIES);
-
-		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);
-
-		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 ();
-
-	if (paper_info == NULL)
-		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);
-
-	print_comp_item (pc, comp, client, l, r, t, b);
-
-	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));
-}
-
-void
-print_setup (void)
-{
-	GtkWidget *dlg, *ps;
-	gint btn;
-
-	ps = gnome_paper_selector_new ();
-	gtk_widget_show (ps);
-
-	dlg = gnome_dialog_new (_("Print Setup"),
-				GNOME_STOCK_BUTTON_OK,
-				GNOME_STOCK_BUTTON_CANCEL,
-				NULL);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), ps, TRUE, TRUE, 2);
-
-	btn = gnome_dialog_run (GNOME_DIALOG (dlg));
-	if (btn == 0) {
-		gchar *name;
-
-		name  = gnome_paper_selector_get_name (GNOME_PAPER_SELECTOR (ps));
-		paper_info = gnome_paper_with_name (name);
-	}
-
-	gnome_dialog_close (GNOME_DIALOG (dlg));
-}
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
deleted file mode 100644
index 4571b36976..0000000000
--- a/calendar/gui/print.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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);
-void print_comp (CalComponent *comp, CalClient *client, gboolean preview);
-
-void print_setup (void);
-
-
-
-#endif
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
deleted file mode 100644
index cda93a1d64..0000000000
--- a/calendar/gui/tag-calendar.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <cal-util/timeutil.h>
-#include "calendar-config.h"
-#include "tag-calendar.h"
-
-
-
-struct calendar_tag_closure {
-	ECalendarItem *calitem;
-	icaltimezone *zone;
-	time_t start_time;
-	time_t end_time;
-
-	gboolean skip_transparent_events;
-};
-
-/* Clears all the tags in a calendar and fills a closure structure with the
- * necessary information for iterating over occurrences.
- * Returns FALSE if the calendar has no dates shown.
- */
-static gboolean
-prepare_tag (ECalendar *ecal, struct calendar_tag_closure *c, gboolean clear_first)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct icaltimetype start_tt = icaltime_null_time ();
-	struct icaltimetype end_tt = icaltime_null_time ();
-	char *location;
-
-	if (clear_first)
-		e_calendar_item_clear_marks (ecal->calitem);
-
-	if (!e_calendar_item_get_date_range (ecal->calitem,
-					     &start_year, &start_month,
-					     &start_day,
-					     &end_year, &end_month, &end_day))
-	    return FALSE;
-
-	start_tt.year = start_year;
-	start_tt.month = start_month + 1;
-	start_tt.day = start_day;
-
-	end_tt.year = end_year;
-	end_tt.month = end_month + 1;
-	end_tt.day = end_day;
-
-	icaltime_adjust (&end_tt, 1, 0, 0, 0);
-
-	c->calitem = ecal->calitem;
-
-	/* FIXME. It may be better if the timezone is passed in. */
-	location = calendar_config_get_timezone ();
-	c->zone = icaltimezone_get_builtin_timezone (location);
-
-	c->start_time = icaltime_as_timet_with_zone (start_tt, c->zone);
-	c->end_time = icaltime_as_timet_with_zone (end_tt, c->zone);
-
-	return TRUE;
-}
-
-/* Marks the specified range in an ECalendar; called from cal_client_generate_instances() */
-static gboolean
-tag_calendar_cb (CalComponent *comp,
-		 time_t istart,
-		 time_t iend,
-		 gpointer data)
-{
-	struct calendar_tag_closure *c = data;
-	struct icaltimetype start_tt, end_tt;
-	CalComponentTransparency transparency;
-
-	/* If we are skipping TRANSPARENT events, return if the event is
-	   transparent. */
-	if (c->skip_transparent_events) {
-		cal_component_get_transparency (comp, &transparency);
-		if (transparency == CAL_COMPONENT_TRANSP_TRANSPARENT)
-			return TRUE;
-	}
-
-	start_tt = icaltime_from_timet_with_zone (istart, FALSE, c->zone);
-	end_tt = icaltime_from_timet_with_zone (iend - 1, FALSE, c->zone);
-	e_calendar_item_mark_days (c->calitem,
-				   start_tt.year, start_tt.month - 1,
-				   start_tt.day,
-				   end_tt.year, end_tt.month - 1,
-				   end_tt.day,
-				   E_CALENDAR_ITEM_MARK_BOLD);
-
-	return TRUE;
-}
-
-/**
- * tag_calendar_by_client:
- * @ecal: Calendar widget to tag.
- * @client: A calendar client object.
- * 
- * Tags an #ECalendar widget with the events that occur in its current time
- * range.  The occurrences are extracted from the specified calendar @client.
- **/
-void
-tag_calendar_by_client (ECalendar *ecal, CalClient *client)
-{
-	struct calendar_tag_closure c;
-
-	g_return_if_fail (ecal != NULL);
-	g_return_if_fail (E_IS_CALENDAR (ecal));
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED)
-		return;
-
-	if (!prepare_tag (ecal, &c, TRUE))
-		return;
-
-	c.skip_transparent_events = TRUE;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT,
-				       c.start_time, c.end_time,
-				       tag_calendar_cb, &c);
-}
-
-/* Resolves TZIDs for the recurrence generator, for when the comp is not on
-   the server. We need to try to use builtin timezones first, as they may not
-   be added to the server yet. */
-static icaltimezone*
-resolve_tzid_cb (const char *tzid, gpointer data)
-{
-	CalClient *client;
-	icaltimezone *zone = NULL;
-	CalClientGetStatus status;
-
-	g_return_val_if_fail (data != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (data), NULL);
-	
-	client = CAL_CLIENT (data);
-
-	/* Try to find the builtin timezone first. */
-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
-	if (!zone) {
-		/* FIXME: Handle errors. */
-		status = cal_client_get_timezone (client, tzid, &zone);
-	}
-
-	return zone;
-}
-
-/**
- * tag_calendar_by_comp:
- * @ecal: Calendar widget to tag.
- * @comp: A calendar component object.
- * @clear_first: Whether the #ECalendar should be cleared of any marks first.
- * 
- * Tags an #ECalendar widget with any occurrences of a specific calendar
- * component that occur within the calendar's current time range.
- * Note that TRANSPARENT events are also tagged here.
- *
- * If comp_is_on_server is FALSE, it will try to resolve TZIDs using builtin
- * timezones first, before querying the server, since the timezones may not
- * have been added to the calendar on the server yet.
- **/
-void
-tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp, CalClient *client, gboolean clear_first, gboolean comp_is_on_server)
-{
-	struct calendar_tag_closure c;
-
-	g_return_if_fail (ecal != NULL);
-	g_return_if_fail (E_IS_CALENDAR (ecal));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	if (!prepare_tag (ecal, &c, clear_first))
-		return;
-
-	c.skip_transparent_events = FALSE;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	if (comp_is_on_server) {
-		cal_recur_generate_instances (comp, c.start_time, c.end_time,
-					      tag_calendar_cb, &c,
-					      cal_client_resolve_tzid_cb,
-					      client, c.zone);
-	} else {
-		cal_recur_generate_instances (comp, c.start_time, c.end_time,
-					      tag_calendar_cb, &c,
-					      resolve_tzid_cb,
-					      client, c.zone);
-	}
-}
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
deleted file mode 100644
index 32c7eb475c..0000000000
--- a/calendar/gui/tag-calendar.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Damon Chaplin <damon@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 TAG_CALENDAR_H
-#define TAG_CALENDAR_H
-
-#include <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-void tag_calendar_by_client (ECalendar *ecal, CalClient *client);
-void tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp,
-			   CalClient *client, gboolean clear_first,
-			   gboolean comp_is_on_server);
-
-#endif
diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c
deleted file mode 100644
index 5fd8d61346..0000000000
--- a/calendar/gui/tasks-control-factory.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#include <config.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include "tasks-control-factory.h"
-#include "tasks-control.h"
-
-
-#define TASKS_CONTROL_FACTORY_ID   "OAFIID:GNOME_Evolution_Tasks_ControlFactory"
-
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static BonoboObject *tasks_control_factory_fn	(BonoboGenericFactory	*Factory,
-						 void			*data);
-
-
-/* Registers the factory with Bonobo. Should be called on startup. */
-void
-tasks_control_factory_init		(void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (TASKS_CONTROL_FACTORY_ID,
-					      tasks_control_factory_fn, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-
-	if (factory == NULL)
-		g_error ("I could not register a Tasks control factory.");
-}
-
-
-/* Callback factory function to create a tasks control. */
-static BonoboObject *
-tasks_control_factory_fn		(BonoboGenericFactory	*Factory,
-					 void			*data)
-{
-	BonoboControl *control;
-
-	control = tasks_control_new ();
-
-	if (control)
-		return BONOBO_OBJECT (control);
-	else {
-		gnome_warning_dialog (_("Could not create the tasks view.  Please check your "
-					"ORBit and OAF setup."));
-		return NULL;
-	}
-}
diff --git a/calendar/gui/tasks-control-factory.h b/calendar/gui/tasks-control-factory.h
deleted file mode 100644
index 468f03b9e7..0000000000
--- a/calendar/gui/tasks-control-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control-factory.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _TASKS_CONTROL_FACTORY_H_
-#define _TASKS_CONTROL_FACTORY_H_
-
-void           tasks_control_factory_init         (void);
-BonoboControl *tasks_control_factory_new_control  (void);
-
-#endif /* _TASKS_CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
deleted file mode 100644
index 53e3eb239f..0000000000
--- a/calendar/gui/tasks-control.c
+++ /dev/null
@@ -1,684 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Damon Chaplin <damon@ximian.com>
- *	    Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-paper.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.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 <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <e-util/e-dialog-utils.h>
-#include "dialogs/cal-prefs-dialog.h"
-#include "calendar-config.h"
-#include "calendar-commands.h"
-#include "e-tasks.h"
-#include "tasks-control.h"
-#include "evolution-shell-component-utils.h"
-
-#define TASKS_CONTROL_PROPERTY_URI		"folder_uri"
-#define TASKS_CONTROL_PROPERTY_URI_IDX		1
-
-
-static void tasks_control_properties_init	(BonoboControl		*control,
-						 ETasks			*tasks);
-static void tasks_control_get_property		(BonoboPropertyBag	*bag,
-						 BonoboArg		*arg,
-						 guint			 arg_id,
-						 CORBA_Environment      *ev,
-						 gpointer		 user_data);
-static void tasks_control_set_property		(BonoboPropertyBag	*bag,
-						 const BonoboArg	*arg,
-						 guint			 arg_id,
-						 CORBA_Environment      *ev,
-						 gpointer		 user_data);
-static void tasks_control_activate_cb		(BonoboControl		*control,
-						 gboolean		 activate,
-						 gpointer		 user_data);
-static void tasks_control_activate		(BonoboControl		*control,
-						 ETasks			*tasks);
-static void tasks_control_deactivate		(BonoboControl		*control,
-						 ETasks			*tasks);
-
-static void tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_cut_cmd               (BonoboUIComponent      *uic,
-						 gpointer                data,
-						 const gchar            *path);
-static void tasks_control_copy_cmd              (BonoboUIComponent      *uic,
-						 gpointer                data,
-						 const gchar            *path);
-static void tasks_control_paste_cmd             (BonoboUIComponent      *uic,
-						 gpointer                data,
-						 const gchar            *path);
-static void tasks_control_delete_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_complete_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_expunge_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_print_cmd		(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-static void tasks_control_print_preview_cmd	(BonoboUIComponent	*uic,
-						 gpointer		 data,
-						 const char		*path);
-
-
-BonoboControl *
-tasks_control_new (void)
-{
-	BonoboControl *control;
-	GtkWidget *tasks;
-
-	tasks = e_tasks_new ();
-	if (!tasks)
-		return NULL;
-	gtk_widget_show (tasks);
-
-	control = bonobo_control_new (tasks);
-	if (!control) {
-		gtk_widget_destroy (tasks);
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-
-	tasks_control_properties_init (control, E_TASKS (tasks));
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (tasks_control_activate_cb),
-			    tasks);
-
-	return control;
-}
-
-
-/* Creates the property bag for our new control. */
-static void
-tasks_control_properties_init		(BonoboControl		*control,
-					 ETasks			*tasks)
-					 
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (tasks_control_get_property,
-					tasks_control_set_property, tasks);
-
-	bonobo_property_bag_add (pbag,
-				 TASKS_CONTROL_PROPERTY_URI,
-				 TASKS_CONTROL_PROPERTY_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI of the tasks folder to display"),
-				 0);
-
-	bonobo_control_set_properties (control, pbag);
-	bonobo_object_unref (BONOBO_OBJECT (pbag));
-}
-
-
-/* Gets a property of our control. FIXME: Finish. */
-static void
-tasks_control_get_property		(BonoboPropertyBag	*bag,
-					 BonoboArg		*arg,
-					 guint			 arg_id,
-					 CORBA_Environment      *ev,
-					 gpointer		 user_data)
-{
-	ETasks *tasks = user_data;
-	char *uri;
-
-	switch (arg_id) {
-
-	case TASKS_CONTROL_PROPERTY_URI_IDX:
-		uri = cal_client_get_uri (e_tasks_get_cal_client (tasks));
-		BONOBO_ARG_SET_STRING (arg, uri);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-tasks_control_set_property		(BonoboPropertyBag	*bag,
-					 const BonoboArg	*arg,
-					 guint			 arg_id,
-					 CORBA_Environment      *ev,
-					 gpointer		 user_data)
-{
-	ETasks *tasks = user_data;
-	char *uri;
-
-	switch (arg_id) {
-
-	case TASKS_CONTROL_PROPERTY_URI_IDX:
-		uri = BONOBO_ARG_GET_STRING (arg);
-		if (!e_tasks_open (tasks, uri)) {
-			char *msg;
-
-			msg = g_strdup_printf (_("Could not load the tasks in `%s'"), uri);
-			gnome_error_dialog_parented (
-				msg,
-				GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));
-			g_free (msg);
-		}
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-tasks_control_activate_cb		(BonoboControl		*control,
-					 gboolean		 activate,
-					 gpointer		 user_data)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (user_data);
-
-	if (activate)
-		tasks_control_activate (control, tasks);
-	else
-		tasks_control_deactivate (control, tasks);
-}
-
-/* Sensitizes the UI Component menu/toolbar commands based on the number of
- * selected tasks.
- */
-static void
-sensitize_commands (ETasks *tasks, BonoboControl *control, int n_selected)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	bonobo_ui_component_set_prop (uic, "/commands/TasksCut", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksCopy", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksDelete", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksMarkComplete", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-}
-
-/* Callback used when the selection in the table changes */
-static void
-selection_changed_cb (ETasks *tasks, int n_selected, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	sensitize_commands (tasks, control, n_selected);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("TasksNewTask", tasks_control_new_task_cmd),
-	BONOBO_UI_VERB ("TasksCut", tasks_control_cut_cmd),
-	BONOBO_UI_VERB ("TasksCopy", tasks_control_copy_cmd),
-	BONOBO_UI_VERB ("TasksPaste", tasks_control_paste_cmd),
-	BONOBO_UI_VERB ("TasksDelete", tasks_control_delete_cmd),
-	BONOBO_UI_VERB ("TasksMarkComplete", tasks_control_complete_cmd),
-	BONOBO_UI_VERB ("TasksExpunge", tasks_control_expunge_cmd),
-	BONOBO_UI_VERB ("TasksPrint", tasks_control_print_cmd),
-	BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask",            "new_task-16.png"),
-	E_PIXMAP ("/menu/File/Print/Print",			    "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/PrintPreview",		    "print-preview.xpm"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCut",            "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCopy",           "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksPaste",          "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksDelete",         "evolution-trash-mini.png"),
-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/TasksSettings", "configure_16_calendar.xpm"),
-	E_PIXMAP ("/Toolbar/New",                                   "buttons/new_task.png"),
-	E_PIXMAP ("/Toolbar/Cut",                                   "buttons/cut.png"),
-	E_PIXMAP ("/Toolbar/Copy",                                  "buttons/copy.png"),
-	E_PIXMAP ("/Toolbar/Paste",                                 "buttons/paste.png"),
-	E_PIXMAP ("/Toolbar/Delete",                                "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/Print",				    "buttons/print.png"),
-	E_PIXMAP_END
-};
-
-static void
-tasks_control_activate (BonoboControl *control, ETasks *tasks)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-	int n_selected;
-	ECalendarTable *cal_table;
-	ETable *etable;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	e_tasks_set_ui_component (tasks, uic);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, tasks);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-tasks.xml",
-			       "evolution-tasks");
-
-	e_pixmaps_update (uic, pixmaps);
-
-	e_tasks_setup_view_menus (tasks, uic);
-
-	/* Signals from the tasks widget; also sensitize the menu items as appropriate */
-
-	gtk_signal_connect (GTK_OBJECT (tasks), "selection_changed",
-			    GTK_SIGNAL_FUNC (selection_changed_cb), control);
-
-	cal_table = e_tasks_get_calendar_table (tasks);
-	etable = e_calendar_table_get_table (cal_table);
-	n_selected = e_table_selected_count (etable);
-
-	sensitize_commands (tasks, control, n_selected);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	/* Show the dialog for setting the timezone if the user hasn't chosen
-	   a default timezone already. This is done in the startup wizard now,
-	   so we don't do it here. */
-#if 0
-	calendar_config_check_timezone_set ();
-#endif
-
-	control_util_set_folder_bar_label (control, "");
-}
-
-
-static void
-tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-
-	g_assert (uic != NULL);
-
-	e_tasks_set_ui_component (tasks, NULL);
-
-	e_tasks_discard_view_menus (tasks);
-
-	/* Stop monitoring the "selection_changed" signal */
-	gtk_signal_disconnect_by_data (GTK_OBJECT (tasks), control);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-}
-
-
-static void
-tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_new_task (tasks);
-}
-
-static void
-tasks_control_cut_cmd                   (BonoboUIComponent      *uic,
-					 gpointer                data,
-					 const char             *path)
-{
-	ETasks *tasks;
-	ECalendarTable *cal_table;
-
-	tasks = E_TASKS (data);
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_cut_clipboard (cal_table);
-}
-
-static void
-tasks_control_copy_cmd                  (BonoboUIComponent      *uic,
-					 gpointer                data,
-					 const char             *path)
-{
-	ETasks *tasks;
-	ECalendarTable *cal_table;
-
-	tasks = E_TASKS (data);
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_copy_clipboard (cal_table);
-}
-
-static void
-tasks_control_paste_cmd                 (BonoboUIComponent      *uic,
-					 gpointer                data,
-					 const char             *path)
-{
-	ETasks *tasks;
-	ECalendarTable *cal_table;
-
-	tasks = E_TASKS (data);
-	cal_table = e_tasks_get_calendar_table (tasks);
-	e_calendar_table_paste_clipboard (cal_table);
-}
-
-static void
-tasks_control_delete_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_delete_selected (tasks);
-}
-
-static void
-tasks_control_complete_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	e_tasks_complete_selected (tasks);
-}
-
-static gboolean
-confirm_expunge (ETasks *tasks)
-{
-	GtkWidget *dialog, *label, *checkbox;
-	int button;
-	
-	if (!calendar_config_get_confirm_expunge ())
-		return TRUE;
-	
-	dialog = gnome_dialog_new (_("Warning"),
-				   GNOME_STOCK_BUTTON_YES,
-				   GNOME_STOCK_BUTTON_NO,
-				   NULL);
-	e_gnome_dialog_set_parent (GNOME_DIALOG (dialog), 
-				   GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (tasks),
-									GTK_TYPE_WINDOW)));
-	
-	label = gtk_label_new (_("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?"));
-	
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4);
-	
-	checkbox = gtk_check_button_new_with_label (_("Do not ask me again."));
-	gtk_widget_show (checkbox);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), checkbox, TRUE, TRUE, 4);
-	
-	button = gnome_dialog_run (GNOME_DIALOG (dialog));	
-	if (button == 0 && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
-		calendar_config_set_confirm_expunge (FALSE);
-	gnome_dialog_close (GNOME_DIALOG (dialog));
-	
-	if (button == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static void
-tasks_control_expunge_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-	
-	if (confirm_expunge (tasks))
-	    e_tasks_delete_completed (tasks);
-}
-
-
-static void
-print_title (GnomePrintContext *pc,
-	     double page_width, double page_height)
-{
-	GnomeFont *font;
-	char *text;
-	double w, x, y;
-
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, 18);
-
-	text = _("Tasks");
-	w = gnome_font_get_width_utf8 (font, text);
-
-	x = (page_width - w) / 2;
-	y = page_height - gnome_font_get_ascender (font);
-
-	gnome_print_moveto (pc, x, y);
-	gnome_print_setfont (pc, font);
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_show (pc, text);
-
-	gtk_object_unref (GTK_OBJECT (font));
-}
-
-
-static void
-print_tasks (ETasks *tasks, gboolean preview, gboolean landscape,
-	     int copies, gboolean collate)
-{
-	ECalendarTable *cal_table;
-	EPrintable *printable;
-	ETable *etable;
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	const GnomePaper *paper_info;
-	double l, r, t, b, page_width, page_height, left_margin, bottom_margin;
-
-	cal_table = e_tasks_get_calendar_table (tasks);
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (cal_table));
-	printable = e_table_get_printable (etable);
-
-	master = gnome_print_master_new ();
-
-	paper_info = gnome_paper_with_name (gnome_paper_name_default ());
-	gnome_print_master_set_paper (master, paper_info);
-
-	gnome_print_master_set_copies (master, copies, collate);
-	pc = gnome_print_master_get_context (master);
-	e_printable_reset (printable);
-
-	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);
-
-	if (landscape) {
-		page_width = t - b;
-		page_height = r - l;
-		left_margin = b;
-		bottom_margin = gnome_paper_rmargin (paper_info);
-	} else {
-		page_width = r - l;
-		page_height = t - b;
-		left_margin = l;
-		bottom_margin = b;
-	}
-
-	while (e_printable_data_left (printable)) {
-		gnome_print_beginpage (pc, "Tasks");
-		gnome_print_gsave (pc);
-		if (landscape) {
-			gnome_print_rotate (pc, 90);
-			gnome_print_translate (pc, 0, -gnome_paper_pswidth (paper_info));
-		}
-
-		gnome_print_translate (pc, left_margin, bottom_margin);
-
-		print_title (pc, page_width, page_height);
-
-		e_printable_print_page (printable, pc,
-					page_width, page_height - 24, TRUE);
-
-		gnome_print_grestore (pc);
-		gnome_print_showpage (pc);
-	}
-	gnome_print_master_close (master);
-
-	if (preview) {
-		GnomePrintMasterPreview *gpmp;
-		gpmp = gnome_print_master_preview_new_with_orientation (master, _("Print Preview"), landscape);
-		gtk_widget_show (GTK_WIDGET (gpmp));
-	} else {
-		gnome_print_master_print (master);
-	}
-
-	gtk_object_unref (GTK_OBJECT (master));
-	gtk_object_unref (GTK_OBJECT (printable));
-}
-
-
-/* File/Print callback */
-static void
-tasks_control_print_cmd (BonoboUIComponent *uic,
-			 gpointer data,
-			 const char *path)
-{
-	ETasks *tasks;
-	GtkWidget *gpd, *mode_box, *portrait_radio, *landscape_radio;
-	GtkWidget *dialog_vbox, *dialog_hbox, *mode_frame;
-	GList *children;
-	GSList *group;
-	gboolean preview = FALSE, landscape = FALSE;
-	GnomePrinter *printer;
-	int copies;
-	gboolean collate;
-
-	tasks = E_TASKS (data);
-
-	gpd = gnome_print_dialog_new (_("Print Tasks"),
-				      GNOME_PRINT_DIALOG_COPIES);
-
-	mode_frame = gtk_frame_new (_("Orientation"));
-
-	mode_box = gtk_vbox_new (FALSE, 4);
-	gtk_container_add (GTK_CONTAINER (mode_frame), mode_box);
-
-	/* Portrait */
-	portrait_radio = gtk_radio_button_new_with_label (NULL, _("Portrait"));
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (portrait_radio));
-	gtk_box_pack_start (GTK_BOX (mode_box), portrait_radio,
-			    FALSE, FALSE, 0);
-
-	/* Landscape */
-	landscape_radio = gtk_radio_button_new_with_label (group,
-							   _("Landscape"));
-	gtk_box_pack_start (GTK_BOX (mode_box), landscape_radio,
-			    FALSE, FALSE, 0);
-
-	gtk_widget_show_all (mode_frame);
-
-	/* A bit of a hack to insert our own Orientation option. */
-	dialog_vbox = GNOME_DIALOG (gpd)->vbox;
-	children = gtk_container_children (GTK_CONTAINER (dialog_vbox));
-	dialog_hbox = children->next->data;
-	g_list_free (children);
-	gtk_box_pack_start (GTK_BOX (dialog_hbox), mode_frame,
-			    FALSE, FALSE, 3);
-
-	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;
-	}
-
-	gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd),
-				       &copies, &collate);
-	if (GTK_TOGGLE_BUTTON (landscape_radio)->active)
-		landscape = TRUE;
-
-	printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));
-
-	gnome_dialog_close (GNOME_DIALOG (gpd));
-
-	print_tasks (tasks, preview, landscape, copies, collate);
-}
-
-static void
-tasks_control_print_preview_cmd (BonoboUIComponent *uic,
-				 gpointer data,
-				 const char *path)
-{
-	ETasks *tasks;
-
-	tasks = E_TASKS (data);
-
-	print_tasks (tasks, TRUE, FALSE, 1, FALSE);
-}
-
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
deleted file mode 100644
index 2d701f0c85..0000000000
--- a/calendar/gui/tasks-control.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _TASKS_CONTROL_H_
-#define _TASKS_CONTROL_H_
-
-
-BonoboControl *tasks_control_new		(void);
-
-
-#endif /* _TASKS_CONTROL_H_ */
diff --git a/calendar/gui/tasks-migrate.c b/calendar/gui/tasks-migrate.c
deleted file mode 100644
index 5c9a4fa7c5..0000000000
--- a/calendar/gui/tasks-migrate.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* Evolution calendar - Migrate tasks from the calendar folder to the tasks folder
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <cal-client/cal-client.h>
-#include "component-factory.h"
-#include "tasks-migrate.h"
-
-
-
-/* Client for the calendar folder */
-static CalClient *calendar_client = NULL;
-
-/* Client for the tasks folder */
-static CalClient *tasks_client = NULL;
-
-/* Whether we have done the migration yet */
-static gboolean migrated = FALSE;
-
-
-
-/* Performs the actual migration process */
-static void
-migrate (void)
-{
-	GList *uids;
-	GList *l;
-	gboolean success;
-	gboolean at_least_one;
-
-	g_assert (calendar_client != NULL);
-	g_assert (tasks_client != NULL);
-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);
-	g_assert (cal_client_get_load_state (tasks_client) == CAL_CLIENT_LOAD_LOADED);
-
-	uids = cal_client_get_uids (calendar_client, CALOBJ_TYPE_TODO);
-
-	success = TRUE;
-	at_least_one = FALSE;
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-		CalComponent *comp;
-		CalClientGetStatus status;
-
-		at_least_one = TRUE;
-
-		uid = l->data;
-		status = cal_client_get_object (calendar_client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			if (cal_client_update_object (tasks_client, comp))
-				cal_client_remove_object (calendar_client, uid);
-			else
-				success = FALSE;
-
-			gtk_object_unref (GTK_OBJECT (comp));
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* This is OK; the object may have disappeared from the server */
-			break;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			success = FALSE;
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	if (!at_least_one)
-		return;
-
-	if (success)
-		gnome_ok_dialog (_("Evolution has taken the tasks that were in your calendar folder "
-				   "and automatically migrated them to the new tasks folder."));
-	else
-		gnome_ok_dialog (_("Evolution has tried to take the tasks that were in your "
-				   "calendar folder and migrate them to the new tasks folder.\n"
-				   "Some of the tasks could not be migrated, so "
-				   "this process may be attempted again in the future."));
-}
-
-/* Displays an error to indicate that a calendar could not be opened */
-static void
-open_error (const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not open `%s'; no items from the calendar folder "
-				 "will be migrated to the tasks folder."),
-				 uri);
-	gnome_error_dialog (msg);
-	g_free (msg);
-}
-
-/* Displays an error to indicate that a URI method is not supported */
-static void
-method_error (const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("The method required to load `%s' is not supported; "
-				 "no items from the calendar folder will be migrated "
-				 "to the tasks folder."),
-			       uri);
-	gnome_error_dialog (msg);
-	g_free (msg);
-}
-
-/* Callback used when the tasks client is finished loading */
-static void
-tasks_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	g_assert (calendar_client != NULL);
-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		migrate ();
-		break;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		open_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* This can't happen because we did not specify only_if_exists when
-		 * issuing the open request.
-		 */
-		g_assert_not_reached ();
-		break;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (calendar_client));
-	calendar_client = NULL;
-
-	gtk_object_unref (GTK_OBJECT (tasks_client));
-	tasks_client = NULL;
-}
-
-/* Initiates the loading process for the tasks client */
-static gboolean
-load_tasks_client (void)
-{
-	char *uri;
-	gboolean success;
-
-	g_assert (calendar_client != NULL);
-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);
-
-	tasks_client = cal_client_new ();
-	if (!tasks_client)
-		goto error;
-
-	gtk_signal_connect (GTK_OBJECT (tasks_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (tasks_opened_cb),
-			    NULL);
-
-	uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
-	success = cal_client_open_calendar (tasks_client, uri, FALSE);
-	g_free (uri);
-
-	if (success)
-		return TRUE;
-
- error:
-	g_message ("load_tasks_client(): could not issue open request for the tasks client");
-
-	if (tasks_client) {
-		gtk_object_unref (GTK_OBJECT (tasks_client));
-		tasks_client = NULL;
-	}
-
-	return FALSE;
-}
-
-/* Callback used when the calendar client finishes loading */
-static void
-calendar_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		if (!load_tasks_client ()) {
-			migrated = FALSE;
-			break;
-		}
-
-		return;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		open_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* This is OK; the calendar folder did not exist in the first
-		 * place so there is nothing to migrate.
-		 */
-		break;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (calendar_client));
-	calendar_client = NULL;
-}
-
-/* Initiates the loading process for the calendar client */
-static gboolean
-load_calendar_client (void)
-{
-	char *uri;
-	gboolean success;
-
-	/* First we load the calendar client; the tasks client will be loaded
-	 * later only if the former one succeeds.
-	 */
-
-	calendar_client = cal_client_new ();
-	if (!calendar_client)
-		goto error;
-
-	gtk_signal_connect (GTK_OBJECT (calendar_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (calendar_opened_cb),
-			    NULL);
-
-	uri = g_strdup_printf ("%s/local/Calendar/calendar.ics", evolution_dir);
-	success = cal_client_open_calendar (calendar_client, uri, TRUE);
-	g_free (uri);
-
-	if (success)
-		return TRUE;
-
- error:
-	g_message ("load_calendar_client(): could not issue open request for the calendar client");
-
-	if (calendar_client) {
-		gtk_object_unref (GTK_OBJECT (calendar_client));
-		calendar_client = NULL;
-	}
-
-	return FALSE;
-}
-
-/**
- * tasks_migrate:
- *
- * Initiates the asynchronous process that migrates the tasks from the default
- * user calendar folder to the default tasks folder.  This is because Evolution
- * used to store tasks in the same folder as the calendar by default, but they
- * are separate folders now.
- **/
-void
-tasks_migrate (void)
-{
-	g_assert (!migrated);
-	migrated = TRUE;
-
-	if (!load_calendar_client ())
-		migrated = FALSE;
-}
diff --git a/calendar/gui/tasks-migrate.h b/calendar/gui/tasks-migrate.h
deleted file mode 100644
index 0307d533b9..0000000000
--- a/calendar/gui/tasks-migrate.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Evolution calendar - Migrate tasks from the calendar folder to the tasks folder
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 TASKS_MIGRATE_H
-#define TASKS_MIGRATE_H
-
-
-void tasks_migrate (void);
-
-
-#endif
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
deleted file mode 100644
index 890d46f92e..0000000000
--- a/calendar/gui/weekday-picker.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-canvas-text.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;
-
-	/* Blocked days; these cannot be modified */
-	guint8 blocked_day_mask;
-
-	/* Day that defines the start of the week; 0 = Sunday, ..., 6 = Saturday */
-	int week_start_day;
-
-	/* Metrics */
-	int font_ascent, font_descent;
-	int max_letter_width;
-
-	/* Components */
-	GnomeCanvasItem *boxes[7];
-	GnomeCanvasItem *labels[7];
-};
-
-
-
-/* Signal IDs */
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-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;
-
-static guint wp_signals[LAST_SIGNAL];
-
-
-
-/**
- * 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);
-
-	wp_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (WeekdayPickerClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, wp_signals, LAST_SIGNAL);
-
-	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;
-
-	class->changed = NULL;
-}
-
-/* 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 */
-
-	i += priv->week_start_day;
-	if (i >= 7)
-		i -= 7;
-
-	if (priv->blocked_day_mask & (0x1 << i))
-		return TRUE;
-
-	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;
-
-	GTK_WIDGET_UNSET_FLAGS (wp, GTK_CAN_FOCUS);
-
-	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];
-
-	for (i = 0; i < 7; i++) {
-		int day;
-		GdkColor *f, *t;
-
-		day = i + priv->week_start_day;
-		if (day >= 7)
-			day -= 7;
-
-		if (priv->day_mask & (0x1 << day)) {
-			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;
-	str = _("SMTWTFS");
-
-	for (i = 0; i < 7; i++) {
-		char *c;
-		int day;
-
-		day = i + priv->week_start_day;
-		if (day >= 7)
-			day -= 7;
-
-		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 + day, 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);
-
-	gtk_signal_emit (GTK_OBJECT (wp), wp_signals[CHANGED]);
-}
-
-/**
- * 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_blocked_days:
- * @wp: A weekday picker.
- * @blocked_day_mask: Bitmask with the days to be blocked.
- * 
- * Sets the days that the weekday picker will prevent from being modified by the
- * user.  The @blocked_day_mask is specified in the same way as in
- * weekday_picker_set_days().
- **/
-void
-weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-	priv->blocked_day_mask = blocked_day_mask;
-}
-
-/**
- * weekday_picker_get_blocked_days:
- * @wp: A weekday picker.
- * 
- * Queries the set of days that the weekday picker prevents from being modified
- * by the user.
- * 
- * Return value: Bit mask of blocked days, with the same format as that returned
- * by weekday_picker_get_days().
- **/
-guint
-weekday_picker_get_blocked_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->blocked_day_mask;
-}
-
-/**
- * weekday_picker_set_week_start_day:
- * @wp: A weekday picker.
- * @week_start_day: Index of the day that defines the start of the week; 0 is
- * Sunday, 1 is Monday, etc.
- * 
- * Sets the day that defines the start of the week for a weekday picker.
- **/
-void
-weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-	g_return_if_fail (week_start_day >= 0 && week_start_day < 7);
-
-	priv = wp->priv;
-	priv->week_start_day = week_start_day;
-
-	configure_items (wp);
-}
-
-/**
- * weekday_picker_get_week_start_day:
- * @wp: A weekday picker.
- * 
- * Queries the day that defines the start of the week in a weekday picker.
- * 
- * Return value: Index of the day that defines the start of the week.  See
- * weekday_picker_set_week_start_day() to see how this is represented.
- **/
-int
-weekday_picker_get_week_start_day (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, -1);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), -1);
-
-	priv = wp->priv;
-	return priv->week_start_day;
-}
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
deleted file mode 100644
index 928dcac353..0000000000
--- a/calendar/gui/weekday-picker.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-
-	void (* changed) (WeekdayPicker *wp);
-};
-
-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_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask);
-guint weekday_picker_get_blocked_days (WeekdayPicker *wp);
-
-void weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day);
-int weekday_picker_get_week_start_day (WeekdayPicker *wp);
-
-
-
-END_GNOME_DECLS
-
-#endif
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 7ad011aecf..0000000000
--- a/calendar/idl/evolution-calendar.idl
+++ /dev/null
@@ -1,350 +0,0 @@
-/* Evolution calendar interface
- *
- * Copyright (C) 2000 Eskil Heyn Olsen
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          Federico Mena-Quintero <federico@ximian.com>
- */
-
-#ifndef _EVOLUTION_CALENDAR_IDL_
-#define _EVOLUTION_CALENDAR_IDL_
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-
-module Calendar {
-	/* A calendar component (event/todo/journal/etc), represented as an
-	 * iCalendar string.
-	 */
-	typedef string CalObj;
-	typedef sequence<CalObj> CalObjSeq;
-
-	/* A unique identifier for a calendar component */
-	typedef string CalObjUID;
-
-	/* Simple sequence of strings */
-	typedef sequence<string> StringSeq;
-
-	/* Sequence of unique identifiers */
-	typedef sequence<CalObjUID> CalObjUIDSeq;
-
-	/* A VTIMEZONE component, represented as an iCalendar string. */
-	typedef string CalTimezoneObj;
-
-	/* A unique identifier for a VTIMEZONE component, i.e. its TZID. */
-	typedef string CalTimezoneObjUID;
-
-	/* A unique identifier for an alarm subcomponent */
-	typedef string CalAlarmUID;
-
-	/* 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;
-
-	/* Flags for getting URI sequences */
-	typedef long CalMode;
-	const CalMode MODE_LOCAL   = 1 << 0;
-	const CalMode MODE_REMOTE  = 1 << 1;
-	const CalMode MODE_ANY     = 0x07;
-
-	/* Types of object changes made */
-	typedef long CalObjChangeType;
-	const CalObjChangeType ADDED = 1 << 0;
-	const CalObjChangeType MODIFIED = 1 << 1;
-	const CalObjChangeType DELETED = 1 << 2;
-	
-	/* 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 component 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;
-	};
-
-	/* Used to transfer a list of component occurrences */
-	typedef sequence<CalObjInstance> CalObjInstanceSeq;
-
-	/* An object change */
-	struct CalObjChange {
-		CalObj calobj;
-		CalObjChangeType type;
-	};
-
-	/* Used to transfer a list of changed components */
-	typedef sequence<CalObjChange> CalObjChangeSeq;
-
-	/* An alarm trigger instance */
-	struct CalAlarmInstance {
-		CalAlarmUID auid;
-		Time_t trigger;
-		Time_t occur_start;
-		Time_t occur_end;
-	};
-
-	/* Used to represent a list of alarm triggers for a single component */
-	typedef sequence<CalAlarmInstance> CalAlarmInstanceSeq;
-
-	/* Alarms for a component */
-	struct CalComponentAlarms {
-		CalObj calobj;
-		CalAlarmInstanceSeq alarms;
-	};
-
-	/* Used to represent a list of components plus their triggers */
-	typedef sequence<CalComponentAlarms> CalComponentAlarmsSeq;
-
-	/* Used to represent users and lists of users */
-	typedef string User;
-	typedef sequence<User> UserList;
-
-	interface Query;
-
-	interface Listener;
-
-	interface QueryListener;
-
-	/* Calendar client interface */
-	interface Cal : Bonobo::Unknown {
-		exception NotFound {};
-		exception InvalidRange {};
-		exception InvalidObject {};
-		exception CouldNotCreate {};
-		
-		/* A calendar is identified by its URI */
-		readonly attribute string uri;
-
-		/* For going online/offline */
-		void setMode (in CalMode mode);
-		
-		/* Gets the number of components of the specified types */
-		long countObjects (in CalObjType type);
-
-		/* Gets a component based on its URI */
-		CalObj getObject (in CalObjUID uid)
-			raises (NotFound);
-
-		/* Sets the default timezone to be used for resolving DATE
-		   and floating DATE-TIME values. */
-		void setDefaultTimezone (in CalTimezoneObjUID tzid)
-			raises (NotFound);
-
-		/* Gets a VTIMEZONE component based on its TZID */
-		CalTimezoneObj getTimezoneObject (in CalTimezoneObjUID tzid)
-			raises (NotFound);
-
-		/* Gets a list of UIDs based on component type */
-		CalObjUIDSeq getUIDs (in CalObjType type);
-
-		/* Gets a list of components that changed based on object type */
-		CalObjChangeSeq getChanges (in CalObjType type, in string change_id);
-
-		/* Gets a list of components that occur or recur in the specified time range */
-		CalObjUIDSeq getObjectsInRange (in CalObjType type, 
-						in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets a list of the components that have alarms that trigger
-		 * in the specified range of time, and the trigger/occurrence
-		 * structures themselves.  
-		 */
-		CalComponentAlarmsSeq getAlarmsInRange (in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Returns free/busy objects for the given interval */
-		CalObjSeq getFreeBusy (in UserList users, in Time_t start, in Time_t end)
-			raises (NotFound, InvalidRange);
-
-		/* Gets the alarms for the specified component that trigger in
-		 * the specified time range.  
-		 */
-		CalComponentAlarms getAlarmsForObject (in CalObjUID uid,
-						       in Time_t start, in Time_t end)
-			raises (NotFound, InvalidRange);
-
-
-		/* Adds or updates one or more VEVENT/VTODO/VTIMEZONE
-		 * components. The calobj should be a string representation of
-		 * a complete VCALENDAR object (we also support single
-		 * VEVENT/VTODO strings, but that is deprecated).
-		 *
-		 * The VTIMEZONE data will be merged into the calendar,
-		 * possibly by renaming TZIDs (though not for builtin
-		 * VTIMEZONEs, which have unique TZIDs), so don't rely on the
-		 * TZIDs being the same in the new object on the server.
-		 *
-		 * The client should probably immediately free its copy of the
-		 * object after this call, and call getObject to get the
-		 * updated version.
-		 */
-		void updateObjects (in CalObj calobj)
-			raises (InvalidObject);
-
-		/* Removes a component */
-		void removeObject (in CalObjUID uid)
-			raises (NotFound);
-
-		/* Initiates a live query of the calendar.  Returns a handle
-		 * to the live query itself; changes to components that are
-		 * present in the query are notified to the listener.
-		 */
-		Query getQuery (in string sexp, in QueryListener ql)
-			raises (CouldNotCreate);
-	};
-
-	/* Listener for changes in a calendar */
-	interface Listener : Bonobo::Unknown {
-		/* Return status when opening a calendar */
-		enum OpenStatus {
-			SUCCESS,		/* All OK */
-			ERROR,			/* Generic error */
-			NOT_FOUND,		/* Requested opening in only_if_exists mode
-						 * when the URI did not exist.
-						 */
-			METHOD_NOT_SUPPORTED	/* A method handler is not registered */
-		};
-
-		/* Return status when setting calendar mode */
-		enum SetModeStatus {
-			MODE_SET,                    /* All OK */
-			MODE_NOT_SET,                /* Generic error */
-			MODE_NOT_SUPPORTED           /* Mode not supported */
-		};
-
-		/* Called from a CalFactory when a calendar is initially opened.
-		 * The listener must remember the cal object.  
-		 */
-		void notifyCalOpened (in OpenStatus status, in Cal cal);
-
-                /* Called from a Calendar when the mode is changed */
-		void notifyCalSetMode (in SetModeStatus status, in CalMode mode);
-		
-		/* Called from a Calendar when a component is added or changed */
-		void notifyObjUpdated (in CalObjUID uid);
-
-		/* Called from a Calendar when a component is removed */
-		void notifyObjRemoved (in CalObjUID uid);
-
-		/* Called from a Calendar when the list of categories changes */
-		void notifyCategoriesChanged (in StringSeq categories);
-	};
-
-	/* Handle to a live query on a calendar */
-	interface Query : Bonobo::Unknown {
-	};
-
-	/* Listener for changes in a query of a calendar */
-	interface QueryListener : Bonobo::Unknown {
-		/* Called when a component is added or changed.  If
-		 * query_in_progress is true, then the initial query results are
-		 * being populated and the other arguments indicate the
-		 * percentage of completion Otherwise, the percent value is
-		 * unspecified.  */
-		void notifyObjUpdated (in CalObjUID uid, 
-				       in boolean query_in_progress, 
-				       in long n_scanned,
-				       in long total);
-
-		/* Called when a component is removed */
-		void notifyObjRemoved (in CalObjUID uid);
-
-		/* Reported when a query ends */
-		enum QueryDoneStatus {
-			SUCCESS,
-			PARSE_ERROR
-		};
-
-		/* Called when the query finishes populating itself some time
-		 * after it is created.  Before this is called,
-		 * notifyObjUpdated() may have been called several times to
-		 * indicate which objects are actually in the query, unless the
-		 * status result is a parse error.  
-		 */
-		void notifyQueryDone (in QueryDoneStatus status, in string error_str);
-
-		/* Called when an evaluation error occurs while performing a query */
-		void notifyEvalError (in string error_str);
-	};
-
-	/* A calendar factory, can load and create calendars */
-	interface CalFactory : Bonobo::Unknown {
-		exception NilListener {};
-		exception InvalidURI {};
-		exception UnsupportedMethod {};
-
-		/* Open a calendar from an URI */
-		void open (in string uri, in boolean only_if_exists, in Listener listener)
-			raises (NilListener, InvalidURI, UnsupportedMethod);
-
-		/* List of open URI's */
-		StringSeq uriList (in CalMode mode);
-	};
-
-	/* Interface to the alarm notification service */
-	interface AlarmNotify : Bonobo::Unknown {
-		exception InvalidURI {};
-		exception BackendContactError {};
-		exception NotFound {};
-
-		/* Adds a calendar to the alarm notification system so that
-		 * alarms will be triggered for it.  The calendar will be loaded
-		 * automatically whenever the alarm daemon starts up.  
-		 */
-		void addCalendar (in string uri)
-			raises (InvalidURI, BackendContactError);
-
-		/* Removes a calendar from the alarm notification system and
-		 * alarms will no longer be triggered for it.  The calendar will
-		 * no longer be loaded when the alarm daemon starts up. 
-		 */
-		void removeCalendar (in string uri)
-			raises (InvalidURI, NotFound);
-	};
-
-	/* Factory to centralize calendar component editor dialogs */
-	interface CompEditorFactory : Bonobo::Unknown {
-		exception InvalidURI {};
-		exception BackendContactError {};
-		exception UnsupportedType {};
-
-		typedef long CompEditorMode;
-		const CompEditorMode EDITOR_MODE_EVENT        = 1 << 0;
-		const CompEditorMode EDITOR_MODE_ALLDAY_EVENT = 1 << 1;
-		const CompEditorMode EDITOR_MODE_MEETING      = 1 << 2;
-		const CompEditorMode EDITOR_MODE_TODO         = 1 << 3;
-
-		/* Loads a calendar and opens an editor for the specified object */
-		void editExisting (in string uri, in CalObjUID uid)
-			raises (InvalidURI, BackendContactError);
-
-		/* Loads a calendar and creates a new component of the specified type */
-		void editNew (in string uri, in CompEditorMode mode)
-			raises (InvalidURI, BackendContactError, UnsupportedType);
-	};
-};
-
-};
-};
-
-#endif
diff --git a/calendar/importers/.cvsignore b/calendar/importers/.cvsignore
deleted file mode 100644
index dfa0930c53..0000000000
--- a/calendar/importers/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-evolution-calendar-importer
-GNOME_Evolution_Calendar_Importer.oaf
diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in
deleted file mode 100644
index 710567dbc0..0000000000
--- a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in
+++ /dev/null
@@ -1,51 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
-	    type="exe"
-	    location="evolution-calendar-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to import iCalendar files into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="evolution:menu-name" type="string"
-                       value="iCalendar files (.ics)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports iCalendar files into Evolution"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="evolution:menu-name" type="string"
-                       value="vCalendar files (.vcf)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports vCalendar files into Evolution"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-</oaf_info>
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
deleted file mode 100644
index 4015e12f86..0000000000
--- a/calendar/importers/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-bin_PROGRAMS = evolution-calendar-importer
-
-sounddir = $(datadir)/evolution/sounds
-
-INCLUDES = 						\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_SOUNDDIR=\""$(sounddir)"\"		\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/calendar/cal-client		\
-	-I$(top_builddir)/calendar/cal-client		\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libicalvcal		\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-evolution_calendar_importer_SOURCES = 	\
-	evolution-calendar-importer.h	\
-	icalendar-importer.c		\
-	main.c
-
-evolution_calendar_importer_LDADD =				\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/calendar/cal-client/libcal-client.la	\
-	$(top_builddir)/libwombat/libwombat.la			\
-	$(top_builddir)/libical/src/libical/libical-evolution.la	\
-	$(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \
-	$(EVOLUTION_CALENDAR_LIBS)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Calendar_Importer.oaf.in
-
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
-
-@XML_I18N_MERGE_OAF_RULE@
diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h
deleted file mode 100644
index b4c59da340..0000000000
--- a/calendar/importers/evolution-calendar-importer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 EVOLUTION_CALENDAR_IMPORTER_H
-#define EVOLUTION_CALENDAR_IMPORTER_H
-
-#include <bonobo/bonobo-object.h>
-
-BEGIN_GNOME_DECLS
-
-BonoboObject *ical_importer_new (void);
-BonoboObject *vcal_importer_new (void);
-
-BonoboObject *gnome_calendar_importer_new (void);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
deleted file mode 100644
index 6a7a6f363f..0000000000
--- a/calendar/importers/icalendar-importer.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/types.h>
-#include <fcntl.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <bonobo/bonobo-control.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <cal-client.h>
-#include <importer/evolution-importer.h>
-#include <importer/evolution-intelligent-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-#include "icalvcal.h"
-#include "evolution-calendar-importer.h"
-
-/* We timeout after 2 minutes, when opening the folders. */
-#define IMPORTER_TIMEOUT_SECONDS 120
-
-
-typedef struct {
-	CalClient *client;
-	CalClient *tasks_client;
-	EvolutionImporter *importer;
-	icalcomponent *icalcomp;
-	gboolean folder_contains_events;
-	gboolean folder_contains_tasks;
-} ICalImporter;
-
-typedef struct {
-	gboolean do_calendar;
-	gboolean do_tasks;
-} ICalIntelligentImporter;
-
-/*
- * Functions shared by iCalendar & vCalendar importer.
- */
-
-static void
-importer_destroy_cb (GtkObject *object, gpointer user_data)
-{
-	ICalImporter *ici = (ICalImporter *) user_data;
-
-	g_return_if_fail (ici != NULL);
-
-	gtk_object_unref (GTK_OBJECT (ici->client));
-	gtk_object_unref (GTK_OBJECT (ici->tasks_client));
-	if (ici->icalcomp != NULL)
-		icalcomponent_free (ici->icalcomp);
-	g_free (ici);
-}
-
-
-/* This reads in an entire file and returns it. It returns NULL on error.
-   The returned string should be freed. */
-static char*
-read_file (const char *filename)
-{
-	int fd, n;
-	GString *str;
-	char buffer[2049];
-	gboolean error = FALSE;
-
-	/* read file contents */
-	fd = open (filename, O_RDONLY);
-	if (fd == -1)
-		return NULL;
-
-	str = g_string_new ("");
-	while (1) {
-		memset (buffer, 0, sizeof(buffer));
-		n = read (fd, buffer, sizeof (buffer) - 1);
-		if (n > 0) {
-			str = g_string_append (str, buffer);
-		} else if (n == 0) {
-			break;
-		} else {
-			error = TRUE;
-			break;
-		}
-	}
-
-	close (fd);
-
-	if (error) {
-		g_string_free (str, FALSE);
-		return NULL;
-	} else {
-		gchar *retval = str->str;
-		g_string_free (str, FALSE);
-		return retval;
-	}
-}
-
-
-/* Returns the URI to load given a folder path. Currently this is just a full
-   pathname. The returned string should be freed. */
-static char*
-get_uri_from_folder_path (const char *folderpath)
-{
-	const char *name;
-	char *parent;
-
-	if (folderpath == NULL || *folderpath == '\0') {
-		return g_strdup_printf ("%s/evolution/local/Calendar/calendar.ics",
-					g_get_home_dir ());
-	}
-
-	name = strrchr (folderpath, '/');
-	if (name == NULL || name == folderpath) {
-		parent = "evolution/local/";
-		if (folderpath[0] == '/')
-			name = folderpath + 1;
-		else
-			name = folderpath;
-	} else {
-		name += 1;
-		parent = "evolution/local/Calendar/subfolders/";
-	}
-
-	return g_strdup_printf ("%s/%s%s/calendar.ics", g_get_home_dir (),
-				parent, name);
-}
-
-
-/* Determine whether it is a calendar or tasks folder, or both. If it starts
-   with 'file:' we know it is a local folder so we see if it ends with
-   calendar.ics or tasks.ics. For remote folders (i.e. Exchange folders at
-   present), we import both calendar events and tasks into it. */
-static void
-check_folder_type (ICalImporter *ici,
-		   const char *folderpath)
-{
-	ici->folder_contains_events = TRUE;
-	ici->folder_contains_tasks = TRUE;
-
-	/* FIXME: Finish. */
-}
-
-
-/* This removes all components except VEVENTs and VTIMEZONEs from the toplevel
-   icalcomponent, and returns a GList of the VTODO components. */
-static GList*
-prepare_events (icalcomponent *icalcomp)
-{
-	icalcomponent *subcomp, *next_subcomp;
-	GList *vtodos = NULL;
-
-	subcomp = icalcomponent_get_first_component (icalcomp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
-		next_subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
-		if (child_kind != ICAL_VEVENT_COMPONENT
-		    && child_kind != ICAL_VTIMEZONE_COMPONENT) {
-
-			icalcomponent_remove_component (icalcomp,
-							subcomp);
-			if (child_kind == ICAL_VTODO_COMPONENT)
-				vtodos = g_list_prepend (vtodos, subcomp);
-			else
-				icalcomponent_free (subcomp);
-		}
-		subcomp = next_subcomp;
-	}
-
-	return vtodos;
-}
-
-
-/* This removes all components except VTODOs and VTIMEZONEs from the toplevel
-   icalcomponent, and adds the given list of VTODO components. The list is
-   freed afterwards. */
-static void
-prepare_tasks (icalcomponent *icalcomp, GList *vtodos)
-{
-	icalcomponent *subcomp, *next_subcomp;
-	GList *elem;
-
-	subcomp = icalcomponent_get_first_component (icalcomp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
-		next_subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
-		if (child_kind != ICAL_VTODO_COMPONENT
-		    && child_kind != ICAL_VTIMEZONE_COMPONENT) {
-			icalcomponent_remove_component (icalcomp, subcomp);
-			icalcomponent_free (subcomp);
-		}
-		subcomp = next_subcomp;
-	}
-
-	for (elem = vtodos; elem; elem = elem->next) {
-		icalcomponent_add_component (icalcomp, elem->data);
-	}
-	g_list_free (vtodos);
-}
-
-
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	CalClientLoadState state, tasks_state;
-	ICalImporter *ici = (ICalImporter *) closure;
-	GNOME_Evolution_ImporterListener_ImporterResult result;
-
-	result = GNOME_Evolution_ImporterListener_OK;
-
-	g_return_if_fail (ici != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (ici->client));
-	g_return_if_fail (ici->icalcomp != NULL);
-
-	state = cal_client_get_load_state (ici->client);
-	tasks_state = cal_client_get_load_state (ici->tasks_client);
-	if (state == CAL_CLIENT_LOAD_LOADING
-	    || tasks_state == CAL_CLIENT_LOAD_LOADING) {
-		GNOME_Evolution_ImporterListener_notifyResult (
-			listener,
-			GNOME_Evolution_ImporterListener_NOT_READY,
-			TRUE, ev);
-		return;
-	}
-	else if (state != CAL_CLIENT_LOAD_LOADED
-		 || tasks_state != CAL_CLIENT_LOAD_LOADED) {
-		GNOME_Evolution_ImporterListener_notifyResult (
-			listener,
-			GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-			FALSE, ev);
-		return;
-	}
-
-	/* If the folder contains events & tasks we can just import everything
-	   into it. If it contains just events, we have to strip out the
-	   VTODOs and import them into the default tasks folder. If the folder
-	   contains just tasks, we strip out the VEVENTs, which do not get
-	   imported at all. */
-	if (ici->folder_contains_events && ici->folder_contains_tasks) {
-		if (!cal_client_update_objects (ici->client, ici->icalcomp))
-			result = GNOME_Evolution_ImporterListener_BAD_DATA;
-	} else if (ici->folder_contains_events) {
-		GList *vtodos = prepare_events (ici->icalcomp);
-		if (!cal_client_update_objects (ici->client, ici->icalcomp))
-			result = GNOME_Evolution_ImporterListener_BAD_DATA;
-
-		prepare_tasks (ici->icalcomp, vtodos);
-		if (!cal_client_update_objects (ici->tasks_client,
-						ici->icalcomp))
-			result = GNOME_Evolution_ImporterListener_BAD_DATA;
-	} else {
-		prepare_tasks (ici->icalcomp, NULL);
-		if (!cal_client_update_objects (ici->client, ici->icalcomp))
-			result = GNOME_Evolution_ImporterListener_BAD_DATA;
-	}
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener, result, FALSE,
-						       ev);
-}
-
-
-/*
- * iCalendar importer functions.
- */
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *contents;
-	icalcomponent *icalcomp;
-	gboolean ret = FALSE;
-
-	contents = read_file (filename);
-
-	/* parse the file */
-	if (contents) {
-		icalcomp = icalparser_parse_string (contents);
-		if (icalcomp) {
-			icalcomponent_free (icalcomp);
-			ret = TRUE;
-		}
-	}
-
-	g_free (contents);
-
-	return ret;
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      const char *folderpath,
-	      void *closure)
-{
-	char *uri_str, *contents;
-	gboolean ret = FALSE;
-	ICalImporter *ici = (ICalImporter *) closure;
-
-	g_return_val_if_fail (ici != NULL, FALSE);
-
-	uri_str = get_uri_from_folder_path (folderpath);
-	check_folder_type (ici, folderpath);
-
-	contents = read_file (filename);
-
-	/* parse the file */
-	if (contents) {
-		icalcomponent *icalcomp;
-
-		icalcomp = icalparser_parse_string (contents);
-		if (icalcomp) {
-			if (cal_client_open_calendar (ici->client, uri_str, TRUE)
-			    && cal_client_open_default_tasks (ici->tasks_client, FALSE)) {
-				ici->icalcomp = icalcomp;
-				ret = TRUE;
-			}
-		}
-	}
-
-	g_free (contents);
-	g_free (uri_str);
-
-	return ret;
-}
-
-BonoboObject *
-ical_importer_new (void)
-{
-	ICalImporter *ici;
-
-	ici = g_new0 (ICalImporter, 1);
-	ici->client = cal_client_new ();
-	ici->tasks_client = cal_client_new ();
-	ici->icalcomp = NULL;
-	ici->importer = evolution_importer_new (support_format_fn,
-						load_file_fn,
-						process_item_fn,
-						NULL,
-						ici);
-	gtk_signal_connect (GTK_OBJECT (ici->importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), ici);
-
-	return BONOBO_OBJECT (ici->importer);
-}
-
-
-
-/*
- * vCalendar importer functions.
- */
-
-static gboolean
-vcal_support_format_fn (EvolutionImporter *importer,
-			const char *filename,
-			void *closure)
-{
-	char *contents;
-	gboolean ret = FALSE;
-
-	contents = read_file (filename);
-
-	/* parse the file */
-	if (contents) {
-		VObject *vcal;
-
-		vcal = Parse_MIME (contents, strlen (contents));
-
-		if (vcal) {
-			icalcomponent *icalcomp;
-
-			icalcomp = icalvcal_convert (vcal);
-		
-			if (icalcomp) {
-				icalcomponent_free (icalcomp);
-				ret = TRUE;
-			}
-
-			cleanVObject (vcal);
-		}
-	}
-
-	g_free (contents);
-
-	return ret;
-}
-
-/* This tries to load in a vCalendar file and convert it to an icalcomponent.
-   It returns NULL on failure. */
-static icalcomponent*
-load_vcalendar_file (const char *filename)
-{
-	icalvcal_defaults defaults = { 0 };
-	icalcomponent *icalcomp = NULL;
-	char *contents;
-
-	defaults.alarm_audio_url = "file://" EVOLUTION_SOUNDDIR "/default_alarm.wav";
-	defaults.alarm_audio_fmttype = "audio/x-wav";
-	defaults.alarm_description = (char*) U_("Reminder!!");
-
-	contents = read_file (filename);
-
-	/* parse the file */
-	if (contents) {
-		VObject *vcal;
-
-		vcal = Parse_MIME (contents, strlen (contents));
-
-		if (vcal) {
-			icalcomp = icalvcal_convert_with_defaults (vcal,
-								   &defaults);
-			cleanVObject (vcal);
-		}
-	}
-
-	g_free (contents);
-
-	return icalcomp;
-}
-
-static gboolean
-vcal_load_file_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   const char *folderpath,
-		   void *closure)
-{
-	char *uri_str;
-	gboolean ret = FALSE;
-	ICalImporter *ici = (ICalImporter *) closure;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (ici != NULL, FALSE);
-
-	uri_str = get_uri_from_folder_path (folderpath);
-	check_folder_type (ici, folderpath);
-
-	icalcomp = load_vcalendar_file (filename);
-	if (icalcomp) {
-		if (cal_client_open_calendar (ici->client, uri_str, TRUE)
-		    && cal_client_open_default_tasks (ici->tasks_client, FALSE)) {
-			ici->icalcomp = icalcomp;
-			ret = TRUE;
-		}
-	}
-
-	g_free (uri_str);
-
-	return ret;
-}
-
-BonoboObject *
-vcal_importer_new (void)
-{
-	ICalImporter *ici;
-
-	ici = g_new0 (ICalImporter, 1);
-	ici->client = cal_client_new ();
-	ici->tasks_client = cal_client_new ();
-	ici->icalcomp = NULL;
-	ici->importer = evolution_importer_new (vcal_support_format_fn,
-						vcal_load_file_fn,
-						process_item_fn,
-						NULL,
-						ici);
-	gtk_signal_connect (GTK_OBJECT (ici->importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), ici);
-
-	return BONOBO_OBJECT (ici->importer);
-}
-
-
-
-
-
-
-static void
-gnome_calendar_importer_destroy_cb (GtkObject *object, gpointer user_data)
-{
-	ICalIntelligentImporter *ici = (ICalIntelligentImporter *) user_data;
-
-	g_return_if_fail (ici != NULL);
-
-	g_free (ici);
-}
-
-
-
-static gboolean
-gnome_calendar_can_import_fn (EvolutionIntelligentImporter *ii,
-			      void *closure)
-{
-	char *filename;
-	gboolean gnome_calendar_exists;
-
-	filename = gnome_util_home_file ("user-cal.vcf");
-	gnome_calendar_exists = g_file_exists (filename);
-	g_free (filename);
-
-	return gnome_calendar_exists;
-}
-
-
-static void
-gnome_calendar_import_data_fn (EvolutionIntelligentImporter *ii,
-			       void *closure)
-{
-	ICalIntelligentImporter *ici = closure;
-	icalcomponent *icalcomp = NULL;
-	char *filename;
-	GList *vtodos;
-	CalClient *calendar_client = NULL, *tasks_client = NULL;
-	int t;
-
-	/* If neither is selected, just return. */
-	if (!ici->do_calendar && !ici->do_tasks) {
-		return;
-	}
-
-	/* Try to open the default calendar & tasks folders. */
-	if (ici->do_calendar) {
-		calendar_client = cal_client_new ();
-		if (!cal_client_open_default_calendar (calendar_client, FALSE))
-			goto out;
-	}
-
-	if (ici->do_tasks) {
-		tasks_client = cal_client_new ();
-		if (!cal_client_open_default_tasks (tasks_client, FALSE))
-			goto out;
-	}
-
-	/* Load the Gnome Calendar file and convert to iCalendar. */
-	filename = gnome_util_home_file ("user-cal.vcf");
-	icalcomp = load_vcalendar_file (filename);
-	g_free (filename);
-
-	/* If we couldn't load the file, just return. FIXME: Error message? */
-	if (!icalcomp)
-		goto out;
-
-	/*
-	 * Import the calendar events into the default calendar folder.
-	 */
-	vtodos = prepare_events (icalcomp);
-
-	/* Wait for client to finish opening the calendar & tasks folders. */
-	for (t = 0; t < IMPORTER_TIMEOUT_SECONDS; t++) {
-		CalClientLoadState calendar_state, tasks_state;
-
-		calendar_state = tasks_state = CAL_CLIENT_LOAD_LOADED;
-
-		/* We need this so the CalClient gets notified that the
-		   folder is opened, via Corba. */
-		while (gtk_events_pending ())
-			gtk_main_iteration ();
-
-		if (ici->do_calendar)
-			calendar_state = cal_client_get_load_state (calendar_client);
-
-		if (ici->do_tasks)
-			tasks_state = cal_client_get_load_state (tasks_client);
-
-		if (calendar_state == CAL_CLIENT_LOAD_LOADED
-		    && tasks_state == CAL_CLIENT_LOAD_LOADED)
-			break;
-
-		sleep (1);
-	}
-
-	/* If we timed out, just return. */
-	if (t == IMPORTER_TIMEOUT_SECONDS)
-		goto out;
-
-	/* Import the calendar events. */
-	/* FIXME: What do intelligent importers do about errors? */
-	if (ici->do_calendar)
-		cal_client_update_objects (calendar_client, icalcomp);
-
-
-	/*
-	 * Import the tasks into the default tasks folder.
-	 */
-	prepare_tasks (icalcomp, vtodos);
-	if (ici->do_tasks)
-		cal_client_update_objects (tasks_client, icalcomp);
-
- out:
-	if (icalcomp)
-		icalcomponent_free (icalcomp);
-	if (calendar_client)
-		gtk_object_unref (GTK_OBJECT (calendar_client));
-	if (tasks_client)
-		gtk_object_unref (GTK_OBJECT (tasks_client));
-}
-
-
-/* Fun with aggregation */
-static void
-checkbox_toggle_cb (GtkToggleButton *tb,
-		    gboolean *do_item)
-{
-	*do_item = gtk_toggle_button_get_active (tb);
-}
-
-static BonoboControl *
-create_checkboxes_control (ICalIntelligentImporter *ici)
-{
-	GtkWidget *hbox, *calendar_checkbox, *tasks_checkbox;
-	BonoboControl *control;
-
-	hbox = gtk_hbox_new (FALSE, 2);
-
-	calendar_checkbox = gtk_check_button_new_with_label (_("Calendar Events"));
-	gtk_signal_connect (GTK_OBJECT (calendar_checkbox), "toggled",
-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
-			    &ici->do_calendar);
-	gtk_box_pack_start (GTK_BOX (hbox), calendar_checkbox,
-			    FALSE, FALSE, 0);
-
-	tasks_checkbox = gtk_check_button_new_with_label (_("Tasks"));
-	gtk_signal_connect (GTK_OBJECT (tasks_checkbox), "toggled",
-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
-			    &ici->do_tasks);
-	gtk_box_pack_start (GTK_BOX (hbox), tasks_checkbox,
-			    FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-	control = bonobo_control_new (hbox);
-	return control;
-}
-
-BonoboObject *
-gnome_calendar_importer_new (void)
-{
-	EvolutionIntelligentImporter *importer;
-	ICalIntelligentImporter *ici;
-	BonoboControl *control;
-	char *message = N_("Evolution has found Gnome Calendar files.\n"
-			   "Would you like to import them into Evolution?");
-
-	ici = g_new0 (ICalIntelligentImporter, 1);
-
-	importer = evolution_intelligent_importer_new (gnome_calendar_can_import_fn,
-						       gnome_calendar_import_data_fn,
-						       _("Gnome Calendar"),
-						       _(message),
-						       ici);
-
-
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (gnome_calendar_importer_destroy_cb), ici);
-
-	control = create_checkboxes_control (ici);
-	bonobo_object_add_interface (BONOBO_OBJECT (importer),
-				     BONOBO_OBJECT (control));
-
-	return BONOBO_OBJECT (importer);
-}
diff --git a/calendar/importers/main.c b/calendar/importers/main.c
deleted file mode 100644
index f6d5788d93..0000000000
--- a/calendar/importers/main.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-main.h>
-#include "evolution-calendar-importer.h"
-
-#define IMPORTER_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
-#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
-#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"
-#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"
-
-static BonoboObject *
-importer_factory_fn (BonoboGenericFactory *factory, const char *id, void *closure)
-{
-	BonoboObject *object = NULL;
-
-	g_return_val_if_fail (id != NULL, NULL);
-
-	if (!strcmp (id, ICALENDAR_IMPORTER_ID))
-		object = ical_importer_new ();
-	else if (!strcmp (id, VCALENDAR_IMPORTER_ID))
-		object = vcal_importer_new ();
-	else if (!strcmp (id, GNOME_CALENDAR_IMPORTER_ID))
-		object = gnome_calendar_importer_new ();
-	else
-		g_warning ("Component not supporte by this factory");
-
-	return object;
-}
-
-static void
-init_importer (void)
-{
-	BonoboGenericFactory *factory;
-
-	factory = bonobo_generic_factory_new_multi (IMPORTER_FACTORY_ID,
-						    importer_factory_fn, NULL);
-	if (factory == NULL) {
-		g_error ("Unable to create factory");
-		exit (0);
-	}
-
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-}
-
-int
-main (int argc, char *argv[])
-{
-	CORBA_ORB orb;
-
-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain(PACKAGE);
-	
-	gnome_init_with_popt_table ("evolution-calendar-importer",
-				    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.");
-		exit (0);
-	}
-
-	init_importer ();
-	bonobo_main ();
-
-	return 0;
-}
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 57c24d3130..0000000000
--- a/calendar/pcs/Makefile.am
+++ /dev/null
@@ -1,52 +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		\
-	-I$(top_srcdir)/libwombat			\
-	-I$(top_builddir)/libwombat			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-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 = -I $(srcdir) `$(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-backend-util.c	\
-	cal-backend-util.h	\
-	cal-common.h		\
-	cal-factory.c		\
-	cal-factory.h		\
-	job.c			\
-	job.h			\
-	query.c			\
-	query.h
-
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
deleted file mode 100644
index 5ca5a06f0e..0000000000
--- a/calendar/pcs/cal-backend-file.c
+++ /dev/null
@@ -1,1949 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include "e-util/e-dbhash.h"
-#include "cal-util/cal-recur.h"
-#include "cal-util/cal-util.h"
-#include "cal-backend-file.h"
-#include "cal-backend-util.h"
-
-
-
-/* A category that exists in some of the objects of the calendar */
-typedef struct {
-	/* Category name, also used as the key in the categories hash table */
-	char *name;
-
-	/* Number of objects that have this category */
-	int refcount;
-} Category;
-
-/* Private part of the CalBackendFile structure */
-struct _CalBackendFilePrivate {
-	/* URI where the calendar data is stored */
-	char *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;
-
-	/* Hash table of live categories, and a temporary hash of removed categories */
-	GHashTable *categories;
-	GHashTable *removed_categories;
-
-	/* Config database handle for free/busy organizer information */
-	Bonobo_ConfigDatabase db;
-	
-	/* Idle handler for saving the calendar when it is dirty */
-	guint idle_id;
-
-	/* The calendar's default timezone, used for resolving DATE and
-	   floating DATE-TIME values. */
-	icaltimezone *default_zone;
-};
-
-
-
-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 const char *cal_backend_file_get_uri (CalBackend *backend);
-static CalBackendOpenStatus cal_backend_file_open (CalBackend *backend,
-						   const char *uristr,
-						   gboolean only_if_exists);
-static gboolean cal_backend_file_is_loaded (CalBackend *backend);
-static Query *cal_backend_file_get_query (CalBackend *backend,
-					  GNOME_Evolution_Calendar_QueryListener ql,
-					  const char *sexp);
-
-static CalMode cal_backend_file_get_mode (CalBackend *backend);
-static void cal_backend_file_set_mode (CalBackend *backend, CalMode mode);
-
-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 CalComponent *cal_backend_file_get_object_component (CalBackend *backend, const char *uid);
-static char *cal_backend_file_get_timezone_object (CalBackend *backend, const char *tzid);
-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_free_busy (CalBackend *backend, GList *users, time_t start, time_t end);
-static GNOME_Evolution_Calendar_CalObjChangeSeq *cal_backend_file_get_changes (
-	CalBackend *backend, CalObjType type, const char *change_id);
-
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_file_get_alarms_in_range (
-	CalBackend *backend, time_t start, time_t end);
-
-static GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_file_get_alarms_for_object (
-	CalBackend *backend, const char *uid,
-	time_t start, time_t end, gboolean *object_found);
-
-static gboolean cal_backend_file_update_objects (CalBackend *backend, const char *calobj);
-static gboolean cal_backend_file_remove_object (CalBackend *backend, const char *uid);
-
-static icaltimezone* cal_backend_file_get_timezone (CalBackend *backend, const char *tzid);
-static icaltimezone* cal_backend_file_get_default_timezone (CalBackend *backend);
-static gboolean cal_backend_file_set_default_timezone (CalBackend *backend,
-						       const char *tzid);
-
-static void notify_categories_changed (CalBackendFile *cbfile);
-
-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->open = cal_backend_file_open;
-	backend_class->is_loaded = cal_backend_file_is_loaded;
-	backend_class->get_query = cal_backend_file_get_query;
-	backend_class->get_mode = cal_backend_file_get_mode;
-	backend_class->set_mode = cal_backend_file_set_mode;	
-	backend_class->get_n_objects = cal_backend_file_get_n_objects;
-	backend_class->get_object = cal_backend_file_get_object;
-	backend_class->get_object_component = cal_backend_file_get_object_component;
-	backend_class->get_timezone_object = cal_backend_file_get_timezone_object;
-	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_free_busy = cal_backend_file_get_free_busy;
-	backend_class->get_changes = cal_backend_file_get_changes;
-	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_objects = cal_backend_file_update_objects;
-	backend_class->remove_object = cal_backend_file_remove_object;
-
-	backend_class->get_timezone = cal_backend_file_get_timezone;
-	backend_class->get_default_timezone = cal_backend_file_get_default_timezone;
-	backend_class->set_default_timezone = cal_backend_file_set_default_timezone;
-}
-
-static Bonobo_ConfigDatabase
-load_db (void)
-{
-	Bonobo_ConfigDatabase db = CORBA_OBJECT_NIL;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
- 
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	
-	if (BONOBO_EX (&ev))
-		db = CORBA_OBJECT_NIL;
-		
-	CORBA_exception_free (&ev);
-
-	return db;
-}
-
-static void
-cal_added_cb (CalBackend *backend, gpointer user_data)
-{
-	notify_categories_changed (CAL_BACKEND_FILE (backend));
-}
-
-/* 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;
-
-	priv->uri = NULL;
-	priv->icalcomp = NULL;
-	priv->comp_uid_hash = NULL;
-	priv->events = NULL;
-	priv->todos = NULL;
-	priv->journals = NULL;
-
-	priv->categories = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->removed_categories = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* The timezone defaults to UTC. */
-	priv->default_zone = icaltimezone_get_utc_timezone ();
-
-	priv->db = load_db ();
-	
-	gtk_signal_connect (GTK_OBJECT (cbfile), "cal_added",
-			    GTK_SIGNAL_FUNC (cal_added_cb), NULL);
-}
-
-/* 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;
-	GnomeVFSURI *uri;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-	GnomeVFSFileSize out;
-	gchar *tmp;
-	char *buf;
-	
-	priv = cbfile->priv;
-	g_assert (priv->uri != NULL);
-	g_assert (priv->icalcomp != NULL);
-
-	uri = gnome_vfs_uri_new (priv->uri);
-
-	/* Make a backup copy of the file if it exists */
-	tmp = gnome_vfs_uri_to_string (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 (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, 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);
-	gnome_vfs_uri_unref (uri);
-
-	return;
-	
- error:
-	g_warning ("Error writing calendar file.");
-	return;
-}
-
-/* Used from g_hash_table_foreach(), frees a Category structure */
-static void
-free_category_cb (gpointer key, gpointer value, gpointer data)
-{
-	Category *c;
-
-	c = value;
-	g_free (c->name);
-	g_free (c);
-}
-
-/* Destroy handler for the file backend */
-static void
-cal_backend_file_destroy (GtkObject *object)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *clients;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));
-
-	cbfile = CAL_BACKEND_FILE (object);
-	priv = cbfile->priv;
-
-	clients = CAL_BACKEND (cbfile)->clients;
-	g_assert (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) {
-	        g_free (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;
-
-	g_hash_table_foreach (priv->categories, free_category_cb, NULL);
-	g_hash_table_destroy (priv->categories);
-	priv->categories = NULL;
-
-	g_hash_table_foreach (priv->removed_categories, free_category_cb, NULL);
-	g_hash_table_destroy (priv->removed_categories);
-	priv->removed_categories = NULL;
-
-	if (priv->icalcomp) {
-		icalcomponent_free (priv->icalcomp);
-		priv->icalcomp = NULL;
-	}
-
-	bonobo_object_release_unref (priv->db, NULL);
-	priv->db = CORBA_OBJECT_NIL;
-	
-	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 const char *
-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 (const char *) priv->uri;
-}
-
-/* Used from g_hash_table_foreach(), adds a category name to the sequence */
-static void
-add_category_cb (gpointer key, gpointer value, gpointer data)
-{
-	Category *c;
-	GNOME_Evolution_Calendar_StringSeq *seq;
-
-	c = value;
-	seq = data;
-
-	seq->_buffer[seq->_length] = CORBA_string_dup (c->name);
-	seq->_length++;
-}
-
-/* Notifies the clients with the current list of categories */
-static void
-notify_categories_changed (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	GNOME_Evolution_Calendar_StringSeq *seq;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	/* Build the sequence of category names */
-
-	seq = GNOME_Evolution_Calendar_StringSeq__alloc ();
-	seq->_length = 0;
-	seq->_maximum = g_hash_table_size (priv->categories);
-	seq->_buffer = CORBA_sequence_CORBA_string_allocbuf (seq->_maximum);
-	CORBA_sequence_set_release (seq, TRUE);
-
-	g_hash_table_foreach (priv->categories, add_category_cb, seq);
-	g_assert (seq->_length == seq->_maximum);
-
-	/* Notify the clients */
-
-	for (l = CAL_BACKEND (cbfile)->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_categories_changed (cal, seq);
-	}
-
-	CORBA_free (seq);
-}
-
-/* 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);
-}
-
-/* Updates the hash table of categories by adding or removing those in the
- * component.
- */
-static void
-update_categories_from_comp (CalBackendFile *cbfile, CalComponent *comp, gboolean add)
-{
-	CalBackendFilePrivate *priv;
-	GSList *categories, *l;
-
-	priv = cbfile->priv;
-
-	cal_component_get_categories_list (comp, &categories);
-
-	for (l = categories; l; l = l->next) {
-		const char *name;
-		Category *c;
-
-		name = l->data;
-		c = g_hash_table_lookup (priv->categories, name);
-
-		if (add) {
-			/* Add the category to the set */
-			if (c)
-				c->refcount++;
-			else {
-				/* See if it was in the removed categories */
-
-				c = g_hash_table_lookup (priv->removed_categories, name);
-				if (c) {
-					/* Move it to the set of live categories */
-					g_assert (c->refcount == 0);
-					g_hash_table_remove (priv->removed_categories, c->name);
-
-					c->refcount = 1;
-					g_hash_table_insert (priv->categories, c->name, c);
-				} else {
-					/* Create a new category */
-					c = g_new (Category, 1);
-					c->name = g_strdup (name);
-					c->refcount = 1;
-
-					g_hash_table_insert (priv->categories, c->name, c);
-				}
-			}
-		} else {
-			/* Remove the category from the set --- it *must* have existed */
-
-			g_assert (c != NULL);
-			g_assert (c->refcount > 0);
-
-			c->refcount--;
-
-			if (c->refcount == 0) {
-				g_hash_table_remove (priv->categories, c->name);
-				g_hash_table_insert (priv->removed_categories, c->name, c);
-			}
-		}
-	}
-
-	cal_component_free_categories_list (categories);
-}
-
-/* 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);
-	}
-
-	/* Update the set of categories */
-
-	update_categories_from_comp (cbfile, comp, TRUE);
-}
-
-/* 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);
-
-	/* Update the set of categories */
-
-	update_categories_from_comp (cbfile, comp, FALSE);
-
-	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;
-	icalcompiter iter;
-
-	priv = cbfile->priv;
-	g_assert (priv->icalcomp != NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_ANY_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-		CalComponent *comp;
-
-		icalcomp = icalcompiter_deref (&iter);
-		
-		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_fn (char *s, size_t size, void *data)
-{
-	FILE *file;
-
-	file = data;
-	return fgets (s, size, file);
-}
-
-/* Parses an open iCalendar file and returns a toplevel component with the contents */
-static icalcomponent *
-parse_file (FILE *file)
-{
-	icalparser *parser;
-	icalcomponent *icalcomp;
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, file);
-
-	icalcomp = icalparser_parse (parser, get_line_fn);
-	icalparser_free (parser);
-
-	return icalcomp;
-}
-
-/* Parses an open iCalendar file and loads it into the backend */
-static CalBackendOpenStatus
-open_cal (CalBackendFile *cbfile, const char *uristr, FILE *file)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-
-	priv = cbfile->priv;
-
-	icalcomp = parse_file (file);
-
-	if (fclose (file) != 0) {
-		if (icalcomp)
-			icalcomponent_free (icalcomp);
-
-		return CAL_BACKEND_OPEN_ERROR;
-	}
-
-	if (!icalcomp)
-		return CAL_BACKEND_OPEN_ERROR;
-		
-	/* FIXME: should we try to demangle XROOT components and
-	 * individual components as well?
-	 */
-
-	if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_free (icalcomp);
-		return CAL_BACKEND_OPEN_ERROR;
-	}
-
-	priv->icalcomp = icalcomp;
-
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	scan_vcalendar (cbfile);
-
-	priv->uri = g_strdup (uristr);
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-static CalBackendOpenStatus
-create_cal (CalBackendFile *cbfile, const char *uristr)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = cbfile->priv;
-
-	/* Create the new calendar information */
-	priv->icalcomp = cal_util_new_top_level ();
-
-	/* Create our internal data */
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->uri = g_strdup (uristr);
-
-	mark_dirty (cbfile);
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-/* Open handler for the file backend */
-static CalBackendOpenStatus
-cal_backend_file_open (CalBackend *backend, const char *uristr, gboolean only_if_exists)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	FILE *file;
-	char *str_uri;
-	GnomeVFSURI *uri;
-	CalBackendOpenStatus status;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp == NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail (uristr != NULL, CAL_BACKEND_OPEN_ERROR);
-
-	g_assert (priv->uri == NULL);
-	g_assert (priv->comp_uid_hash == NULL);
-
-	uri = gnome_vfs_uri_new (uristr);
-	if (!uri)
-		return CAL_BACKEND_OPEN_ERROR;
-
-	if (!gnome_vfs_uri_is_local (uri)) {
-		gnome_vfs_uri_unref (uri);
-		return CAL_BACKEND_OPEN_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");
-
-	if (file)
-		status = open_cal (cbfile, str_uri, file);
-	else {
-		if (only_if_exists)
-			status = CAL_BACKEND_OPEN_NOT_FOUND;
-		else
-			status = create_cal (cbfile, str_uri);
-	}
-
-	g_free (str_uri);
-	gnome_vfs_uri_unref (uri);
-
-	return status;
-}
-
-/* is_loaded handler for the file backend */
-static gboolean
-cal_backend_file_is_loaded (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	return (priv->icalcomp != NULL);
-}
-
-/* get_query handler for the file backend */
-static Query *
-cal_backend_file_get_query (CalBackend *backend,
-			    GNOME_Evolution_Calendar_QueryListener ql,
-			    const char *sexp)
-{
-	CalBackendFile *cbfile;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-
-	return query_new (backend, ql, sexp);
-}
-
-/* is_remote handler for the file backend */
-static CalMode
-cal_backend_file_get_mode (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	return CAL_MODE_LOCAL;	
-}
-
-static void
-notify_mode (CalBackendFile *cbfile, 
-	     GNOME_Evolution_Calendar_Listener_SetModeStatus status, 
-	     GNOME_Evolution_Calendar_CalMode mode)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = CAL_BACKEND (cbfile)->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_mode (cal, status, mode);
-	}
-}
-
-/* Set_mode handler for the file backend */
-static void
-cal_backend_file_set_mode (CalBackend *backend, CalMode mode)
-{
-	notify_mode (CAL_BACKEND_FILE (backend),
-		     GNOME_Evolution_Calendar_Listener_MODE_NOT_SUPPORTED,
-		     GNOME_Evolution_Calendar_MODE_LOCAL);
-	
-}
-
-/* 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);
-}
-
-/* Get_object handler for the file backend */
-static CalComponent *
-cal_backend_file_get_object_component (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	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);
-
-	return lookup_component (cbfile, uid);
-}
-
-/* Get_object handler for the file backend */
-static char *
-cal_backend_file_get_timezone_object (CalBackend *backend, const char *tzid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icaltimezone *zone;
-	icalcomponent *icalcomp;
-	char *ical_string;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (tzid != NULL, NULL);
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	zone = icalcomponent_get_timezone (priv->icalcomp, tzid);
-	if (!zone)
-		return NULL;
-
-	icalcomp = icaltimezone_get_component (zone);
-	if (!icalcomp)
-		return NULL;
-
-	ical_string = icalcomponent_as_ical_string (icalcomp);
-	/* We dup the string; libical owns that memory. */
-	if (ical_string)
-	  return g_strdup (ical_string);
-	else
-	  return NULL;
-}
-
-/* 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;
-}
-
-/* function to resolve timezones */
-static icaltimezone *
-resolve_tzid (const char *tzid, gpointer user_data)
-{
-	icalcomponent *vcalendar_comp = user_data;
-
-        if (!tzid || !tzid[0])
-                return NULL;
-        else if (!strcmp (tzid, "UTC"))
-                return icaltimezone_get_utc_timezone ();
-
-	return icalcomponent_get_timezone (vcalendar_comp, tzid);
-}
-
-/* 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, icaltimezone *default_zone)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-		icalcomponent *icalcomp, *vcalendar_comp;
-
-		comp = CAL_COMPONENT (l->data);
-
-		/* Get the parent VCALENDAR component, so we can resolve
-		   TZIDs. */
-		icalcomp = cal_component_get_icalcomponent (comp);
-		vcalendar_comp = icalcomponent_get_parent (icalcomp);
-		g_assert (vcalendar_comp != NULL);
-
-		cal_recur_generate_instances (comp, start, end, add_instance, uid_hash, resolve_tzid, vcalendar_comp, default_zone);
-	}
-}
-
-/* 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,
-					priv->default_zone);
-
-	if (type & CALOBJ_TYPE_TODO)
-		get_instances_in_range (uid_hash, priv->todos, start, end,
-					priv->default_zone);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		get_instances_in_range (uid_hash, priv->journals, start, end,
-					priv->default_zone);
-
-	event_list = NULL;
-	g_hash_table_foreach (uid_hash, add_uid_to_list, &event_list);
-	g_hash_table_destroy (uid_hash);
-
-	return event_list;
-}
-
-static gboolean
-free_busy_instance (CalComponent *comp,
-		    time_t        instance_start,
-		    time_t        instance_end,
-		    gpointer      data)
-{
-	icalcomponent *vfb = data;
-	icalproperty *prop;
-	icalparameter *param;
-	struct icalperiodtype ipt;
-	icaltimezone *utc_zone;
-
-	utc_zone = icaltimezone_get_utc_timezone ();
-
-	ipt.start = icaltime_from_timet_with_zone (instance_start, FALSE, utc_zone);
-	ipt.end = icaltime_from_timet_with_zone (instance_end, FALSE, utc_zone);
-	ipt.duration = icaldurationtype_null_duration ();
-	
-        /* add busy information to the vfb component */
-	prop = icalproperty_new (ICAL_FREEBUSY_PROPERTY);
-	icalproperty_set_freebusy (prop, ipt);
-	
-	param = icalparameter_new_fbtype (ICAL_FBTYPE_BUSY);
-	icalproperty_add_parameter (prop, param);
-	
-	icalcomponent_add_property (vfb, prop);
-
-	return TRUE;
-}
-
-static icalcomponent *
-create_user_free_busy (CalBackendFile *cbfile, const char *address, const char *cn,
-		       time_t start, time_t end)
-{	
-	CalBackendFilePrivate *priv;
-	GList *uids;
-	GList *l;
-	icalcomponent *vfb;
-	icaltimezone *utc_zone;
-	
-	priv = cbfile->priv;
-
-	/* create the (unique) VFREEBUSY object that we'll return */
-	vfb = icalcomponent_new_vfreebusy ();
-	if (address != NULL) {
-		icalproperty *prop;
-		icalparameter *param;
-		
-		prop = icalproperty_new_organizer (address);
-		if (prop != NULL && cn != NULL) {
-			param = icalparameter_new_cn (cn);
-			icalproperty_add_parameter (prop, param);			
-		}
-		if (prop != NULL)
-			icalcomponent_add_property (vfb, prop);		
-	}
-	utc_zone = icaltimezone_get_utc_timezone ();
-	icalcomponent_set_dtstart (vfb, icaltime_from_timet_with_zone (start, FALSE, utc_zone));
-	icalcomponent_set_dtend (vfb, icaltime_from_timet_with_zone (end, FALSE, utc_zone));
-
-	/* add all objects in the given interval */
-
-	uids = cal_backend_get_objects_in_range (CAL_BACKEND (cbfile),
-						 CALOBJ_TYPE_ANY, start, end);
-	for (l = uids; l != NULL; l = l->next) {
-		CalComponent *comp;
-		icalcomponent *icalcomp, *vcalendar_comp;
-		icalproperty *prop;
-		char *uid = (char *) l->data;
-
-		/* get the component from our internal list */
-		comp = lookup_component (cbfile, uid);
-		if (!comp)
-			continue;
-
-		icalcomp = cal_component_get_icalcomponent (comp);
-		if (!icalcomp)
-			continue;
-
-		/* If the event is TRANSPARENT, skip it. */
-		prop = icalcomponent_get_first_property (icalcomp,
-							 ICAL_TRANSP_PROPERTY);
-		if (prop) {
-			const char *transp_val = icalproperty_get_transp (prop);
-			if (transp_val
-			    && !strcasecmp (transp_val, "TRANSPARENT"))
-				continue;
-		}
-
-		vcalendar_comp = icalcomponent_get_parent (icalcomp);
-		cal_recur_generate_instances (comp, start, end,
-					      free_busy_instance,
-					      vfb,
-					      resolve_tzid,
-					      vcalendar_comp,
-					      priv->default_zone);
-		
-	}
-	cal_obj_uid_list_free (uids);
-
-	return vfb;	
-}
-
-/* Get_free_busy handler for the file backend */
-static GList *
-cal_backend_file_get_free_busy (CalBackend *backend, GList *users, time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	gchar *address, *name;	
-	icalcomponent *vfb;
-	char *calobj;
-	GList *obj_list = NULL;
-	GList *l;
-
-	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);
-
-	if (users == NULL) {
-		if (cal_backend_mail_account_get_default (priv->db, &address, &name)) {			
-			vfb = create_user_free_busy (cbfile, address, name, start, end);
-			calobj = icalcomponent_as_ical_string (vfb);
-			obj_list = g_list_append (obj_list, g_strdup (calobj));
-			icalcomponent_free (vfb);
-			g_free (address);
-			g_free (name);
-		}		
-	} else {
-		for (l = users; l != NULL; l = l->next ) {
-			address = l->data;			
-			if (cal_backend_mail_account_is_valid (priv->db, address, &name)) {
-				vfb = create_user_free_busy (cbfile, address, name, start, end);
-				calobj = icalcomponent_as_ical_string (vfb);
-				obj_list = g_list_append (obj_list, g_strdup (calobj));
-				icalcomponent_free (vfb);
-				g_free (name);
-			}
-		}		
-	}
-
-	return obj_list;
-}
-
-typedef struct 
-{
-	CalBackend *backend;
-	CalObjType type;	
-	GList *changes;
-	GList *change_ids;
-} CalBackendFileComputeChangesData;
-
-static void
-cal_backend_file_compute_changes_foreach_key (const char *key, gpointer data)
-{
-	CalBackendFileComputeChangesData *be_data = data;
-	char *calobj = cal_backend_get_object (be_data->backend, key);
-	
-	if (calobj == NULL) {
-		CalComponent *comp;
-		GNOME_Evolution_Calendar_CalObjChange *coc;
-		char *calobj;
-
-		comp = cal_component_new ();
-		if (be_data->type == GNOME_Evolution_Calendar_TYPE_TODO)
-			cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		else
-			cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-		cal_component_set_uid (comp, key);
-		calobj = cal_component_get_as_string (comp);
-
-		coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-		coc->calobj =  CORBA_string_dup (calobj);
-		coc->type = GNOME_Evolution_Calendar_DELETED;
-		be_data->changes = g_list_prepend (be_data->changes, coc);
-		be_data->change_ids = g_list_prepend (be_data->change_ids, g_strdup (key));
-
-		g_free (calobj);
-		gtk_object_unref (GTK_OBJECT (comp));
- 	}
-}
-
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_file_compute_changes (CalBackend *backend, CalObjType type, const char *change_id)
-{
-	char    *filename;
-	EDbHash *ehash;
-	CalBackendFileComputeChangesData be_data;
-	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
-	GList *uids, *changes = NULL, *change_ids = NULL;
-	GList *i, *j;
-	int n;
-	
-	/* Find the changed ids - FIX ME, path should not be hard coded */
-	if (type == GNOME_Evolution_Calendar_TYPE_TODO)
-		filename = g_strdup_printf ("%s/evolution/local/Tasks/%s.db", g_get_home_dir (), change_id);
-	else 
-		filename = g_strdup_printf ("%s/evolution/local/Calendar/%s.db", g_get_home_dir (), change_id);
-	ehash = e_dbhash_new (filename);
-	g_free (filename);
-	
-	uids = cal_backend_get_uids (backend, type);
-	
-	/* Calculate adds and modifies */
-	for (i = uids; i != NULL; i = i->next) {
-		GNOME_Evolution_Calendar_CalObjChange *coc;
-		char *uid = i->data;
-		char *calobj = cal_backend_get_object (backend, uid);
-
-		g_assert (calobj != NULL);
-
-		/* check what type of change has occurred, if any */
-		switch (e_dbhash_compare (ehash, uid, calobj)) {
-		case E_DBHASH_STATUS_SAME:
-			break;
-		case E_DBHASH_STATUS_NOT_FOUND:
-			coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-			coc->calobj =  CORBA_string_dup (calobj);
-			coc->type = GNOME_Evolution_Calendar_ADDED;
-			changes = g_list_prepend (changes, coc);
-			change_ids = g_list_prepend (change_ids, g_strdup (uid));
-			break;
-		case E_DBHASH_STATUS_DIFFERENT:
-			coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-			coc->calobj =  CORBA_string_dup (calobj);
-			coc->type = GNOME_Evolution_Calendar_MODIFIED;
-			changes = g_list_prepend (changes, coc);
-			change_ids = g_list_prepend (change_ids, g_strdup (uid));
-			break;
-		}
-	}
-
-	/* Calculate deletions */
-	be_data.backend = backend;
-	be_data.type = type;	
-	be_data.changes = changes;
-	be_data.change_ids = change_ids;
-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)cal_backend_file_compute_changes_foreach_key, &be_data);
-	changes = be_data.changes;
-	change_ids = be_data.change_ids;
-	
-	/* Build the sequence and update the hash */
-	n = g_list_length (changes);
-
-	seq = GNOME_Evolution_Calendar_CalObjChangeSeq__alloc ();
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_allocbuf (n);
-	CORBA_sequence_set_release (seq, TRUE);
-
-	for (i = changes, j = change_ids, n = 0; i != NULL; i = i->next, j = j->next, n++) {
-		GNOME_Evolution_Calendar_CalObjChange *coc = i->data;
-		GNOME_Evolution_Calendar_CalObjChange *seq_coc;
-		char *uid = j->data;
-
-		/* sequence building */
-		seq_coc = &seq->_buffer[n];
-		seq_coc->calobj = CORBA_string_dup (coc->calobj);
-		seq_coc->type = coc->type;
-
-		/* hash updating */
-		if (coc->type == GNOME_Evolution_Calendar_ADDED 
-		    || coc->type == GNOME_Evolution_Calendar_MODIFIED) {
-			e_dbhash_add (ehash, uid, coc->calobj);
-		} else {
-			e_dbhash_remove (ehash, uid);
-		}		
-
-		CORBA_free (coc);
-		g_free (uid);
-	}	
-	e_dbhash_write (ehash);
-  	e_dbhash_destroy (ehash);
-
-	cal_obj_uid_list_free (uids);
-	g_list_free (change_ids);
-	g_list_free (changes);
-	
-	return seq;
-}
-
-/* Get_changes handler for the file backend */
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_file_get_changes (CalBackend *backend, CalObjType type, const char *change_id)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	return cal_backend_file_compute_changes (backend, type, change_id);
-}
-
-/* Get_alarms_in_range handler for the file backend */
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-cal_backend_file_get_alarms_in_range (CalBackend *backend,
-				      time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	int n_comp_alarms;
-	GSList *comp_alarms;
-	GSList *l;
-	int i;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;
-
-	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);
-
-	/* Per RFC 2445, only VEVENTs and VTODOs can have alarms */
-
-	n_comp_alarms = 0;
-	comp_alarms = NULL;
-
-	n_comp_alarms += cal_util_generate_alarms_for_list (priv->events, start, end,
-							    &comp_alarms, resolve_tzid,
-							    priv->icalcomp,
-							    priv->default_zone);
-	n_comp_alarms += cal_util_generate_alarms_for_list (priv->todos, start, end,
-							    &comp_alarms, resolve_tzid,
-							    priv->icalcomp,
-							    priv->default_zone);
-
-	seq = GNOME_Evolution_Calendar_CalComponentAlarmsSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n_comp_alarms;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalComponentAlarms_allocbuf (
-		n_comp_alarms);
-
-	for (l = comp_alarms, i = 0; l; l = l->next, i++) {
-		CalComponentAlarms *alarms;
-		char *comp_str;
-
-		alarms = l->data;
-
-		comp_str = cal_component_get_as_string (alarms->comp);
-		seq->_buffer[i].calobj = CORBA_string_dup (comp_str);
-		g_free (comp_str);
-
-		cal_backend_util_fill_alarm_instances_seq (&seq->_buffer[i].alarms, alarms->alarms);
-
-		cal_component_alarms_free (alarms);
-	}
-
-	g_slist_free (comp_alarms);
-
-	return seq;
-}
-
-/* Get_alarms_for_object handler for the file backend */
-static GNOME_Evolution_Calendar_CalComponentAlarms *
-cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,
-					time_t start, time_t end,
-					gboolean *object_found)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-	char *comp_str;
-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;
-	CalComponentAlarms *alarms;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (uid != NULL, NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-	g_return_val_if_fail (object_found != NULL, NULL);
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp) {
-		*object_found = FALSE;
-		return NULL;
-	}
-
-	*object_found = TRUE;
-
-	comp_str = cal_component_get_as_string (comp);
-	corba_alarms = GNOME_Evolution_Calendar_CalComponentAlarms__alloc ();
-
-	corba_alarms->calobj = CORBA_string_dup (comp_str);
-	g_free (comp_str);
-
-	alarms = cal_util_generate_alarms_for_comp (comp, start, end, resolve_tzid, priv->icalcomp, priv->default_zone);
-	if (alarms) {
-		cal_backend_util_fill_alarm_instances_seq (&corba_alarms->alarms, alarms->alarms);
-		cal_component_alarms_free (alarms);
-	} else
-		cal_backend_util_fill_alarm_instances_seq (&corba_alarms->alarms, NULL);
-
-	return corba_alarms;
-}
-
-/* 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;
-
-	cal_backend_obj_updated (CAL_BACKEND (cbfile), uid);
-
-	for (l = CAL_BACKEND (cbfile)->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;
-
-	cal_backend_obj_removed (CAL_BACKEND (cbfile), uid);
-
-	for (l = CAL_BACKEND (cbfile)->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_remove (cal, uid);
-	}
-}
-
-/* Used from g_hash_table_foreach_remove(); removes and frees a category */
-static gboolean
-remove_category_cb (gpointer key, gpointer value, gpointer data)
-{
-	Category *c;
-
-	c = value;
-	g_free (c->name);
-	g_free (c);
-
-	return TRUE;
-}
-
-/* Clears the table of removed categories */
-static void
-clean_removed_categories (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = cbfile->priv;
-
-	g_hash_table_foreach_remove (priv->removed_categories,
-				     remove_category_cb,
-				     NULL);
-}
-
-
-/* Creates a CalComponent for the given icalcomponent and adds it to our
-   cache. Note that the icalcomponent is not added to the toplevel
-   icalcomponent here. That needs to be done elsewhere. It returns the uid
-   of the added component, or NULL if it failed. */
-static const char*
-cal_backend_file_update_object (CalBackendFile *cbfile,
-				icalcomponent *icalcomp)
-{
-	CalComponent *old_comp;
-	CalComponent *comp;
-	const char *comp_uid;
-
-	/* Create a CalComponent wrapper for the icalcomponent. */
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return NULL;
-	}
-
-	/* Get the UID, and check it isn't empty. */
-	cal_component_get_uid (comp, &comp_uid);
-	if (!comp_uid || !comp_uid[0]) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return NULL;
-	}
-
-	/* Remove any old version of the component. */
-	old_comp = lookup_component (cbfile, comp_uid);
-	if (old_comp)
-		remove_component (cbfile, old_comp);
-
-	/* Now add the component to our local cache, but we pass FALSE as
-	   the last argument, since the libical component is assumed to have
-	   been added already. */
-	add_component (cbfile, comp, FALSE);
-
-	return comp_uid;
-}
-
-
-
-/* Update_objects handler for the file backend. */
-static gboolean
-cal_backend_file_update_objects (CalBackend *backend, const char *calobj)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icalcomponent *toplevel_comp, *icalcomp = NULL;
-	icalcomponent_kind kind;
-	int old_n_categories, new_n_categories;
-	icalcomponent *subcomp;
-	gboolean retval = TRUE;
-	GList *comp_uid_list = NULL, *elem;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	/* Pull the component from the string and ensure that it is sane */
-
-	toplevel_comp = icalparser_parse_string ((char *) calobj);
-
-	if (!toplevel_comp)
-		return FALSE;
-
-	kind = icalcomponent_isa (toplevel_comp);
-
-	if (kind == ICAL_VEVENT_COMPONENT
-	    || kind == ICAL_VTODO_COMPONENT
-	    || kind == ICAL_VJOURNAL_COMPONENT) {
-		/* Create a temporary toplevel component and put the VEVENT
-		   or VTODO in it, to simplify the code below. */
-		icalcomp = toplevel_comp;
-		toplevel_comp = cal_util_new_top_level ();
-		icalcomponent_add_component (toplevel_comp, icalcomp);
-	} else if (kind != ICAL_VCALENDAR_COMPONENT) {
-		/* We don't support this type of component */
-		icalcomponent_free (toplevel_comp);
-		return FALSE;
-	}
-
-	/* The list of removed categories must be empty because we are about to
-	 * start a new scanning process.
-	 */
-	g_assert (g_hash_table_size (priv->removed_categories) == 0);
-
-	old_n_categories = g_hash_table_size (priv->categories);
-
-	/* Step throught the VEVENT/VTODOs being added, create CalComponents
-	   for them, and add them to our cache. */
-	subcomp = icalcomponent_get_first_component (toplevel_comp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		/* We ignore anything except VEVENT, VTODO and VJOURNAL
-		   components. */
-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
-		if (child_kind == ICAL_VEVENT_COMPONENT
-		    || child_kind == ICAL_VTODO_COMPONENT
-		    || child_kind == ICAL_VJOURNAL_COMPONENT) {
-			const char *comp_uid;
-
-			comp_uid = cal_backend_file_update_object (cbfile,
-								   subcomp);
-			if (comp_uid) {
-				/* We add a copy of the UID to a list, so we
-				   can emit notification signals later. We do
-				   a g_strdup() in case any of the components
-				   get removed while we are emitting
-				   notification signals. */
-				comp_uid_list = g_list_prepend (comp_uid_list,
-								g_strdup (comp_uid));
-			} else {
-				retval = FALSE;
-			}
-		}
-		subcomp = icalcomponent_get_next_component (toplevel_comp,
-							    ICAL_ANY_COMPONENT);
-	}
-
-	/* Merge the iCalendar components with our existing VCALENDAR,
-	   resolving any conflicting TZIDs. */
-	icalcomponent_merge_component (priv->icalcomp, toplevel_comp);
-
-	new_n_categories = g_hash_table_size (priv->categories);
-
-	mark_dirty (cbfile);
-
-	/* Now emit notification signals for all of the added components.
-	   We do this after adding them all to make sure the calendar is in a
-	   stable state before emitting signals. */
-	for (elem = comp_uid_list; elem; elem = elem->next) {
-		char *comp_uid = elem->data;
-		notify_update (cbfile, comp_uid);
-		g_free (comp_uid);
-	}
-	g_list_free (comp_uid_list);
-
-	if (old_n_categories != new_n_categories ||
-	    g_hash_table_size (priv->removed_categories) != 0) {
-		clean_removed_categories (cbfile);
-		notify_categories_changed (cbfile);
-	}
-
-	return retval;
-}
-
-
-/* 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;
-
-	/* The list of removed categories must be empty because we are about to
-	 * start a new scanning process.
-	 */
-	g_assert (g_hash_table_size (priv->removed_categories) == 0);
-
-	remove_component (cbfile, comp);
-
-	mark_dirty (cbfile);
-
-	notify_remove (cbfile, uid);
-
-	if (g_hash_table_size (priv->removed_categories) != 0) {
-		clean_removed_categories (cbfile);
-		notify_categories_changed (cbfile);
-	}
-
-	return TRUE;
-}
-
-
-static icaltimezone*
-cal_backend_file_get_timezone (CalBackend *backend, const char *tzid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	if (!strcmp (tzid, "UTC"))
-		return icaltimezone_get_utc_timezone ();
-	else
-		return icalcomponent_get_timezone (priv->icalcomp, tzid);
-}
-
-
-static icaltimezone*
-cal_backend_file_get_default_timezone (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	return priv->default_zone;
-}
-
-
-static gboolean
-cal_backend_file_set_default_timezone (CalBackend *backend,
-				       const char *tzid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icaltimezone *zone;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	/* Look up the VTIMEZONE in our icalcomponent. */
-	zone = icalcomponent_get_timezone (priv->icalcomp, tzid);
-	if (!zone)
-		return FALSE;
-
-	/* Set the default timezone to it. */
-	priv->default_zone = zone;
-
-	return TRUE;
-}
-
diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h
deleted file mode 100644
index c90feddea3..0000000000
--- a/calendar/pcs/cal-backend-file.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-util.c b/calendar/pcs/cal-backend-util.c
deleted file mode 100644
index 6ae480e30b..0000000000
--- a/calendar/pcs/cal-backend-util.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>    
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "cal-backend-util.h"
-
-void
-cal_backend_util_fill_alarm_instances_seq (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq,
-					   GSList *alarms)
-{
-	int n_alarms;
-	GSList *l;
-	int i;
-
-	g_return_if_fail (seq != NULL);
-
-	n_alarms = g_slist_length (alarms);
-
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n_alarms;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf (n_alarms);
-
-	for (l = alarms, i = 0; l; l = l->next, i++) {
-		CalAlarmInstance *instance;
-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;
-
-		instance = l->data;
-		corba_instance = seq->_buffer + i;
-
-		corba_instance->auid = CORBA_string_dup (instance->auid);
-		corba_instance->trigger = (long) instance->trigger;
-		corba_instance->occur_start = (long) instance->occur_start;
-		corba_instance->occur_end = (long) instance->occur_end;
-	}
-}
-
-void
-cal_backend_mail_account_get (Bonobo_ConfigDatabase db,
-			      gint def,
-			      char **address,
-			      char **name)
-{
-	gchar *path;
-	
-	*address = NULL;
-	*name = NULL;
-	
-	/* get the identity info */
-	path = g_strdup_printf ("/Mail/Accounts/identity_name_%d", def);
-	*name = bonobo_config_get_string (db, path, NULL);
-	g_free (path);
-	
-	path = g_strdup_printf ("/Mail/Accounts/identity_address_%d", def);
-	*address = bonobo_config_get_string (db, path, NULL);
-	g_free (path);
-}
-
-gboolean
-cal_backend_mail_account_get_default (Bonobo_ConfigDatabase db,
-				      char **address,
-				      char **name)
-{
-	glong def, len;
-	
-	*address = NULL;
-	*name = NULL;
-	
-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);
-	def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL);
-
-	if (def < len)
-		cal_backend_mail_account_get (db, def, address, name);
-	else
-		return FALSE;
-	
-	return TRUE;
-}
-
-gboolean
-cal_backend_mail_account_is_valid (Bonobo_ConfigDatabase db, char *user, char **name)
-{
-	gchar *address;
-	glong len, i;
-	
-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);
-
-	for (i = 0; i < len; i++) {
-		cal_backend_mail_account_get (db, i, &address, name);
-		if (address != NULL && !strcmp (address, user)) {
-			g_free (address);
-			return TRUE;
-		}		
-		g_free (address);
-		g_free (*name);		
-	}
-
-	return FALSE;	
-}
diff --git a/calendar/pcs/cal-backend-util.h b/calendar/pcs/cal-backend-util.h
deleted file mode 100644
index f10267453a..0000000000
--- a/calendar/pcs/cal-backend-util.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>    
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_UTIL_H
-#define CAL_BACKEND_UTIL_H
-
-#include <bonobo-conf/bonobo-config-database.h>
-#include <cal-backend.h>
-
-BEGIN_GNOME_DECLS
-
-/*
- * CORBA utility functions
- */
-
-void cal_backend_util_fill_alarm_instances_seq (
-	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq, GSList *alarms);
-
-/*
- * Functions for accessing mail configuration
- */
-
-void     cal_backend_mail_account_get (Bonobo_ConfigDatabase db, gint def,
-				       char **address, char **name);
-gboolean cal_backend_mail_account_get_default (Bonobo_ConfigDatabase db,
-					       char **address, char **name);
-gboolean cal_backend_mail_account_is_valid (Bonobo_ConfigDatabase db,
-					    char *user, char **name);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
deleted file mode 100644
index 95dc9957e6..0000000000
--- a/calendar/pcs/cal-backend.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>    
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/gtkobject.h>
-#include <gtk/gtksignal.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,
-	CAL_ADDED,
-	OPENED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	LAST_SIGNAL
-};
-
-static void cal_backend_class_init (CalBackendClass *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) NULL,
-			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;
-
-	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);
-	cal_backend_signals[CAL_ADDED] =
-		gtk_signal_new ("cal_added",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, cal_added),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-	cal_backend_signals[OPENED] =
-		gtk_signal_new ("opened",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, opened),
-				gtk_marshal_NONE__ENUM,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_ENUM);
-	cal_backend_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, obj_updated),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	cal_backend_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, obj_removed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, cal_backend_signals, LAST_SIGNAL);
-
-	class->last_client_gone = NULL;
-	class->opened = NULL;
-	class->obj_updated = NULL;
-	class->obj_removed = NULL;
-
-	class->get_uri = NULL;
-	class->open = NULL;
-	class->is_loaded = NULL;
-	class->get_query = NULL;
-	class->get_mode = NULL;
-	class->set_mode = NULL;	
-	class->get_n_objects = NULL;
-	class->get_object = NULL;
-	class->get_object_component = NULL;
-	class->get_timezone_object = NULL;
-	class->get_uids = NULL;
-	class->get_objects_in_range = NULL;
-	class->get_free_busy = NULL;
-	class->get_changes = NULL;
-	class->get_alarms_in_range = NULL;
-	class->get_alarms_for_object = NULL;
-	class->update_objects = NULL;
-	class->remove_object = NULL;
-}
-
-
-
-/**
- * cal_backend_get_uri:
- * @backend: A calendar backend.
- *
- * Queries the URI of a calendar backend, which must already have an open
- * calendar.
- *
- * Return value: The URI where the calendar is stored.
- **/
-const char *
-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);
-}
-
-/* Callback used when a Cal is destroyed */
-static void
-cal_destroy_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *lcal;
-	CalBackend *backend;
-	GList *l;
-
-	cal = CAL (object);
-
-	backend = CAL_BACKEND (data);
-
-	/* Find the cal in the list of clients */
-
-	for (l = backend->clients; l; l = l->next) {
-		lcal = CAL (l->data);
-
-		if (lcal == cal)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	backend->clients = g_list_remove_link (backend->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 (!backend->clients)
-		cal_backend_last_client_gone (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 an open 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_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);
-
-	backend->clients = g_list_prepend (backend->clients, cal);
-
-	/* notify backend that a new Cal has been added */
-	gtk_signal_emit (GTK_OBJECT (backend),
-			 cal_backend_signals[CAL_ADDED],
-			 cal);
-}
-
-/**
- * cal_backend_open:
- * @backend: A calendar backend.
- * @uristr: URI that contains the calendar data.
- * @only_if_exists: Whether the calendar should be opened only if it already
- * exists.  If FALSE, a new calendar will be created when the specified @uri
- * does not exist.
- *
- * Opens a calendar backend with data from a calendar stored at the specified
- * URI.
- *
- * Return value: An operation status code.
- **/
-CalBackendOpenStatus
-cal_backend_open (CalBackend *backend, const char *uristr, gboolean only_if_exists)
-{
-	CalBackendOpenStatus result;
-
-	g_return_val_if_fail (backend != NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail (uristr != NULL, CAL_BACKEND_OPEN_ERROR);
-
-	g_assert (CLASS (backend)->open != NULL);
-	result = (* CLASS (backend)->open) (backend, uristr, only_if_exists);
-
-	return result;
-}
-
-/**
- * cal_backend_is_loaded:
- * @backend: A calendar backend.
- * 
- * Queries whether a calendar backend has been loaded yet.
- * 
- * Return value: TRUE if the backend has been loaded with data, FALSE
- * otherwise.
- **/
-gboolean
-cal_backend_is_loaded (CalBackend *backend)
-{
-	gboolean result;
-
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-
-	g_assert (CLASS (backend)->is_loaded != NULL);
-	result = (* CLASS (backend)->is_loaded) (backend);
-
-	return result;
-}
-
-/**
- * cal_backend_get_query:
- * @backend: A calendar backend.
- * @ql: The query listener.
- * @sexp: Search expression.
- *
- * Create a query object for this backend.
- */
-Query *
-cal_backend_get_query (CalBackend *backend,
-		       GNOME_Evolution_Calendar_QueryListener ql,
-		       const char *sexp)
-{
-	Query *result;
-
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-
-	if (CLASS (backend)->get_query != NULL)
-		result = (* CLASS (backend)->get_query) (backend, ql, sexp);
-	else
-		result = query_new (backend, ql, sexp);
-
-	return result;
-}
-
-/**
- * cal_backend_get_mode:
- * @backend: A calendar backend. 
- * 
- * Queries whether a calendar backend is connected remotely.
- * 
- * Return value: The current mode the calendar is in
- **/
-CalMode
-cal_backend_get_mode (CalBackend *backend)
-{
-	CalMode result;
-
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-
-	g_assert (CLASS (backend)->get_mode != NULL);
-	result = (* CLASS (backend)->get_mode) (backend);
-
-	return result;
-}
-
-
-/**
- * cal_backend_set_mode:
- * @backend: A calendar backend
- * @mode: Mode to change to
- * 
- * Sets the mode of the calendar
- * 
- **/
-void
-cal_backend_set_mode (CalBackend *backend, CalMode mode)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	g_assert (CLASS (backend)->set_mode != NULL);
-	(* CLASS (backend)->set_mode) (backend, mode);
-}
-
-/**
- * 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.
- **/
-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_object_component:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- *
- * Queries a calendar backend for a calendar object based on its unique
- * identifier. It returns the CalComponent rather than the string
- * representation.
- *
- * Return value: The CalComponent of the sought object, or NULL if no object
- * had the specified UID.
- **/
-CalComponent *
-cal_backend_get_object_component (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_component != NULL);
-	return (* CLASS (backend)->get_object_component) (backend, uid);
-}
-
-/**
- * cal_backend_get_timezone_object:
- * @backend: A calendar backend.
- * @tzid: Unique identifier for a calendar VTIMEZONE object.
- *
- * Queries a calendar backend for a VTIMEZONE calendar object based on its
- * unique TZID identifier.
- *
- * Return value: The string representation of a VTIMEZONE component, or NULL
- * if no VTIMEZONE object had the specified TZID.
- **/
-char *
-cal_backend_get_timezone_object (CalBackend *backend, const char *tzid)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (tzid != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_timezone_object != NULL);
-	return (* CLASS (backend)->get_timezone_object) (backend, tzid);
-}
-
-/**
- * cal_backend_get_type_by_uid
- * @backend: A calendar backend.
- * @uid: Unique identifier for a Calendar object.
- *
- * Returns the type of the object identified by the @uid argument
- */
-CalObjType
-cal_backend_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	icalcomponent *icalcomp;
-	char *comp_str;
-	CalObjType type = CAL_COMPONENT_NO_TYPE;
-
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (uid != NULL, CAL_COMPONENT_NO_TYPE);
-
-	comp_str = cal_backend_get_object (backend, uid);
-	if (!comp_str)
-		return CAL_COMPONENT_NO_TYPE;
-
-	icalcomp = icalparser_parse_string (comp_str);
-	if (icalcomp) {
-		switch (icalcomponent_isa (icalcomp)) {
-		case ICAL_VEVENT_COMPONENT :
-			type = CALOBJ_TYPE_EVENT;
-			break;
-		case ICAL_VTODO_COMPONENT :
-			type = CALOBJ_TYPE_TODO;
-			break;
-		case ICAL_VJOURNAL_COMPONENT :
-			type = CALOBJ_TYPE_JOURNAL;
-			break;
-		default :
-			type = CAL_COMPONENT_NO_TYPE;
-		}
-
-		icalcomponent_free (icalcomp);
-	}
-
-	g_free (comp_str);
-
-	return type;
-}
-
-/**
- * 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);
-}
-
-
-/**
- * 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_free_busy:
- * @backend: A calendar backend.
- * @users: List of users to get free/busy information for.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Gets a free/busy object for the given time interval
- * 
- * Return value: a list of CalObj's
- **/
-GList *
-cal_backend_get_free_busy (CalBackend *backend, GList *users, 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_free_busy != NULL);
-	return (* CLASS (backend)->get_free_busy) (backend, users, start, end);
-}
-
-/**
- * cal_backend_get_changes:
- * @backend: A calendar backend
- * @type: Bitmask with types of objects to return.
- * @change_id: A unique uid for the callers change list
- * 
- * Builds a sequence of objects and the type of change that occurred on them since
- * the last time the give change_id was seen
- * 
- * Return value: A list of the objects that changed and the type of change
- **/
-GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_get_changes (CalBackend *backend, CalObjType type, const char *change_id) 
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (change_id != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_changes != NULL);
-	return (* CLASS (backend)->get_changes) (backend, type, change_id);
-}
-
-/**
- * cal_backend_get_alarms_in_range:
- * @backend: A calendar backend.
- * @start: Start time for query.
- * @end: End time for query.
- * @valid_range: Return value that says whether the range is valid or not.
- * 
- * Builds a sorted list of the alarms that trigger in the specified time range.
- * 
- * Return value: A sequence of component alarm instances structures, or NULL
- * if @valid_range returns FALSE.
- **/
-GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end,
-				 gboolean *valid_range)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (valid_range != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_alarms_in_range != NULL);
-
-	if (!(start != -1 && end != -1 && start <= end)) {
-		*valid_range = FALSE;
-		return NULL;
-	} else {
-		*valid_range = TRUE;
-		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.
- * @result: Return value for the result code for the operation.
- * 
- * Builds a sorted list of the alarms of the specified event that trigger in a
- * particular time range.
- * 
- * Return value: A structure of the component's alarm instances, or NULL if @result
- * returns something other than #CAL_BACKEND_GET_ALARMS_SUCCESS.
- **/
-GNOME_Evolution_Calendar_CalComponentAlarms *
-cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,
-				   time_t start, time_t end,
-				   CalBackendGetAlarmsForObjectResult *result)
-{
-	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_return_val_if_fail (result != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_alarms_for_object != NULL);
-
-	if (!(start != -1 && end != -1 && start <= end)) {
-		*result = CAL_BACKEND_GET_ALARMS_INVALID_RANGE;
-		return NULL;
-	} else {
-		gboolean object_found;
-		GNOME_Evolution_Calendar_CalComponentAlarms *alarms;
-
-		alarms = (* CLASS (backend)->get_alarms_for_object) (backend, uid, start, end,
-								     &object_found);
-
-		if (object_found)
-			*result = CAL_BACKEND_GET_ALARMS_SUCCESS;
-		else
-			*result = CAL_BACKEND_GET_ALARMS_NOT_FOUND;
-
-		return alarms;
-	}
-}
-
-/**
- * cal_backend_update_objects:
- * @backend: A calendar backend.
- * @calobj: String representation of the new calendar object(s).
- * 
- * 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_objects (CalBackend *backend, const char *calobj)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	g_assert (CLASS (backend)->update_objects != NULL);
-	return (* CLASS (backend)->update_objects) (backend, calobj);
-}
-
-/**
- * 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)
-{
-	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);
-	return (* CLASS (backend)->remove_object) (backend, uid);
-}
-
-/**
- * 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]);
-}
-
-/**
- * cal_backend_opened:
- * @backend: A calendar backend.
- * @status: Open status code.
- * 
- * Emits the "opened" signal of a calendar backend.  This function is to be used
- * only by backend implementations.
- **/
-void
-cal_backend_opened (CalBackend *backend, CalBackendOpenStatus status)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[OPENED],
-			 status);
-}
-
-/**
- * cal_backend_obj_updated:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the component that was updated.
- * 
- * Emits the "obj_updated" signal of a calendar backend.  This function is to be
- * used only by backend implementations.
- **/
-void
-cal_backend_obj_updated (CalBackend *backend, const char *uid)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-	g_return_if_fail (uid != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[OBJ_UPDATED],
-			 uid);
-}
-
-/**
- * cal_backend_obj_removed:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the component that was removed.
- * 
- * Emits the "obj_removed" signal of a calendar backend.  This function is to be
- * used only by backend implementations.
- **/
-void
-cal_backend_obj_removed (CalBackend *backend, const char *uid)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-	g_return_if_fail (uid != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[OBJ_REMOVED],
-			 uid);
-}
-
-
-/**
- * cal_backend_get_timezone:
- * @backend: A calendar backend.
- * @tzid: Unique identifier of a VTIMEZONE object. Note that this must not be
- * NULL.
- * 
- * Returns the icaltimezone* corresponding to the TZID, or NULL if the TZID
- * can't be found.
- * 
- * Returns: The icaltimezone* corresponding to the given TZID, or NULL.
- **/
-icaltimezone*
-cal_backend_get_timezone (CalBackend *backend, const char *tzid)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (tzid != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_timezone != NULL);
-	return (* CLASS (backend)->get_timezone) (backend, tzid);
-}
-
-
-/**
- * cal_backend_get_default_timezone:
- * @backend: A calendar backend.
- * 
- * Returns the default timezone for the calendar, which is used to resolve
- * DATE and floating DATE-TIME values.
- * 
- * Returns: The default icaltimezone* for the calendar.
- **/
-icaltimezone*
-cal_backend_get_default_timezone (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_default_timezone != NULL);
-	return (* CLASS (backend)->get_default_timezone) (backend);
-}
-
-
-/**
- * cal_backend_set_default_timezone:
- * @backend: A calendar backend.
- * @tzid: The TZID identifying the timezone.
- * 
- * Sets the default timezone for the calendar, which is used to resolve
- * DATE and floating DATE-TIME values.
- * 
- * Returns: TRUE if the VTIMEZONE data for the timezone was found, or FALSE if
- * not.
- **/
-gboolean
-cal_backend_set_default_timezone (CalBackend *backend, const char *tzid)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (tzid != NULL, FALSE);
-
-	g_assert (CLASS (backend)->set_default_timezone != NULL);
-	return (* CLASS (backend)->set_default_timezone) (backend, tzid);
-}
-
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
deleted file mode 100644
index 4fd0a42bd0..0000000000
--- a/calendar/pcs/cal-backend.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <cal-util/cal-util.h>
-#include <cal-util/cal-component.h>
-#include "evolution-calendar.h"
-#include "cal-common.h"
-#include "cal.h"
-#include "query.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))
-
-/* Open status values */
-typedef enum {
-	CAL_BACKEND_OPEN_SUCCESS,	/* Loading OK */
-	CAL_BACKEND_OPEN_ERROR,		/* We need better error reporting in libversit */
-	CAL_BACKEND_OPEN_NOT_FOUND
-} CalBackendOpenStatus;
-
-/* Result codes for ::get_alarms_in_range() */
-typedef enum {
-	CAL_BACKEND_GET_ALARMS_SUCCESS,
-	CAL_BACKEND_GET_ALARMS_NOT_FOUND,
-	CAL_BACKEND_GET_ALARMS_INVALID_RANGE
-} CalBackendGetAlarmsForObjectResult;
-
-struct _CalBackend {
-	GtkObject object;
-	GList *clients;
-};
-
-struct _CalBackendClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_client_gone) (CalBackend *backend);
-	void (* cal_added) (CalBackend *backend, Cal *cal);
-
-	void (* opened) (CalBackend *backend, CalBackendOpenStatus status);
-	void (* obj_updated) (CalBackend *backend, const char *uid);
-	void (* obj_removed) (CalBackend *backend, const char *uid);
-
-	/* Virtual methods */
-	const char *(* get_uri) (CalBackend *backend);
-
-	CalBackendOpenStatus (* open) (CalBackend *backend, const char *uristr,
-				       gboolean only_if_exists);
-
-	gboolean (* is_loaded) (CalBackend *backend);
-
-	Query *(* get_query) (CalBackend *backend,
-			      GNOME_Evolution_Calendar_QueryListener ql,
-			      const char *sexp);
-
-	/* Mode relate virtual methods */
-	CalMode (* get_mode) (CalBackend *backend);
-	void    (* set_mode) (CalBackend *backend, CalMode mode);	
-
-	/* General object acquirement and information related virtual methods */
-	int (* get_n_objects) (CalBackend *backend, CalObjType type);
-	char *(* get_object) (CalBackend *backend, const char *uid);
-	CalComponent *(* get_object_component) (CalBackend *backend, const char *uid);
-	char *(* get_timezone_object) (CalBackend *backend, const char *tzid);
-	GList *(* get_uids) (CalBackend *backend, CalObjType type);
-
-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-	GList *(* get_free_busy) (CalBackend *backend, GList *users, time_t start, time_t end);
-
-	/* Change related virtual methods */
-	GNOME_Evolution_Calendar_CalObjChangeSeq * (* get_changes) (
-		CalBackend *backend, CalObjType type, const char *change_id);
-
-	/* Alarm related virtual methods */
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *(* get_alarms_in_range) (
-		CalBackend *backend, time_t start, time_t end);
-	GNOME_Evolution_Calendar_CalComponentAlarms *(* get_alarms_for_object) (
-		CalBackend *backend, const char *uid,
-		time_t start, time_t end, gboolean *object_found);
-
-	/* Object manipulation virtual methods */
-	gboolean (* update_objects) (CalBackend *backend, const char *calobj);
-	gboolean (* remove_object) (CalBackend *backend, const char *uid);
-
-	/* Timezone related virtual methods */
-	icaltimezone *(* get_timezone) (CalBackend *backend, const char *tzid);
-	icaltimezone *(* get_default_timezone) (CalBackend *backend);
-	gboolean (* set_default_timezone) (CalBackend *backend, const char *tzid);
-};
-
-GtkType cal_backend_get_type (void);
-
-const char *cal_backend_get_uri (CalBackend *backend);
-
-void cal_backend_add_cal (CalBackend *backend, Cal *cal);
-
-CalBackendOpenStatus cal_backend_open (CalBackend *backend, const char *uristr,
-				       gboolean only_if_exists);
-
-gboolean cal_backend_is_loaded (CalBackend *backend);
-
-Query *cal_backend_get_query (CalBackend *backend,
-			      GNOME_Evolution_Calendar_QueryListener ql,
-			      const char *sexp);
-
-CalMode cal_backend_get_mode (CalBackend *backend);
-void cal_backend_set_mode (CalBackend *backend, CalMode mode);
-
-int cal_backend_get_n_objects (CalBackend *backend, CalObjType type);
-
-char *cal_backend_get_object (CalBackend *backend, const char *uid);
-
-CalComponent *cal_backend_get_object_component (CalBackend *backend, const char *uid);
-
-gboolean cal_backend_set_default_timezone (CalBackend *backend, const char *tzid);
-
-char *cal_backend_get_timezone_object (CalBackend *backend, const char *tzid);
-
-CalObjType cal_backend_get_type_by_uid (CalBackend *backend, const char *uid);
-
-GList *cal_backend_get_uids (CalBackend *backend, CalObjType type);
-
-GList *cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-
-GList *cal_backend_get_free_busy (CalBackend *backend, GList *users, time_t start, time_t end);
-
-GNOME_Evolution_Calendar_CalObjChangeSeq * cal_backend_get_changes (
-	CalBackend *backend, CalObjType type, const char *change_id);
-
-GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_get_alarms_in_range (
-	CalBackend *backend, time_t start, time_t end, gboolean *valid_range);
-
-GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_get_alarms_for_object (
-	CalBackend *backend, const char *uid,
-	time_t start, time_t end,
-	CalBackendGetAlarmsForObjectResult *result);
-
-
-gboolean cal_backend_update_objects (CalBackend *backend, const char *calobj);
-
-gboolean cal_backend_remove_object (CalBackend *backend, const char *uid);
-
-icaltimezone* cal_backend_get_timezone (CalBackend *backend, const char *tzid);
-icaltimezone* cal_backend_get_default_timezone (CalBackend *backend);
-
-void cal_backend_last_client_gone (CalBackend *backend);
-void cal_backend_opened (CalBackend *backend, CalBackendOpenStatus status);
-void cal_backend_obj_updated (CalBackend *backend, const char *uid);
-void cal_backend_obj_removed (CalBackend *backend, const char *uid);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h
deleted file mode 100644
index 228a67fcfe..0000000000
--- a/calendar/pcs/cal-common.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Evolution calendar server - common declarations
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 1df133ea90..0000000000
--- a/calendar/pcs/cal-factory.c
+++ /dev/null
@@ -1,820 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <liboaf/liboaf.h>
-#include "e-util/e-url.h"
-#include "evolution-calendar.h"
-#include "cal.h"
-#include "cal-backend.h"
-#include "cal-factory.h"
-#include "job.h"
-
-#define PARENT_TYPE                BONOBO_X_OBJECT_TYPE
-#define DEFAULT_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-
-static BonoboXObjectClass *parent_class;
-
-/* 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;
-
-	/* OAFIID of the factory */
-	char *iid;
-
-	/* Whether we have been registered with OAF yet */
-	guint registered : 1;
-};
-
-typedef struct 
-{
-	CalFactory *factory;	
-	GNOME_Evolution_Calendar_CalMode mode;	
-	GNOME_Evolution_Calendar_StringSeq *list;
-} CalFactoryUriData;
-
-/* Signal IDs */
-enum SIGNALS {
-	LAST_CALENDAR_GONE,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-/* 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)
-{
-	char *uri;
-	CalBackend *backend;
-
-	uri = key;
-	backend = value;
-
-	g_free (uri);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-/* Opening calendars */
-
-/* Looks up a calendar backend in a factory's hash table of uri->cal.  If
- * *non-NULL, orig_uri_return will be set to point to the original key in the
- * *hash table.
- */
-static CalBackend *
-lookup_backend (CalFactory *factory, const char *uristr, char **orig_uri_return)
-{
-	CalFactoryPrivate *priv;
-	EUri *uri;
-	char *tmp;
-	gboolean found;
-	gpointer orig_key;
-	gpointer data;
-
-	priv = factory->priv;
-
-	uri = e_uri_new (uristr);
-	if (!uri) {
-		if (orig_uri_return)
-			*orig_uri_return = NULL;
-
-		return NULL;
-	}
-
-	tmp = e_uri_to_string (uri, FALSE);
-	found = g_hash_table_lookup_extended (priv->backends, tmp, &orig_key, &data);
-	g_free (tmp);
-	e_uri_free (uri);
-
-	if (found) {
-		if (orig_uri_return)
-			*orig_uri_return = orig_key;
-
-		return CAL_BACKEND (data);
-	} else {
-		if (orig_uri_return)
-			*orig_uri_return = FALSE;
-
-		return NULL;
-	}
-}
-
-/* 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;
-	CalBackend *ret_backend;
-	const char *uristr;
-	char *orig_uristr;
-
-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");
-
-	factory = CAL_FACTORY (data);
-	priv = factory->priv;
-
-	/* Remove the backend from the hash table */
-
-	uristr = cal_backend_get_uri (backend);
-	g_assert (uristr != NULL);
-
-	ret_backend = lookup_backend (factory, uristr, &orig_uristr);
-	g_assert (ret_backend != NULL);
-	g_assert (ret_backend == backend);
-
-	g_hash_table_remove (priv->backends, orig_uristr);
-	g_free (orig_uristr);
-
-	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), signals[LAST_CALENDAR_GONE]);
-}
-
-/* Adds a backend to the calendar factory's hash table */
-static void
-add_backend (CalFactory *factory, const char *uristr, CalBackend *backend)
-{
-	CalFactoryPrivate *priv;
-	EUri *uri;
-	char *tmp;
-
-	priv = factory->priv;
-
-	uri = e_uri_new (uristr);
-	if (!uri)
-		return;
-
-	tmp = e_uri_to_string (uri, FALSE);
-	g_hash_table_insert (priv->backends, tmp, backend);
-	e_uri_free (uri);
-
-	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,
-			const char *uristr,
-			GNOME_Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	const char *method;
-	GtkType *type;
-	CalBackend *backend;
-	EUri *uri;
-
-	priv = factory->priv;
-
-	uri = e_uri_new (uristr);
-	if (!uri)
-		return NULL;
-
-	method = uri->protocol;
-	type = g_hash_table_lookup (priv->methods, method);
-	e_uri_free (uri);
-
-	if (!type) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_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;
-}
-
-/* Opens a calendar backend and puts it in the factory's backend hash table */
-static CalBackend *
-open_backend (CalFactory *factory, const char *uristr, gboolean only_if_exists,
-	      GNOME_Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-	CalBackendOpenStatus status;
-	CORBA_Environment ev;
-
-	priv = factory->priv;
-
-	backend = launch_backend_for_uri (factory, uristr, listener);
-	if (!backend)
-		return NULL;
-
-	status = cal_backend_open (backend, uristr, only_if_exists);
-
-	switch (status) {
-	case CAL_BACKEND_OPEN_SUCCESS:
-		add_backend (factory, uristr, backend);
-		return backend;
-
-	case CAL_BACKEND_OPEN_ERROR:
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_ERROR,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("open_backend(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-
-	case CAL_BACKEND_OPEN_NOT_FOUND:
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_NOT_FOUND,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("open_backend(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Adds a listener to a calendar backend by creating a calendar client interface
- * object.
- */
-static void
-add_calendar_client (CalFactory *factory,
-		     CalBackend *backend,
-		     GNOME_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);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_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);
-	GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-		listener,
-		GNOME_Evolution_Calendar_Listener_SUCCESS,
-		BONOBO_OBJREF (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);
-}
-
-/* Add a uri to a string list */
-static void
-add_uri (gpointer key, gpointer value, gpointer data)
-{
-	CalFactoryUriData *cfud = data;
-	CalFactory *factory = cfud->factory;	
-	GNOME_Evolution_Calendar_StringSeq *list = cfud->list;
-	GNOME_Evolution_Calendar_CalMode mode = cfud->mode;
-	char *uri_string = key;
-	CalBackend *backend;
-
-	switch (mode) {
-	case GNOME_Evolution_Calendar_MODE_LOCAL:
-		backend = lookup_backend (factory, uri_string, NULL);
-		if (backend == NULL || cal_backend_get_mode (backend) != CAL_MODE_LOCAL)
-			return;
-		break;		
-	case GNOME_Evolution_Calendar_MODE_REMOTE:
-		backend = lookup_backend (factory, uri_string, NULL);
-		if (backend == NULL || cal_backend_get_mode (backend) != CAL_MODE_REMOTE)
-			return;
-		break;		
-	case GNOME_Evolution_Calendar_MODE_ANY:
-		break;
-	}
-	
-	list->_buffer[list->_length] = CORBA_string_dup (uri_string);
-	list->_length++;
-}
-
-/* Job data */
-typedef struct {
-	CalFactory *factory;
-	char *uri;
-	gboolean only_if_exists;
-	GNOME_Evolution_Calendar_Listener listener;
-} OpenJobData;
-
-/* Job handler for the open calendar command */
-static void
-open_fn (gpointer data)
-{
-	OpenJobData *jd;
-	CalFactory *factory;
-	gboolean only_if_exists;
-	GNOME_Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-	char *uri_string;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-	uri_string = g_strdup (jd->uri);
-	g_free (jd->uri);
-
-	only_if_exists = jd->only_if_exists;
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri_string) {
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_ERROR,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("open_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_string, NULL);
-
-	if (!backend)
-		backend = open_backend (factory, uri_string, only_if_exists, listener);
-
-	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 ("open_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-
-
-static void
-impl_CalFactory_open (PortableServer_Servant servant,
-		      const CORBA_char *str_uri,
-		      CORBA_boolean only_if_exists,
-		      GNOME_Evolution_Calendar_Listener listener,
-		      CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	CORBA_Environment ev2;
-	gboolean result;
-	OpenJobData *jd;
-	GNOME_Evolution_Calendar_Listener listener_copy;
-	GtkType *type;
-	EUri *uri;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	/* check URI to see if we support it */
-
-	uri = e_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_CalFactory_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	type = g_hash_table_lookup (priv->methods, uri->protocol);
-
-	e_uri_free (uri);
-	if (!type) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod,
-				     NULL);
-		return;
-	}
-		
-	/* duplicate the listener object */
-	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_GNOME_Evolution_Calendar_CalFactory_NilListener,
-				     NULL);
-
-		CORBA_exception_free (&ev2);
-		return;
-	}
-	CORBA_exception_free (&ev2);
-
-	CORBA_exception_init (&ev2);
-	listener_copy = CORBA_Object_duplicate (listener, &ev2);
-
-	if (ev2._major != CORBA_NO_EXCEPTION) {
-		g_message ("CalFactory_open(): could not duplicate the listener");
-		CORBA_exception_free (&ev2);
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_CalFactory_NilListener,
-				     NULL);
-		return;
-	}
-
-	CORBA_exception_free (&ev2);
-
-	/* add new asynchronous job */
-	jd = g_new (OpenJobData, 1);
-	jd->factory = factory;
-	jd->uri = g_strdup (str_uri);
-	jd->only_if_exists = only_if_exists;
-	jd->listener = listener_copy;
-
-	job_add (open_fn, jd);
-}
-
-static GNOME_Evolution_Calendar_StringSeq *
-impl_CalFactory_uriList (PortableServer_Servant servant,
-			 GNOME_Evolution_Calendar_CalMode mode,
-			 CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	CalFactoryUriData cfud;
-	GNOME_Evolution_Calendar_StringSeq *list;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	list = GNOME_Evolution_Calendar_StringSeq__alloc ();
-	list->_length = 0;
-	list->_maximum = g_hash_table_size (priv->backends); 
-	list->_buffer = CORBA_sequence_CORBA_string_allocbuf (list->_maximum);
-
-	cfud.factory = factory;	
-	cfud.mode = mode;	
-	cfud.list = list;
-	g_hash_table_foreach (priv->backends, add_uri, &cfud);
-	
-	return list;	
-
-}
-
-
-
-/**
- * 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;
-
-	factory = gtk_type_new (CAL_FACTORY_TYPE);
-
-	return factory;
-}
-
-/* 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;
-
-	if (priv->registered) {
-		oaf_active_server_unregister (priv->iid, BONOBO_OBJREF (factory));
-		priv->registered = FALSE;
-	}
-	g_free (priv->iid);
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Class initialization function for the calendar factory */
-static void
-cal_factory_class_init (CalFactoryClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	POA_GNOME_Evolution_Calendar_CalFactory__epv *epv = &klass->epv;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	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, signals, LAST_SIGNAL);
-
-	/* Class method overrides */
-	object_class->destroy = cal_factory_destroy;
-
-	/* Epv methods */
-	epv->open = impl_CalFactory_open;
-	epv->uriList = impl_CalFactory_uriList;
-}
-
-/* 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 (g_str_hash, g_str_equal);
-	priv->registered = FALSE;
-}
-
-BONOBO_X_TYPE_FUNC_FULL (CalFactory,
-			 GNOME_Evolution_Calendar_CalFactory,
-			 PARENT_TYPE,
-			 cal_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_oaf_register:
- * @factory: A calendar factory.
- * @iid: OAFIID for the factory to be registered.
- * 
- * Registers a calendar factory with the OAF object activation daemon.  This
- * function must be called before any clients can activate the factory.
- * 
- * Return value: TRUE on success, FALSE otherwise.
- **/
-gboolean
-cal_factory_oaf_register (CalFactory *factory, const char *iid)
-{
-	CalFactoryPrivate *priv;
-	OAF_RegistrationResult result;
-	char *tmp_iid;
-
-	g_return_val_if_fail (factory != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), FALSE);
-
-	priv = factory->priv;
-
-	g_return_val_if_fail (!priv->registered, FALSE);
-
-	/* if iid is NULL, use the default factory OAFIID */
-	if (iid)
-		tmp_iid = g_strdup (iid);
-	else
-		tmp_iid = g_strdup (DEFAULT_CAL_FACTORY_OAF_ID);
-
-	result = oaf_active_server_register (tmp_iid, BONOBO_OBJREF (factory));
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		priv->iid = tmp_iid;
-		return TRUE;
-
-	case OAF_REG_NOT_LISTED:
-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "
-			   "not listed");
-		break;
-
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "
-			   "already active");
-		break;
-
-	case OAF_REG_ERROR:
-	default:
-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "
-			   "generic error");
-		break;
-	}
-
-	g_free (tmp_iid);
-
-	return FALSE;
-}
-
-/**
- * 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 open 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);
-}
-
-/* Frees a uri/backend pair from the backends hash table */
-static void
-dump_backend (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-	CalBackend *backend;
-
-	uri = key;
-	backend = value;
-
-	g_message ("  %s: %p", uri, backend);
-}
-
-void
-cal_factory_dump_active_backends   (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	g_message ("Active PCS backends");
-
-	priv = factory->priv;
-	g_hash_table_foreach (priv->backends, dump_backend, NULL);
-}
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
deleted file mode 100644
index 46a66ed9a0..0000000000
--- a/calendar/pcs/cal-factory.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-xobject.h>
-
-#include "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 {
-	BonoboXObject object;
-
-	/* Private data */
-	CalFactoryPrivate *priv;
-};
-
-struct _CalFactoryClass {
-	BonoboXObjectClass parent_class;
-	
-	POA_GNOME_Evolution_Calendar_CalFactory__epv epv;
-
-	/* Notification signals */
-	void (* last_calendar_gone) (CalFactory *factory);
-};
-
-GtkType     cal_factory_get_type        (void);
-CalFactory *cal_factory_new             (void);
-
-gboolean    cal_factory_oaf_register    (CalFactory *factory, const char *iid);
-void        cal_factory_register_method (CalFactory *factory,
-					 const char *method,
-					 GtkType     backend_type);
-int         cal_factory_get_n_backends  (CalFactory *factory);
-void        cal_factory_dump_active_backends   (CalFactory *factory);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
deleted file mode 100644
index 5225b5680e..0000000000
--- a/calendar/pcs/cal.c
+++ /dev/null
@@ -1,871 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ical.h>
-#include <bonobo/bonobo-exception.h>
-#include "cal.h"
-#include "cal-backend.h"
-#include "query.h"
-#include "wombat.h"
-
-#define PARENT_TYPE         BONOBO_X_OBJECT_TYPE
-
-static BonoboXObjectClass *parent_class;
-
-/* Private part of the Cal structure */
-struct _CalPrivate {
-	/* Our backend */
-	CalBackend *backend;
-
-	/* Listener on the client we notify */
-	GNOME_Evolution_Calendar_Listener listener;
-
-	/* A reference to the WombatClient interface */
-	GNOME_Evolution_WombatClient wombat_client;
-};
-
-
-/* Cal::get_uri method */
-static CORBA_char *
-impl_Cal_get_uri (PortableServer_Servant servant,
-	     CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	const char *str_uri;
-	CORBA_char *str_uri_copy;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	str_uri = cal_backend_get_uri (priv->backend);
-	str_uri_copy = CORBA_string_dup (str_uri);
-
-	return str_uri_copy;
-}
-
-/* Converts a calendar object type from its CORBA representation to our own
- * representation.
- */
-static CalObjType
-uncorba_obj_type (GNOME_Evolution_Calendar_CalObjType type)
-{
-	return (((type & GNOME_Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
-		| ((type & GNOME_Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
-		| ((type & GNOME_Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
-}
-
-static void
-impl_Cal_set_mode (PortableServer_Servant servant,
-		   GNOME_Evolution_Calendar_CalMode mode,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	cal_backend_set_mode (priv->backend, mode);
-}
-
-/* Cal::get_n_objects method */
-static CORBA_long
-impl_Cal_get_n_objects (PortableServer_Servant servant,
-			GNOME_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 GNOME_Evolution_Calendar_CalObj
-impl_Cal_get_object (PortableServer_Servant servant,
-		     const GNOME_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 {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-
-		return NULL;
-	}
-}
-
-static GNOME_Evolution_Calendar_CalObjUIDSeq *
-build_uid_seq (GList *uids)
-{
-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *l;
-	int n, i;
-
-	n = g_list_length (uids);
-
-	seq = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_GNOME_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 GNOME_Evolution_Calendar_CalObjUIDSeq *
-impl_Cal_get_uids (PortableServer_Servant servant,
-		   GNOME_Evolution_Calendar_CalObjType type,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GList *uids;
-	GNOME_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;
-}
-
-/* Cal::get_changes method */
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-impl_Cal_get_changes (PortableServer_Servant servant,
-		      GNOME_Evolution_Calendar_CalObjType type,
-		      const CORBA_char *change_id,
-		      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	
-	return cal_backend_get_changes (priv->backend, t, change_id);
-}
-
-/* Cal::get_objects_in_range method */
-static GNOME_Evolution_Calendar_CalObjUIDSeq *
-impl_Cal_get_objects_in_range (PortableServer_Servant servant,
-			       GNOME_Evolution_Calendar_CalObjType type,
-			       GNOME_Evolution_Calendar_Time_t start,
-			       GNOME_Evolution_Calendar_Time_t end,
-			       CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	time_t t_start, t_end;
-	GNOME_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) {
-		bonobo_exception_set (ev,  ex_GNOME_Evolution_Calendar_Cal_InvalidRange);
-		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;
-}
-
-static GNOME_Evolution_Calendar_CalObjSeq *
-build_fb_seq (GList *obj_list)
-{
-	GNOME_Evolution_Calendar_CalObjSeq *seq;
-	GList *l;
-	int n, i;
-
-	n = g_list_length (obj_list);
-
-	seq = GNOME_Evolution_Calendar_CalObjSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObj_allocbuf (n);
-
-	/* Fill the sequence */
-
-	for (i = 0, l = obj_list; l; i++, l = l->next) {
-		char *calobj;
-
-		calobj = l->data;
-		seq->_buffer[i] = CORBA_string_dup (calobj);
-	}
-
-	return seq;
-}
-
-/* Cal::get_free_busy method */
-static GNOME_Evolution_Calendar_CalObjSeq *
-impl_Cal_get_free_busy (PortableServer_Servant servant,
-			const GNOME_Evolution_Calendar_UserList *user_list,
-			const GNOME_Evolution_Calendar_Time_t start,
-			const GNOME_Evolution_Calendar_Time_t end,
-			CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	GList *users = NULL;
-	GList *obj_list;
-	GNOME_Evolution_Calendar_CalObjSeq *seq;
-
-	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) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidRange);
-		return build_fb_seq (NULL);
-	}
-
-	/* convert the CORBA user list to a GList */
-	if (user_list) {
-		int i;
-
-		for (i = 0; i < user_list->_length; i++)
-			users = g_list_append (users, user_list->_buffer[i]);
-	}
-
-	/* call the backend's get_free_busy method */
-	obj_list = cal_backend_get_free_busy (priv->backend, users, t_start, t_end);
-	seq = build_fb_seq (obj_list);	
-	g_list_free (users);
-
-        if (obj_list == NULL)
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-
-        return seq;
-}
-
-/* Cal::get_alarms_in_range method */
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-impl_Cal_get_alarms_in_range (PortableServer_Servant servant,
-			      GNOME_Evolution_Calendar_Time_t start,
-			      GNOME_Evolution_Calendar_Time_t end,
-			      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	gboolean valid_range;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	seq = cal_backend_get_alarms_in_range (priv->backend, t_start, t_end, &valid_range);
-	if (!valid_range) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidRange);
-		return NULL;
-	}
-
-	if (!seq) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-		return NULL;
-	}
-
-	return seq;
-}
-
-/* Cal::get_alarms_for_object method */
-static GNOME_Evolution_Calendar_CalComponentAlarms *
-impl_Cal_get_alarms_for_object (PortableServer_Servant servant,
-				const GNOME_Evolution_Calendar_CalObjUID uid,
-				GNOME_Evolution_Calendar_Time_t start,
-				GNOME_Evolution_Calendar_Time_t end,
-				CORBA_Environment * ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	GNOME_Evolution_Calendar_CalComponentAlarms *alarms;
-	CalBackendGetAlarmsForObjectResult result;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	alarms = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &result);
-
-	switch (result) {
-	case CAL_BACKEND_GET_ALARMS_SUCCESS:
-		return alarms;
-
-	case CAL_BACKEND_GET_ALARMS_NOT_FOUND:
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-		return NULL;
-
-	case CAL_BACKEND_GET_ALARMS_INVALID_RANGE:
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidRange);
-		return NULL;
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Cal::update_objects method */
-static void
-impl_Cal_update_objects (PortableServer_Servant servant,
-			 const GNOME_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_objects (priv->backend, calobj))
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject);
-}
-
-/* Cal::remove_object method */
-static void
-impl_Cal_remove_object (PortableServer_Servant servant,
-			const GNOME_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))
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-}
-
-/* Cal::getQuery implementation */
-static GNOME_Evolution_Calendar_Query
-impl_Cal_get_query (PortableServer_Servant servant,
-		    const CORBA_char *sexp,
-		    GNOME_Evolution_Calendar_QueryListener ql,
-		    CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	Query *query;
-	CORBA_Environment ev2;
-	GNOME_Evolution_Calendar_Query query_copy;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	query = cal_backend_get_query (priv->backend, ql, sexp);
-	if (!query) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_init (&ev2);
-	query_copy = CORBA_Object_duplicate (BONOBO_OBJREF (query), &ev2);
-	if (BONOBO_EX (&ev2)) {
-		CORBA_exception_free (&ev2);
-		g_message ("Cal_get_query(): Could not duplicate the query reference");
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev2);
-
-	return query_copy;
-}
-
-/* Cal::set_default_timezone method */
-static void
-impl_Cal_set_default_timezone (PortableServer_Servant servant,
-			       const GNOME_Evolution_Calendar_CalTimezoneObjUID tzid,
-			       CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	gboolean zone_set;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	zone_set = cal_backend_set_default_timezone (priv->backend, tzid);
-
-	if (!zone_set) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-	}
-}
-
-/* Cal::get_timezone_object method */
-static GNOME_Evolution_Calendar_CalObj
-impl_Cal_get_timezone_object (PortableServer_Servant servant,
-			      const GNOME_Evolution_Calendar_CalTimezoneObjUID tzid,
-			      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	char *calobj;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	calobj = cal_backend_get_timezone_object (priv->backend, tzid);
-
-	if (calobj) {
-		CORBA_char *calobj_copy;
-
-		calobj_copy = CORBA_string_dup (calobj);
-		g_free (calobj);
-		return calobj_copy;
-	} else {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
-		return NULL;
-	}
-}
-
-/**
- * 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,
-	       CalBackend *backend,
-	       GNOME_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 (BONOBO_EX (&ev)) {
-		g_message ("cal_construct: could not duplicate the listener");
-		priv->listener = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/* obtain the WombatClient interface */
-	CORBA_exception_init (&ev);
-	priv->wombat_client = Bonobo_Unknown_queryInterface (
-		priv->listener,
-		"IDL:GNOME/Evolution/WombatClient:1.0",
-		&ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_construct: could not get the WombatClient interface");
-		priv->wombat_client = CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	priv->backend = backend;
-
-	return cal;
-}
-
-/**
- * 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, GNOME_Evolution_Calendar_Listener listener)
-{
-	Cal *cal, *retval;
-
-	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));
-
-	retval = cal_construct (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;
-}
-
-/* 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);
-	bonobo_object_release_unref (priv->listener, &ev);
-	if (BONOBO_EX (&ev))
-		g_message ("cal_destroy(): could not release the listener");
-
-	priv->listener = NULL;
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Class initialization function for the calendar */
-static void
-cal_class_init (CalClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	POA_GNOME_Evolution_Calendar_Cal__epv *epv = &klass->epv;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	/* Class method overrides */
-	object_class->destroy = cal_destroy;
-
-	/* Epv methods */
-	epv->_get_uri = impl_Cal_get_uri;
-	epv->setMode = impl_Cal_set_mode;
-	epv->countObjects = impl_Cal_get_n_objects;
-	epv->getObject = impl_Cal_get_object;
-	epv->setDefaultTimezone = impl_Cal_set_default_timezone;
-	epv->getTimezoneObject = impl_Cal_get_timezone_object;
-	epv->getUIDs = impl_Cal_get_uids;
-	epv->getChanges = impl_Cal_get_changes;
-	epv->getObjectsInRange = impl_Cal_get_objects_in_range;
-	epv->getFreeBusy = impl_Cal_get_free_busy;
-	epv->getAlarmsInRange = impl_Cal_get_alarms_in_range;
-	epv->getAlarmsForObject = impl_Cal_get_alarms_for_object;
-	epv->updateObjects = impl_Cal_update_objects;
-	epv->removeObject = impl_Cal_remove_object;
-	epv->getQuery = impl_Cal_get_query;
-}
-
-
-/* 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;
-}
-
-BONOBO_X_TYPE_FUNC_FULL (Cal, GNOME_Evolution_Calendar_Cal, PARENT_TYPE, cal);
-
-/**
- * cal_notify_mode:
- * @cal: A calendar client interface.
- * @status: Status of the mode set.
- * @mode: The current mode.
- * 
- * Notifys the listener of the results of a setMode call.
- **/
-void
-cal_notify_mode (Cal *cal,
-		 GNOME_Evolution_Calendar_Listener_SetModeStatus status,
-		 GNOME_Evolution_Calendar_CalMode mode)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Listener_notifyCalSetMode (priv->listener, status, mode, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("cal_notify_mode(): could not notify the listener "
-			   "about a mode change");
-
-	CORBA_exception_free (&ev);	
-}
-
-/**
- * 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);
-	GNOME_Evolution_Calendar_Listener_notifyObjUpdated (priv->listener, (char *) uid, &ev);
-
-	if (BONOBO_EX (&ev))
-		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);
-	GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv->listener, (char *) uid, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("cal_notify_remove(): could not notify the listener "
-			   "about a removed object");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_notify_categories_changed:
- * @cal: A calendar client interface.
- * @categories: List of categories.
- * 
- * Notifies a listener attached to a calendar client interface object about the
- * current set of categories in a calendar backend.
- **/
-void
-cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *categories)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (categories != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Listener_notifyCategoriesChanged (priv->listener, categories, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("cal_notify_categories_changed(): Could not notify the listener "
-			   "about the current set of categories");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_get_password:
- * @cal: A calendar client interface.
- * @prompt: The message to show to the user when asking for the password.
- * @key: A key associated with the password being asked.
- *
- * Gets a password from the calendar client this Cal knows about. It does
- * so by using the WombatClient interface being used by the corresponding
- * CalClient.
- *
- * Returns: a password entered by the user.
- */
-char *
-cal_get_password (Cal *cal, const char *prompt, const char *key)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-	CORBA_char *pwd;
-
-	g_return_val_if_fail (cal != NULL, NULL);
-	g_return_val_if_fail (IS_CAL (cal), NULL);
-
-	priv = cal->priv;
-	g_return_val_if_fail (priv->wombat_client != CORBA_OBJECT_NIL, NULL);
-
-	CORBA_exception_init (&ev);
-	pwd = GNOME_Evolution_WombatClient_getPassword (
-		priv->wombat_client,
-		(const CORBA_char *) prompt,
-		(const CORBA_char *) key,
-		&ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_get_password: could not get password from associated WombatClient");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return pwd;
-}
-
-/**
- * cal_forget_password:
- * @cal: A calendar client interface.
- * @key: A key associated with the password to be forgotten.
- *
- * Notifies the associated calendar client that it should forget
- * about the password identified by @key, so that next time the backend
- * asks the client about it, the client would ask again the user for it.
- * This is done in cases where the password supplied the first time
- * was not a valid password and the backend needs the user to enter
- * a new one.
- */
-void
-cal_forget_password (Cal *cal, const char *key)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	priv = cal->priv;
-	g_return_if_fail (priv->wombat_client != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_WombatClient_forgetPassword (
-		priv->wombat_client,
-		(const CORBA_char *) key,
-		&ev);
-
-	if (BONOBO_EX (&ev)) {
-		g_message ("cal_forget_password: could not notify WombatClient about "
-			   "password to be forgotten");
-	}
-
-	CORBA_exception_free (&ev);
-}
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
deleted file mode 100644
index 81c3e55154..0000000000
--- a/calendar/pcs/cal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-xobject.h>
-#include "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 {
-	BonoboXObject object;
-
-	/* Private data */
-	CalPrivate *priv;
-};
-
-struct _CalClass {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_Cal__epv epv;
-};
-
-GtkType cal_get_type (void);
-
-Cal *cal_construct (Cal *cal,
-		    CalBackend *backend,
-		    GNOME_Evolution_Calendar_Listener listener);
-
-Cal *cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener);
-
-void cal_notify_mode (Cal *cal, 
-		      GNOME_Evolution_Calendar_Listener_SetModeStatus status, 
-		      GNOME_Evolution_Calendar_CalMode mode);
-void cal_notify_update (Cal *cal, const char *uid);
-void cal_notify_remove (Cal *cal, const char *uid);
-
-void cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *categories);
-
-char *cal_get_password (Cal *cal, const char *prompt, const char *key);
-void  cal_forget_password (Cal *cal, const char *key);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/job.c b/calendar/pcs/job.c
deleted file mode 100644
index 584f1a6f38..0000000000
--- a/calendar/pcs/job.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 07e3371f89..0000000000
--- a/calendar/pcs/job.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/calendar/pcs/query.c b/calendar/pcs/query.c
deleted file mode 100644
index 2006157e58..0000000000
--- a/calendar/pcs/query.c
+++ /dev/null
@@ -1,1449 +0,0 @@
-/* Evolution calendar - Live search query implementation
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtksignal.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-sexp.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/timeutil.h>
-#include "cal-backend.h"
-#include "query.h"
-
-
-
-/* States of a query */
-typedef enum {
-	QUERY_WAIT_FOR_BACKEND, /* the query is not populated and the backend is not loaded */
-	QUERY_START_PENDING,	/* the query is not populated yet, but the backend is loaded */
-	QUERY_IN_PROGRESS,	/* the query is populated; components are still being processed */
-	QUERY_DONE,		/* the query is done, but still accepts object changes */
-	QUERY_PARSE_ERROR	/* a parse error occurred when initially creating the ESexp */
-} QueryState;
-
-/* Private part of the Query structure */
-struct _QueryPrivate {
-	/* The backend we are monitoring */
-	CalBackend *backend;
-
-	/* The default timezone for the calendar. */
-	icaltimezone *default_zone;
-
-	/* Listener to which we report changes in the live query */
-	GNOME_Evolution_Calendar_QueryListener ql;
-
-	/* Sexp that defines the query */
-	char *sexp;
-	ESExp *esexp;
-
-	/* Timeout handler ID for asynchronous queries and current state of the query */
-	guint timeout_id;
-	QueryState state;
-
-	/* List of UIDs that we still have to process */
-	GList *pending_uids;
-	int n_pending;
-	int pending_total;
-
-	/* Table of the UIDs we know do match the query */
-	GHashTable *uids;
-
-	/* The next component that will be handled in e_sexp_eval(); put here
-	 * just because the query object itself is the esexp context.
-	 */
-	CalComponent *next_comp;
-};
-
-
-
-static void query_class_init (QueryClass *class);
-static void query_init (Query *query);
-static void query_destroy (GtkObject *object);
-
-static BonoboXObjectClass *parent_class;
-
-
-
-BONOBO_X_TYPE_FUNC_FULL (Query,
-			 GNOME_Evolution_Calendar_Query,
-			 BONOBO_X_OBJECT_TYPE,
-			 query);
-
-/* Class initialization function for the live search query */
-static void
-query_class_init (QueryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);
-
-	object_class->destroy = query_destroy;
-
-	/* The Query interface (ha ha! query interface!) has no methods, so we
-	 * don't need to fiddle with the epv.
-	 */
-}
-
-/* Object initialization function for the live search query */
-static void
-query_init (Query *query)
-{
-	QueryPrivate *priv;
-
-	priv = g_new0 (QueryPrivate, 1);
-	query->priv = priv;
-
-	priv->backend = NULL;
-	priv->default_zone = NULL;
-	priv->ql = CORBA_OBJECT_NIL;
-	priv->sexp = NULL;
-
-	priv->timeout_id = 0;
-	priv->state = QUERY_WAIT_FOR_BACKEND;
-
-	priv->pending_uids = NULL;
-	priv->uids = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->next_comp = NULL;
-}
-
-/* Used from g_hash_table_foreach(); frees a UID */
-static void
-free_uid_cb (gpointer key, gpointer value, gpointer data)
-{
-	char *uid;
-
-	uid = key;
-	g_free (uid);
-}
-
-/* Destroy handler for the live search query */
-static void
-query_destroy (GtkObject *object)
-{
-	Query *query;
-	QueryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_QUERY (object));
-
-	query = QUERY (object);
-	priv = query->priv;
-
-	if (priv->backend) {
-		/* If we are waiting for the backend to be opened, we'll be
-		 * connected to its "opened" signal.  If we are in the middle of
-		 * a query or if we are just waiting for object update
-		 * notifications, we'll have the "obj_removed" and "obj_updated"
-		 * connections.  Otherwise, we are either in a parse error state
-		 * or waiting for the query to be populated, and in both cases
-		 * we have no signal connections.
-		 */
-		if (priv->state == QUERY_WAIT_FOR_BACKEND
-		    || priv->state == QUERY_IN_PROGRESS || priv->state == QUERY_DONE)
-			gtk_signal_disconnect_by_data (GTK_OBJECT (priv->backend), query);
-
-		gtk_object_unref (GTK_OBJECT (priv->backend));
-		priv->backend = NULL;
-	}
-
-	if (priv->ql != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		bonobo_object_release_unref (priv->ql, &ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("query_destroy(): Could not unref the listener\n");
-
-		CORBA_exception_free (&ev);
-
-		priv->ql = CORBA_OBJECT_NIL;
-	}
-
-	if (priv->sexp) {
-		g_free (priv->sexp);
-		priv->sexp = NULL;
-	}
-
-	if (priv->esexp) {
-		e_sexp_unref (priv->esexp);
-		priv->esexp = NULL;
-	}
-
-	if (priv->timeout_id) {
-		g_source_remove (priv->timeout_id);
-		priv->timeout_id = 0;
-	}
-
-	if (priv->pending_uids) {
-		GList *l;
-
-		for (l = priv->pending_uids; l; l = l->next) {
-			char *uid;
-
-			uid = l->data;
-			g_assert (uid != NULL);
-			g_free (uid);
-		}
-
-		g_list_free (priv->pending_uids);
-		priv->pending_uids = NULL;
-		priv->n_pending = 0;
-	}
-
-	g_hash_table_foreach (priv->uids, free_uid_cb, NULL);
-	g_hash_table_destroy (priv->uids);
-	priv->uids = NULL;
-
-	g_free (priv);
-	query->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* E-Sexp functions */
-
-/* (time-now)
- *
- * Returns a time_t of time (NULL).
- */
-static ESExpResult *
-func_time_now (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	ESExpResult *result;
-
-	if (argc != 0) {
-		e_sexp_fatal_error (esexp, _("time-now expects 0 arguments"));
-		return NULL;
-	}
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);
-	result->value.time = time (NULL);
-
-	return result;
-}
-
-/* (make-time ISODATE)
- *
- * ISODATE - string, ISO 8601 date/time representation
- *
- * Constructs a time_t value for the specified date.
- */
-static ESExpResult *
-func_make_time (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	const char *str;
-	time_t t;
-	ESExpResult *result;
-
-	if (argc != 1) {
-		e_sexp_fatal_error (esexp, _("make-time expects 1 argument"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_STRING) {
-		e_sexp_fatal_error (esexp, _("make-time expects argument 1 "
-					     "to be a string"));
-		return NULL;
-	}
-	str = argv[0]->value.string;
-
-	t = time_from_isodate (str);
-	if (t == -1) {
-		e_sexp_fatal_error (esexp, _("make-time argument 1 must be an "
-					     "ISO 8601 date/time string"));
-		return NULL;
-	}
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);
-	result->value.time = t;
-
-	return result;
-}
-
-/* (time-add-day TIME N)
- *
- * TIME - time_t, base time
- * N - int, number of days to add
- *
- * Adds the specified number of days to a time value.
- *
- * FIXME: TIMEZONES - need to use a timezone or daylight saving changes will
- * make the result incorrect.
- */
-static ESExpResult *
-func_time_add_day (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	ESExpResult *result;
-	time_t t;
-	int n;
-
-	if (argc != 2) {
-		e_sexp_fatal_error (esexp, _("time-add-day expects 2 arguments"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_TIME) {
-		e_sexp_fatal_error (esexp, _("time-add-day expects argument 1 "
-					     "to be a time_t"));
-		return NULL;
-	}
-	t = argv[0]->value.time;
-
-	if (argv[1]->type != ESEXP_RES_INT) {
-		e_sexp_fatal_error (esexp, _("time-add-day expects argument 2 "
-					     "to be an integer"));
-		return NULL;
-	}
-	n = argv[1]->value.number;
-	
-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);
-	result->value.time = time_add_day (t, n);
-
-	return result;
-}
-
-/* (time-day-begin TIME)
- *
- * TIME - time_t, base time
- *
- * Returns the start of the day, according to the local time.
- *
- * FIXME: TIMEZONES - this uses the current Unix timezone.
- */
-static ESExpResult *
-func_time_day_begin (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	time_t t;
-	ESExpResult *result;
-
-	if (argc != 1) {
-		e_sexp_fatal_error (esexp, _("time-day-begin expects 1 argument"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_TIME) {
-		e_sexp_fatal_error (esexp, _("time-day-begin expects argument 1 "
-					     "to be a time_t"));
-		return NULL;
-	}
-	t = argv[0]->value.time;
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);
-	result->value.time = time_day_begin (t);
-
-	return result;
-}
-
-/* (time-day-end TIME)
- *
- * TIME - time_t, base time
- *
- * Returns the end of the day, according to the local time.
- *
- * FIXME: TIMEZONES - this uses the current Unix timezone.
- */
-static ESExpResult *
-func_time_day_end (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	time_t t;
-	ESExpResult *result;
-
-	if (argc != 1) {
-		e_sexp_fatal_error (esexp, _("time-day-end expects 1 argument"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_TIME) {
-		e_sexp_fatal_error (esexp, _("time-day-end expects argument 1 "
-					     "to be a time_t"));
-		return NULL;
-	}
-	t = argv[0]->value.time;
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);
-	result->value.time = time_day_end (t);
-
-	return result;
-}
-
-/* (get-vtype)
- *
- * Returns a string indicating the type of component (VEVENT, VTODO, VJOURNAL,
- * VFREEBUSY, VTIMEZONE, UNKNOWN).
- */
-static ESExpResult *
-func_get_vtype (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CalComponent *comp;
-	CalComponentVType vtype;
-	char *str;
-	ESExpResult *result;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->next_comp != NULL);
-	comp = priv->next_comp;
-
-	/* Check argument types */
-
-	if (argc != 0) {
-		e_sexp_fatal_error (esexp, _("get-vtype expects 0 arguments"));
-		return NULL;
-	}
-
-	/* Get the type */
-
-	vtype = cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		str = g_strdup ("VEVENT");
-		break;
-
-	case CAL_COMPONENT_TODO:
-		str = g_strdup ("VTODO");
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		str = g_strdup ("VJOURNAL");
-		break;
-
-	case CAL_COMPONENT_FREEBUSY:
-		str = g_strdup ("VFREEBUSY");
-		break;
-
-	case CAL_COMPONENT_TIMEZONE:
-		str = g_strdup ("VTIMEZONE");
-		break;
-
-	default:
-		str = g_strdup ("UNKNOWN");
-		break;
-	}
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_STRING);
-	result->value.string = str;
-
-	return result;
-}
-
-/* Sets a boolean value in the data to TRUE; called from
- * cal_recur_generate_instances() to indicate that at least one instance occurs
- * in the sought time range.  We always return FALSE because we want the
- * recurrence engine to finish as soon as possible.
- */
-static gboolean
-instance_occur_cb (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	gboolean *occurs;
-
-	occurs = data;
-	*occurs = TRUE;
-
-	return FALSE;
-}
-
-/* Call the backend function to get a timezone from a TZID. */
-static icaltimezone*
-resolve_tzid (const char *tzid, gpointer data)
-{
-	Query *query = data;
-
-	if (!tzid || !tzid[0])
-		return NULL;
-	else
-		return cal_backend_get_timezone (query->priv->backend, tzid);
-}
-
-
-/* (occur-in-time-range? START END)
- *
- * START - time_t, start of the time range
- * END - time_t, end of the time range
- *
- * Returns a boolean indicating whether the component has any occurrences in the
- * specified time range.
- */
-static ESExpResult *
-func_occur_in_time_range (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CalComponent *comp;
-	time_t start, end;
-	gboolean occurs;
-	ESExpResult *result;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->next_comp != NULL);
-	comp = priv->next_comp;
-
-	/* Check argument types */
-
-	if (argc != 2) {
-		e_sexp_fatal_error (esexp, _("occur-in-time-range? expects 2 arguments"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_TIME) {
-		e_sexp_fatal_error (esexp, _("occur-in-time-range? expects argument 1 "
-					     "to be a time_t"));
-		return NULL;
-	}
-	start = argv[0]->value.time;
-
-	if (argv[1]->type != ESEXP_RES_TIME) {
-		e_sexp_fatal_error (esexp, _("occur-in-time-range? expects argument 2 "
-					     "to be a time_t"));
-		return NULL;
-	}
-	end = argv[1]->value.time;
-
-	/* See if there is at least one instance in that range */
-
-	occurs = FALSE;
-
-	cal_recur_generate_instances (comp, start, end,
-				      instance_occur_cb, &occurs,
-				      resolve_tzid, query, priv->default_zone);
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = occurs;
-
-	return result;
-}
-
-/* Returns whether a list of CalComponentText items matches the specified string */
-static gboolean
-matches_text_list (GSList *text_list, const char *str)
-{
-	GSList *l;
-	gboolean matches;
-
-	matches = FALSE;
-
-	for (l = text_list; l; l = l->next) {
-		CalComponentText *text;
-
-		text = l->data;
-		g_assert (text->value != NULL);
-
-		if (e_utf8_strstrcasedecomp (text->value, str) != NULL) {
-			matches = TRUE;
-			break;
-		}
-	}
-
-	return matches;
-}
-
-/* Returns whether the comments in a component matches the specified string */
-static gboolean
-matches_comment (CalComponent *comp, const char *str)
-{
-	GSList *list;
-	gboolean matches;
-
-	cal_component_get_comment_list (comp, &list);
-	matches = matches_text_list (list, str);
-	cal_component_free_text_list (list);
-
-	return matches;
-}
-
-/* Returns whether the description in a component matches the specified string */
-static gboolean
-matches_description (CalComponent *comp, const char *str)
-{
-	GSList *list;
-	gboolean matches;
-
-	cal_component_get_description_list (comp, &list);
-	matches = matches_text_list (list, str);
-	cal_component_free_text_list (list);
-
-	return matches;
-}
-
-/* Returns whether the summary in a component matches the specified string */
-static gboolean
-matches_summary (CalComponent *comp, const char *str)
-{
-	CalComponentText text;
-
-	cal_component_get_summary (comp, &text);
-
-	if (!text.value)
-		return FALSE;
-
-	return e_utf8_strstrcasedecomp (text.value, str) != NULL;
-}
-
-/* Returns whether any text field in a component matches the specified string */
-static gboolean
-matches_any (CalComponent *comp, const char *str)
-{
-	/* As an optimization, and to make life easier for the individual
-	 * predicate functions, see if we are looking for the empty string right
-	 * away.
-	 */
-	if (strlen (str) == 0)
-		return TRUE;
-
-	return (matches_comment (comp, str)
-		|| matches_description (comp, str)
-		|| matches_summary (comp, str));
-}
-
-/* (contains? FIELD STR)
- *
- * FIELD - string, name of field to match (any, comment, description, summary)
- * STR - string, match string
- *
- * Returns a boolean indicating whether the specified field contains the
- * specified string.
- */
-static ESExpResult *
-func_contains (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CalComponent *comp;
-	const char *field;
-	const char *str;
-	gboolean matches;
-	ESExpResult *result;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->next_comp != NULL);
-	comp = priv->next_comp;
-
-	/* Check argument types */
-
-	if (argc != 2) {
-		e_sexp_fatal_error (esexp, _("contains? expects 2 arguments"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_STRING) {
-		e_sexp_fatal_error (esexp, _("contains? expects argument 1 "
-					     "to be a string"));
-		return NULL;
-	}
-	field = argv[0]->value.string;
-
-	if (argv[1]->type != ESEXP_RES_STRING) {
-		e_sexp_fatal_error (esexp, _("contains? expects argument 2 "
-					     "to be a string"));
-		return NULL;
-	}
-	str = argv[1]->value.string;
-
-	/* See if it matches */
-
-	if (strcmp (field, "any") == 0)
-		matches = matches_any (comp, str);
-	else if (strcmp (field, "comment") == 0)
-		matches = matches_comment (comp, str);
-	else if (strcmp (field, "description") == 0)
-		matches = matches_description (comp, str);
-	else if (strcmp (field, "summary") == 0)
-		matches = matches_summary (comp, str);
-	else {
-		e_sexp_fatal_error (esexp, _("contains? expects argument 1 to "
-					     "be one of \"any\", \"summary\", \"description\""));
-		return NULL;
-	}
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = matches;
-
-	return result;
-}
-
-/* (has-categories? STR+)
- * (has-categories? #f)
- *
- * STR - At least one string specifying a category
- * Or you can specify a single #f (boolean false) value for components
- * that have no categories assigned to them ("unfiled").
- *
- * Returns a boolean indicating whether the component has all the specified
- * categories.
- */
-static ESExpResult *
-func_has_categories (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CalComponent *comp;
-	gboolean unfiled;
-	int i;
-	GSList *categories;
-	gboolean matches;
-	ESExpResult *result;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->next_comp != NULL);
-	comp = priv->next_comp;
-
-	/* Check argument types */
-
-	if (argc < 1) {
-		e_sexp_fatal_error (esexp, _("has-categories? expects at least 1 argument"));
-		return NULL;
-	}
-
-	if (argc == 1 && argv[0]->type == ESEXP_RES_BOOL)
-		unfiled = TRUE;
-	else
-		unfiled = FALSE;
-
-	if (!unfiled)
-		for (i = 0; i < argc; i++)
-			if (argv[i]->type != ESEXP_RES_STRING) {
-				e_sexp_fatal_error (esexp, _("has-categories? expects all arguments "
-							     "to be strings or one and only one "
-							     "argument to be a boolean false (#f)"));
-				return NULL;
-			}
-
-	/* Search categories.  First, if there are no categories we return
-	 * whether unfiled components are supposed to match.
-	 */
-
-	cal_component_get_categories_list (comp, &categories);
-	if (!categories) {
-		result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-		result->value.bool = unfiled;
-
-		return result;
-	}
-
-	/* Otherwise, we *do* have categories but unfiled components were
-	 * requested, so this component does not match.
-	 */
-	if (unfiled) {
-		result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-		result->value.bool = FALSE;
-
-		return result;
-	}
-
-	matches = TRUE;
-
-	for (i = 0; i < argc; i++) {
-		const char *sought;
-		GSList *l;
-		gboolean has_category;
-
-		sought = argv[i]->value.string;
-
-		has_category = FALSE;
-
-		for (l = categories; l; l = l->next) {
-			const char *category;
-
-			category = l->data;
-
-			if (strcmp (category, sought) == 0) {
-				has_category = TRUE;
-				break;
-			}
-		}
-
-		if (!has_category) {
-			matches = FALSE;
-			break;
-		}
-	}
-
-	cal_component_free_categories_list (categories);
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = matches;
-
-	return result;
-}
-
-/* (is-completed?)
- *
- * Returns a boolean indicating whether the component is completed (i.e. has
- * a COMPLETED property. This is really only useful for TODO components.
- */
-static ESExpResult *
-func_is_completed (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CalComponent *comp;
-	ESExpResult *result;
-	struct icaltimetype *t;
-	gboolean complete = FALSE;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->next_comp != NULL);
-	comp = priv->next_comp;
-
-	/* Check argument types */
-
-	if (argc != 0) {
-		e_sexp_fatal_error (esexp, _("is-completed? expects 0 arguments"));
-		return NULL;
-	}
-
-	cal_component_get_completed (comp, &t);
-	if (t) {
-		complete = TRUE;
-		cal_component_free_icaltimetype (t);
-	}
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = complete;
-
-	return result;
-}
-
-/* (completed-before? TIME)
- *
- * TIME - time_t
- *
- * Returns a boolean indicating whether the component was completed on or
- * before the given time (i.e. it checks the COMPLETED property).
- * This is really only useful for TODO components.
- */
-static ESExpResult *
-func_completed_before (ESExp *esexp, int argc, ESExpResult **argv, void *data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CalComponent *comp;
-	ESExpResult *result;
-	struct icaltimetype *tt;
-	icaltimezone *zone;
-	gboolean retval = FALSE;
-	time_t before_time, completed_time;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->next_comp != NULL);
-	comp = priv->next_comp;
-
-	/* Check argument types */
-
-	if (argc != 1) {
-		e_sexp_fatal_error (esexp, _("completed-before? expects 1 argument"));
-		return NULL;
-	}
-
-	if (argv[0]->type != ESEXP_RES_TIME) {
-		e_sexp_fatal_error (esexp, _("completed-before? expects argument 1 "
-					     "to be a time_t"));
-		return NULL;
-	}
-	before_time = argv[0]->value.time;
-
-	cal_component_get_completed (comp, &tt);
-	if (tt) {
-		/* COMPLETED must be in UTC. */
-		zone = icaltimezone_get_utc_timezone ();
-		completed_time = icaltime_as_timet_with_zone (*tt, zone);
-
-#if 0
-		g_print ("Query Time    : %s", ctime (&before_time));
-		g_print ("Completed Time: %s", ctime (&completed_time));
-#endif
-
-		/* We want to return TRUE if before_time is after
-		   completed_time. */
-		if (difftime (before_time, completed_time) > 0) {
-#if 0
-			g_print ("  Returning TRUE\n");
-#endif
-			retval = TRUE;
-		}
-
-		cal_component_free_icaltimetype (tt);
-	}
-
-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = retval;
-
-	return result;
-}
-
-
-
-/* Adds a component to our the UIDs hash table and notifies the client */
-static void
-add_component (Query *query, const char *uid, gboolean query_in_progress, int n_scanned, int total)
-{
-	QueryPrivate *priv;
-	char *old_uid;
-	CORBA_Environment ev;
-
-	if (query_in_progress)
-		g_assert (n_scanned > 0 || n_scanned <= total);
-
-	priv = query->priv;
-
-	if (g_hash_table_lookup_extended (priv->uids, uid, (gpointer *) &old_uid, NULL)) {
-		g_hash_table_remove (priv->uids, old_uid);
-		g_free (old_uid);
-	}
-
-	g_hash_table_insert (priv->uids, g_strdup (uid), NULL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_QueryListener_notifyObjUpdated (
-		priv->ql,
-		(char *) uid,
-		query_in_progress,
-		n_scanned,
-		total,
-		&ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("add_component(): Could not notify the listener of an "
-			   "updated component");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Removes a component from our the UIDs hash table and notifies the client */
-static void
-remove_component (Query *query, const char *uid)
-{
-	QueryPrivate *priv;
-	char *old_uid;
-	CORBA_Environment ev;
-
-	priv = query->priv;
-
-	if (!g_hash_table_lookup_extended (priv->uids, uid, (gpointer *) &old_uid, NULL))
-		return;
-
-	/* The component did match the query before but it no longer does, so we
-	 * have to notify the client.
-	 */
-
-	g_hash_table_remove (priv->uids, old_uid);
-	g_free (old_uid);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_QueryListener_notifyObjRemoved (
-		priv->ql,
-		(char *) uid,
-		&ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("remove_component(): Could not notify the listener of a "
-			   "removed component");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Removes a component from the list of pending UIDs */
-static void
-remove_from_pending (Query *query, const char *remove_uid)
-{
-	QueryPrivate *priv;
-	GList *l;
-
-	priv = query->priv;
-
-	for (l = priv->pending_uids; l; l = l->next) {
-		char *uid;
-
-		g_assert (priv->n_pending > 0);
-
-		uid = l->data;
-		if (strcmp (remove_uid, uid))
-			continue;
-
-		g_free (uid);
-
-		priv->pending_uids = g_list_remove_link (priv->pending_uids, l);
-		g_list_free_1 (l);
-		priv->n_pending--;
-
-		g_assert ((priv->pending_uids && priv->n_pending != 0)
-			  || (!priv->pending_uids && priv->n_pending == 0));
-
-		break;
-	}
-}
-
-static struct {
-	char *name;
-	ESExpFunc *func;
-} functions[] = {
-	/* Time-related functions */
-	{ "time-now", func_time_now },
-	{ "make-time", func_make_time },
-	{ "time-add-day", func_time_add_day },
-	{ "time-day-begin", func_time_day_begin },
-	{ "time-day-end", func_time_day_end },
-
-	/* Component-related functions */
-	{ "get-vtype", func_get_vtype },
-	{ "occur-in-time-range?", func_occur_in_time_range },
-	{ "contains?", func_contains },
-	{ "has-categories?", func_has_categories },
-	{ "is-completed?", func_is_completed },
-	{ "completed-before?", func_completed_before }
-};
-
-/* Initializes a sexp by interning our own symbols */
-static ESExp *
-create_sexp (Query *query)
-{
-	ESExp *esexp;
-	int i;
-
-	esexp = e_sexp_new ();
-
-	for (i = 0; i < (sizeof (functions) / sizeof (functions[0])); i++)
-		e_sexp_add_function (esexp, 0, functions[i].name, functions[i].func, query);
-
-	return esexp;
-}
-
-/* Creates the ESexp and parses the esexp.  If a parse error occurs, it sets the
- * query state to QUERY_PARSE_ERROR and returns FALSE.
- */
-static gboolean
-parse_sexp (Query *query)
-{
-	QueryPrivate *priv;
-
-	priv = query->priv;
-
-	/* Compile the query string */
-
-	priv->esexp = create_sexp (query);
-
-	g_assert (priv->sexp != NULL);
-	e_sexp_input_text (priv->esexp, priv->sexp, strlen (priv->sexp));
-
-	if (e_sexp_parse (priv->esexp) == -1) {
-		const char *error_str;
-		CORBA_Environment ev;
-
-		priv->state = QUERY_PARSE_ERROR;
-
-		/* Report the error to the listener */
-
-		error_str = e_sexp_error (priv->esexp);
-		g_assert (error_str != NULL);
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_QueryListener_notifyQueryDone (
-			priv->ql,
-			GNOME_Evolution_Calendar_QueryListener_PARSE_ERROR,
-			error_str,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("parse_sexp(): Could not notify the listener of "
-				   "a parse error");
-
-		CORBA_exception_free (&ev);
-
-		e_sexp_unref (priv->esexp);
-		priv->esexp = NULL;
-
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Evaluates the query sexp on the specified component and notifies the listener
- * as appropriate.
- */
-static void
-match_component (Query *query, const char *uid,
-		 gboolean query_in_progress, int n_scanned, int total)
-{
-	QueryPrivate *priv;
-	CalComponent *comp;
-	ESExpResult *result;
-
-	priv = query->priv;
-
-	g_assert (priv->state == QUERY_IN_PROGRESS || priv->state == QUERY_DONE);
-	g_assert (priv->esexp != NULL);
-
-	comp = cal_backend_get_object_component (priv->backend, uid);
-	if (!comp)
-		return;
-
-	/* Eval the sexp */
-
-	g_assert (priv->next_comp == NULL);
-
-	priv->next_comp = comp;
-	result = e_sexp_eval (priv->esexp);
-	priv->next_comp = NULL;
-
-	if (!result) {
-		const char *error_str;
-		CORBA_Environment ev;
-
-		error_str = e_sexp_error (priv->esexp);
-		g_assert (error_str != NULL);
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_QueryListener_notifyEvalError (
-			priv->ql,
-			error_str,
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("match_component(): Could not notify the listener of "
-				   "an evaluation error");
-
-		CORBA_exception_free (&ev);
-		return;
-	} else if (result->type != ESEXP_RES_BOOL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_QueryListener_notifyEvalError (
-			priv->ql,
-			_("Evaluation of the search expression did not yield a boolean value"),
-			&ev);
-
-		if (BONOBO_EX (&ev))
-			g_message ("match_component(): Could not notify the listener of "
-				   "an unexpected result value type when evaluating the "
-				   "search expression");
-
-		CORBA_exception_free (&ev);
-	} else {
-		/* Success; process the component accordingly */
-
-		if (result->value.bool)
-			add_component (query, uid, query_in_progress, n_scanned, total);
-		else
-			remove_component (query, uid);
-	}
-
-	e_sexp_result_free (priv->esexp, result);
-}
-
-/* Processes all components that are queued in the list */
-static gboolean
-process_components_cb (gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	char *uid;
-	GList *l;
-	CORBA_Environment ev;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_source_remove (priv->timeout_id);
-	priv->timeout_id = 0;
-
-	while (priv->pending_uids) {
-		g_assert (priv->n_pending > 0);
-
-		/* Fetch the component */
-
-		l = priv->pending_uids;
-		priv->pending_uids = g_list_remove_link (priv->pending_uids, l);
-		priv->n_pending--;
-
-		g_assert ((priv->pending_uids && priv->n_pending != 0)
-			  || (!priv->pending_uids && priv->n_pending == 0));
-
-		uid = l->data;
-		g_assert (uid != NULL);
-
-		g_list_free_1 (l);
-
-		bonobo_object_ref (BONOBO_OBJECT (query));
-
-		match_component (query, uid,
-				 TRUE,
-				 priv->pending_total - priv->n_pending,
-				 priv->pending_total);
-
-		bonobo_object_unref (BONOBO_OBJECT (query));
-
-		g_free (uid);
-
-		/* run the main loop, for not blocking */
-		if (gtk_events_pending ())
-			gtk_main_iteration ();
-	}
-
-	/* notify listener that the query ended */
-	priv->state = QUERY_DONE;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_QueryListener_notifyQueryDone (
-		priv->ql,
-		GNOME_Evolution_Calendar_QueryListener_SUCCESS,
-		"",
-		&ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("start_query(): Could not notify the listener of "
-			   "a finished query");
-
-	CORBA_exception_free (&ev);
-
-	return FALSE;
-}
-
-/* Callback used when a component changes in the backend */
-static void
-backend_obj_updated_cb (CalBackend *backend, const char *uid, gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->state == QUERY_IN_PROGRESS || priv->state == QUERY_DONE);
-
-	bonobo_object_ref (BONOBO_OBJECT (query));
-
-	match_component (query, uid, FALSE, 0, 0);
-	remove_from_pending (query, uid);
-
-	bonobo_object_unref (BONOBO_OBJECT (query));
-}
-
-/* Callback used when a component is removed from the backend */
-static void
-backend_obj_removed_cb (CalBackend *backend, const char *uid, gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->state == QUERY_IN_PROGRESS || priv->state == QUERY_DONE);
-
-	bonobo_object_ref (BONOBO_OBJECT (query));
-
-	remove_component (query, uid);
-	remove_from_pending (query, uid);
-
-	bonobo_object_unref (BONOBO_OBJECT (query));
-}
-
-/* Actually starts the query */
-static void
-start_query (Query *query)
-{
-	QueryPrivate *priv;
-
-	priv = query->priv;
-
-	if (!parse_sexp (query))
-		return;
-
-	/* Populate the query with UIDs so that we can process them asynchronously */
-
-	priv->state = QUERY_IN_PROGRESS;
-	priv->pending_uids = cal_backend_get_uids (priv->backend, CALOBJ_TYPE_ANY);
-	priv->pending_total = g_list_length (priv->pending_uids);
-	priv->n_pending = priv->pending_total;
-
-	gtk_signal_connect (GTK_OBJECT (priv->backend), "obj_updated",
-			    GTK_SIGNAL_FUNC (backend_obj_updated_cb),
-			    query);
-	gtk_signal_connect (GTK_OBJECT (priv->backend), "obj_removed",
-			    GTK_SIGNAL_FUNC (backend_obj_removed_cb),
-			    query);
-
-	priv->timeout_id = g_timeout_add (100, (GSourceFunc) process_components_cb, query);
-}
-
-/* Idle handler for starting a query */
-static gboolean
-start_query_cb (gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_source_remove (priv->timeout_id);
-	priv->timeout_id = 0;
-
-	if (priv->state == QUERY_START_PENDING) {
-		priv->state = QUERY_IN_PROGRESS;
-		start_query (query);
-	}
-
-	return FALSE;
-}
-
-/* Callback used when the backend gets loaded; we just queue the query to be
- * started later.
- */
-static void
-backend_opened_cb (CalBackend *backend, CalBackendOpenStatus status, gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	g_assert (priv->state == QUERY_WAIT_FOR_BACKEND);
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->backend), query);
-	priv->state = QUERY_START_PENDING;
-
-	if (status == CAL_BACKEND_OPEN_SUCCESS) {
-		g_assert (cal_backend_is_loaded (backend));
-
-		priv->timeout_id = g_timeout_add (100, (GSourceFunc) start_query_cb, query);
-	}
-}
-
-/**
- * query_construct:
- * @query: A live search query.
- * @backend: Calendar backend that the query object will monitor.
- * @ql: Listener for query results.
- * @sexp: Sexp that defines the query.
- * 
- * Constructs a #Query object by binding it to a calendar backend and a query
- * listener.  The @query object will start to populate itself asynchronously and
- * call the listener as appropriate.
- * 
- * Return value: The same value as @query, or NULL if the query could not
- * be constructed.
- **/
-Query *
-query_construct (Query *query,
-		 CalBackend *backend,
-		 GNOME_Evolution_Calendar_QueryListener ql,
-		 const char *sexp)
-{
-	QueryPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (query != NULL, NULL);
-	g_return_val_if_fail (IS_QUERY (query), NULL);
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (ql != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (sexp != NULL, NULL);
-
-	priv = query->priv;
-
-	CORBA_exception_init (&ev);
-	priv->ql = CORBA_Object_duplicate (ql, &ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("query_construct(): Could not duplicate the listener");
-		priv->ql = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	priv->backend = backend;
-	gtk_object_ref (GTK_OBJECT (priv->backend));
-
-	priv->default_zone = cal_backend_get_default_timezone (backend);
-
-	priv->sexp = g_strdup (sexp);
-
-	/* Queue the query to be started asynchronously */
-
-	if (cal_backend_is_loaded (priv->backend)) {
-		priv->state = QUERY_START_PENDING;
-
-		priv->timeout_id = g_timeout_add (100, (GSourceFunc) start_query_cb, query);
-	} else
-		gtk_signal_connect (GTK_OBJECT (priv->backend), "opened",
-				    GTK_SIGNAL_FUNC (backend_opened_cb),
-				    query);
-
-	return query;
-}
-
-/**
- * query_new:
- * @backend: Calendar backend that the query object will monitor.
- * @ql: Listener for query results.
- * @sexp: Sexp that defines the query.
- * 
- * Creates a new query engine object that monitors a calendar backend.
- * 
- * Return value: A newly-created query object, or NULL on failure.
- **/
-Query *
-query_new (CalBackend *backend,
-	   GNOME_Evolution_Calendar_QueryListener ql,
-	   const char *sexp)
-{
-	Query *query;
-
-	query = QUERY (gtk_type_new (QUERY_TYPE));
-	if (!query_construct (query, backend, ql, sexp)) {
-		bonobo_object_unref (BONOBO_OBJECT (query));
-		return NULL;
-	}
-
-	return query;
-}
diff --git a/calendar/pcs/query.h b/calendar/pcs/query.h
deleted file mode 100644
index 80b17983a6..0000000000
--- a/calendar/pcs/query.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Evolution calendar - Live search query implementation
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 QUERY_H
-#define QUERY_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-xobject.h>
-#include "cal-common.h"
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define QUERY_TYPE            (query_get_type ())
-#define QUERY(obj)            (GTK_CHECK_CAST ((obj), QUERY_TYPE, Query))
-#define QUERY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), QUERY_TYPE, QueryClass))
-#define IS_QUERY(obj)         (GTK_CHECK_TYPE ((obj), QUERY_TYPE))
-#define IS_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), QUERY_TYPE))
-
-typedef struct _QueryPrivate QueryPrivate;
-
-typedef struct {
-	BonoboXObject xobject;
-
-	/* Private data */
-	QueryPrivate *priv;
-} Query;
-
-typedef struct {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_Query__epv epv;
-} QueryClass;
-
-GtkType query_get_type (void);
-
-Query *query_construct (Query *query,
-			CalBackend *backend,
-			GNOME_Evolution_Calendar_QueryListener ql,
-			const char *sexp);
-
-Query *query_new (CalBackend *backend,
-		  GNOME_Evolution_Calendar_QueryListener ql,
-		  const char *sexp);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/zones.h b/calendar/zones.h
deleted file mode 100644
index 06f10b749a..0000000000
--- a/calendar/zones.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * These are the timezone names from the Olson timezone data.
- * We only place them here so gettext picks them up for translation.
- * Don't include in any C files.
- */
-
-N_("Africa/Abidjan");
-N_("Africa/Accra");
-N_("Africa/Addis_Ababa");
-N_("Africa/Algiers");
-N_("Africa/Asmera");
-N_("Africa/Bamako");
-N_("Africa/Bangui");
-N_("Africa/Banjul");
-N_("Africa/Bissau");
-N_("Africa/Blantyre");
-N_("Africa/Brazzaville");
-N_("Africa/Bujumbura");
-N_("Africa/Cairo");
-N_("Africa/Casablanca");
-N_("Africa/Ceuta");
-N_("Africa/Conakry");
-N_("Africa/Dakar");
-N_("Africa/Dar_es_Salaam");
-N_("Africa/Djibouti");
-N_("Africa/Douala");
-N_("Africa/El_Aaiun");
-N_("Africa/Freetown");
-N_("Africa/Gaborone");
-N_("Africa/Harare");
-N_("Africa/Johannesburg");
-N_("Africa/Kampala");
-N_("Africa/Khartoum");
-N_("Africa/Kigali");
-N_("Africa/Kinshasa");
-N_("Africa/Lagos");
-N_("Africa/Libreville");
-N_("Africa/Lome");
-N_("Africa/Luanda");
-N_("Africa/Lubumbashi");
-N_("Africa/Lusaka");
-N_("Africa/Malabo");
-N_("Africa/Maputo");
-N_("Africa/Maseru");
-N_("Africa/Mbabane");
-N_("Africa/Mogadishu");
-N_("Africa/Monrovia");
-N_("Africa/Nairobi");
-N_("Africa/Ndjamena");
-N_("Africa/Niamey");
-N_("Africa/Nouakchott");
-N_("Africa/Ouagadougou");
-N_("Africa/Porto-Novo");
-N_("Africa/Sao_Tome");
-N_("Africa/Timbuktu");
-N_("Africa/Tripoli");
-N_("Africa/Tunis");
-N_("Africa/Windhoek");
-N_("America/Adak");
-N_("America/Anchorage");
-N_("America/Anguilla");
-N_("America/Antigua");
-N_("America/Araguaina");
-N_("America/Aruba");
-N_("America/Asuncion");
-N_("America/Barbados");
-N_("America/Belem");
-N_("America/Belize");
-N_("America/Boa_Vista");
-N_("America/Bogota");
-N_("America/Boise");
-N_("America/Buenos_Aires");
-N_("America/Cambridge_Bay");
-N_("America/Cancun");
-N_("America/Caracas");
-N_("America/Catamarca");
-N_("America/Cayenne");
-N_("America/Cayman");
-N_("America/Chicago");
-N_("America/Chihuahua");
-N_("America/Cordoba");
-N_("America/Costa_Rica");
-N_("America/Cuiaba");
-N_("America/Curacao");
-N_("America/Danmarkshavn");
-N_("America/Dawson");
-N_("America/Dawson_Creek");
-N_("America/Denver");
-N_("America/Detroit");
-N_("America/Dominica");
-N_("America/Edmonton");
-N_("America/Eirunepe");
-N_("America/El_Salvador");
-N_("America/Fortaleza");
-N_("America/Glace_Bay");
-N_("America/Godthab");
-N_("America/Goose_Bay");
-N_("America/Grand_Turk");
-N_("America/Grenada");
-N_("America/Guadeloupe");
-N_("America/Guatemala");
-N_("America/Guayaquil");
-N_("America/Guyana");
-N_("America/Halifax");
-N_("America/Havana");
-N_("America/Hermosillo");
-N_("America/Indiana/Indianapolis");
-N_("America/Indiana/Knox");
-N_("America/Indiana/Marengo");
-N_("America/Indiana/Vevay");
-N_("America/Indianapolis");
-N_("America/Inuvik");
-N_("America/Iqaluit");
-N_("America/Jamaica");
-N_("America/Jujuy");
-N_("America/Juneau");
-N_("America/Kentucky/Louisville");
-N_("America/Kentucky/Monticello");
-N_("America/La_Paz");
-N_("America/Lima");
-N_("America/Los_Angeles");
-N_("America/Louisville");
-N_("America/Maceio");
-N_("America/Managua");
-N_("America/Manaus");
-N_("America/Martinique");
-N_("America/Mazatlan");
-N_("America/Mendoza");
-N_("America/Menominee");
-N_("America/Merida");
-N_("America/Mexico_City");
-N_("America/Miquelon");
-N_("America/Monterrey");
-N_("America/Montevideo");
-N_("America/Montreal");
-N_("America/Montserrat");
-N_("America/Nassau");
-N_("America/New_York");
-N_("America/Nipigon");
-N_("America/Nome");
-N_("America/Noronha");
-N_("America/North_Dakota/Center");
-N_("America/Panama");
-N_("America/Pangnirtung");
-N_("America/Paramaribo");
-N_("America/Phoenix");
-N_("America/Port-au-Prince");
-N_("America/Port_of_Spain");
-N_("America/Porto_Velho");
-N_("America/Puerto_Rico");
-N_("America/Rainy_River");
-N_("America/Rankin_Inlet");
-N_("America/Recife");
-N_("America/Regina");
-N_("America/Rio_Branco");
-N_("America/Rosario");
-N_("America/Santiago");
-N_("America/Santo_Domingo");
-N_("America/Sao_Paulo");
-N_("America/Scoresbysund");
-N_("America/Shiprock");
-N_("America/St_Johns");
-N_("America/St_Kitts");
-N_("America/St_Lucia");
-N_("America/St_Thomas");
-N_("America/St_Vincent");
-N_("America/Swift_Current");
-N_("America/Tegucigalpa");
-N_("America/Thule");
-N_("America/Thunder_Bay");
-N_("America/Tijuana");
-N_("America/Tortola");
-N_("America/Vancouver");
-N_("America/Whitehorse");
-N_("America/Winnipeg");
-N_("America/Yakutat");
-N_("America/Yellowknife");
-N_("Antarctica/Casey");
-N_("Antarctica/Davis");
-N_("Antarctica/DumontDUrville");
-N_("Antarctica/Mawson");
-N_("Antarctica/McMurdo");
-N_("Antarctica/Palmer");
-N_("Antarctica/South_Pole");
-N_("Antarctica/Syowa");
-N_("Antarctica/Vostok");
-N_("Arctic/Longyearbyen");
-N_("Asia/Aden");
-N_("Asia/Almaty");
-N_("Asia/Amman");
-N_("Asia/Anadyr");
-N_("Asia/Aqtau");
-N_("Asia/Aqtobe");
-N_("Asia/Ashgabat");
-N_("Asia/Baghdad");
-N_("Asia/Bahrain");
-N_("Asia/Baku");
-N_("Asia/Bangkok");
-N_("Asia/Beirut");
-N_("Asia/Bishkek");
-N_("Asia/Brunei");
-N_("Asia/Calcutta");
-N_("Asia/Choibalsan");
-N_("Asia/Chongqing");
-N_("Asia/Colombo");
-N_("Asia/Damascus");
-N_("Asia/Dhaka");
-N_("Asia/Dili");
-N_("Asia/Dubai");
-N_("Asia/Dushanbe");
-N_("Asia/Gaza");
-N_("Asia/Harbin");
-N_("Asia/Hong_Kong");
-N_("Asia/Hovd");
-N_("Asia/Irkutsk");
-N_("Asia/Istanbul");
-N_("Asia/Jakarta");
-N_("Asia/Jayapura");
-N_("Asia/Jerusalem");
-N_("Asia/Kabul");
-N_("Asia/Kamchatka");
-N_("Asia/Karachi");
-N_("Asia/Kashgar");
-N_("Asia/Katmandu");
-N_("Asia/Krasnoyarsk");
-N_("Asia/Kuala_Lumpur");
-N_("Asia/Kuching");
-N_("Asia/Kuwait");
-N_("Asia/Macao");
-N_("Asia/Magadan");
-N_("Asia/Manila");
-N_("Asia/Muscat");
-N_("Asia/Nicosia");
-N_("Asia/Novosibirsk");
-N_("Asia/Omsk");
-N_("Asia/Phnom_Penh");
-N_("Asia/Pontianak");
-N_("Asia/Pyongyang");
-N_("Asia/Qatar");
-N_("Asia/Rangoon");
-N_("Asia/Riyadh");
-N_("Asia/Saigon");
-N_("Asia/Sakhalin");
-N_("Asia/Samarkand");
-N_("Asia/Seoul");
-N_("Asia/Shanghai");
-N_("Asia/Singapore");
-N_("Asia/Taipei");
-N_("Asia/Tashkent");
-N_("Asia/Tbilisi");
-N_("Asia/Tehran");
-N_("Asia/Thimphu");
-N_("Asia/Tokyo");
-N_("Asia/Ujung_Pandang");
-N_("Asia/Ulaanbaatar");
-N_("Asia/Urumqi");
-N_("Asia/Vientiane");
-N_("Asia/Vladivostok");
-N_("Asia/Yakutsk");
-N_("Asia/Yekaterinburg");
-N_("Asia/Yerevan");
-N_("Atlantic/Azores");
-N_("Atlantic/Bermuda");
-N_("Atlantic/Canary");
-N_("Atlantic/Cape_Verde");
-N_("Atlantic/Faeroe");
-N_("Atlantic/Jan_Mayen");
-N_("Atlantic/Madeira");
-N_("Atlantic/Reykjavik");
-N_("Atlantic/South_Georgia");
-N_("Atlantic/St_Helena");
-N_("Atlantic/Stanley");
-N_("Australia/Adelaide");
-N_("Australia/Brisbane");
-N_("Australia/Broken_Hill");
-N_("Australia/Darwin");
-N_("Australia/Hobart");
-N_("Australia/Lindeman");
-N_("Australia/Lord_Howe");
-N_("Australia/Melbourne");
-N_("Australia/Perth");
-N_("Australia/Sydney");
-N_("Europe/Amsterdam");
-N_("Europe/Andorra");
-N_("Europe/Athens");
-N_("Europe/Belfast");
-N_("Europe/Belgrade");
-N_("Europe/Berlin");
-N_("Europe/Bratislava");
-N_("Europe/Brussels");
-N_("Europe/Bucharest");
-N_("Europe/Budapest");
-N_("Europe/Chisinau");
-N_("Europe/Copenhagen");
-N_("Europe/Dublin");
-N_("Europe/Gibraltar");
-N_("Europe/Helsinki");
-N_("Europe/Istanbul");
-N_("Europe/Kaliningrad");
-N_("Europe/Kiev");
-N_("Europe/Lisbon");
-N_("Europe/Ljubljana");
-N_("Europe/London");
-N_("Europe/Luxembourg");
-N_("Europe/Madrid");
-N_("Europe/Malta");
-N_("Europe/Minsk");
-N_("Europe/Monaco");
-N_("Europe/Moscow");
-N_("Europe/Nicosia");
-N_("Europe/Oslo");
-N_("Europe/Paris");
-N_("Europe/Prague");
-N_("Europe/Riga");
-N_("Europe/Rome");
-N_("Europe/Samara");
-N_("Europe/San_Marino");
-N_("Europe/Sarajevo");
-N_("Europe/Simferopol");
-N_("Europe/Skopje");
-N_("Europe/Sofia");
-N_("Europe/Stockholm");
-N_("Europe/Tallinn");
-N_("Europe/Tirane");
-N_("Europe/Uzhgorod");
-N_("Europe/Vaduz");
-N_("Europe/Vatican");
-N_("Europe/Vienna");
-N_("Europe/Vilnius");
-N_("Europe/Warsaw");
-N_("Europe/Zagreb");
-N_("Europe/Zaporozhye");
-N_("Europe/Zurich");
-N_("Indian/Antananarivo");
-N_("Indian/Chagos");
-N_("Indian/Christmas");
-N_("Indian/Cocos");
-N_("Indian/Comoro");
-N_("Indian/Kerguelen");
-N_("Indian/Mahe");
-N_("Indian/Maldives");
-N_("Indian/Mauritius");
-N_("Indian/Mayotte");
-N_("Indian/Reunion");
-N_("Pacific/Apia");
-N_("Pacific/Auckland");
-N_("Pacific/Chatham");
-N_("Pacific/Easter");
-N_("Pacific/Efate");
-N_("Pacific/Enderbury");
-N_("Pacific/Fakaofo");
-N_("Pacific/Fiji");
-N_("Pacific/Funafuti");
-N_("Pacific/Galapagos");
-N_("Pacific/Gambier");
-N_("Pacific/Guadalcanal");
-N_("Pacific/Guam");
-N_("Pacific/Honolulu");
-N_("Pacific/Johnston");
-N_("Pacific/Kiritimati");
-N_("Pacific/Kosrae");
-N_("Pacific/Kwajalein");
-N_("Pacific/Majuro");
-N_("Pacific/Marquesas");
-N_("Pacific/Midway");
-N_("Pacific/Nauru");
-N_("Pacific/Niue");
-N_("Pacific/Norfolk");
-N_("Pacific/Noumea");
-N_("Pacific/Pago_Pago");
-N_("Pacific/Palau");
-N_("Pacific/Pitcairn");
-N_("Pacific/Ponape");
-N_("Pacific/Port_Moresby");
-N_("Pacific/Rarotonga");
-N_("Pacific/Saipan");
-N_("Pacific/Tahiti");
-N_("Pacific/Tarawa");
-N_("Pacific/Tongatapu");
-N_("Pacific/Truk");
-N_("Pacific/Wake");
-N_("Pacific/Wallis");
-N_("Pacific/Yap");
diff --git a/camel/.cvsignore b/camel/.cvsignore
deleted file mode 100644
index 094641c7a6..0000000000
--- a/camel/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
-camel-lock-helper
-camel-index-control
-\ No newline at end of file
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 897085bba2..0000000000
--- a/camel/ChangeLog
+++ /dev/null
@@ -1,18330 +0,0 @@
-2002-05-15  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c (refresh_folder_info): removed.
-	(imap_store_refresh_folders): Copy the folders first, then refresh
-	them, outside of the cache_lock, which could cause deadlocks
-	because of a workaround for crappo exchange.
-	(imap_disconnect_online): Dont pass an exception to LOGOUT
-	command.  The required response 'BYE' always sets an exception
-	when we call LOGOUT.  This also interfered with a lot of other
-	processing causing partial failures and messed up offline/online
-	state.
-
-	* camel-disco-folder.c (disco_prepare_for_offline): Do progress
-	reporting.
-
-2002-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #24136.
-
-	* providers/imap/camel-imap-folder.c (content_info_get_part_spec):
-	New function to take a CamelMessageContentInfo and generate a
-	part-specification string.
-	(get_content): Stop passing around part_spec strings and use
-	content_info_get_part_spec instead.
-
-	* camel-folder-summary.c (camel_content_info_dump): Made this into
-	a public debugging function.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_body): Make sure
-	to set the parent of any message/rfc822 subparts.
-
-2002-05-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Previous
-	fix reverted.
-
-2002-05-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):
-	Overload the setv/getv CamelObject virtual methods.
-	(imap_setv): Implemented.
-	(imap_getv): Implemented.
-
-2002-05-13  Dan Winship  <danw@ximian.com>
-
-	* camel-folder.c (camel_folder_append_message): Add a "char
-	**appended_uid" argument, for the caller to optionally pass in a
-	variable to receive the UID of the appended message (if the
-	provider knows it).
-	(camel_folder_transfer_messages_to): Likewise, add "GPtrArray
-	**transferred_uids"
-	(transfer_messages_to): Update default implementation to handle
-	transferred_uids.
-
-	* camel-disco-folder.c (disco_append_message,
-	disco_transfer_messages_to): Update for API changes.
-
-	* camel-disco-diary.c (camel_disco_diary_replay): Update the
-	diary's temporary uid->real uid map when replaying appends and
-	transfers.
-
-	* providers/imap/camel-imap-folder.c (imap_append_offline,
-	imap_append_online, imap_transfer_offline): Pass back the new
-	UIDs, when requested and available.
-	(imap_append_resyncing): Pass back the new UIDs when requested and
-	available. Remove the diary uidmap managing code since
-	CamelDiscoDiary can handle that itself now.
-	(imap_transfer_online, imap_transfer_resyncing): Update for new
-	APIs, but don't actually pass back the new UIDs yet. (It's tricky
-	since the COPYUID response may not be in the same order as the
-	input uids.)
-	
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	Pass back the new UID if requested.
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message):
-	Likewise.
-
-	* providers/local/camel-mh-folder.c (mh_append_message): Likewise.
-
-	* providers/local/camel-spool-folder.c (spool_append_message):
-	Likewise.
-
-	* camel-digest-folder.c (digest_append_message,
-	digest_transfer_messages_to): Update for API changes.
-
-	* camel-filter-driver.c	(camel_filter_driver_filter_message,
-	do_copy, do_move): Update for API changes.
-
-	* camel-vee-folder.c (vee_append_message,
-	vee_transfer_messages_to): Likewise.
-
-	* camel-vtrash-folder.c (vtrash_append_message,
-	vtrash_transfer_messages_to): Likewise. 
-
-2002-05-13  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-thread.c
-	(camel_folder_thread_messages_new_summary):
-	(camel_folder_thread_messages_new): Since the fix for #3357 uses
-	'order=0' to indicate tree structure nodes, make sure we dont
-	actually set order=0 for valid messages, otherwise we silently
-	lose duplicates of the first message (i==0).  Fixes #19920.
-
-2002-05-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fetch the
-	BODYSTRUCTURE rather than BODY since BODY seems to be lacking some
-	of the data we need. This fixes bug #24136.
-
-	* camel-transport.c (camel_transport_get_type): Might help if we
-	called camel_transport_class_init.
-
-2002-05-10  Dan Winship  <danw@ximian.com>
-
-	* camel-folder.c (camel_folder_transfer_messages_to): Replace
-	copy_messages_to and move_messages_to with a single function that
-	just takes a "delete_originals" flag. Also, use the vtrash
-	implementation if *either* folder is a vtrash.
-	(transfer_messages_to): Make this use camel_operation_progress
-	(previously move_messages_to did but copy_messages_to didn't), and
-	freeze/thaw the folder(s) if doing multiple messages.
-
-	* camel-vtrash-folder.c (vtrash_transfer_messages_to): Update for
-	move/copy merge. Move the "move messages into vtrash" code here
-	from mail-ops.c. Now all of the vtrash move/copy special casing is
-	in camel instead of half of it being here and half in mail/. (This
-	should also make it so that "Move to Trash" will work in filter
-	rules.)
-
-	* camel-vee-folder.c (vee_transfer_messages_to): Make this just
-	return an exception, since it will only be called when trying to
-	move/copy messages from one vfolder to another.
-	(vee_append_message): Add this too so we get a nicer error message
-	than the default "unimplemented" one in camel-folder.c.
-
-	* camel-digest-folder.c: Replace copy_messages_to and
-	move_messages_to with transfer_messages_to.
-
-	* camel-disco-folder.c: Likewise
-
-	* camel-disco-diary.c (camel_disco_diary_log,
-	camel_disco_diary_replay): replace MOVE/COPY with TRANSFER.
-
-	* providers/imap/camel-imap-folder.c (imap_transfer_offline,
-	imap_transfer_online, imap_transfer_resyncing): Update for
-	changes. (This ends up being a bit more complicated than it was
-	before for now, but later disconnected operation changes should
-	resimplify it.)
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message,
-	do_copy, do_move): Use transfer_messages_to instead of copy.
-
-2002-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-search.c (shell_exec): New filter function to pipe
-	a message to another program.
-	(run_command): Fixed some bugs to make this work.
-
-2002-05-09  Not Zed  <NotZed@Ximian.com>
-
-	* camel-service.c (camel_service_disconnect): Instead of testing
-	for SERVICE_CONNECTED, we need to also handle SERVICE_CONNECTING
-	too, as it will often have setup some details before it failed.
-	Make it !DISCONNECTED (and !DISCONNECTING for recursive calls,
-	which happen).  Fixes #23782, and maybe also #21604 and many other
-	random crashes.
-
-2002-05-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-digest-store.c (digest_setv): Implemented.
-	(digest_getv): Implemented.
-
-	* camel-disco-store.c (disco_setv): Implemented.
-	(disco_getv): Implemented.
-
-	* camel-remote-store.c (remote_store_setv): Implemented.
-	(remote_store_getv): Implemented.
-
-	* camel-transport.c (camel_transport_class_init): Implemented.
-	(transport_setv): Implemented.
-	(transport_getv): Implemented.
-
-	* camel-store.c (store_setv): Implemented.
-	(store_getv): Implemented.
-
-	* camel-service.c (service_setv): Implemented.
-	(service_getv): Implemented.
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate):
-	camel_pop3_engine_iterate doesn't return the state, it returns -1
-	on fail, 0 when finished processing request or >0 if more ops are
-	in the queue, so don't check status against CAMEL_POP3_STATE_OK,
-	instead check pcp->state against that.
-
-2002-05-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-object.h: s/class/klass for arguments so that c++
-	developers don't complain later.
-
-2002-05-07  Dan Winship  <danw@ximian.com>
-
-	* camel-object.c (camel_object_class_cast): Fix a crash in a
-	g_warning.
-
-2002-05-07  Not Zed  <NotZed@Ximian.com>
-
-	* camel-remote-store.c (remote_send_string): Check for LOGIN xxxx
-	as well if debug is on, so we dont print passwords to evolution
-	logs.
-
-	* providers/imap/camel-imap-utils.c (imap_is_atom_char): This was
-	really broken.  1. isprint() is locale dependent, and 2. it looked
-	up an 8 bit value in a 7 bit table without truncating it.  I've
-	removed the isprint() stuff and just put it directly into the
-	special table, which i've expanded to the right size too.
-
-	* providers/imap/*: Applied patch from Preston Elder
-	<prez@magick.tm> to make camel only use literals if it needs to
-	for simple strings.  Changed slightly to use imap_is_atom() and
-	more consistent formatting.
-	providers/imap/camel-imap-utils.c (imap_is_atom): Chagned from
-	imap_needs_quoting().
-
-	** Merged in camel-object2 branch.  Simpler camelobject
-	implementation + object args interface.
-
-	* camel.c (camel_init): Call camel_object_get_type() to make sure
-	camel_object_type is initialised.
-
-	* camel-object.h (CAMEL_OBJECT_TYPE): Changed to return global
-	camel_object_type pointer, not call camel_object_get_type.
-	
-2002-05-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): If
-	the pop3 command status is -1, then we probably have a TCP error
-	(?) so set a SYSTEM exception so our caller can distinguish
-	between a "bad password" and a "tcp error".
-	(pop3_connect): Only uncache the password on "bad password"
-	errors.
-
-	* camel-pgp-mime.c (pgp_mime_part_sign_prepare_part): Use
-	CamelMimeFilterBestenc to get a more appropriate encoding rather
-	than just blindling assigning QP.
-
-	* providers/imap/camel-imap-folder.c (do_append): Call
-	camel_mime_message_encode_8bit_parts() which fixes bug #10885.
-
-	* camel-tcp-stream-raw.c (socket_connect): Don't bother with
-	counting down the timeout.
-
-2002-05-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-fs.c (stream_read): Same fix as the tcp stream.
-	(stream_write): Again here. Just like tcp stream's stream_write(),
-	also make sure to save errno before calling fcntl to restore the
-	fd flags.
-
-	* camel-tcp-stream-raw.c (stream_read): Handle EINTR errors for
-	select().
-	(stream_write): Same and also preserve errno when setting the fd
-	flags back. If w == -1, return -1.
-
-2002-05-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_mailbox): Fixed the fix for
-	stupidly-broken-mailer bug #5 to work when multiple unescaped
-	characters were in a row. Fixes bug #24140.
-
-	* camel-tcp-stream-raw.c (socket_connect): Check select() for
-	EINTR errors.
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): Change the order
-	of some code so that we check if the select() failed before we
-	check for user-cancellation.
-
-	* camel-service.c (camel_gethostbyname): Check for EINTR when
-	select()ing.
-	(camel_gethostbyaddr): Same.
-
-2002-04-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-provider.c (camel_provider_auto_detect): Now takes a
-	CamelURL argument rather than a GHashTable *settings argument.
-
-2002-04-29  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-store.c (get_folder_info): We want
-	to set unread_count to get_unread_message_count, not
-	get_message_count().  Might fix #17174.  Also removed FIXME: as it
-	was fixed.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/Makefile.am: Don't link to libibex.a anymore.
-
-	* providers/nntp/Makefile.am: Same.
-
-	* providers/imap/Makefile.am: And again here.
-
-	* camel-store-summary.h: No longer want to #include
-	<libibex/ibex.h>
-
-	* camel-provider.c (camel_provider_auto_detect): New function to
-	auto-detect configuration settings.
-
-2002-04-26  Not Zed  <NotZed@Ximian.com>
-
-	* camel-block-file.c (block_file_validate_root): Remove the
-	excessive \n's, after printfs.
-
-	* camel-text-index.c (text_index_compress_nosync): @!#$@#$!@$#!.
-	Since the rename op was fixed, this broke compression's rename,
-	resulting in the index 'vanishing' after every compress
-	(i.e. after every reindex).  Fix this code to account for the
-	fixed rename operation.
-
-2002-04-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_rcpt): Don't put a
-	space between the "RCPT TO:" and the "<recipient>" strings -
-	rfc0821 was not clear on this but it seems rfc2821 defines a
-	grammar excluding that SP.
-	(smtp_mail): Same.
-
-2002-04-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-provider.c
-	(camel_provider_module_init): Configure the default paths for mh,
-	mbox, maildir, spools, etc.
-
-	* camel-provider.h: Add a CAMEL_PROVIDER_CONF_LABEL enum and
-	define some default CamelProviderConfEntry macros.
-
-2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Free the
-	LIST pop3 command.
-
-	* camel-data-cache.c (data_cache_finalise): Free the cdc->path.
-
-	* camel-multipart.c (write_to_stream): Don't g_return_val_if_fail
-	here if the boundary is an empty string. See bug #23676 for
-	details. The way I see it, we have 2 options: 1) leave this fix
-	the way it is, thus allowing multipart boundaries to be
-	empty-strings; or 2) make camel_multipart_get_boundary() change
-	the boundary to something legal if the boundary is an
-	empty-string. Since the parser should be able to handle an
-	empty-string boundary *and* more importantly because we want to
-	keep the same boundaries as the original raw message so as to be
-	able to verify multipart/signed parts, I vote for solution #1.
-
-2002-04-19  Not Zed  <NotZed@Ximian.com>
-
-	* devel-docs/camel-index.txt: Start of a white-paperish document
-	describing camel-index and older libibex.
-
-2002-04-18  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-local-store.c (rename_folder): If we get a
-	failure, make sure we set an exception.
-
-	* camel-text-index.c (camel_text_index_rename): If the file
-	doesn't exist, just assume it never did, dont return failure.
-	(text_index_rename): Add '.index' to the path name we're using,
-	since we dont get it passed in.
-
-	* camel-folder-search.c (check_header): When doing a contains
-	match, split the words and perform an and on it.
-	(match_words_messages): If we have an index, but were forced to do
-	a full search, first lookup a subset of messages using
-	the index and a simplified word set.  Only do a manual search of
-	this subset.
-
-2002-04-17  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-search.c (match_message_index): Changed to take a
-	utf8 string not a regex pattern.
-	(match_words_index): Matches against a camel_search_words list.
-	(match_words_1message): Matches a single message against a
-	camel_search_words list.
-	(match_words_message): Same, but gets the message from the folder
-	for you.
-	(match_words_messages): Matches a list of messages against a words
-	list.
-	(search_body_contains): Rewritten to handle multiple word
-	searches.  For #23371.
-
-	* providers/imap/camel-imap-search.c (sync_match): Split words
-	when searching, to support multiple search words.  Also, try
-	searching specifying charset of utf8 if we can, if that fails,
-	fall back to not specifying charset.  TODO: It should translate
-	the strings into the locale default charset?
-
-	* providers/imap/camel-imap-store.c (connect_to_server): Added new
-	cap - utf8_search, if set, we tell the server we're searching
-	using utf8, otherwise we dont (incorrectly, since we always use
-	utf8 to search).
-
-	* camel-search-private.c (camel_ustrstrcase): Make this class public.
-	(camel_search_words_split): Split a word into multiple words based
-	on whitespace, and keep track of whether the word is simple
-	(indexable directly), or not.
-	(camel_search_words_free): Free 'em.
-
-2002-04-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-vee-folder.c (vee_search_by_expression): If the vee-folder
-	is the unmatched, we don't have our own expression so we cannot
-	merge them. Instead, just use the expression passed in. This fixes
-	a Null-Pointer-Read crash on Solaris systems at least.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Get
-	rid of an unused variable.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Use
-	camel_gethostbyaddr since gethostbyaddr is not reentrant.
-
-	* camel-http-stream.c (http_connect): Updated after the rename of
-	camel_get_host_byname.
-
-	* camel-service.c (camel_gethostbyname): Renamed.
-	(camel_gethostbyaddr): New cancellable/reentrant version of
-	gethostbyaddr.
-
-2002-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-spoold-store.c: Added #include
-	<sys/types.h> for dirent.h which needs it on MacOS X.
-
-	* providers/local/camel-maildir-store.c: Same.
-
-	* providers/nntp/camel-nntp-store.c: Same.
-
-	* providers/imap/camel-imap-message-cache.c: Same.
-
-	* camel-provider.c: Same.
-
-	* camel-data-cache.c: Same.
-
-2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* broken-date-parser.c (datetok): Treat commas as token
-	delimeters.
-	(WEEKDAY_CHARS): Use full weekday names in case the broken mailer
-	used the full names.
-	(MONTH_CHARS): Same as above but for months.
-
-2002-04-15  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: Fix callers for api changes to camel-object, mainly
-	declare_event->add_event, and classfuncs->klass, and a couple
-        of missing #include <config.h>'s
-
-	* camel-arg.[ch], Makefile.am: New support code for
-	camel_object_get/set arg.
-
-	* *.h: Fixed all uses of get_type to return a CamelType rather
-	than a guint (now a pointer).
-
-	* camel-object.[ch]: Major cleanup of object implementation.  Also
-	added a get/set interface, and some debugging options.
-
-2002-04-11  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-summary.c (spool_summary_sync_full):
-	If the last message(s) were deleted, and we had any messages
-	output, account for the lost \n of the following From line by
-	adding an extra \n. fix for #8214.
-
-2002-04-10  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part-utils.c (convert_buffer): If we get a 0 length
-	input, return a 0 lenght output as valid - fixes bugs with some
-	iconv impl and its simpler anyway.
-
-2002-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c: Set the UID_SET_LIMIT value
-	to 4096. I ran into an issue tonight where apparently the IMAP
-	server changed the UIDVALIDITY and so Evo needed to re-fetch all
-	headers and it was trying to send a uid set of some 25k (yes, I
-	have a very large INBOX). Anyways, it was set to unlimited
-	before. Courier IMAPd can safely handle up to ~16k per token, but
-	UW IMAPd can only handle 8k per command-line, so I set it to 4k
-	just to be safe.
-
-2002-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c (convert_buffer): Fixed a bug that would
-	miscalculate how much data to copy into the GByteArray (negative
-	value) thus causing a segfault. Also optimized it while I was at
-	it.
-
-2002-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_init): Make the folder_lock
-	recursive. See bug #22363 for details. Basically,
-	get_folder_info() is requesting a diary folder which in turn
-	connects which requests then calls get_folder() but deadlocks
-	because get_folder_info already holds the lock.
-
-	* camel-mime-message.c (camel_mime_message_set_date): Don't adjust
-	the timezone offset if we used tm.tm_gmtoff because it is already
-	adjusted.
-
-2002-04-09  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part.c (construct_from_parser): If we get multiple
-	Content-Type header values, change subsequent headers to
-	X-Invalid-Content-Type so it doesn't wreck processing.  This fixes
-	the reported case in #18929, but i dont know if it fixes the
-	original posters problems.
-
-2002-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* camel-vtrash-folder.c (vtrash_move_messages_to): If we find
-	we're moving from the vtrash to another folder, we need to convert
-	the uid from a vfolder uid to the source uid (+8).  Fix for
-	#20886.  Also changed to batch multiple moves to different folders
-	so they are done as efficiently as possible rather than one at a
-	time.
-
-	* camel-mime-utils.c (base64_decode_step): If we only get passed
-	'=', we back track only if we actually output any data.  Fix for
-	#21716.
-	(quoted_decode): Pass out size_t instead of int, and use 0 instead
-	of -1 for error since its not signed.  This will fix similar bug
-	to above in different circumstances since the result is taken as
-	unsigned.  This is only an internal func.
-	(quoted_encode): Return size_t just for consistency.
-
-	* camel-block-file.c (block_file_validate_root): Comment out the
-	debug and move it into a warning when the validation fails.
-
-2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (uuencode_close): Don't count our filler when
-	encoding our line-length octet.
-
-2002-04-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-http-stream.c (http_get_headers): Don't get the statuscode
-	here anymore.
-	(http_method_invoke): Use a User-Agent header and do basic proxy
-	authentication.
-	(stream_read): Handle redirects.
-	(camel_http_stream_set_user_agent): New function to allow client
-	to set the User-Agent string.
-	(camel_http_stream_set_proxy): New function for setting the proxy
-	server.
-	(camel_http_stream_set_proxy_authrealm): New function for setting
-	the proxy auth realm.
-	(camel_http_stream_set_proxy_authpass): New function for setting
-	the proxy auth password.
-
-2002-04-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (message_info_new): Simplified since we
-	can now decode in-reply-to without getting extra cruft. Get rid of
-	the FIXME about having to check scan->id because of the
-	possibility of it being NULL, this can no longer happen.
-
-	* camel-mime-utils.c (header_references_inreplyto_decode): New
-	function to decode in-reply-to headers. Only grabs the first thing
-	that looks like a message-id and then returns.
-	(header_references_decode): Loop calling
-	header_references_decode_single (a new internal function).
-
-2002-04-04  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-search.c (imap_body_contains): If
-	(body-contains) is not passed any arguments, return empty/false.
-	Fixes a crash exposed by #15001.
-
-	* camel-remote-store.c (remote_connect): Reset the keepalive
-	timeout to 10 minutes rather than the 30 seconds I was using for
-	testing.
-
-2002-04-03  Dan Winship  <danw@ximian.com>
-
-	* camel-provider.h (CamelProvider): make service_cache be an array
-	of CAMEL_NUM_PROVIDER_TYPES elements so you can have a single
-	provider offer both stores and transports. (Eg, Exchange, NNTP)
-
-	* providers/imap/camel-imap-provider.c: Don't initialize
-	service_cache here. (The session code can do it itself since the
-	url_hash and url_equal functions are stored as part of the
-	provider.)
-
-	* providers/nntp/camel-nntp-provider.c: Likewise.
-
-	* providers/local/camel-local-provider.c: Likewise.
-
-	* providers/pop3/camel-pop3-provider.c: Likewise.
-
-	* providers/sendmail/camel-sendmail-provider.c: Likewise.
-
-	* providers/smtp/camel-smtp-provider.c: Likewise.
-
-	* camel-session.c (register_provider): Initialize the provider's
-	service cache(s) here.
-	(camel_session_class_init): Don't initialize.
-	vee_provider.service_cache here.
-	(camel_session_destroy_provider): Update to destroy multiple
-	service_caches.
-	(service_cache_remove, get_service): Tweak these a bit to deal
-	with multiple service_caches.
-
-2002-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (set_errno): Handle a ton more nspr i/o
-	errno's.
-	(stream_connect): Act as if we are doing a non-blocking
-	connect. This is to try and work around bug #15120 where users get
-	an EINPROGRESS error. Maybe importing a PRFileDesc into SSL mode
-	automagically makes it non-blocking? I dunno.
-
-2002-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (message_info_new): Updated the
-	construction of the references to match JWZ's updated algorithm
-	initialization (ie, append any In-Reply-To reference onto any
-	References header and never take more than a single message-id
-	from the In-Reply-To header since anything after the first will
-	probably just be email addresses). Fixes bug #1336.
-
-2002-04-03  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Turn indexing back on, fingers
-	crossed ...
-
-	* camel-block-file.c (sync_nolock): #!@$@$#@~#$
-	DF@#$!Q@$#!@$#!#%.  Well it helps if we're iterating a list to
-	iterate the node pointer ...
-
-	* camel-text-index.c (text_index_sync): Sync the key tables
-	explcitly.
-	(text_index_sync): Debug out frag info.
-	(camel_text_index_dump): Added a (rather large, but optional) raw
-	dumping mode for debugging purposes.
-
-	* camel-partition-table.c (camel_key_table_finalise): Sync root
-	block when done.
-	(camel_key_table_sync): New function, sync key table (root) explicitly.
-	(camel_partition_table_sync): Method to explicitly sync the
-	partition table.
-
-2002-04-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-block-file.c (camel_block_file_free_block): Mark root
-	block dirty when we change it (this function isn't used yet
-	anyway).
-
-	* camel-text-index.c (text_index_add_name_to_word): Touch the root
-	block when we modify the counts.  Also, abort processing on any
-	errors.
-	(text_index_sync): Fix typo in comments.  Sync the block file
-	inside the lock.
-	(text_index_compress_nosync): Lock the old index while we're
-	compressing.
-	(text_index_compress_nosync): Remove the bogus while() at the end
-	of the while() loops!  Also plug a memleak - records weren't
-	freed.
-	(text_index_rename): Lock around rename op.
-	(text_index_add_name): More typos.
-	(text_index_sync): Touch root when changing it.
-	(text_index_add_name): "
-	(text_index_delete_name): "
-	(camel_text_index_new): Touch root if we change it.
-	(text_index_cursor_reset): Make sure we NULL pointers after we
-	free them (nothing uses this yet).
-
-	* camel-partition-table.c (hash_key): Remove some debug
-	accidentally left in.
-	(camel_partition_table_add): When linking in the next block list,
-	set the right previous pointer.
-	(camel_key_table_add): Simplify the 'left' calculation (it was
-	already ok though).
-	(camel_key_table_next): Initialise returns before processing.
-	Broaden the lock slightly, and simplify validity calculations.
-
-	* providers/imap/camel-imap-store.c (imap_keepalive): Put back in
-	the exception setup stuff i disabled for debugging.
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Temporarily disable indexing.
-
-2002-03-28  Not Zed  <NotZed@Ximian.com>
-
-	* camel-partition-table.c (camel_key_table_lookup): Change range
-	checking assert to a warning.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_finalize): Make sure we
-	flush out all outstanding commands before finalising, stops being
-	finalised while outsanding requests are processed by the store
-	finalise.
-	(pop3_get_message): Instead of pre-fetching all messages, just
-	pre-fetch a maxiumum number at any one time, stops us running out
-	of cache fd's.
-	
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init/finalise):
-	Setup priv data + locks, & free.
-
-	* providers/imap/camel-imap-folder.c (imap_rescan): Batch all
-	message_chagned events into a single folder_changed event
-	(otherwise updates can be >>> expensive, like >5 hours for 80K
-	messages changing!).  Alternately it could use folder
-	freeze/unfreeze perhaps.
-
-2002-03-27  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_keepalive): Pass an
-	exception to called code so it behaves properly since it uses the
-	passed exception to check returns.
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/Makefile.am (libcamelimap_la_LDFLAGS): Use
-	-avoid-version instead of -version-info 0:0:0, and specify
-	-module. (From Max Horn <max@quendi.de>).
-
-	* providers/local/Makefile.am (libcamellocal_la_LDFLAGS): Likewise.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_LDFLAGS): Likewise.
-
-	* providers/sendmail/Makefile.am (libcamelsendmail_la_LDFLAGS):
-	Likewise.
-
-	* providers/smtp/Makefile.am (libcamelsmtp_la_LDFLAGS): Likewise.
-
-	* providers/pop3/Makefile.am (libcamelpop3_la_LDFLAGS): Likewise.
-	Also remove $(KRB4_LDFLAGS) since KPOP is gone.
-	(INCLUDES): and $(KRB4_CFLAGS)
-
-2002-03-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_copy): We now have to check to make
-	sure that p->message is non-NULL because we only load the message
-	when we have to.
-	(do_move): Same here.
-
-2002-03-28  Dan Winship  <danw@ximian.com>
-
-	* camel-transport.c (camel_transport_send_to): Change the message
-	arg to a CamelMimeMessage instead of a CamelMedium. Even the NNTP
-	provider returns CamelMimeMessages, and we're never going to
-	support anything more exotic than that. Also do a few more
-	g_return_if_fails here instead of in the providers.
-	(camel_transport_can_send): No longer needed.
-	(camel_transport_send): Remove this too. It wasn't being used any
-	more, and it doesn't behave exactly the same in sendmail and smtp.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_send,
-	smtp_can_send): Gone.
-	(smtp_send_to): Update for arg change.
-	(smtp_data): Make this take a CamelMimeMessage too.
-
-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send,
-	sendmail_can_send): Gone.
-	(sendmail_send_to): Update for arg change, and merge in the part
-	that used to be shared with sendmail_send.
-
-2002-03-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder):
-	Construct the source_url the right way. The previous way was
-	generating urls like pop://fejj@ximian.com;keep_on_server/inbox
-	which is wrong.
-
-2002-03-26  Not Zed  <NotZed@Ximian.com>
-
-	* camel-text-index.c (text_index_normalise): Changed to use just
-	g_utf8_strdown instead of utf8_normalise, to match the indexing
-	code.  utf8_normalise is just far too expensive (saves approx 25%
-	total processing).
-
-2002-03-25  Not Zed  <NotZed@Ximian.com>
-
-	* camel-text-index.c (text_index_add_name): When we add a new
-	name, up all of the cache limits, because we're probably going to
-	be adding more.
-	(text_index_sync): Drop the cache limits back down again, we dont
-	need them when looking words up.
-
-	** MERGE camel_index branch.
-
-	* camel-text-index.[ch]: Added files i forgot to add (eep nearly
-	lost all this work!)
-
-	* camel-block-file.c (sync_nolock): Fix an infinite loop in syncing.
-
-2002-03-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (camel_message_info_new_from_header): Use
-	the date in the received header for the received_date.
-
-2002-03-22  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Use the right option to remove the
-	index file and reset the index file on creation.
-	(camel_local_folder_construct): Remove any existing '.ibex' files
-	- these are the old format index files.
-
-	* camel-block-file.c (camel_block_file_rename): Lock io lock while
-	renaming.
-	(camel_key_file_rename): Lock around rename.
-	(block_file_validate_root): Implement sync flag checking.
-	(camel_block_file_touch_block): Turn off the sync flag if we're
-	touching any non-root block and write it to disk.  Shoudl this
-	fsync()?
-	(sync_nolock): sync the root block only if we need to.
-
-	* providers/local/camel-local-store.c (rename_folder): Re-enable
-	index rename code.  Not sure how race-free it is though.
-	(delete_folder): Delete the index file properly.
-
-	* camel-partition-table.c (camel_key_table_lookup): Initialise
-	output values to 0 before doing anything.
-	(camel_key_table_add): Do some range-checking on values.
-
-	* camel-text-index.c (text_index_compress): Changed to call sync here.
-	(text_index_compress_nolock): and not here - stops a recursive
-	sync call when sync performs a compress also.
-	(text_index_compress_nolock): Change to _nosync, since the locking
-	is irrelevent (recursive lock).  Fixed callers.
-	(text_index_add_name_to_word): If we get a failure with key table
-	ops, fail immediately.
-	(text_index_compress_nosync): Likewise.
-	(text_index_write_name): If the nameid is 0, do nothing.
-	(text_index_add_name): If we can't get a keyid, dont add it to the
-	partition table.
-	(camel_text_index_remove): Function to delete an index file.
-	(text_index_compress_nosync): Clean up temp files when done.
-
-	* camel-folder-search.c (match_messages_index): New function,
-	split from body_contains, matches a regex against all words in an
-	index.
-	(match_message_index): Similar to above but matches against an
-	individual message.
-	(search_body_contains): Changed to use above functions for
-	matching - substring matches should now work on indexed data.
-
-2002-03-21  Not Zed  <NotZed@Ximian.com>
-
-	* camel-index.c (camel_index_words/names): New virtual
-	methods/stubs to get a cursor of all words and names.
-
-	* camel-text-index.c (text_index_compress_nolock): Split from
-	text_index_compress, so we can call the compressor while locked
-	also, removed lock calls.
-	(text_index_compress): Changed to stub which calls
-	text_index_compress_nolock.
-	(camel_text_index_key_cursor_new): New object to iterate through
-	a key table.
-	(text_index_words, text_index_names): Implement virtual functions
-	for iterating through all words or names.
-
-	* camel-block-file.c: Turn off some debug.
-
-2002-03-20  Not Zed  <NotZed@Ximian.com>
-
-	** New body index implementation.
-
-	* camel-index*: Code for camel index, a new class to replace ibex.
-
-	* camel-block-file.[ch]: block-based and link based
-	filesystem-in-a-file classes.
-
-	* camel-partition-table.[ch]: An implementation of a partition
-	table (automatically extending on-disk hash-table using ideal
-	hash), and a key-table, a key<>name mapping table.  Used by
-	camelindex.
-
-	* providers/local/*, camel-folder-summary.[ch]: Changed to use
-	camel-index interface rather than ibex.
-
-2002-03-05  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_check):
-	Do progress reporting of operations.
-	(maildir_summary_sync): Same here.
-
-2002-03-04  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spoold-store.c (scan_dir): Kill a warning
-	with a cast.
-
-	* providers/local/camel-*.c: Changed for ibex->camelindex.
-
-	* camel-folder-search.c (camel_folder_search_set_summary): Init
-	summary_hash to point to 'static' uid strings.
-	(search_body_contains): Use the static uid memory to return
-	results rather than the values from the index library.
-
-	* camel-folder-search.[ch]: Changed to use camelindex object.
-
-	* camel-folder-summary.c (summary_build_content_info_message):
-	Use a stream to index content, also filter html mail first.
-	(camel_folder_summary_info_new_from_message): Use a stream
-	filtered to index content.
-	(main): Removed the test main code.  Added headers for open call
-	(ibex must've had them before).
-
-	* camel-folder-summary.[ch]: Changed from ibex to CamelIndex.
-
-	* camel-mime-filter-index.c (camel_mime_filter_index_finalize):
-	Unref index.
-
-	* camel-mime-filter-index.[ch]: Changed from ibex to CamelIndex.
-
-2002-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_encode_param): Fix this to work
-	right. We need to convert the input buffer to the charset we claim
-	in the encoded param (duh).
-
-2002-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c
-	(connect_to_server_wrapper): Updated to use the same logic as the
-	POP code.
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): No longer
-	takes a stls_supported argument since we no longer need it with
-	the new logic.
-	(connect_to_server_wrapper): New logic: First try connecting to
-	the SSL port (995 by default), if that fails with
-	SERVICE_UNAVAILABLE, then we attempt to connect (to port 110 by
-	default) and try to use STARTTLS.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.h: 
-
-	* camel-private.h: Don't allow any empty structs. If
-	!ENABLE_THREADS, provide a gpointer dummy member. Fixes bug #6382.
-
-2002-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Added a
-	work-around for SMTP servers that can't read the RFCs and thus
-	implement SASL incorrectly. Oh well, that's life in the world of
-	mail clients I guess.
-
-2002-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-digest-store.c (camel_digest_store_new): Now takes a url
-	argument.
-
-	* camel-digest-folder.c (digest_add_multipart): Fixed some memory
-	corruption and also modified to use CAMEL_IS_MIME_MESSAGE() rather
-	than comparing content-type strings.
-	(digest_get_message): Fixed a logic blooper.
-
-	* camel-folder-summary.c (camel_message_info_new_from_header): Set
-	the date fields of the CamelMessageInfo as well. This may even fix
-	some filter-related bugs where the user was trying to compare
-	dates.
-
-2002-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-digest-store.c: A pretty empty store implementation to be
-	the parent store of a CamelDigestFolder.
-
-	* camel-digest-folder.c: Updated to reference it's parent store.
-
-2002-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-digest-folder.c (camel_digest_folder_new): Allow any leaf
-	part to be a message/rfc822 part.
-	(digest_get_uids): Recurse the mime structure and add all
-	message/rfc822 parts and use a uid scheme similar to IMAP's mime
-	part naming convention.
-	(digest_get_message): Decode the uid to get the correct mime part.
-
-2002-03-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* camel-mime-utils.c: Change the order of the mailing list magic
-	patterns so that the more mailing-list specific ones are on the
-	top.
-
-2002-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	These fixes should fix bug #21737.
-
-	* providers/smtp/camel-smtp-transport.c
-	(connect_to_server_wrapper): Same as with the POP code.
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server_wrapper):
-	Slight restructuring of the if-statements for the USE_SSL_ALWAYS
-	case so that we can't possibly return TRUE unless we really did
-	connect successfully.
-
-2002-03-10  Dan Winship  <danw@ximian.com>
-
-	Rename the OpenSSL implementation of things to match the NSS
-	implementation so that callers don't need to care which one is
-	being used.
-
-	* camel-tcp-stream-openssl.c: Implement CamelTcpStreamSSL, not
-	CamelTcpStreamOpenSSL. Rename methods as well. Replace the
-	camel-tcp-stream-openssl.h include with camel-tcp-stream-ssl.h.
-
-	* camel-tcp-stream-openssl.h: Gone.
-
-	* camel-tcp-stream-ssl.c: Add a note explaining that this
-	implementation is only used for NSS, and that OpenSSL's
-	implementation is in another file. (Should probably do some CVS
-	renaming magic at some point.)
-
-	* camel-http-stream.c (http_connect): Remove OpenSSL refs; the
-	previously-NSS-specific code works for both now.
-
-	* camel-remote-store.c: Likewise.
-
-	* providers/smtp/camel-smtp-transport.c: Likewise.
-
-	* providers/pop3/camel-pop3-store.c: Likewise.
-
-	* Makefile.am (libcamelinclude_HEADERS): Remove
-	camel-tcp-stream-openssl.h
-
-2002-03-10  Dan Winship  <danw@ximian.com>
-
-	* camel-tcp-stream.c (camel_tcp_stream_get_socket): Remove this:
-	it couldn't be generically used, because different subclasses
-	returned entirely different types of data.
-	(camel_tcp_stream_get_local_address,
-	camel_tcp_stream_get_remote_address): Add these to replace what
-	get_socket was being used for.
-	(camel_tcp_address_new, camel_tcp_address_free): Utility functions
-	for get_{local,remote}_address.
-
-	* providers/smtp/camel-smtp-transport.c: Change localaddr to a
-	CamelTcpAddress *.
-	(connect_to_server): Call camel_tcp_stream_get_local_address to
-	get the local IP address.
-	(smtp_disconnect): free localaddr.
-	(smtp_helo): Update for localaddr change.
-
-	* camel-tcp-stream-raw.c (stream_get_socket): Remove
-	(stream_get_local_address, stream_get_remote_address): Implement.
-
-	* camel-tcp-stream-ssl.c (stream_get_socket): Remove
-	(stream_get_local_address, stream_get_remote_address): Implement.
-
-	* camel-tcp-stream-openssl.c (stream_get_socket): Remove
-	(stream_get_local_address, stream_get_remote_address): Implement.
-
-2002-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-provider.c
-	(camel_provider_module_init): Don't call
-	camel_remote_store_get_authtypes since we no longer subclass
-	camel-remote-store.
-
-	* providers/pop3/camel-pop3-engine.c: Added STARTTLS to the
-	capabilities to look for.
-	(camel_pop3_engine_reget_capabilities): New function to re-get
-	capabilities.
-
-	* providers/pop3/camel-pop3-store.c: Updated to not subclass
-	CamelRemoteStore.
-	(connect_to_server): Rewritten to not depend on CamelRemoteStore's
-	connect implementation. Also added support for STLS (aka
-	STARTTLS).
-
-2002-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_sign): Add support for
-	hash type RIPEMD160.
-
-	* camel-cipher-context.h: Add RIPEMD160 hash type.
-
-	* camel-pgp-context.c (pgp_sign): Updated to consider hash
-	function for pgp5 and pgp6.
-	(pgp_clearsign): Same.
-
-	* camel-tcp-stream-openssl.c (stream_read): Add a timeout on the
-	select.
-	(stream_write): Same.
-
-2002-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (connect_to_server): Fix
-	to work with OpenSSL.
-
-	* camel-tcp-stream-openssl.c: compile fixes.
-	(camel_tcp_stream_openssl_enable_ssl): Check to make sure that the
-	sockfd != -1, it's not enough to check that it is non-zero. Also
-	set the sockfd to -1 on fail (open_ssl_connection will close the
-	sockfd on fail).
-
-2002-03-06  Dan Winship  <danw@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_construct): Make
-	this compile.
-
-2002-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (save_ssl_cert): Removed. Glory glory
-	hallelujah!
-	(ssl_bad_cert): No longer calls ssl_save_cert or
-	ssl_cert_is_saved.
-
-2002-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_new_raw):
-	Start the ssl stream off in non-ssl mode (useful for STARTTLS).
-	(camel_tcp_stream_openssl_enable_ssl): New function to toggle an
-	ssl stream into ssl mode.
-	(open_ssl_connection): Close the sockfd on fail so our caller
-	doesn't have to - this also allows us to save the original errno.
-	(stream_connect): If we want ssl mode, do our ssl stuff.
-	(camel_tcp_stream_openssl_class_init): Init some SSL stuff here
-	instead of in open_ssl_connection since these only ever need to be
-	called once.
-	(stream_read): Only use SSL_read if we are in ssl mode.
-	(stream_write): Only use SSL_write if we are in ssl mode.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Check for the
-	STARTTLS extension.
-	(connect_to_server): Try to use STARTTLS whenever possible rather
-	than the old way of doing things.
-	(connect_to_server_wrapper): Wrapper around connect_to_server() to
-	first try STARTTLS and then attempt normal SSL mode if we can't
-	connect via STARTTLS.
-
-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_enable_ssl): New
-	function to toggle an ssl stream into ssl mode.
-	(camel_tcp_stream_ssl_new_raw): Start the ssl stream off in
-	non-ssl mode (useful for STARTTLS).
-	(stream_connect): Only connect in SSL mode if required.
-
-2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-vtrash-folder.h: 
-	* camel-vee-store.h: 
-	* camel-vee-folder.h: 
-	* camel-stream-null.h: 
-	* camel-stream-filter.h: 
-	* camel-store-summary.h: 
-	* camel-news-address.h: 
-	* camel-mime-utils.h: 
-	* camel-mime-parser.h: 
-	* camel-mime-filter-save.h: 
-	* camel-mime-filter-linewrap.h: 
-	* camel-mime-filter-index.h: 
-	* camel-mime-filter-html.h: 
-	* camel-mime-filter.h: 
-	* camel-mime-filter-from.h: 
-	* camel-mime-filter-crlf.h: 
-	* camel-mime-filter-chomp.h: 
-	* camel-mime-filter-charset.h: 
-	* camel-mime-filter-bestenc.h: 
-	* camel-mime-filter-basic.h: 
-	* camel-internet-address.h: 
-	* camel-folder-thread.h: 
-	* camel-folder-summary.h: 
-	* camel-folder-search.h: 
-	* camel-filter-driver.h: 
-	* camel-charset-map.h: 
-	* camel-address.h: Add c++ armoring.
-
-	* camel-object.h: s/class/klass
-
-2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Reverted my
-	pgp/mime fixes here too.
-
-	* camel-mime-part.c (write_to_stream): Removed my pgp/mime raw
-	stream hack, this is causing problems such as some messages to not
-	displaying, view->source not working at all, etc.
-
-2002-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-parser.c: Changed offset variables from int's to
-	off_t's since the system may support large files.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Rearrange the
-	save filter stuff so that we save raw streams for all mime
-	parts. If the mime part turns out to be a multupart, then don't
-	bother saving the raw stream, we only need to save the raw stream
-	for leaf parts.
-
-2002-02-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.h: Don't #include camel-mime-filter-save.h,
-	we don't use it.
-
-	* camel-file-utils.c: Fixed a few 'might be used uninitialized'
-	warnings which were real problems.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Save the raw mime
-	stream for any/all signed parts.
-
-	* camel-mime-part.c (camel_mime_part_init): Initialize our raw
-	stream to NULL.
-	(camel_mime_part_finalize): Unref our raw stream, if we have one.
-	(write_to_stream): If we have a raw stream, write that out instead
-	of re-encoding.
-
-	* camel-mime-filter-save.[c,h]: Rewritten to save to a stream
-	rather than a file.
-
-2002-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_fold): Use the FOLD_SIZE as a
-	recommended folding size, but add a new FOLD_MAX_SIZE (=998, the
-	smtp max line size) as the hard limit for any output.
-
-2002-02-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-chomp.c (camel_mime_filter_chomp_new): New
-	stream filter that chomps excess trailing whitespace from the end
-	of the stream. This is needed to update the PGP/MIME code to
-	comply with rfc3156.
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Don't attach a
-	from filter, if it ain't from-filtered already, then we'll just be
-	breaking stuff. To become rfc3156 compliant, add a chomp filter
-	here.
-	(camel_pgp_mime_part_sign): Add a chomp filter here too.
-
-2002-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part.c (init_header_name_table): Changed header
-	formatted table to contain a pointer to an output function, and
-	added in-reply-to and references headers.
-	(write_references): New function to write out references header,
-	folded properly.  It only approximates based on the last >, but it
-	should be adequate and will also handle invalid headers.
-	(write_fold): Function to write out headers folded.  Since this is
-	the default it isn't required.
-	(write_raw): Write out an already formatted header, e.g. most of
-	the rest.
-	(write_to_stream): Lookup header output function, if we have one,
-	use that, otherwise fold header using basic (dumb) function.
-
-	This is all for #14779.  A better fix is probably do have the
-	headers always stored formatted, but that can wait.
-
-2002-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-digest-folder.c (camel_digest_folder_new): Allow all
-	multiparts that contain message/rfc822 attachments.
-	(digest_get_uids): Only assign uids to message parts.
-
-2002-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part.c (camel_mime_part_set_filename): Set the 'name'
-	parameter on the Content-Type too. Fixes bug #20779.
-
-2002-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_sign): Pass --always-trust to gpg
-	(requested by users).
-	(pgp_clearsign): Same.
-	(pgp_encrypt): Here too.
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Since the
-	AUTH token sometimes uses '=' instead of whitespace, don't use
-	smtp_token_next here.
-
-2002-02-09  Not Zed  <NotZed@Ximian.com>
-
-	* providers/pop3/camel-pop3-engine.c (get_capabilities): Duh, when
-	we grab the apop stamp it needs to include the <> as well, I even
-	read the rfc, silly me.
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Doh,
-	when iterating the authtype list, it helps to goto the next node.
-	Found with help from miles.
-
-2002-02-08  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-summary.c
-	(camel_spool_summary_build_from): The day number has to be 2 chars
-	wide, space filled to work properly with pine, etc.
-
-	* providers/local/camel-spoold-store.[ch]: new type of provider
-	'spool directory', which lets you view external mbox dirs without
-	adding any extra cruft.  Perhaps it should use . files to store
-	summaries?  Still a bit experimental, there's a warning when you
-	select it in the account editor.  Finished off most of #1185.
-	Can't rename or move folders.
-
-	* camel-mime-utils.c (header_decode_date): If the date is
-	100->1900 then we actually want to use it as the year in the tm
-	struct, not year+100.  e.g. year 102 -> 2002, not 2102.
-
-2002-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-store.c (get_folder): Pass path into
-	spool_folder_new.
-
-	* providers/local/camel-spool-folder.c (camel_spool_folder_new): 
-	(camel_spool_folder_construct): Take the full path to the folder
-	and use that as the file path, independent of the full_name we
-	use.
-
-2002-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-local-provider.c: Added new type, spoold
-	provider, spoold: for local directories.
-
-	* providers/imap/camel-imap-store.c (get_one_folder_offline):
-	Create offline uri's in a compatible manner to online ones.
-
-2002-02-07  Dan Winship  <danw@ximian.com>
-
-	* camel-sasl-ntlm.c: Implementation of NTLM (aka "Secure Password
-	Authentication") auth, taken from soup.
-
-	* Makefile.am (libcamel_la_SOURCES, libcamel_la_HEADERS): Add
-	camel-sasl-ntlm.
-
-	* camel-sasl.c: Add refs to camel-sasl-ntlm.
-
-	* providers/imap/camel-imap-store.c (try_auth): Use
-	imap_next_word() to skip over the "+ " of the continuation rather
-	than just "resp + 2" since Exchange (incorrectly) returns "+"
-	instead of "+ " for an empty continuation response.
-
-2002-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.h: Remove the CAMEL_MESSAGE_NEEDS_REPLY
-	flag, we no longer will be using this.
-
-2002-02-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-http-stream.c (stream_read): Use camel_mime_parser_read to
-	read internal parser data.
-	(camel_http_stream_get_content_type): Implemented.
-	(http_method_invoke): Use HTTP/1.0 instead of 1.1
-
-	* camel-mime-utils.c (header_decode_int): Made public.
-
-	* camel-http-stream.[c,h]: Added. New stream for HTTP requests
-	(currently supported are GET and HEAD).
-
-	* camel-tcp-stream-ssl.c (stream_connect): Call set_errno
-	appropriately.
-
-2002-01-31  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_decode_domain): Oops, this was
-	converting foo@[blah] to foo@[ blah ], fixed.
-
-2002-01-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-provider.c: Use "pop" instead of
-	"pop3" so current configurations continue to work.
-
-2002-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* camel-sasl-login.c: Changed name from "NT Login" to simply
-	"Login".
-
-	* providers/pop3/*: Entirely new pop implmentation, supporting
-	pipelining.
-
-2002-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* camel-data-cache.c (free_busy): We dont want to unref the
-	stream, instead, stop listening to the finalised events, and free
-	the path only.
-
-2002-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* camel-data-cache.c (stream_finalised): Remove the object from
-	the busy_stream hashtable, not the busy_path hashtable.
-
-2002-01-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Added
-	more kludge to an existing Exchange IMAP 5.5 kludge to work around
-	it returning multiple messages with the same UIDs.
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-message.c (process_header): Handle Resent headers
-	too.
-
-	* camel-mime-message.h: Added Resent-* #defines.
-
-	* camel-filter-driver.c (camel_filter_driver_remove_rule_by_name):
-	Use while (node->next) instead of while (node)
-
-	* providers/smtp/camel-smtp-transport.c (smtp_decode_status_code):
-	New function to decode an enhanced status code.
-	(smtp_set_exception): Sets an exception based on the
-	Enhanced-Status-Code.
-	(esmtp_get_authtypes): Don't diplicate the key in the hash since
-	the key and value are the same.
-	(smtp_rcpt): Include the failed recipient in the error message to
-	be more helpful to the user.
-
-	* camel-mime-utils.c (hex_decode): Make sure to allocate enough
-	for the NUL byte.
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_construct):
-	(connect_to_server): Use flags rather than a bunch of gboolean
-	variables.
-	(smtp_connect): Same.
-	(smtp_mail): Here too. Use the enhanced status codes if available.
-	(smtp_data): And again here.
-	(smtp_helo): Finally here. Also detect the ENHANCEDSTATUSCODES
-	extension.
-	(smtp_rcpt): Use the enhanced status codes if available.
-	(smtp_rset): Here too.
-	(smtp_quit): And finally here.
-
-	* camel-transport.h: Removed gboolean supports_8bit since this is
-	pretty local to only SMTP for now.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Remove some old cruft.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tests/folder/Makefile.am: s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/.
-	* tests/message/Makefile.am: Likewise.
-	* tests/mime-filter/Makefile.am: Likewise.
-	* tests/misc/Makefile.am: Likewise.
-	* tests/smime/Makefile.am: Likewise.
-	* tests/stream/Makefile.am: Likewise.
-
-2002-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_beep): Call the beep callback
-	function.
-	(camel_filter_driver_set_system_beep_func): New function to set
-	the beep callback.
-
-2002-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_remove_rule_by_name):
-	New function to remove a filter rule by name.
-
-2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_beep): As a temporary solution, just
-	printf ("\a"); to make a beep :-)
-
-	* providers/imap/camel-imap-command.c
-	(imap_command_strdup_vprintf): Encode the mailbox to UTF-7 here.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):
-	Decode the mailbox name as we parse the list response.
-	(imap_mailbox_decode): It's only an illegal mailbox name if it
-	didn't switch back to US-ASCII mode.
-
-2002-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_mailbox_decode): New
-	function to decode an IMAP mailbox name from modified UTF-7
-	encoding to UTF-8.
-	(imap_mailbox_encode): New function to convert a mailbox name from
-	UTF-8 to IMAP's modified UTF-7 encoding.
-
-2002-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-basic.c (filter): Stop uudecoding once the
-	CAMEL_UUDECODE_STATE_END state bit gets set. Set the
-	CAMEL_UUDECODE_STATE_BEGIN state bit once we find the begin line.
-	(reset): No longer have uu_begin or uulen state variables, these
-	are now stuffed into a single state variable.
-
-	* camel-mime-utils.c (uudecode_step): No longer needs a uulen
-	argument and also keeps track of whether or not the end of the
-	encoded data has been found in 'state'.
-	(uuencode_step): Now stuffs uulen into state so that the uulen
-	argument is no longer needed.
-	(uuencode_close): Same.
-
-2002-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-basic.c (filter): If we don't want to corrupt
-	the uuencoded data by overwriting it with base64 decoded data
-	afterward, we need to add a break statement!
-
-	* camel-folder-summary.c (summary_build_content_info): Add code to
-	add a uu filter.
-	(camel_folder_summary_finalize): Unref the uuencode filter.
-
-2002-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-basic.c (filter): Fixed slight logic error to
-	find the uuencode begin line. Fixes bug #18754.
-
-2002-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_send_to): Updated to
-	match the new send_to API.
-	(smtp_send): Get the from address and pass that along to
-	smtp_send_to().
-
-	* providers/sendmail/camel-sendmail-transport.c
-	(sendmail_send_to): Updated to match the new send_to API.
-
-	* camel-transport.c (camel_transport_send_to): Now takes a from
-	argument too.
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Sort
-	the needheaders UID array and fixed to respect the
-	UID_SET_LIMIT. This should now finish the fixification of bug
-	#2529. There's still the possible issue that a command-line (The
-	only command-line I can think of that can still be too long is a
-	SEARCH command, but this can't possibly be fixed until we rewrite
-	the imap code to use Zucchi's ImapEngine idea).
-
-2002-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge_uids_online):
-	Move the command-lock outside the loop.
-
-2002-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge_uids_online):
-	Updated to use the new imap_uid_array_to_set() interface.
-	(imap_expunge_uids_resyncing): Same.
-	(do_copy): Here too.
-	(imap_update_summary): Added a FIXME comment to rewrite allowing
-	for a uid-set limitation.
-	(get_matching): Copy some of the logic over from
-	imap_uid_adday_to_set() to limit the length of the uid-set string.
-	(imap_sync_online): Added a comment to explain what is going on
-	with get_matching() since the behavior has changed slightly.
-
-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set):
-	Modify the interface so that we can limit the size of the uid set
-	string returned.
-
-2002-01-14  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-search.c (imap_body_contains):
-	Rewritten to use a cache for body searches when online.  Will need
-	some heavy testing but so far seems to be beneficial.
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression,
-	search_by_uids): dont initialise search object here.
-	(camel_imap_folder_new): Setup search object here with pointer to
-	cache dir.
-
-2001-12-01  Not Zed  <NotZed@Ximian.com>
-
-	* camel-store-summary.[ch]: New class to store a store's folder
-	list in.  Not yet completed.
-
-2002-01-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Kludge
-	around a bug in Exchange 5.5 that reports 2 messages with the same
-	UID. Fixes bug #17694. Replaces the fix from yesterday.
-
-2002-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-folder.c: If PATH_MAX doesn't exist,
-	use _POSIX_PATH_MAX.
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): If mi
-	is NULL, don't bother updating it. Should fix bug #17694.
-
-2002-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.h: #include camel-mime-filter-tohtml.h
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Kludge
-	around Microsoft Exchange 5.5 (bug #5348) by forgetting our
-	currently selected folder and re-SELECTing it so that the Exchange
-	server has a chance to realise it has new messages.
-
-2002-01-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): If the mbox file is a symlink,
-	follow the symlink and get the One True Path so that we can
-	rewrite the mbox later without worrying about clobbering the
-	symlink.
-
-2002-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-search.c (TODO): There are a few sexp callbacks
-	that could be modified to use fms->info rather than using a
-	message object (like date and possibly mlist stuff) but *only* if
-	the date exists on the CamelMessageInfo object (since it may be
-	blank except for message flags).
-	(camel_filter_search_get_message): New internal convenience
-	function to make sure that the FilterMessageSearch has loaded the
-	message (and to load the message if this isn't the case).
-	(check_header): Call camel_filter_search_get_message().
-	(header_exists): Same.
-	(header_regex): Here too.
-	(header_full_regex): And here.
-	(body_contains): Again here.
-	(body_regex): Here too.
-	(get_sent_date): Here also.
-	(get_received_date): Same.
-	(get_source): Here if we need to.
-	(camel_filter_search_match): Now takes a callback function/data
-	pair for on-demand message loading so that we don't necessarily
-	have to load the message if the defined filter rules don't require
-	it.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Don't
-	bother fetching the message here, let
-	camel_filter_driver_filter_message() worry about this.
-	(get_message_cb): New utility callback to fetch a message.
-	(camel_filter_driver_filter_message): Only fetch the message if we
-	absolutely need it to get a CamelMessageInfo. Instead of passing a
-	message object to camel_filter_search_match(), pass get_message_cb
-	and some user_data so that the matching code can fetch the message
-	on demand.
-
-2002-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.c (filter_filter): Flush the only-once actions.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Don't increment a filtered_count here any longer.
-	(camel_filter_driver_reset_filtered_count): Removed.
-	(camel_filter_driver_get_filtered_count): Removed.
-	(do_beep): New action.
-	(play_sound): New action to play a sound
-	(do_only_once): Another new action.
-	(camel_filter_driver_finalise): Free the only_once hash if the
-	driver has not been "flushed".
-	(camel_filter_driver_flush): Flush all of the only-once actions.
-
-	* camel-charset-map.c: Moved windows-1251 to the end of the list
-	since it contains the euro and we'd prefer to use iso-8859-15 when
-	the euro is requested than a windows charset if possible.
-
-	* camel-charset-map-private.h: Regenerated.
-
-2001-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (content_info_load): Don't try setting a
-	content-type parameter if either the name or value is NULL.
-
-	* camel-mime-utils.c (header_set_param): NULL-protection.
-
-2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Do more like what mutt
-	does so hopefully this'll fix bug #16363 and #16300.
-
-2001-12-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* broken-date-parser.c (parse_broken_date): Completely
-	rewritten. It is now a load faster and a heck of a lot more
-	accurate, also now returns a time_t and sets the saveoffset
-	variable rather than returning a new char* buffer for the normal
-	camel date parser to re-parse. This saves a fair number of cpu
-	cycles :-)
-
-	* camel-mime-utils.c (header_decode_date): Cleanup the broken date
-	parsing code.
-
-2001-12-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-address.h: Change the prototype for camel_address_get_type
-	to return a CamelType (since internally this is what it returns
-	and also in case we decide to write a replacement for the current
-	CamelObject it'd be easier to drop in).
-
-	* camel-internet-address.h: Same but for
-	camel_internet_address_get_type()
-
-	* providers/smtp/camel-smtp-transport.c (smtp_send_to): Updated to
-	use a CamelAddress of recipients.
-	(smtp_send): Since smtp_send_to now takes a CamelAddress
-	recipients argument, our lives have been simplified and we can now
-	just concat To/Cc/Bcc into a recipients addr and send away.
-
-	* providers/sendmail/camel-sendmail-transport.c
-	(sendmail_send_to): Updated to use a CamelAddress of recipients.
-
-	* camel-transport.c (camel_transport_send_to): Now takes a
-	CamelAddress argument for the recipient list rather than a GList.
-
-2001-12-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/Makefile.am: Remove the providerdir variable.
-
-	* providers/sendmail/Makefile.am: Same.
-
-2001-12-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-charset-map.c (camel_charset_iso_to_windows): New function
-	to map ISO charsets to the Windows charsets.
-
-	* camel-mime-part-utils.c (broken_windows_charset): Detect Windows
-	charsets.
-	(simple_data_wrapper_construct_from_parser): Simplify a tad and
-	also check for iso-8859-* charsets that are really Windows
-	charsets. Fixes bug #12631.
-
-2001-12-17  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): define CAMEL_PROVIDERDIR to be the
-	configure.in-defined camel_providerdir.
-
-	* providers/Makefile.am: Remove some outdated comments
-
-	* providers/imap/Makefile.am (camel_provider_LTLIBRARIES,
-	camel_provider_DATA): renamed from provider_LTLIBRARIES,
-	provider_DATA.  
-
-	* providers/local/Makefile.am: Likewise 
-
-	* providers/nntp/Makefile.am: Likewise 
-
-	* providers/pop3/Makefile.am: Likewise 
-
-	* providers/sendmail/Makefile.am: Likewise 
-
-	* providers/smtp/Makefile.am: Likewise
-
-2001-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (get_content): Reverted my
-	previous changes here since it doesn't actually work afterall.
-
-	* providers/imap/camel-imap-wrapper.c (imap_wrapper_hydrate):
-	Update to do uudecoding when appropriate.
-
-2001-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (get_content): Try to use the
-	original boundary so luis will stop bugging me about "data
-	corruption". Also preserve other params in the multipart
-	content-type by dumping it to a string and setting it on the mime
-	part.
-
-2001-12-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c
-	(camel_filter_driver_reset_filtered_count): Reset the
-	filtered_count to zero.
-	(camel_filter_driver_get_filtered_count): Return the private
-	filtered_count value.
-	(camel_filter_driver_filter_message): Increment the
-	filtered_count.
-	(camel_filter_driver_set_shell_exec_func): New function to set the
-	shell-exec func.
-	(shell_exec): New ESExp filter action callback.
-
-2001-12-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Removed
-	x-inline-pgp-hack kludge because it doesn't work.
-	(camel_pgp_mime_part_decrypt): Same.
-
-2001-12-13  Chris Toshok  <toshok@ximian.com>
-
-	* camel-data-cache.c: include stdlib.h (for alloca on freebsd) and
-	only include alloca.h if HAVE_ALLOCA_H is defined.
-
-2001-12-11  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #17085
-
-	* camel-charset-map.c: Added #include <errno.h>.
-
-	* camel-charset-map-private.h:
-	Recreated (following instructions from camel-charset-map.c)
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-object.c (camel_type_register): Keep a name-to-type hash
-	so that we can make sure that the type has not yet been registered
-	(prevents a race condition such as the one in bug #16559).
-
-	* camel-service.c (camel_service_connect): Make sure that the
-	connect_op is non-NULL before unregistering/unreffing it.
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_content_type_simple): Protect against
-	either of the types being NULL.
-
-2001-12-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-basic.c (filter): If complete() allocates
-	len+2 bytes for the out buffer, so should this. See bug #16371 for
-	an example case.
-
-2001-12-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-digest-md5.c: iconv() returns a size_t, not an int.
-
-	* camel-pgp-context.c: The return value of iconv() is a size_t,
-	not an int.
-
-	* camel-mime-part-utils.c (convert_buffer): Always use size_t args
-	for iconv().
-
-	* camel-mime-filter-charset.c (complete): Always use size_t args
-	for iconv().
-	(filter): Same.
-
-	* camel-mime-utils.c (header_address_fold): Make headerlen a
-	size_t instead of an int.
-	(header_fold): Same.
-	(base64_encode_close): We should be returning a size_t and inlen
-	should also be a size_t.
-	(base64_encode_step): Same here.
-	(base64_decode_step): Here too.
-	(base64_encode_simple): And here...
-	(base64_decode_simple): Same.
-	(uuencode_close): We should also use size_t's here...
-	(uuencode_step): And here too.
-	(uudecode_step): And also here.
-	(quoted_encode_close): Same idea here.
-	(quoted_encode_step): Again here.
-	(quoted_decode_step): Here too.
-	(quoted_encode): Input length should be a size_t.
-	(rfc2047_decode_word): Same.
-	(g_string_append_len): Here too.
-	(append_8bit): "
-	(rfc2047_encode_word): "
-	(quote_word): "
-	(hex_decode): "
-	(rfc2184_decode): Use size_t's with iconv().
-	(header_decode_param): Same.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-folder-summary.c: Add "NeedsReply" to the flag_names array
-	for CAMEL_MESSAGE_NEEDS_REPLY.
-
-	* camel-folder-summary.h: Added CAMEL_MESSAGE_NEEDS_REPLY flag.
-
-2001-12-07  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-message.c (camel_mime_message_set_date): Fix the
-	tm_gmtoff case (its sign is the opposite of "timezone"). Fixes
-	#14678
-
-2001-11-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-search.c (search_body_contains): Don't use regex
-	matching. Fixes bug #16227.
-
-	* camel-mime-message.c (best_encoding): Check the content-object's
-	mime type, not the mime part types. Should fix bug #15843.
-
-2001-11-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (get_content): Return NULL if
-	construct_from_stream fails.
-	(get_message): Same.
-	(get_message_simple): Here too.
-	(add_message_from_data): And here.
-
-2001-11-14    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (folder_changed_remove_uid): Use the uid
-	rather than vuid for unmatched.  Also add the uid to unmatched if
-	it wasn't in the unmatched_uids table at all.
-	(folder_changed_change): If checking for added, if the new ones
-	dont match, then try to add them to unmatched.  Fixes #6893.
-
-	* camel-folder-summary.c (camel_folder_summary_index): Change lock
-	order, always summary_lock before ref_lock.
-	(camel_folder_summary_array): "
-	(camel_folder_summary_uid): "
-	(camel_folder_summary_remove_uid): " Fixes a deadlock.
-
-2001-11-30  Not Zed  <NotZed@Ximian.com>
-  
-	* providers/nntp/camel-nntp-*.c: Completely new implementation of
-	NNTP.
-	
-	Doesn't support subscriptions yet (lists all folders), but should
-	be more reliable (faster?), and has an integrated cache.
-
-	* camel-exception.c (camel_exception_new): Use e_memchunks for
-	exception blocks.
-	(camel_exception_free): Same.
-
-	* camel-data-cache.[ch]: New object for managing on-disk caches of
-	anything that can be stored in a camel-stream.
-
-	* camel-file-utils.c (camel_file_util_mkdir): New function, just a
-	nicer place to put this (than camel-store), should be removed from
-	camel-store.
-	(camel_file_util_safe_filename): New function to url-encode a
-	filename.
-
-	* camel-mime-parser.c (drop_states): New func to drop the parser
-	state to initial state.
-	(folder_scan_init_with_fd): 
-	(folder_scan_init_with_stream): Call above func to reset state if
-	the stream is changed on us so we can change streams to reuse a
-	parser object.
-
-2001-11-25  Not Zed  <NotZed@Ximian.com>
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message): If
-	the uid doesn't have a ',' in it, fail to crash.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_article_is_read): check group != NULL before
-	scanning.
-	(camel_nntp_newsrc_get_highest_article_read): "
-	(camel_nntp_newsrc_get_num_articles_read): "
-	(camel_nntp_newsrc_mark_range_read): "
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_overview_fmt): IF we dont have
-	nntp_list_follows, dont try and get a list response.
-	(nntp_store_get_folder_info): Set path part of folderinfo.
-
-2001-11-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):
-	Check to see that errno is non-zero before returning
-	g_strerror. If it's 0, then we have an unknown error.
-
-2001-11-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-basic.c: For the uudecoding mode, garble up
-	the "begin <mode> <filename>" line before decoding.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Add a uudecoder if
-	the transfer encoding is x-uuencode.
-
-	* camel-mime-part.c (write_to_stream): Handle x-uuencoded content
-	too.
-
-2001-11-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (stream_read): Added a check to see if
-	the operation has been cancelled.
-	(stream_write): Same.
-
-2001-11-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Updates for compliance with rfc2231
-
-	* camel-mime-utils.c (header_encode_param):
-	camel_mime_special_table[c] & IS_ESAFE should have been
-	!(camel_mime_special_table[c] & IS_ESAFE). Also added a few
-	comments for how to improve the code at some future date.
-	(header_decode_param): Now takes an argument rfc2184_part so our
-	caller can get this information as well.
-	(header_decode_param_list): Pass an rfc2184_part argument to
-	header_decode_param and also added a few comments on where to
-	improve on rfc2184/rfc2231 compliance.
-	(rfc2047_decode_word): Updated to respect the updated ABNF syntax
-	of rfc2047 encoded words, yay.
-
-2001-11-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_body): Abort if
-	body == NULL.
-
-	* camel-mime-filter-tohtml.c (camel_mime_filter_tohtml_new): New
-	mime filter to convert plain text to html.
-
-2001-11-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Since some mail clients like Outlook are broken, we need to set a
-	name parameter on pgp signed and encrypted parts.
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_encrypt): Set a name
-	parameter.
-	(camel_pgp_mime_part_sign): Same.
-
-2001-11-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-command.c
-	(camel_imap_command_response): If we get a BYE response, call
-	camel_service_disconnect() and set an exception. Also do the check
-	for "* BYE" first instead of passing it off imap_read_untagged()
-	since we'll just waste time in there mallocing left and right only
-	to arrive at the single response line "* BYE" again :-)
-
-2001-11-13    <NotZed@Ximian.com>
-
-	* camel-filter-search.c (get_source): If we have no source string,
-	then use undefined, which should always evaluate to FALSE.  Fix
-	for #15267.
-
-2001-11-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_get_folder): Added a
-	g_return_val_if_fail for folder_name != NULL.
-
-2001-11-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): If any of the
-	pipe()'s fail, clean up any pipes that may have succeeded. Also
-	close the password fds.
-
-2001-11-09    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_auth_loop): If we get a
-	user cancel and that causes us to fail to authenticate, abort
-	rather than loop forever.  Fix for #14951.
-
-2001-11-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-command.c
-	(camel_imap_command_continuation): Now takes a command-length
-	argument so we can 1) avoid duping the command string yet again,
-	yay. 2) we now don't have to worry about embedded nul-chars
-	screwing us over (we still need to avoid allowing them into the
-	string but at least now it won't mess us up).
-
-	* providers/imap/camel-imap-folder.c (do_append): Instead of
-	appending a nul char to the end of the byte array and then passing
-	that off as if it were a string to
-	camel_imap_command_continuation, instead pass the byte-array
-	length since that function now takes a length argument. Yay.  Also
-	encode any 8bit parts to avoid the possibility of sending embedded
-	nul chars to the imap server.
-
-	* providers/imap/camel-imap-store.c (try_auth): Updated to pass a
-	command-length argument to camel_imap_command_continuation().
-
-2001-11-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (save_ssl_cert): Oops, pass a mode
-	argument to the open() call.
-
-	* camel-tcp-stream-openssl.c (save_ssl_cert): Oops, pass a mode
-	argument to the open() call.
-
-2001-11-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_decrypt): Add code to
-	kludge around any x-inline-pgp-hacks by prepending some content
-	headers to the decrypted data.
-
-2001-11-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-data-wrapper.c (camel_data_wrapper_init): Initialize our
-	private mutex.
-	(camel_data_wrapper_finalize): Destroy our private mutex.
-	(write_to_stream): Lock around camel_stream_write_to_stream() so
-	that we don't get 2 threads trying to read from our stream at the
-	same time.
-
-2001-11-01    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (folder_changed_change): Move all searching
-	operations outside of any locks except subfolder lock, same as
-	build_folder.  Fix for #14294.
-
-2001-10-31    <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-folder.c (spool_get_message): Same
-	as below.
-
-	* providers/local/camel-maildir-folder.c (maildir_get_message):
-	Same as below.
-
-	* providers/local/camel-mbox-folder.c (mbox_get_message): Set
-	USER_CANCEL if failed due to EINTR.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): If
-	construct from parser fails due to user cancel, set USER_CANCEL on
-	exception.
-
-	* camel-mime-part.c (construct_from_parser): Return error if the
-	parser had an io error.
-
-	* camel-mime-message.c (construct_from_parser): Check error on
-	parser/return error.
-
-	* camel-mime-parser.c (folder_scan_init): Init error number.
-	(camel_mime_parser_errno): New function, return errno of any io
-	failures.
-	(folder_read): Set errno if a failure occured.
-	(folder_seek): Same.
-	(folder_scan_init_with_fd): Setup errno depeding on ok/failure.
-	(folder_scan_init_with_stream): Same.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* camel-operation.c (camel_operation_new): Dont setup cancel_fd.
-	(camel_operation_cancel_fd): If cancel_fd not created, set it up.
-	(camel_operation_cancel): Set cancel flag before sending message.
-	(cancel_thread): Same.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Make
-	sure we unref the mimeparse when we're done (successfully).  This
-	was leaking an fd every get-mail! :(
-
-	* camel-lock-client.c (camel_lock_helper_init): Close all fd's
-	above 2.
-
-	* providers/local/camel-mbox-folder.c (mbox_get_message): Remove
-	the X-Evolution header before anyone else gets to see this private
-	thing.  Shoudl fix 11676 since we were inheriting flags from
-	X-Evolution headers we didn't want to.
-
-	* camel-folder-search.c (match_message): If we can't retrieve the
-	message, ignore it, it can't match.
-
-	* providers/imap/camel-imap-search.c
-	(camel_imap_search_class_init): Setup parent class pointer.
-	(imap_body_contains): If offline, just use the parent
-	body_contains method which will get the messages and search them
-	manually.
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression,
-	imap_search_by_uids): Remove offline check.
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-part.c (free_headers): Fix this to match get_headers.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* providers/local/camel-local-store.c (rename_folder): Dont try to
-	move ibex if we have none.
-
-	* camel-tcp-stream-openssl.c (stream_write): Fixed compilation
-	errors.
-
-2001-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (camel_mime_utils_init): Removed unused
-	variable.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_decode_mailbox): w(x) out some warnings.
-
-	* providers/local/camel-local-summary.c
-	(camel_local_summary_load): Remove the warning about not loading
-	summary file - its a valid case for new folders.
-
-2001-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-openssl.c (my_SSL_write): Removed.
-	(stream_write): Keep looping (non-blocking case) if errno is
-	EAGAIN, EINTR or EWOULDBLOCK. For NONBLOCKing I/O, sync up with
-	CamelTcpStreamRaw. As with CamelTcpStreamRaw/SSL - make sure to
-	write out everything before returning.
-	(my_SSL_read): Removed.
-	(stream_read): Just call ssl_error_to_errno() and check the errno
-	values that we care about so we can keep the general look of all
-	this stream code the same. Also when checking the return value of
-	SSL_read, check for <0 instead of ==-1 since the man page for
-	SSL_read doesn't say it will return -1 on fail, it just says <0.
-	(stream_flush): Don't fsync() since syncing on a socket is a Bad
-	Thing (tm).
-
-	* camel-tcp-stream-ssl.c (stream_write): Make sure we write out
-	everything just like in camel-tcp-stream-raw.c.
-
-	* camel-stream-buffer.c (camel_stream_buffer_gets): If
-	camel_stream_read() returns -1, don't necessarily return -1 to our
-	caller since it's possible that we did actually "read" some data
-	(ie, we copied some pre-buffered data into the out buffer).
-
-	* camel-stream-buffer.h: Removed CAMEL_STREAM_BUFFER_NEWLINE since
-	it never got used anywhere and it isn't supported anyway.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c
-	(parse_list_response_as_folder_info): If we get an empty name,
-	then mark that as NoSelect.  Workaround fix for #13239.
-
-2001-10-29  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (get_message_simple, 
-	imap_get_message): Set an X-Evolution-Source header on the
-	returned message so replies come from the right identity.
-
-2001-10-29    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (folder_changed_change): If we're not going
-	to search on a changed uid, make sure we change out copy still.
-	Fixes #13916.
-
-2001-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (subscribe_folder): Don't emit
-	a folder_subscribed signal if we are in the process of renaming
-	folders.
-	(unsubscribe_folder): Same here but for the unsubscribe signal.
-	(rename_folder): Unsubscribe from the folder being renamed and any
-	subfolders it may have before actually renaming. Once the folder
-	has been renamed, re-subscribe to it and it's subfolders with the
-	new name.
-
-	* camel-store.c (camel_folder_info_build): Sort the folder info's
-	before constructing the tree.
-
-	* camel-mime-utils.c (header_decode_param): Minor fix - should
-	have been using a strNcmp when checking if it was an rfc2047
-	encoded word.
-
-	* camel-pgp-context.c (pgp_sign): Notify the user that PGP 2.6.x
-	is no longer supported and use camel_exception_set() instead of
-	setv() where appropriate.
-	(pgp_clearsign): Same.
-	(pgp_verify): And again here.
-	(pgp_encrypt): Here too.
-	(pgp_decrypt): And finally here.
-
-2001-10-29  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Don't
-	free the hash table key if the folder wasn't found in the hash
-	table. I'm not sure where the bug is/was that made it possible to
-	add a folder to the tree after creating it failed, but now if that
-	happens, it won't crash if you try to delete it again. (#11492)
-
-	* camel-disco-store.c (camel_disco_store_status): if the service
-	is being connected and thinks it's online, but the session is
-	offline, then mark the service offline as well. Fixes 13683.
-
-2001-10-29    <NotZed@Ximian.com>
-
-	* camel-mime-utils.c: Turn off w() -> warnings.
-
-	* providers/imap/camel-imap-store.c (rename_folder): Also rename
-	the message cache.
-	(rename_folder): Fix subscribed folders table with rename(s).
-
-	* providers/imap/camel-imap-folder.c (imap_rename): Implement,
-	rename the cache dir pointer.
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_set_path): New method to set the path
-	used by a message cache.
-
-	* camel-vee-store.c (build_info): Fix the 'is this a matching
-	subfolder or subfolder' logic to match camel-store
-	get_subfolders'.
-
-	* camel-store.c (get_subfolders): Fix the 'is this a matching
-	folder or subfolder' logic.
-
-2001-10-28    <NotZed@Ximian.com>
-
-	* providers/local/camel-local-store.c (rename_folder): Changed to
-	call ibex_move to rename it internally.
-
-	* camel-store.c (camel_store_rename_folder): Use the right
-	variable, not info.
-
-2001-10-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Make sure
-	we've actually read data before checking if p[-] is '\r' or not.
-
-	* camel-tcp-stream-raw.c (stream_write): Same.
-
-	* camel-stream-fs.c (stream_write): If errno isn't EAGAIN, just
-	exit with -1 and instead of using continue (which doesn't go to
-	the top of the do-while thus making our logic suck), just set w to
-	0. Still seems to be a bug in select() if it's telling us the
-	socket is ready for data when it really isn't but oh well.
-
-2001-10-28    <NotZed@Ximian.com>
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Use path not protocol as the path
-	part of the uri of the folder_created event.
-
-	* providers/local/camel-maildir-store.c (scan_dir): If FAST is
-	set, dont try and scan for unread counts.
-
-	* providers/local/camel-local-store.c (create_folder): Implement,
-	just return the folderinfo of the folder matched, not all of it.
-
-	* camel-store.c (camel_store_rename_folder): Rename the
-	camelfolders before emitting the folderchanged event (otherwise
-	vstore fails to pick up change.
-
-2001-10-27    <NotZed@Ximian.com>
-
-	* camel-store.c (camel_store_init): Always use a default dir_sep
-	of '/'.
-
-	* camel-store.h (struct _CamelStore): Added a dir_sep to the base
-	store so rename and whatnot can work, temporary fix for mixed dir
-	separator in folder name api's.
-
-	* providers/imap/camel-imap-store.c (rename_folder): Finished
-	implementation.
-	(imap_connect_online): Also set the store's dir_sep here.
-	(imap_connect_offline): "
-
-	* providers/local/camel-local-folder.c (local_rename): Implement
-	local rename of folder objects.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (camel_vee_folder_class_init): Hook into
-	rename function.
-	(vee_rename): Implement the veefolder rename function.
-	(camel_vee_folder_class_init): 
-	(folder_changed_change): Kill a warning with a cast.
-
-	* camel-vee-store.c (vee_rename_folder): Emit a folder_renamed
-	event properly, also call parent to do some rename stuff.
-
-	* camel-store.h: Added a CamelRenameInfo for the rename event.
-
-	* camel-folder.c (camel_folder_rename): New function to rename a
-	folder object.
-	(camel_folder_class_init): Added a renamed event.
-	(folder_rename): Default impl, set full_name, and set name
-	assuming the dir separator is '/'.
-
-	* camel-store.c (camel_store_class_init): Added folder_renamed
-	event.
-	(camel_store_rename_folder): Rename an active folder object if we
-	have one, and update the folder table.
-	(rename_folder): Make a default implementation that handles
-	updating the folder tree.
-
-2001-10-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (delete_folder): Don't bother
-	checking ex since we can rely on the response being NULL on error.
-	(rename_folder): Implemented.
-
-2001-10-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Check to
-	make sure that the dataset is non-NULL before using and/or
-	freeing.
-
-	* camel-tcp-stream-raw.c (stream_write): Check for EWOULDBLOCK
-	too?
-	(stream_read): Same.
-	(stream_flush): Return 0 always, fsync() and tcp sockets don't
-	play nice :-)
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_get): Lets try putting a
-	camel_stream_reset() here. Logic being that the stream may have
-	been read from since it was cached and thus our caller may try
-	reading from it and get no data from it since it is already at the
-	EOS. This may fix bug #12943.
-
-2001-10-25    <NotZed@Ximian.com>
-
-	* camel-search-private.c (utf8_get): Remove the stupid warning
-	that should never have been there in the first place.
-
-	* camel-sasl-digest-md5.c (digest_response): s/iconv/e_iconv/
-
-	* camel-pgp-context.c (pgp_verify): "
-
-	* camel-mime-utils.c (rfc2047_decode_word, rfc2047_decode_word,
-	append_8bit, rfc2047_encode_word, rfc2184_decode,
-	header_decode_param): "
-
-	* camel-mime-part-utils.c (convert_buffer, convert_buffer): "
-
-	* camel-mime-filter-charset.c (reset, complete, filter): "
-
-2001-10-24    <NotZed@Ximian.com>
-
-	* camel-mime-filter-basic.c (complete): For qp decoding, if the
-	data isn't really qp encoded, we could possible grow the buffer by
-	upto 2 bytes above the input size, fix allocations/assertions
-	appropraitely.
-
-	* camel-vee-folder.c (folder_changed_change): If we're not
-	autoupdate, only search for new matches against changed uid's that
-	we dont already have.
-
-2001-10-24  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Don't
-	let fi->name be NULL.
-
-2001-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-fs.c (stream_read): Same as in the TcpStreamRaw code.
-	(stream_write): And again here...
-
-	* camel-tcp-stream-raw.c (stream_read): Handle the EAGAIN error
-	case as well.
-	(stream_write): Same here, this might fix the SMTP truncation
-	thing? I hope?
-
-2001-10-23  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-utils.c (mail_list_magic): Remove an extra * in one
-	of the regexps that glibc apparently doesn't mind but bsd does.
-
-2001-10-23    <NotZed@Ximian.com>
-
-	* providers/local/camel-mbox-summary.c: made d(x) x recompile again.
-
-2001-10-22    <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-summary.c (summary_rebuild): No, use
-	Storing, as the other code does :p
-	(spool_summary_check): Check for consistency.
-
-2001-10-22  Jon Trowbridge  <trow@ximian.com>
-
-	* providers/local/camel-spool-summary.c (summary_rebuild):
-	s/summarising/summarizing/.
-	(spool_summary_check): s/summarise/summarize/.
-
-2001-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): If we are
-	kludging around a inline-pgp signed part, do some charset
-	conversion to protect any 8bit text.
-
-2001-10-22    <NotZed@Ximian.com>
-
-	* camel-filter-search.c, camel-folder-search.c (check_header): Use
-	search_type_mlist for mailing list searches.
-
-	* camel.c (camel_init): call camel-mime-utils-init func.
-
-	* camel-mime-utils.c: Changed mail mail_list_magic to include a
-	domain part, also pre-compile all the patterns.  They are all
-	backward compatible except List-Id: which now uses the
-	mail-address-like <list-name.host.name> part rather than the
-	plain-text part (which might've been blank anyway).
-	(camel_mime_utils_init): Initialisation function to setup any
-	static data required by camel-mime-utils at run-time.  We now
-	setup the base64/charset class tables here, so it doesn't need to
-	be done statically.
-	(camel_mime_special_table, camel_mime_base64_rank): No longer
-	statically initialise these.
-	(main): Removed + the tests at the end of the file.
-	(header_raw_check_mailing_list): Dont compile regex's here,
-	already compiled in utils_init.  Use the regex patterns to remove
-	leading <'s from addresses.  Also, if there is a domain part
-	matched, add that after a '@' is added.
-
-	* camel-search-private.c (camel_search_header_match): Match check
-	against all addresses in a multiple address match.  Should fix
-	#13051.
-	(camel_search_header_match): Oops, missing i=0.
-	(camel_search_header_match): Added SEARCH_TYPE_MLIST for mlist
-	search types.  It ignores the domain part if either (but not both)
-	of the values dont have it.
-
-2001-10-22  Dan Winship  <danw@ximian.com>
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Add a hack: if
-	the multipart/signed part has a "x-inline-pgp-hack" parameter in
-	its Content-Type, don't pass the MIME headers as part of the data
-	to be verified.
-
-2001-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: added $GNOME_INCLUDEDIR to INCLUDES, needed for latest
-	libgnome, which install headers in $(prefix)/gnome-1.0
-
-2001-10-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Only do the rawtext
-	checks if the part is a text part, otherwise don't bother wasting
-	cpu cycles.
-
-	* camel-store.c (camel_folder_info_build): Updated comments to
-	make the code a bit more clear.
-
-2001-10-21    <NotZed@Ximian.com>
-
-	* camel-store.c (CS_CLASS): Dont do the macro stuff - basically so
-	you can actually debug calls.
-	(camel_store_uri_cmp): New function to compare store objects.
-
-	* camel-vee-folder.c (vee_folder_add_info): oops, dont free the
-	vuid, since its alloca'd now.
-	(folder_changed_change): Kill a compile warning.
-
-2001-10-20    <NotZed@Ximian.com>
-
-	* camel-folder.c (move_messages_to): If no exception supplied, use
-	a local one.
-	(move_message_to): Set the seen flag also when we delete it.
-
-2001-10-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-vtrash-folder.c (vtrash_move_messages_to): If the
-	destination folder is the vfolder source folder, then
-	set_message_flags on it.
-
-2001-10-19    <NotZed@Ximian.com>
-
-	* camel-session.c (register_provider): When registering provider,
-	translate all strings.
-
-	* camel-vee-folder.c (camel_vee_folder_remove_folder): Lock the
-	right lock for unmatched subfolder list stuff.  If the sub folder
-	is deleted & part of unmatched, or the last ref to the sub folder
-	is gone from unmatched, blow it away completely from unmatched,
-	but only do it once.
-	(vee_folder_remove_folder): Added arg to kill unmatched
-	unconditionally.  Also handle deleted folders, always remove
-	stuff.
-	(folder_changed_change): Lock subfolder lock for entirety of
-	operation, and also check to see if the subfolder is still there
-	before doing any fancy work (incase it got removed while we were
-	waiting to execute).
-	(folder_changed_change_uid): Use alloca for vuid, and not
-	sprintf(".lengths")
-	(vee_search_by_expression): Dont use sprintf for vuid.
-	(vee_search_by_uids): "
-	(vee_folder_add_info): "
-	(folder_changed_remove_uid): "
-	(folder_changed_change): "
-	(folder_changed_change_uid): Also check folder_unmatched for
-	changed uid's so we properly update/propagate unmatched changes.
-	(folder_changed_change): Ok, so dont hold the subfolder lock for
-	the whole duration of the changed event, although we probably
-	should, requires a recursive mutex.
-	(folder_changed_change): Change logic, we always add changed stuff
-	if it now matches, but dont remove it unless its auto-remove, only
-	propagate changes for it.
-	(vee_set_message_flags): Call parent method after doing our work.
-	(vee_set_message_user_flag): Same here.
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): If a charset isn't
-	specified or claims to be utf-8, check the validity of the text
-	and if it's invalid, set the rawtext bit to TRUE. If the charset
-	is x-unknown or some other x- charset, always set the rawtext bit
-	to TRUE.
-
-2001-10-18    <NotZed@Ximian.com>
-
-	* camel-store.c (camel_store_unsubscribe_folder): If we are
-	unsubscribing from a folder we have loaded, set the folder
-	deleted, as with the delete_folder case.
-
-	* providers/(imap|local|pop3|sendmail|smtp)/Makefile.am: Added
-	CAMEL_CFLAGS so we get the right iconv stuff, patch from Yanko
-	Kaneti <yaneti@declera.com>
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): Make sure the
-	cancel_fd isn't -1.
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-message-cache.c (insert_finish): Flush
-	the stream here, not sure it really matters but it might
-	(hopefully) fix bug #12943.
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): Make
-	user-cancellable.
-
-	* providers/local/camel-local-provider.c: String cleanup for bug
-	#6640.
-
-	* providers/imap/camel-imap-folder.c (imap_sync_online): Fix my
-	Cyrus imapd workaround...instead of checking to see if info->flags
-	== FLAGGED, just check to see if it contains any IMAP flags.
-
-2001-10-17    <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-folder.c
-	(camel_maildir_folder_new): Use '.' as the inbox name for filter
-	new messages test.
-
-	* camel-store.c (camel_folder_info_clone): New function to clone a
-	folderinfo tree.
-
-2001-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-mh-folder.c (mh_append_message): Same as
-	maildir and mbox append-message.
-
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	Same as mbox append.
-
-	* camel-exception.c (camel_exception_set): Make sure the new
-	description isn't the same as the old description pointer before
-	freeing the old one.
-	(camel_exception_setv): Don't free the old description until we
-	set the new one this way we can reuse the old description in the
-	new description.
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message): If
-	errno == EINTR, then we got a user-cancel so set the exception
-	appropriately so that we don't make the user shit his pants.
-
-	* camel-filter-driver.c (do_copy): Add an optimization for when
-	destination folder is the same as the source folder.
-
-2001-10-17    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info_online):
-	(parse_list_response_as_folder_info): Patch from Danw, Use unread
-	count of -1 to mark unflagged messages.  Make sure any folder we
-	dont lookup explicitly is marked as -1.  Should fix #9947 and
-	friends.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): Only
-	touch the summary if the timestamp or size changed.
-
-2001-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Set
-	the DELETED flag on directly on the info if the source folder
-	doesn't have summary capability.
-
-2001-10-17  Not Zed  <NotZed@Ximian.com>
-
-	* camel-tcp-stream-raw.c (stream_write): As below.
-
-	* camel-stream-fs.c (stream_write): If not checking cancellation,
-	make sure we write out everything asked of us.
-
-2001-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Rearange the order of the gpg
-	options slightly otherwise it might try to use "--no-tty" as the
-	filename to verify :-)
-
-	* camel-object.[c,h]: If CAMEL_DEBUG is defined, print some useful
-	ref/unref info.
-
-	* providers/imap/camel-imap-store.c (delete_folder): Fixed an
-	assignment warning.
-
-	* camel-uid-cache.c (camel_uid_cache_new): Make sure that the
-	parent directory exists before trying to open the filename, if it
-	doesn't, create it.
-
-2001-10-16    <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_address_decode): If no content, dont
-	try and decode further and spit meaningless warnings.
-
-2001-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_flag): Only perform the operation on
-	the folder if the folder has summary capability, else just poke
-	the info directly. Fixes the "Filters don't work" bug.
-	(do_score): Same.
-	(do_colour): And here too.
-
-2001-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-fs.c (stream_read): Save the errno before calling
-	fcntl so fcntl doesn't overwrite errno in case of a previous
-	error.
-	(stream_write): Same.
-
-2001-10-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Replace the
-	Bcc headers in a single location and don't flush the data unless
-	the write was successful.
-
-2001-10-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Remove the stripheader filter from the build.
-
-	* camel-mime-filter-stripheader.[c,h]: Removed.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Check the
-	return value of camel_stream_flush to make sure it flushed the
-	data successfully before continuing. Don't use the stripheader
-	filter, it was completely broken - instead remove the header and
-	set it again after we send.
-
-2001-10-12    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (camel_vee_folder_remove_folder): Unhook from
-	all events before removing folder.
-	(camel_vee_folder_add_folder): Hook onto delete event.
-	(camel_vee_folder_finalise): Unhook from deleted event for suibfolder.
-	(subfolder_deleted): When the folder is deleted, remove it from
-	the vfolder automagically.
-
-2001-10-11    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (vee_search_by_uids): convert the uids list
-	to a subset appropriate for each subfolder before trying to search
-	on it.
-
-	* camel-charset-map.[ch]: Removed charset/locale charset lookup
-	and iconv_open/close functions, moved to gal.  Fixed all callers.
-
-2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (ssl_cert_is_saved): Same.
-
-	* camel-tcp-stream-openssl.c (ssl_cert_is_saved): Instead of
-	opening the file, stat it and make sure that it belongs to us.
-
-2001-10-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-openssl.c (ssl_verify): Same hack as below.
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Hack around the fact that
-	adding a cert to nss's certdb seems to not work.
-
-2001-10-10    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (vee_sync): Only re-build the folder if we're
-	expunging.  Also only clear out the changed folders list if we're
-	expungung and everything worked.
-
-2001-10-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-charset-map.c (camel_charset_map_init): Added a hack for
-	Solaris systems.
-
-2001-10-10    <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-store.c (scan_dir): oops, we want
-	get_unread_message_count, not get_message_count!
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* camel-service.c (camel_service_disconnect): Duplicate connect
-	code that unregisters a cancel op if we created one.
-
-	* camel-operation.c (camel_operation_progress): Another go at
-	getting the logic right again.  Make transients only update after
-	5 seconds (CAMEL_OPERATION_TRANSIENT_DELAY)
-	(camel_operation_end): Likewise.
-
-	* providers/local/camel-spool-folder.c (spool_search_by_uids):
-	Implement.
-
-	* providers/imap/camel-imap-search.c (imap_body_contains): If
-	searching a sub-set of the total message count, then use a UID
-	range to search only specific messages.
-
-	* camel-vee-folder.c (vee_folder_change_match): Removed.
-	(folder_changed_add_uid): Helper func for changed code.
-	(folder_changed_remove_uid): "
-	(folder_changed_change_uid): "
-	(folder_changed): Rewritten.  Supports proper auto-updating of
-	changes, but not removals till a sync occurs.
-	(vee_search_by_uids): Implement.
-	(folder_changed): Changed to call an async threaded function to do
-	the actual folder updating.
-
-	* camel-folder-summary.c (camel_flag_list_copy): New func to copy
-	a whole list of flags.
-	(camel_tag_list_copy): New func to copy a whole list of flags.
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_uids):
-	Implement.
-
-	* providers/local/camel-local-folder.c (local_search_by_uids):
-	Implement.
-
-	* camel-folder.c (camel_folder_search_by_uids): New function,
-	search a subset of uid's.
-	(search_by_uids): Default impl, return error.
-
-2001-10-08  Dan Winship  <danw@ximian.com>
-
-	* camel-folder.h (struct _CamelFolder): replace the ever-growing
-	list of gbooleans with a single guint32 for flags.
-
-	* camel-folder.c: Update folder flag setting/checking.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_init):
-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): 
-	* providers/local/camel-spool-folder.c (spool_init,
-	camel_spool_folder_new): 
-	* providers/local/camel-maildir-folder.c (camel_maildir_folder_new): 
-	* providers/local/camel-local-folder.c (local_init): 
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init,
-	camel_imap_folder_new): 
-	* camel-vtrash-folder.c (camel_vtrash_folder_init): 
-	* camel-vee-folder.c (camel_vee_folder_init): 
-	* camel-digest-folder.c (camel_digest_folder_init): update folder
-	flag setting.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_online): Unlock
-	the store before returning error. (noted by NotZed)
-
-2001-10-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_text): Fix a slight error in
-	logic. Just because the last word was an encoded word doesn't mean
-	we ignore the lwsp padding, we only ignore it if the last word and
-	*this* word are encoded.
-
-2001-10-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-basic.c (filter): Implemented uuencoding and
-	decoding.
-	(complete): Implemented uuencoding and decoding.
-
-	* camel-mime-utils.c (uuencode_close): New function to flush the
-	uu encoder.
-	(uuencode_step): New function to uuencode a block of data.
-
-2001-10-05    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c (subscribe_folder): Use a
-	folder_subscribed event rather than a folder_created one.
-	(unsubscribe_folder): Similarly for unsubscribed/deleted.
-	(create_folder): Emit a folder_created event on the folders we
-	added.  Not sure hsould probably check which ones are new and
-	which ones are just existing ones?
-	(delete_folder): Emit a folder_deletd event when we've deleted the
-	folder.  Part of fix for #11831.
-
-	* camel-store.c (camel_store_class_init): Added
-	folder_subscribed/unsubscribed events.
-
-2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-service.c (camel_service_finalize): Turn off warnings.
-	(get_name): Same.
-
-	* camel-sasl.c (sasl_challenge): Turn off warnings.
-
-	* camel-tcp-stream.c (tcp_connect): Turn off warnings.
-	(tcp_getsockopt): Same.
-	(tcp_setsockopt): Here too.
-	(tcp_get_socket): And here.
-
-	* camel-folder.c (folder_sync): Turn off warnings.
-	(expunge): Same.
-	(append_message): Here too.
-	(get_message): And here.
-	(search_by_expression): And again here.
-	(folder_changed): Here too.
-
-	* camel-store.c (get_folder): Set an exception and turn off
-	debugging g_warnings.
-	(create_folder): Same.
-	(delete_folder): Here too.
-	(rename_folder): And here.
-	(get_trash): And here.
-	(get_folder_info): Same.
-	(free_folder_info): And again here.
-	(camel_folder_info_build): Here too.
-	(folder_subscribed): Same.
-	(subscribe_folder): Here too.
-	(unsubscribe_folder): And here.
-
-2001-10-05    <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_decode_mailbox): Try harder to get
-	broken names out of addresses.  Unencoded ,'s in names will still
-	break it, but well what can you do eh?
-	(header_decode_mailbox): Always add .'s into address we've scanned
-	past a '.', even if we can't decode the next part.  Fix for some
-	annoying bug #.
-
-2001-10-04    <NotZed@Ximian.com>
-
-	* camel-store.c (camel_store_delete_folder): Change the order of
-	execution slightly.  We delete the folder first, then call the
-	classes delete folder, then cleanup the hashtable afterwards.
-	This is so deletes of vfolders work, since vee-store uses the
-	folder hashtable to store all of is vfolders :-/
-
-2001-10-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-service.c (camel_service_connect): Unregister the
-	operation before unreffing it.
-
-2001-10-03    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Remove now unused 'recents' array/freeing func.
-
-	* camel-object.c (camel_object_trigger_event): Oops, always run
-	the prep function, even if we have no hooks listening.  Causes
-	incoming imap recents to get ignored bythe camel-folder filter
-	inbox code.
-
-	* providers/local/camel-local-folder.c (local_sync): Dont
-	explicitly save metadata, its saved in summary_sync.
-
-	* providers/local/camel-mh-summary.c: Call superclass.
-	(mh_summary_check): Dont save ibex.
-
-	* providers/local/camel-maildir-summary.c: Call superclass method.
-	(maildir_summary_check): Dont save ibex explictly.
-
-	* providers/local/camel-mbox-summary.c: Call super-class sync when
-	done, saves summary/ibex, etc.
-	(mbox_summary_check): Dont save ibex.
-	(mbox_summary_sync): Call summary_check rather than trying to
-	update from our known position.
-
-	* providers/local/camel-local-summary.c
-	(camel_local_summary_check): Dont save the summary or index here.
-	(local_summary_sync): Save the summary/index here.
-
-	* camel-search-private.c (camel_search_build_match_regex): Added
-	MATCH_NEWLINE flag, -> REG_NEWLINE.
-
-	* camel-lock-helper.c: Include <string.h> to kill some warnings.
-
-	* camel-filter-search.c (get_full_header): Put \n's between each
-	line we generate.
-	(header_full_regex): Dont drop the first argument to the command
-	-> empty matches!
-	(header_full_regex): Set match_newline for building regex.
-	(body_regex): And here too.  These all fix #9877.
-
-2001-10-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_delete_folder): Call
-	camel_folder_delete() on the folder if it's "alive".
-
-	* camel-folder.c (camel_folder_delete): Mark the folder as
-	deleted, perform any folder specific cleanup and emit the deleted
-	event.
-	(camel_folder_sync): Only sync the folder if it hasn't been
-	deleted.
-	(camel_folder_expunge): Same.
-
-2001-10-03  Dan Winship  <danw@ximian.com>
-
-	* providers/local/camel-local-provider.c (local_url_equal):
-	Strange are the ways of alloca. Fixes 11543.
-
-2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Import the certificate if
-	the user accepts it.
-
-2001-10-02    <NotZed@Ximian.com>
-
-	* providers/local/camel-local-provider.c (local_url_hash,
-	local_url_equal): for hashing/comparing local url's, we ignore
-	trailing /'s in paths (maybe shuld handle multiple /'s too).
-	(camel_provider_module_init): Use local_url_hash/equal for all
-	functions.
-
-	* camel-sasl-digest-md5.c (digest_response): Change to
-	camel_charset_iconv_open/close.
-
-	* camel-pgp-context.c (pgp_verify): Change to
-	camel_charset_iconv_open/close.
-
-	* camel-mime-part-utils.c (convert_buffer): Change to
-	camel_charset_iconv_open().
-
-	* camel-mime-filter-charset.c
-	(camel_mime_filter_charset_new_convert, finalise): Change to
-	camel_charset_iconv_open, etc.
-
-	* camel-mime-utils.c: Use the camel_charset_iconv_open/close()
-	functions to open/close it.
-
-	* camel-charset-map.c (camel_charset_iconv_open): New function,
-	wrap iconv_open, so we can cache ic's.
-	(camel_charset_iconv_close): Likewise for close.
-	(camel_charset_map_init,shutdown): Init/free iconv cache.
-
-2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-charset-map.c (camel_charset_to_iconv): Revert my
-	x-unknown special-case hack - this may mask other problems.
-
-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv
-	conversion fails, for whatever reason, retry using the user's
-	locale charset.
-
-2001-10-02    <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-store.c (get_folder_info): Go back
-	to using the store url's path, not the toplevel_dir thing.
-
-	* camel-operation.c (camel_operation_progress): Fix the progress
-	logic, so we dont update too often.
-
-	* camel-object.c (camel_object_get_hooks): Change the lock to a
-	recursive e-mutex.
-	(camel_object_hook_event): Maintain list length of hook list.
-	(camel_object_unhook_event): "
-	(camel_object_unhook_event): If we are in an event, just mark the
-	pair as removed, without removing it.
-	(camel_object_trigger_event): Before running events, copy the
-	list, and also ignore 'removed' events.  After running events, if
-	we're all out of events, then free up any pending-removed events.
-	(camel_object_free_hooks): Add some new assertions on the state of
-	the hook structure.
-	Removed the #error if threads not defined.  It _should_ actually
-	work without threads.
-	(camel_object_free_hooks): Free mutex when done.
-
-2001-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (delete_folder): Remove any
-	cached messages that belonged to the deleted folder.
-	(subscribe_folder): Don't ever let the info->name be NULL and
-	don't use the stupid concat kludge to generate the URL, just use a
-	CamelURL to do it. This way we don't risk breaking stuff by having
-	a url like imap://fejj@imap//folder
-
-	* camel-charset-map.c (camel_charset_to_iconv): If the charset is
-	x-unknown, return the locale_charset.
-
-2001-10-01  Dan Winship  <danw@ximian.com>
-
-	* camel-provider.h: Fix up the provider flags to specify things
-	more completely so we don't have to hardcode provider names in the
-	mailer.
-
-	* providers/local/camel-local-provider.c: MH, mbox, and Maildir
-	are LOCAL. MH and mbox are no longer STORAGE by the new
-	definition.
-
-	* camel-session.c (vee_provider): The vfolder store is a STORAGE.
-
-2001-10-01  Dan Winship  <danw@ximian.com>
-
-	* providers/local/camel-local-store.c (construct): Don't munge the
-	URL; CamelSession's caching relies on it not changing. Instead,
-	add a toplevel_dir field to CamelLocalStore, and set that to the
-	path, but always ending with /.
-	(camel_local_store_finalize): Free toplevel_dir
-	(camel_local_store_get_toplevel_dir): Return toplevel_dir rather
-	than url->path.
-
-	* providers/local/*: Lots of s/url->path/toplevel_dir/
-
-	* providers/local/camel-spool-store.c (construct): Likewise, don't
-	try to strip a trailing / from url->path here, but I didn't make
-	the corresponding toplevel_dir change, because there's no good
-	reason someone should expect "/var/spool/mail/danw/" to work since
-	that's not a directory.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): if STAT
-	returns 0, don't bother sending UIDL. Speeds things up slightly
-	and also works around a bug in a particular random POP server.
-	(ximian bug 11369).
-
-2001-09-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_sign): Add --no-secmem-warning and
-	--no-greeting to the gpg command-line options.
-	(pgp_clearsign): Same.
-	(pgp_verify): Here too.
-	(pgp_encrypt): And here.
-	(pgp_decrypt): And finally here.
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-search.c (get_source): Same here.
-
-	* camel-mime-message.c (camel_mime_message_set_source): Don't use
-	the e_url_shroud hack, use CamelURL functions instead.
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/nntp/camel-nntp-provider.c
-	(camel_provider_module_init): Init the nntp url hash and url_equal
-	functions.
-
-	* providers/sendmail/camel-sendmail-provider.c
-	(camel_provider_module_init): Init the sendmail url hash and
-	url_equal functions.
-
-	* providers/smtp/camel-smtp-provider.c
-	(camel_provider_module_init): Init the smtp url hash and url_equal
-	functions.
-
-	* providers/pop3/camel-pop3-provider.c
-	(camel_provider_module_init): Init the pop3 url hash and url_equal
-	functions.
-
-	* providers/imap/camel-imap-provider.c
-	(camel_provider_module_init): Init the imap url hash and url_equal
-	functions.
-
-	* providers/local/camel-local-provider.c
-	(camel_provider_module_init): Init the local url hash and
-	url_equal functions.
-
-	* camel-session.c (camel_session_class_init): Init the vfolder url
-	hash and url_equal functions.
-
-	* camel-provider.h: Added url_hash and url_equal function pointers
-	to the structure.
-
-	* camel-vtrash-folder.c (vtrash_move_messages_to): Oops, a
-	CamelFolder is not a CamelFolderClass.
-
-2001-09-28  Dan Winship  <danw@ximian.com>
-
-	* camel-tcp-stream-openssl.c (ssl_error_to_errno): Make this take
-	an SSL * instead of a CamelTcpStreamSSL *, since it can get called
-	from open_ssl_connection, when the CamelTcpStreamSSL isn't set up
-	right yet. Fixes a crash on connection failure.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c
-	(camel_imap_folder_fetch_data): Grab the store's command_lock
-	before grabbing the folder's cache_lock to prevent deadlock if
-	another thread is processing an EXPUNGE response.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_expunge_uids_resyncing): Fix a compiler warning that might
-	point out a real bug...
-
-	* providers/imap/camel-imap-folder.c (get_content): and one that
-	doesn't
-
-2001-09-27    <NotZed@Ximian.com>
-
-	* camel-service.c (camel_service_connect): Dont re-register the
-	connect_op if we got it by calling 'operation_registered', which
-	returns an already-registered one.
-	(camel_service_disconnect): Likewise here.  This removes all the
-	re-registered warnings.
-
-	* camel-object.c (camel_object_unref): Fill the finalised data
-	with nonsense, rather than 0's - more easily detect bad data.
-	(camel_object_new): Clear instance data when we retrieve it off
-	the list.
-
-	* camel-object.h (_CamelObject): Added an event lock pointer for
-	uh, locking event stuff.  Also change the hooklist hashtable into
-	a list.  Changed all the code to handle it.  Result: thread-safe
-	events, event-hooks, and save memory too, and SHOULD FINALLY FIX
-	THAT UNREAD COUNT PROBLEM.
-
-2001-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_decrypt): CRLF decode the
-	stream before parsing it into a MIME part. This fixes bug #10521.
-
-	* camel-store.c: Remove the old folder from the vTrash folder.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* camel-service.c: Change "gboolean connected" to
-	"CamelServiceConnectionStatus status", which can be disconnected,
-	connecting, connected, or disconnecting.
-	(camel_service_init, camel_service_finalize): create/destroy the
-	connect_op_lock. Refer to service->status rather than
-	service->connected.
-	(camel_service_connect): When connecting, note the current
-	operation (and create a new one if there's none registered) and
-	mark the connection "connecting" until we succeed or fail.
-	(camel_service_disconnect): Likewise in reverse.
-	(camel_service_cancel_connect): New function to cancel a
-	connection attempt.
-	(cancel_connect): Default implementation: Call
-	camel_operation_cancel on the connect_op.
-
-	* camel-disco-store.c (disco_connect): Only call
-	CamelRemoteStore's connect func if we're online.
-	(disco_cancel_connect): Fall back to offline if a connection gets
-	cancelled.
-	(disco_get_folder_info): Kludge: call connect explicitly before
-	deciding whether to do the online or offline version, so if the
-	connect fails, we fall back correctly.
-
-	* camel-session.c (camel_session_get_service_connected):
-	s/svc->connected/svc->status/
-
-	* camel-remote-store.c (camel_remote_store_finalise):
-	Change service->connected check to service->status check.
-	(remote_connect): Don't set service->connected here:
-	camel_service_connect() itself does that.
-
-	* camel-operation.c (camel_operation_registered): Deal with the
-	possibility that there's no registered op.
-
-2001-09-26    <NotZed@Ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): If
-	we get a search error, just abort, dont try and fall back and copy
-	to inbox.
-	(camel_filter_driver_filter_message): Make sure we ALWAYS use
-	exceptions for important things - like moving messages to inbox!
-	(camel_filter_driver_filter_message): If we have the source
-	folder, use camel_folder_set_message_flags rather then poking the
-	info directly, which skips changed events.  This means filtering
-	immediate doesn't lose changed events.
-	(do_flag): Same here.
-	(do_colour): Same thing but using set_tag.
-	(do_score): Same again.
-	(camel_filter_driver_filter_folder): Use ~0 as the 'set' arg to
-	set_flags, just saves typing.
-	(open_folder): We cache folders that we couldn't open as well as
-	those ones we could.  Use magic token FOLDER_INVALID =
-	(void *)~0 as the marker.
-	(close_folder): Handle FOLDER_INVALID case properly.
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-message.c
-	(camel_mime_message_get_part_by_content_id): New function to
-	convenience Larry ;-)
-	(check_content_id): Oops, return !found instead of found. This
-	callback has to return whether or not to keep searching, not
-	whether or not it found what it's looking for. Do'h!
-
-	* camel-pgp-mime.c (camel_pgp_mime_is_rfc2015_signed): block out
-	some code if ENABLE_PEDANTIC_PGPMIME is not defined.
-
-2001-09-26    <NotZed@Ximian.com>
-
-	* camel-vee-store.c: Emptied VeeStorePrivate, member wasn't used.
-
-	* camel-vee-folder.c (camel_vee_folder_set_expression): Lock
-	changed list separately.
-	(camel_vee_folder_remove_folder): "
-	(camel_vee_folder_set_folders): Use changed_lock for changed list.
-	(vee_refresh_info): Use changed_lock, also just grab the list,
-	reset it in the lock, and do the work unlocked.
-	(vee_sync): Use changed lock for changed list.
-	(folder_changed): ".  All this kills a deadlock with sync/expunge.
-	
-	* camel-private.h (CamelVeeFolderPrivate): Added a new lock for
-	the folders-changed list.
-	(CamelVeeStorePrivate): Removed, defined in camel-vee-store.c,
-	thanks to a pedantic.
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Fix Ettore's fix.
-
-2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (camel_pgp_context_new): No longer takes a
-	remember argument.
-	(pgp_sign): Only uncache the passphrase on failure.
-	(pgp_clearsign): Same.
-	(pgp_encrypt): Here too.
-	(pgp_decrypt): And here.
-	(pass_free): New function to zero the passphrase before freeing
-	it.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch for Automake 1.5 compatibility pointed out by Richard
-	Boulton <richard@tartarus.org>, as per #9258.]
-
-	* providers/nntp/Makefile.am: Remove some commented parts that
-	make Automake 1.5 choke.
-
-	* Makefile.am (camel-lock-helper): Add $(EXEEXT) for Automake 1.5
-	compatibility.
-
-2001-09-25    <NotZed@Ximian.com>
-
-	* camel-folder.c (get_unread_message_count): Only unref info if we
-	got it.
-
-	* camel-operation.c (camel_operation_unref): Fix for !threads
-	enabled not ccompiling.
-	(camel_operation_ref): Assert refcount > 0.
-	(struct _CamelOperation): Removed the lock.  On further
-	investigation, I dont think this will always work, the
-	registration operations assume that a lookup in the
-	operation_active table will return a ref, that will remain valid
-	until we ref it, which needn't be the case.  So now i'm using a
-	single global lock, since we'd need to do that for unref anyway,
-	and every operation is fast & memory-bound.  Changed all the code
-	to handle this.
-	(camel_operation_progress_count): Since the code is identical,
-	just call progress() for now.
-	(camel_operation_register): No longer refcount, use unref to
-	check/clear the active table.
-	(camel_operation_unregister): Same here.
-	(camel_operation_unref): Check if operation is in active table, if
-	so, warn, remove.
-
-2001-09-25  Dan Winship  <danw@ximian.com>
-
-	* camel-tcp-stream-openssl.c (my_SSL_read, my_SSL_write): call
-	SSL_read/write, looping on SSL_ERROR_WANT_READ/WRITE. I'm sure
-	there's a perfectly good reason that the API works this way. No,
-	really.
-	(stream_read, stream_write): use my_SSL_read and my_SSL_write.
-	Fixes at least ximian 8593, and probably 6024 and maybe 10366,
-	at least for OpenSSL. There may be a parallel NSS bug?
-
-2001-09-25    <NotZed@Ximian.com>
-
-	* camel-stream-buffer.c (stream_write_all): A "safe write"
-	function that always writes out all data asked of it, till
-	finished.
-	(stream_write): Rewritten.  What was i on when i wrote that
-	originally, how did it ever work with tcp streams ...
-
-2001-09-24    <NotZed@Ximian.com>
-
-	* camel-folder.c (append_message): Set the exception to
-	FOLDER_INVALID rather than making out it worked.  A fix for #7025.
-	(search_by_expression): Here too.
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): In the
-	'lose' case, free messages, not fetch_data twice!
-
-	* camel-filter-search.c (check_header): If the type is encoded,
-	get the fallback charset from the message content-type.
-
-	* camel-mime-part-utils.c (check_html_charset): Dont check for
-	charset==null before calling charset_to_iconv.
-	(simple_data_wrapper_construct_from_parser): "
-
-	* camel-mime-message.c (process_header): Try use content-type
-	charset param as the fallback charset.
-
-	* camel-charset-map.c (camel_charset_to_iconv): Handle name ==
-	NULL, return NULL.
-
-	* camel-folder-summary.c (camel_folder_summary_format_address):
-	(camel_folder_summary_format_string): Made private again, removed
-	#warning about it.  Renamed to s/camel_folder//.
-	(summary_format_string): Take default charset param.
-	(camel_message_info_new_from_header, message_info_new): Decode
-	content-type field to get the charset parameter to use as the
-	default charset for decoding strings.
-
-	* camel-search-private.c (camel_search_header_match): Pass NULL as
-	the charset, the locale charset is always tried.
-	(camel_search_header_match): Supply a default_charset parameter to
-	be used with TYPE_ENCODED params.
-
-	* camel-mime-utils.c
-	(header_param): get rid of the g_strcasecmp crap.
-	(header_set_param): Same here.
-	(header_decode_param_list): And here.
-	(header_decode_text): Totally rewritten.  30% of its size.  If the
-	word is not rfc2047 encoded, always try default_charset if
-	supplied, if that fails, try locale charset if it exists, if that
-	fails then assume latin1/7 bit ascii.
-	(append_8bit): Changed to return FALSE if we can't convert for
-	whatever reason, and dont append anything.
-
-	* camel-mime-part.h (struct _CamelMimePart): Move content_type and
-	headers out of the 'private' section.
-
-	* camel-mime-part.c (get_headers): Dont do any conversion on the
-	header.
-	(process_header): Get the content-type charset as the fallback
-	charset for decode_string.
-	(construct_from_parser): IF we have a content-type header, process
-	it before doing anything else, so we have access to a fallback
-	charset for invalid headers.
-
-2001-09-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-openssl.c (ssl_verify): Don't even try to alert
-	the user if the session isn't interactive.
-	(errlib_error_to_errno): Make the default errno EINTR so that we
-	act just like CamelTcpStreamSSL.
-
-	* camel-pgp-context.c (pgp_sign): When the password is not
-	provided, set the exception to USER_CANCEL.
-	(pgp_clearsign): Same.
-	(pgp_encrypt): And here.
-	(pgp_decrypt): Here too.
-
-2001-09-21    <NotZed@Ximian.com>
-
-	* camel-store.c (create_folder): Set the exception if
-	create_folder isn't implemented.
-
-2001-09-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (create_folder): Go back to
-	not using camel_folder_info_build() here because this seems to
-	break folder creation (returning nodes from the root path when it
-	shouldn't be?).
-
-2001-09-21    <NotZed@Ximian.com>
-
-	* camel-vee-store.c (vee_get_folder_info): Force a refresh of
-	vfolders before storing their count.  This essentially makes
-	'get_folderinfo' refresh all vfolders, so that get-mail works as
-	expected.
-
-	* camel-vee-folder.c (camel_vee_folder_finalise): Clear lists.
-	(folder_changed): If we're not autoupdating the folder, then
-	add this folder to the list of 'changed' folders for this vfolder.
-	(camel_vee_folder_set_expression): Reset the folders_changed list.
-	(camel_vee_folder_remove_folder): Remove the folder from the
-	folders_changed list.
-	(camel_vee_folder_set_folders): If we have a folder already, but
-	its changed, use this opportunity to update it.
-	(vee_sync): Remove any synced folders from the folders_changed
-	list.
-	(vee_refresh_info): Refresh folder, re-run queries on any changed
-	folders.
-
-2001-09-20    <NotZed@Ximian.com>
-
-	* camel-folder-summary.c (camel_folder_summary_header_load): New
-	function to just load the summary.  Not much use yet, until unread
-	counts are stored in the summary (which now looks like too much
-	work!).
-
-	* camel-mime-utils.c (header_decode_mailbox): Crappy fix for
-	stupid mailers.  If we get 'name b. name <foo>' then treat it as
-	'"name b. name" <foo>'.  See 8147.
-	(header_decode_mailbox): Another fix for really broken mailers
-	that have things that look like addresses followed by <address>
-	bits.
-	(rfc2047_encode_word): Escape ??= to avoid some bizarre warning
-	about trigraphs.
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Setup unread count properly, and
-	also setup the url properly.
-
-	* providers/local/camel-maildir-store.c (camel_folder_info_new):
-	Build the path on the folderinfo.
-	(scan_dir): Dont include empty host part in url for folder.
-	(scan_dir): Lookup folder counts for any folders we currenty have
-	open.
-	(scan_dir): If we dont have the folder open, then scan the 'new'
-	and 'cur' folders for new and unread messages to count instead.
-
-	* providers/local/camel-spool-store.c (get_folder_info): If we
-	have this folder open, then set unread from the folder itself.
-	(get_folder_info): Change the INBOX path to not include the
-	leading /.
-
-	* providers/local/camel-spool-folder.c
-	(camel_spool_folder_construct): Fix path.
-	(camel_spool_folder_construct): Properly setup the url field when
-	we say we've got a new folder created.
-
-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Build
-	path on folderinfo.
-
-	* camel-store.c (camel_folder_info_build_path): Prepend / to path.
-
-	* camel-vee-folder.c (camel_vee_folder_construct): Use macro for
-	unmatched folder name.
-	(camel_vee_folder_new): "
-
-	* camel-vee-store.c (vee_get_folder_info): Use macro for unmatched
-	folder name.
-	(vee_delete_folder): "
-	(vee_rename_folder): "
-	(vee_get_folder): Prepend / onto path.
-	(vee_delete_folder): Setup path in folderinfo.
-	(vee_get_folder_info): Fix path in folderinfo.
-
-	* camel-vee-folder.h (CAMEL_UNMATCHED_NAME): New define for
-	unmatched (internal) name.
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-spool-folder.c
-	(camel_spool_folder_construct): And finally here.
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): And here.
-
-	* camel-vee-store.c (vee_get_folder): ANd here too.
-	(vee_get_folder_info): And here.
-
-	* providers/imap/camel-imap-store.c (create_folder): Use
-	camel_folder_info_build() and do better error checking.
-	(subscribe_folder): Set the path on the folder info.
-
-	* camel-store.c (camel_folder_info_build): Set the folder-info
-	path if it hasn't already been set by the caller.
-	(camel_folder_info_free): Free the path.
-
-	* camel-store.h: Added a path member to the FolderInfo type.
-
-2001-09-20  Dan Winship  <danw@ximian.com>
-
-	* camel-charset-map.c (camel_charset_to_iconv): Nuke debug warning.
-
-2001-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c: Updated exception strings to be more clear.
-
-	* camel-pgp-mime.c (pgp_mime_part_sign_restore_part): Stupid
-	mistake, fixes bug #9975.
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Oops, don't fail if
-	`data' isn't a CamelService...cuz it's not supposed to be! It's a
-	CamelTcpStreamSSL object...doh!
-
-2001-09-19    <NotZed@Ximian.com>
-
-	* General cleanup of camel debug printfs.
-	
-	* camel-lock.c (camel_lock_fcntl): Changed to return 'success' if
-	the error indicates file locking isn't supported on this
-	filesystem.  Still return a warning just incase (if its the first
-	time).  Might fix a lot of reported bugs.
-
-	* providers/local/camel-spool-store.c (get_folder_info): Dont
-	include the empty // host part in the uri.  This 'breaks' the
-	service lookup.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Match mailing-list header List-Owner.
-
-2001-09-18    <NotZed@Ximian.com>
-
-	* camel-vee-store.c (vee_get_folder): Fix the uri genereated for
-	the folderinfo for the folder_created event.
-
-	* camel-store.h: Added 'total' to CamelFolderInfo.
-
-2000-09-18    <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-folder.c
-	(camel_maildir_folder_new): If filter inbox is set on the store,
-	and we're opening inbox '', then enable filtering on new messages.
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): After loading the summary, check
-	it, and only abort if that fails.  Also maintain the changes
-	count.
-
-	* providers/local/camel-local-summary.c
-	(camel_local_summary_load): Remove summary_check code from here.
-	(camel_local_summary_check): Sync index/summary here, if we were
-	successful.
-
-	* providers/local/camel-spool-folder.c
-	(camel_spool_folder_new): If we have filter-new-messages-on-inbox
-	set and we just opened inbox, turn on filtering on this folder.
-	(camel_spool_folder_construct): Keep track of changes for the
-	folder, so that filter-new-messages works right (?)
-
-	* providers/local/camel-spool-store.c (get_folder): Pass 'INBOX'
-	as the folder name, not the path.
-
-	* camel-folder-search.c (search_not): Modified patch from
-	<peterw@ximian.com> since the summary is messageinfo's, not
-	strings.
-
-	** Ok so the problem with the stuff below is that maildir/spool
-	'summary_load' throws away all events, including recents, joy eh?
-	
-	* providers/local/camel-maildir-summary.c (maildir_summary_check):
-	Add new messages to the recent changeinfo.
-
-	* providers/local/camel-spool-summary.c: Mark 'new' message as
-	recent, for later processing if required (i.e. 'filter new
-	messages').
-
-	* camel-store.c (construct): new function, cascade up construct
-	method and check for 'filter' param, and set accordingly for any
-	one that might want it.
-
-	* providers/imap/camel-imap-store.c (construct): map the
-	param_filter_inbox flag to the store->flags as
-	CAMEL_STORE_FILTER_INBOX.
-
-	* camel-store.h (CAMEL_STORE_FILTER_INBOX): new flag to tell it to
-	filter inbox.
-
-	* providers/imap/camel-imap-folder.h: Removed do_filtering flag
-	from CamelImapFolder.
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Remove
-	the 'recents' parameter, use the 'changes' parameter instead to
-	convey this info.
-	(camel_imap_folder_changed): Changed for update_summary api
-	change.  Now always just emit the changed event if we have any
-	changes to report, filtering code removed, handled upstream.
-	(filter_proc): 
-	(filter_free): Removed old filtering code.
-	(camel_imap_folder_new): Set the filter_recent flag on the folder
-	if we're the inbox and filtering of inbox is enabled.
-
-	* camel-folder.c (folder_changed): If we have 'recent' messages,
-	and are set to filter recents, then freeze the folder and launch a
-	thread to do the processing (or similar if threading not enabled).
-	(thaw): Make sure we emit the changed signal outside of owning the
-	lock and if things have changed.  Also, no longer bother
-	downgrading folder_changed events to message_changed events.
-
-	* camel-folder.h (struct _CamelFolder): Added filter_recent flag
-	-> signifies all recent messages in folder should be filtered.
-
-	* camel-session.c: (camel_session_thread_msg_new,
-	camel_session_thread_msg_free, camel_session_thread_queue,
-	camel_session_thread_wait): code to handle async operations as
-	part of camel processing.
-	(camel_session_finalise): free thread_lock, destroy thread, active
-	hash, etc.
-	(camel_session_init): init thread, active hash, etc.
-	(camel_session_class_init): Init virtual functions.
-	(session_thread_msg_new, session_thread_msg_free,
-	session_thread_destroy, session_thread_received,
-	session_thread_queue, session_thread_wait): default implementation
-	of session threads stuff.
-
-2001-09-17    <NotZed@Ximian.com>
-
-	* camel-folder.c (camel_folder_change_info_recent_uid): New
-	function to add a 'recent' uid to the change info.
-	(camel_folder_change_info_clear): Clear recent list.
-	(camel_folder_change_info_free): Free recent list.
-	(camel_folder_change_info_new): Setup recent list.
-
-	* camel-folder.h: Added a uid_recent item to the folder_changed
-	event data.
-
-	* providers/local/camel-maildir-store.c (scan_dir): Free new in
-	the right block.
-
-	* providers/local/camel-local-provider.c: Add local config entries
-	to filter on new messages in spool and maildir provider.
-
-	* camel-vee-folder.c (vee_folder_construct): Remove the assertion
-	which stops ? in names from being allowed.
-
-2001-09-18  Dan Winship  <danw@ximian.com>
-
-	* camel-data-wrapper.c (camel_data_wrapper_is_offline): Virtualize
-	this.
-
-	* camel-medium.c (is_offline): A medium is offline if its content
-	object is offline.
-
-	* camel-multipart.c (is_offline): A multipart is offline if any of
-	its subparts are offline.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-charset-map.c: Added korean charset conversion.
-
-2001-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (delete_folder): Don't process
-	the ImapResponse data, we don't want to block forever on data we
-	don't care about...
-	(create_folder): Use get_folders_online() instead of
-	get_folder_info_online().
-
-	* camel-folder.c: Reverted previous changes.
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: Helpful install-exec-hook debugging output
-
-2001-09-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.c (camel_folder_get_uri): New function to get the
-	URI of a folder.
-	(get_uri): Default implementation.
-
-2001-09-14    <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (camel_vee_folder_set_folders): New function,
-	set the complete list of folders on a vfolder, all at once.
-	(camel_vee_folder_set_expression): If we set the query to be the
-	same thing, dont do anything.
-
-	* camel-vee-store.c (camel_vee_store_init): Turn off vtrash for
-	this store.
-
-	* camel-store.c (camel_store_init): Enable vtrash by default via
-	flags.
-	(camel_store_get_trash): REturn NULL if the store doesn't support
-	vtrash.
-	(init_trash): Dont init if store doesn't support vtrash.
-
-	* camel-store.h: Add a new flags CAMEL_STORE_VTRASH -> store
-	supports vtrash.
-
-2001-09-13    <NotZed@Ximian.com>
-
-	* camel-vee-store.c (vee_get_folder_info): Implement.
-	(build_info): Used to build a folder record from the folders
-	hashtable.
-	(vee_delete_folder): Implemented, remove folder from hashtable.
-	(vee_rename_folder): Implemented, remove old folder from
-	hashtable, add new one and rename its guts too.
-
-	* camel-store.c (camel_store_rename_folder): Do nothing if we're
-	not asked to actually change names.  Also dont do the renamed
-	cache check till after we've called the subclass.
-	(camel_store_delete_folder): Call the subclass delete firs,t then
-	make sure the cache is right.
-
-	* camel-vee-folder.c (vee_folder_construct): Remove support for
-	name?query syntax to setup vfolder.  Abort if such syntax is used.
-	(camel_vee_folder_new): Removed code that handles ? syntax, etc.
-	(vee_folder_build_folder): Handle unset expression, treat it as an
-	empty search.
-	(camel_vee_folder_set_expression): Oops, actually set the
-	expression.
-
-	* camel-vtrash-folder.c (camel_vtrash_folder_new): Dont use
-	name?query syntax to setup vfolder, but set the expression
-	directly.  Also fixes a small memleak.
-
-2001-09-12    <NotZed@Ximian.com>
-
-	* camel-store.c (camel_store_delete_folder): Fixed warnings with a
-	cast.
-	(camel_store_rename_folder): "
-
-2001-09-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-url.c (camel_url_set_param): Use g_datalist_set_data_full
-	so that the data will be free'd when we clear the list.
-
-2001-09-14  Dan Winship  <danw@ximian.com>
-
-	* camel-file-utils.c (camel_file_util_encode_string,
-	camel_file_util_decode_string): Don't claim failure when
-	reading/writing the empty string.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: use install hook instead of install rule to
-	guarantee we run after installation
-
-2001-09-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Don't
-	reuse the exception if it has already been set.
-	(camel_filter_driver_filter_message): Same here. Also use the new
-	return value from camel_filter_search_match().
-
-	* camel-filter-search.c (camel_filter_search_match): Return an
-	integer (matched, no-match, or error).
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message): Do
-	error-checking based on function return values rather than
-	exceptions as it's possible for them to be NULL.
-	(mbox_get_message): Same.
-
-	* providers/imap/camel-imap-folder.c (imap_append_offline): Pass
-	an exception to the cache.
-	(imap_append_online): Same.
-	(imap_append_resyncing): Here too.
-	(imap_copy_offline): And here.
-	(handle_copyuid): Pass NULL as the exception here...
-	(parse_fetch_response): And finally here.
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_insert):
-	(insert_setup):
-	(camel_imap_message_cache_insert_stream):
-	(camel_imap_message_cache_insert_wrapper):
-	(camel_imap_message_cache_copy): Take an exception argument and
-	set it on error.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Convert the charset
-	to the iconv-friendly name.
-
-	* camel-charset-map.c (camel_charset_to_iconv): Add code to
-	convert windows-[cp]#### charsets to their iconv-friendly format
-	of cp####.
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): Return -1 on
-	failure.
-
-2001-09-12  Larry Ewing  <lewing@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): free
-	the source url in the nonfailure case.
-
-2001-09-12    <NotZed@Ximian.com>
-
-	* camel-folder-search.h: Change the 'not' virtual method from an
-	immediate e-sexp function to a non-immediate one, which is what it
-	should be.
-
-	* camel-folder-search.c (search_not): Implement a 'not' function
-	ourselves.  If 'not' on a vector value, then not over all items
-	in the summary.
-	(builtings[]): Change the 'not' builtin to be a non-immediate
-	function.
-
-2001-09-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Unref
-	the message info.
-
-2001-09-10    <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-store.c (get_folder_info): Pass in
-	a hashtalbe used for finding visited nodes.
-	(inode_hash): 
-	(inode_equal): 
-	(inode_free): Helper functions for visited node checks, hashes on
-	inode + device number.
-	(scan_dir): Dont re-visited directories we've already visited, use
-	inodes + device number.
-	Also, if the folder doesn't contain cur/tmp/new, mark it as
-	noselect, but continue to recurse folders, if asked.
-
-	* camel-folder.c (move_messages_to): Progress reporting while
-	moving messages.
-
-	* camel-store.c (camel_store_delete_folder): Make sure we remove
-	the folder from our vtrash, if we have it in our opened set, and
-	also remove it from our hashtable.
-	(camel_store_rename_folder): Remove the old folder name from the
-	folder cahce, if it is there.
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-charset-map.c (camel_charset_to_iconv): Get rid of the
-	g_warning, we no longer really need that.
-
-2001-09-10    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_msg_new): Forgot
-	to return the newly allocated msg.
-
-2001-09-08  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-summary.c (spool_summary_sync_full):
-	Likewise.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	Fix the wording.
-
-	* camel-tcp-stream-raw.c (stream_read): Save errno around fcntl
-	call in cancellable read case.  Also, loop while we get EINTR.
-	This might fix some weird reconnect behaviour with pop.
-	(stream_write): "
-
-2001-09-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): #if 0 out the code that
-	was hopefully going to fix bug #5325 because the functions I used
-	seem to have been deprecated. *sigh*.
-
-	* camel-remote-store.c (camel_remote_store_finalise): Disconnect
-	from the service here otherwise the locks will be destroyed and by
-	the time CamelService finalizes we'll crash or hang.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Make sure to
-	unref the mime filters when we finish with them.
-
-2001-09-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	s/Synchronising/Synchronizing/.
-	(mbox_summary_sync_quick): Likewise.
-	(summary_rebuild): s/Summarising/Summarizing/.
-
-2001-09-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-multipart.c (camel_multipart_set_boundary): Take a const
-	char * instead of a char *.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Reuse the
-	original boundary instead of generating our own.
-
-2001-09-06    <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-folder.c (filter_proc): Thread
-	function to perform filtering.
-	(filter_free): Free the filter object.
-	(camel_imap_folder_changed): If we have threads enabled, then
-	queue up a request to perform filtering.  For bug #4422.
-
-	* providers/imap/camel-imap-store.c (camel_imap_msg_new): Create a
-	new 'imap msg'.
-	(camel_imap_msg_queue): Queue an 'imap msg'.
-	(async_received): Handle receiving of imap msg in async thread.
-	(async_destroy): Handle destroying of imap msg.
-	(camel_imap_store_finalize): Destroy thread when done.
-	(camel_imap_store_init): Setup thread.
-
-	* providers/imap/camel-imap-store.h: Added an ethread to the
-	store, for async processing.
-
-2001-09-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-remote-store.c (remote_recv_line): Use
-	camel_stream_buffer_read_line() instead of duplicationing the
-	functionality. Also, the previous way was broken anyway. What if a
-	line was the same length as our buffer? Then we'd go and read a
-	second line and a third and so on until they weren't the same
-	length, leaving \r's in the middle of the buffer.
-
-2001-09-06  Dan Winship  <danw@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_get_response): Fix this
-	to always set an exception if it returns POP3_FAIL, as documented.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):
-	Revert.
-
-2001-09-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):
-	Set an exception on POP3_FAIL as well.
-
-2001-09-06  Dan Winship  <danw@ximian.com>
-
-	* providers/pop3/camel-pop3-provider.c: #ifdef out the "delete
-	after N days" option in pop3_conf_entries, since it won't be done
-	for 1.0.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-remote-store.c (remote_disconnect): Too late to sync the
-	folders here... if this is gonna happen at all it should be done
-	in the provider.
-
-	* camel-service.c (camel_service_finalize): Do a clean disconnect.
-
-2001-08-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-spool-store.c (get_inbox): Return the
-	default folder (ie. INBOX) rather than saying we don't support an
-	inbox.
-
-	* camel-tcp-stream-ssl.c: #include pk11func.h.
-	(ssl_bad_cert): Use CERT_GetDefaultCertDB.
-
-2001-08-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-smime-context.c (smime_sign_prepare): Do the same here as
-	what we did in the pgp code a moment ago.
-	(smime_sign_restore): And again here.
-	(smime_sign): And update thise code to pass in the address of the
-	encodings list when restoring parts.
-
-	* camel-pgp-mime.c (pgp_mime_part_sign_prepare_part): Special-case
-	message/rfc822 mime parts - don't set an encoding on these,
-	instead traverse into their subparts and set the encodings for
-	those.
-	(pgp_mime_part_sign_restore_part): Reverse any operations done to
-	message/rfc822 parts in the above prepare_part() function and also
-	take a pointer to a GSList of encodings instead of just a GSList
-	so we can properly keep track of which encoding we are on.
-	(camel_pgp_mime_part_sign): Pass in the address to the encodings
-	list when restoring parts.
-
-2001-08-29  Not Zed  <NotZed@Ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_sync): Add progress
-	reporting to deleting messages.  Dont change the calculation to a
-	bloody float.  Bug #6189.
-
-2001-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): Initialize buf
-	and diag_buf to NULL, hopefully this fixes the crash if the
-	select() times out.
-	(pgp_encrypt): Argh. What was I thinking? Don't use "-r recipient"
-	as an argument, instead use "-r" and "recipient" as 2 separate
-	arguments to pgp. This might fix the "gpg only encrypts to my
-	private key" bug?
-
-2001-08-28  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (create_folder): Whoops.
-	Double-free and FMR = bad.
-
-	* camel-remote-store.c (remote_send_string): Don't reveal the
-	user's IMAP password if their server supports LITERALPLUS. Also
-	add some more dashes to make it line up nicely :-)
-
-2001-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): If the user accepts the
-	certificate, add it to the database as a trusted CA.
-
-2001-08-28  Peter Williams  <peterw@ximian.com>
-
-	* camel-object.c (camel_object_unref): Make the locking more
-	fine-grained on destruction; specifically, don't hold the
-	type lock while calling the finalize functions.
-
-2001-08-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-provider.c: Changed the
-	description/names of some of the local providers to try and
-	clarify the meanings.
-
-	* providers/pop3/camel-pop3-provider.c: Simplify the POP
-	description - we want short but sweet.
-
-	* providers/imap/camel-imap-provider.c: s/IMAPv4/IMAP
-
-2001-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part-utils.c (convert_buffer): re-read the iconv man
-	page, and treat the return value properly.  It returns the number
-	of non-reversible conversions performed, not the number of output
-	characters, sigh.
-	(check_html_charset): Changed to just take a buffer of data, and
-	not the mime parser.
-	(simple_data_wrapper_construct_from_parser): Since we dont need
-	the charset till we have all the data, search for the charset
-	after we've read the data, if we have html data with no charset in
-	the header.
-	(simple_data_wrapper_construct_from_parser): Remove the
-	seekable_source stuff.
-
-	* Re-apply patches from before.
-
-2001-08-25  Not Zed  <NotZed@Ximian.com>
-
-	["Summarising" and "Synchronising" are spelt with a "s" in
-	ENGLISH]
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):
-	s/Synchronizing/Synchronising/.
-
-	* providers/local/camel-mbox-summary.c (summary_rebuild):
-	s/Summarizing/Summarising/
-
-2001-08-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-disco-diary.c (camel_disco_diary_replay): Use fseek
-	instead of fseeko since we want to be portable and use ftell
-	rather than ftello for the same reason.
-	(camel_disco_diary_empty): Same here.
-
-2001-08-24  Peter Williams  <peterw@ximian.com>
-
-	* Revert Not Zed's previous commits as they apparently can cause
-	serious data loss for POP3 users.
-	
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	["Summarizing" and "Synchronizing" are spelt with a "z" in the
-	default locale, that happens to be "en_US".]
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):
-	s/Synchronising/Synchronizing/.
-
-	* providers/local/camel-mbox-summary.c (summary_rebuild):
-	s/Summarising/Summarizing/
-
-2001-08-24  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part-utils.c (convert_buffer): Limit the maximum
-	output buffer size.  iconv bugs?  returns E2BIG forever on some
-	(valid) data?
-
-	* providers/local/camel-spool-summary.c (summary_rebuild):
-	Likewise.
-
-	* providers/local/camel-mbox-summary.c (summary_rebuild):
-	Summarising is spelt with an s.
-
-2001-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part.c (write_to_stream): If we have rawtext, then
-	dont do any charset conversion, only encoding/crlf conversion.
-
-	* camel-data-wrapper.h (struct _CamelDataWrapper): Added 'rawtext'
-	member, says the character encoding is raw, not utf8.
-
-	* providers/local/camel-spool-summary.c
-	(spool_summary_sync_quick): Synchronising is spelt with an s, not
-	a z.
-	(spool_summary_sync_full): "
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	No, synchronising is spelt with an s.
-	(mbox_summary_sync_quick): "
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Remove the
-	warnings which aren't going anywhere fast.
-	(convert_buffer): Function to convert a bytearray of textual
-	content from one charset to another.  If the charset doesn't exist
-	or fails, then do no conversion.
-	(simple_data_wrapper_construct_from_parser): First, read in data,
-	then try and convert it using the specified charset if supplied.
-	If that fails, then dont do any conversion, and leave as raw.
-	Also, if we have any x-* charsets, then dont do any processing.
-
-2001-08-23  Peter Williams  <peterw@ximian.com>
-
-	* providers/local/camel-mbox-summary.c (summary_rebuild): Add a
-	missing \n to the end of a printf.
-
-	* providers/local/camel-spool-summary.c (summary_rebuild): Same.
-
-2001-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_generate_uids):
-	Oops. Fixed a mis-use of GPtrArray. If we set_size, then using
-	g_ptr_array_add will assume `size' elements have already been
-	initialized and will start appending on to the end.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Turn on --batch and reenable
-	gpg keyserver lookups.
-	(pgp_decrypt): Disable keyserver lookups if we are disconnected.
-
-2001-08-21  Dan Winship  <danw@ximian.com>
-
-	* camel-folder-thread.c
-	(camel_folder_thread_messages_new_summary): Fix the duplicate
-	message check so it doesn't mess up threading when a reply appears
-	in the folder before the message it's a reply to. Fixes bug #3357.
-	(camel_folder_thread_messages_new): Likewise, although I don't
-	think this function is used any more.
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: build a static camel for the addressbook conduit
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	s/Synchronising/Synchronizing/.
-	(mbox_summary_sync_quick): Likewise.  *
-	providers/local/camel-spool-summary.c (spool_summary_sync_full):
-	Likewise.
-	(spool_summary_sync_quick): Likewise.
-
-2001-08-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (create_folder): Get the
-	entire directory structure for the folder we just created, meaning
-	if we created a folder named "test.mailbox" where test didn't
-	previously exist, get the listing for "test" and "test.mailbox".
-
-	* providers/imap/camel-imap-utils.c (imap_parse_folder_name): New
-	function.
-
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* camel-store.h: #include <sys/types.h> for mode_t on freebsd.
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_generate_uids): Make
-	sure the generated UID is non-NULL before appending it to the
-	array of UIDs. How would this even happen? I have no clue...
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Start
-	scanning new messages at maxuid + 1 rather than uidval + 1? Maybe
-	I'm missing the logic, but anyways...this might fix bug #5348.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_keepalive): If we are
-	online and message flags have changed in the current folder, sync
-	the flags else do a NOOP. This fixes bug #4666. Also lock around
-	the NOOP command.
-
-	* providers/imap/camel-imap-folder.c (imap_sync_online): Don't
-	ever send "STORE FLAGS.SILENT ()" since Cyrus imapd doesn't like
-	this (and maybe others too?) so what we'll do instead is to send
-	"STORE -FLAGS.SILENT (\Seen \Answered \Deleted \Marked)" to clear
-	all the flags (since this is in essence what we want to do
-	anyway).
-
-2001-08-16  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect_online): Fix
-	this again. Sigh. Problem of namespace = "" may not yet be
-	completely solved.
-
-2001-08-15  Peter Williams  <peterw@ximian.com>
-
-	* camel-tcp-stream-openssl.c (ssl_error_to_errno): New
-	function. Try to approximate the SSL error into errno.
-	(errlib_error_to_errno): New function, try to approximate
-	OpenSSl's error library's error (ERR_*) into errno.
-	(stream_read): Try to set errno using ssl_error_to_errno.
-	(stream_write): Same.
-	(open_ssl_connection): Same.
-
-	* providers/imap/camel-imap-store.c (imap_connect_online): Oh
-	crap, huge killer typo.
-
-2001-08-14  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect_online):
-	Canonicalize store->namespace to end in store->dir_sep, once both
-	values are known. The %F-related code makes this
-	assumption. Probably fixes a bug reported on the mailing list.
-
-2001-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_get_folder): After talking to NotZed,
-	it turns out I was wrong after all.
-	(store_sync): Create a copy of the folder-cache that owns a ref on
-	each of the folders so that if one of the folders get's finalized
-	inside store_sync(), we don't run into any locking issues. This is
-	mostly meant to solve a problem in IMAP (#6089).
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (delete_folder): Fix a leak.
-
-	* providers/imap/camel-imap-utils.c (imap_namespace_concat): Bleah,
-	handle when namespace = NULL (can happen upon initial open of mailbox.)
-
-	* providers/imap/camel-imap-command.c (imap_command_strdup_vprintf): 
-	Don't crash when %F'ing with an empty folder name and NULL namespace.
-
-2001-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_get_folder): We need to be ref'ing
-	the folder if/when we add it to the hash. This may fix bug #6089?
-	(camel_store_get_folder): Nevermind, reverted the fix.
-	(camel_store_get_folder): No, I wasn't on crack before after
-	all...if we don't ref here, then we're open to a race condition
-	later.
-
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* providers/local/camel-spool-summary.c (summary_rebuild):
-	s/summarising/summarizing/.
-	(summary_rebuild): Likewise.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	s/summarise/summarize/.
-	(mbox_summary_sync_quick): Likewise.
-	(summary_rebuild): Likewise.
-	(mbox_summary_check): Likewise.
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_quote_string): Added an
-	assert - at this point a backtrace would be more useful than a
-	transaction log for debugging.
-
-	* providers/imap/camel-imap-command.c (imap_command_start): Return
-	FALSE here, not NULL.
-	
-	* providers/imap/camel-imap-folder.c (imap_rescan): Don't
-	g_strdup() the uid into the trigger_event call.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):
-	Set the total bytes expected to 0 if the response is empty too.
-	(pop3_refresh_info): Return of there was an error generating pop3
-	uids.
-
-	* camel-mime-utils.c (header_raw_check_mailing_list): regfree the
-	pattern before continue'ing. This was showing up quite a bit under
-	purify.
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_string_generic): A
-	quoted string cannot contain \n's so check for those as well.
-	(imap_atom_specials): Update this to fix bug #6553.
-
-2001-08-08  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-filter-search.c (get_source): Remove trailing stuff from
-	URLs before returning.  (Done in an evil way, not in the good way
-	suggested by fejj. :)) (Bug #4876)
-
-2001-08-08  jacob berkman  <jacob@ximian.com>
-
-	* camel-search-private.c (camel_search_header_match): check for
-	NULL name and addr (fixes a bug i was about to report)
-
-2001-08-08  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-search.c (check_header): Properly determine match
-	type to pass to header_match.
-	(address_matches_exactly): Removed, effectively added to
-	camel_search_header_match.
-
-	* camel-folder-search.c (check_header): Properly determine the
-	match type to pass to header_match.
-
-	* camel-search-private.c (camel_search_header_match): Add a new
-	parameter 'type' which is the type of header we're matching
-	against.  ASIS means utf8 format, ADDRESS means an internet
-	address ('formatted'), ADDRESS_ENCODED means a raw address header,
-	ENCODED means rfc 2047 encoded text.
-	(header_match): Move original logic here, have search_header_match
-	call it as appropriate for the 'type' of match.
-
-2001-08-07  Not Zed  <NotZed@Ximian.com>
-
-	* camel-session.c (camel_session_class_init): Only init the vee
-	provider struct once (if we're subclassed this will get called
-	multiple times).
-
-	* camel-object.c (obj_finalize): Removed a bit of a debug that
-	crept in with jacob's poolv patch (?).
-
-2001-08-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-search.c (address_matches_exactly): New function to
-	do danw's address "is" comparison (as specified in bug #5886.
-	(check_header): Special-case address-type headers when we are
-	doing an exact match to use the address_matches_exactly function.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):
-	Modify to take a headers_only argument which will then only fetch
-	message headers.
-	(pop3_generate_uids): Pass in TRUE for headers_only.
-	(pop3_get_message): Pass in FALSE for headers_only and move the
-	camel_operation() stuff out of get_message_stream and in to here
-	instead.
-	(pop3_generate_uids): We also need to be using i+ 1 as the id
-	since we are starting at 0.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):
-	New internal function to get a message stream by message sequence
-	id (so that we can share code between pop3_get_message and
-	pop3_generate_uids).
-	(pop3_get_message): Use pop3_get_message_stream.
-	(pop3_generate_uids): New function to generate UIDs based on the
-	message - this fixes bug #1256.
-	(pop3_refresh_info): If the server doesn't support UIDL, call
-	pop3_generate_uids to get our list of UIDs.
-
-	* providers/imap/camel-imap-store.c (get_folder_info_online):
-	Don't strstr for noselect=yes, that's just plain broken.
-
-2001-08-06  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_rescan): Fix off-by-one
-	error in cleaning up deleted messages at the end of the folder.
-	Fixes bug #5585 and maybe others.
-
-	* providers/imap/camel-imap-store.c (get_folder_info_online): Do a
-	refresh_info on the selected folder before looking at its unread
-	count. Should fix bug #4944.
-
-2001-08-06  Peter Williams  <peterw@ximian.com>
-
-	Completely hide the namespace from everything external to the IMAP
-	code, which Dan W says is the way it should be.
-	
-	* providers/imap/camel-imap-command.c
-	(imap_command_strdup_vprintf): Add a new %F argument, which is like
-	%S but will add the namespace (for folder names).
-	(camel_imap_command): Use %F here.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):
-	Changed to strip out the namespec when returning *folder. In order
-	to do this we need to be passed the CamelImapStore.
-	(imap_concat): Move to here from camel-imap-store.c, un-static
-	(imap_namespace_concat): New function, adds the namespace to the 
-	folder name, unless it's INBOX.
-	
-	* providers/imap/camel-imap-utils.h: Prototypes.
-
-	* providers/imap/camel-imap-store.c (imap_connect_online): Extra
-	arg to imap_parse_list_response.
-	(imap_connect_offline): Here too.
-	(get_folder_status): Use %F.
-	(get_folder_online): Here too.
-	(delete_folder): Here too.
-	(create_folder): Here too, and arg to imap_parse_list_response.
-	(parse_list_response_as_folder_info): Arg to i_p_l_r.
-	(get_subscribed_folders_by_hand): Use %F.
-	(get_folders_online): Here too.
-	(get_folder_info_online): Instead of checking for NULL @name, check
-	for name = NULL or "", and set to "" instead of namespace. Pass ""
-	instead of namespace to camel_folder_info_build.
-	(subscribe_folder): Use %F.
-	(unsubscribe_folder): Here too.
-
-	* providers/imap/camel-imap-folder.c (imap_get_full_name): This
-	now just returns folder->full_name.
-	(do_append): Use %F
-	(do_copy): Here too.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Always do --no-auto-key-retrieve.
-
-2001-08-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Minor changes to the iconv
-	code so that it does the check in the return value of iconv() just
-	like the code in camel-mime-utils.c in case this fixes Bo Rosen's
-	gpg bugs (but I doubt this will change anything?).
-
-2001-08-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): First
-	check to make sure that service->url->authmech is non-NULL before
-	passing it into strcmp to avoid a segfault.
-
-	* camel-pgp-context.c (pgp_decrypt): Sigh, if gpg returns '1' it
-	means that the key is bad but it did succeede in decrypting the
-	block so to make users happy (even though I find this a
-	questionable action) we are going to ignore the error and show it
-	to the user anyway. This fixes bug #6136.
-
-2001-08-03  Not Zed  <NotZed@Ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): special
-	case popb4smtp auth before we try and connect, and do the magic
-	here first.
-
-2001-08-02  Not Zed  <NotZed@Ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Check for
-	POPB4SMTP separate to the esmtp auth list.
-	(smtp_auth): If creating the sasl object means it is
-	already authenticated, then exit early.  Sort of 'clean hack' to
-	help popb4smtp work.
-	(smtp_auth): Unref the sasl object, clean up a memleak i think.
-
-	* providers/smtp/camel-smtp-provider.c
-	(camel_provider_module_init): Added POPB4SMTP auth type.
-
-	* camel-sasl.c (camel_sasl_authtype): Added POPB4SMTP type.
-
-	* camel-sasl-popb4smtp.c: New file for pop before smtp
-	'authentication'.
-
-	* Makefile.am (libcamel_la_SOURCES, HEADERS): Add
-	camel-sasl-popb4smtp.[ch].
-
-2001-08-01  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-mbox-folder.c (mbox_lock): If we fail to
-	get the lock, make sure we close our locking fd, and reset it.
-	Fixes the crash part of 5095.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Slightly re-arranged filter/change notification logic.  If we;re
-	filtering, freeze the folder till we're finished to smooth the ui
-	for new mail.
-
-2001-07-31  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder.c (camel_folder_init): Chagned mutexes to
-	e_mutexes, folder lock recursive.  This fixes the imap filtering
-	bug, or at least some cases of it.
-	(camel_folder_finalize): Free mutexes.
-
-	* camel-private.h (CamelFolderPrivate): Changed mutexes to
-	e_mutexes.
-
-2001-07-25  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder.c (camel_folder_change_info_*): Change the
-	return if fail's into asserts.
-	(camel_folder_change_info_free): Don't let it accept a NULL
-	argument.  This isn't g_lib so we dont have to.
-
-2001-07-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_param): Fix the fix that fixes
-	broken mailer behavior. We want to make sure that the user's
-	locale charset is non-NULL before we pass it off to
-	iconv_open(). If it *is* NULL, we want to use iso-8859-1.
-
-2001-07-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-url.c (camel_url_free): Allow the url to be NULL just like
-	the libc free convention.
-
-2001-07-26  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command_start):
-	Send an IMAP command, but don't wait for responses.
-	(camel_imap_command_response): Read a single line of response from
-	the server.
-	(camel_imap_command, etc): Reimplement in terms of the new code.
-
-	* providers/imap/camel-imap-folder.c (imap_rescan): Use
-	camel_imap_command_start and camel_imap_command_response, and
-	call camel_operation_progress after each line read from the
-	server.
-	(imap_update_summary): Likewise, although with more fudging on the
-	precentages... Also, fix this so that if none of the new messages
-	are cached, it only does a single FETCH, and if some of them are
-	cached, it does two FETCHes (one to get the UIDs, FLAGS, and
-	SIZEs, and another to get the bodies of all of the messages that
-	aren't cached now that it knows the relevant UIDs). This should
-	speed up startup a bunch (especially if you have high bandwidth
-	but also high latency to the IMAP server).
-
-2001-07-25  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-utils.c (mail_mlist_magic): Add another Sender
-	pattern.
-
-2001-07-24  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Change the break into a continue, we should process as many as we
-	can find.
-
-	* camel-folder.c (camel_folder_move_messages_to): If we have no
-	uid's to copy, exit here before going any further.  Some code
-	internally [imap] assumes there are uids to copy otherwise it can
-	segfault.
-	(camel_folder_copy_messages_to): Same.
-
-2001-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_param): Handle broken mailers
-	that send unencoded 8bit header params. And there was much
-	rejoicing. Rah.
-
-	* camel-url.h (CAMEL_URL_HIDE_ALL): New #define, and there was
-	much rejoicing. Rah.
-
-2001-07-24  Not Zed  <NotZed@Ximian.com>
-
-	* camel-operation.c (camel_operation_register, unregister): Added
-	some warnings for bad cases.
-
-2001-07-23  Not Zed  <NotZed@Ximian.com>
-
-	* camel-operation.c (camel_operation_register): Only insert a hash
-	entry if we haven't already.
-	(camel_operation_unregister): Only remove the has entry if the id
-	is a real thread.
-
-2001-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_move): Slight fix for when source ==
-	destination (we don't want to do this action because on-demand
-	filtering would then delete the messages it supposedly "moved").
-
-2001-07-23  Not Zed  <NotZed@Ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth, smtp_helo,
-	send_to): Added some operation progress reporting.  Actual data
-	transfer is 'tricky' because of the layers used.
-	(smtp_auth): Instead of checking exception_is_set, use
-	challenge==NULL to test if sasl_challenge_base64 failed.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): Remove
-	peters changes below and put in a better fix.  These functions
-	already return -1 on error, just use that, and not worry about
-	building our own exception redundantly.
-
-	* camel-service.c (camel_get_host_byname): Turn the progress into
-	a transient event.
-
-2001-07-20  Peter Williams  <peterw@ximian.com>
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): More
-	usage fixes for CamelException. Check our own exception for
-	summary_update and xfer it out if an error occurred.
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* Pull up test fixes to get them building again
-
-2001-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* camel-charset-map.c (camel_charset_get_iconv_friendly_name):
-	renamed to camel_charset_to_iconv() to make it just a little more
-	consistent and not so long & fixed callers.
-
-2001-07-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-filter-charset.c
-	(camel_mime_filter_charset_new_convert): Convert to the
-	iconv-friendly charset names.
-
-	* providers/imap/camel-imap-store.c (create_folder): Fixed a
-	compiler warning about returning without a value in a non-void
-	function. Blah.
-
-	* camel-mime-part.c (process_header): Pass the locale charset as
-	the default_charset to header_decode_string().
-
-	* camel-folder-summary.c (camel_folder_summary_format_string):
-	Pass the locale charset as the default_charset to
-	header_decode_string().
-	(content_info_new): Same.
-
-	* camel-mime-message.c (process_header): Pass the locale charset
-	as the default_charset to header_decode_string().
-
-	* camel-mime-utils.c (append_8bit): New helper function who's
-	purpose is similar to append_latin1() but for 8bit text that we
-	are assuming is not latin1.
-	(header_decode_text): Now takes a default_charset parameter and
-	calls append_8bit when appropriate.
-	(header_decode_string): Also takes a default_charset parameter
-	now.
-	(header_decode_mailbox): Pass NULL as the default_charset to
-	header_decode_string().
-
-2001-07-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Modified to treat the return
-	value from camel_charset_locale_name() as a const char*.
-
-	* camel-sasl-digest-md5.c (digest_response): Modified to treat the
-	return value from camel_charset_locale_name() as a const char*.
-
-	* camel-charset-map.c (camel_charset_locale_name): Modify to
-	return const char* by returning the static locale_charset which is
-	created inside of camel_charset_map_init().
-	(camel_charset_map_init): Find the locale charset here and set the
-	static variable.
-
-2001-07-19  Peter Williams  <peterw@ximian.com>
-
-	Policy change: NULL url's are no longer allowed in
-	CamelFolderInfos. They used to signify that the folder was, in
-	IMAP jargon, NoSelect; now the same effect is achieved by adding a
-	"noselect=yes" parameter to the end of the URL. As far as I know,
-	IMAP is the only affected provider.
-	
-	* providers/imap/camel-imap-store.c (delete_folder): New
-	function. Implement folder deletion.
-	(camel_imap_store_class_init): Set the delete_folder class
-	function here.
-	(get_folder_status): New function. Utility wrapper around the
-	STATUS command.
-	(create_folder): If the parent folder is NoSelect but is empty,
-	delete it and recreate it as a a subfolder-containing folder. If
-	it is NoSelect but contains messages, set an exception.
-	(parse_list_response_as_folder_info): Always set the FolderInfo's
-	URL, but add a NoSelect parameter if it isn't selectable.
-	(get_folder_info_online): Change logic of removing the namespace
-	to reflect URL change. Same for logic of checking unread counts.
-	(get_folder_info_online): Use get_folder_status to simplify this.
-
-	* camel-store.c (camel_folder_info_build): When creating dummy
-	parents, copy the child's URL and set the NoSelect parameter.
-
-2001-07-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): No need for
-	`acharset' anymore.
-	(check_html_charset): Return a const char* and also use
-	camel_charset_get_iconv_friendly_name() internally.
-
-	* camel-mime-utils.c (rfc2047_decode_word): Remove my iso8859-1 ->
-	iso-8859-1 hack and use camel_charset_get_iconv_friendly_name()
-	instead.
-	(rfc2184_decode): Use camel_charset_get_iconv_friendly_name()
-
-	* camel.c (camel_init): Call camel_charset_map_init().
-
-	* camel-charset-map.c (camel_charset_map_init): New function to
-	initialize the charset-equivalent lookup table. To be called by
-	camel_init().
-	(camel_charset_get_iconv_friendly_name): New function to try and
-	convert a charset into something that iconv is more likely to
-	accept.
-
-2001-07-19  Peter Williams  <peterw@ximian.com>
-
-	* Revert 7/11/2001 patch for IMAP INBOX filtering at NotZed's 
-	request.
-
-2001-07-17  Peter Williams  <peterw@ximian.com>
-
-	Clean up some exception misusage.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Use
-	our own internal exception for sending the string and transfer it
-	to @ex if anything goes wrong.
-	(imap_read_response): Use our own internal exception for reading
-	the untagged responses and blah blah blah.
-
-	* camel-session.c (get_service): Use our own internal exception
-	when constructing the service and transfer it to @ex if anything
-	goes wrong.
-
-	* camel-remote-store.c (remote_recv_line): Instead of having
-	gboolean exception, use our own internal exception and copy
-	it to @ex if anything goes wrong.
-
-	* camel-store.c (store_sync): Create an internal exception
-	because sync_folder() checks it for validity. Transfer it to
-	@ex when done.
-
-	* camel-exception.c (camel_exception_get_description): If @ex is
-	NULL, complain - passing NULL exceptions to Camel is okay, but
-	there should be no circumstances under which they're then
-	examined.
-	(camel_exception_get_id): Same here,
-	(camel_exception_xfer): NULL-protect and warn if transferring from
-	a NULL exception.
-	
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (init_trash): Use CAMEL_VTRASH_NAME.
-
-	* camel-vtrash-folder.h: #define CAMEL_VTRASH_NAME
-
-2001-07-16  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_response_free):
-	Given:
-		* 4 EXISTS
-		* 1 EXPUNGE
-	We have to pass 3, not 4 to camel_imap_folder_changed for the
-	exists count. Fixes ximian bug #2112 (finally!).
-
-2001-07-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	If the message info for an expunged message is NULL, then just
-	break out - maybe a message was expunged that we were never
-	notified even existed?
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): Added a hack to
-	convert charsets in the format iso8859-1 to iso-8859-1 because it
-	seems to be more iconv friendly. It has been reported that on some
-	systems, iconv doesn't know about iso8859-1 while it *does* know
-	about iso-8859-1. See bug #4530.
-
-2001-07-13  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (install-exec-local): Let people install as
-	non-root, but give them a bigass warning so they're not allowed to
-	complain when it doesn't work right.
-
-	* camel-remote-store.c (sync_remote_folder): New function: hash
-	table callback.
-	(remote_disconnect): If cleanly disconnecting, sync our
-	folders. Fixes deadlocks on exit (folders syncing after store
-	disconnects) and also makes sense.
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-uid-cache.c (camel_uid_cache_new): We now use a structure
-	as the bucket data rather than just a cache level so set the save
-	state to TRUE.
-	(maybe_write_uid): We only save the uid if the cache levels are
-	the same *and* if the save state is TRUE.
-	(free_uid): Free the state value.
-	(camel_uid_cache_get_new_uids): New uids that get added to the
-	cache start with a save state of FALSE.
-	(camel_uid_cache_save_uid): Set the save state of the uid to
-	TRUE. What should we do if the uid isn't already in the cache?
-	Currently I make it add the uid, but maybe it shouldn't?
-
-	* providers/imap/camel-imap-folder.c (imap_filter_timeout): Update
-	to reflect CamelFilterDriver API changes.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Take
-	a cache argument so we can tell the cache whether or not the uid
-	should be saved (meaning we have successfully filtered it).
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Okay, I've decided that that user is just on crack. We don't want
-	to allow filtering of deleted messages or we could get some
-	unexpected behavior.
-	(do_move): Oops. My last fix needs to be after the if-statement,
-	not inside it.
-	(do_copy): And here too.
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_move): Only set p->copied and
-	p->deleted if the messages are copied without an exception.
-	(do_copy): Same - but obviously we don't set the p->deleted here
-	at all.
-	(camel_filter_driver_filter_message): Since users complained that
-	they couldn't filter deleted messages for "safe keeping" (WTF?
-	safe keeping? why were they deleted in the first place then??), I
-	have taken out the code that optimized filtering by not allowing
-	deleted messages to be filtered. This fixes bug #4473.
-
-	Note: Users have a warped sense of logic.
-
-2001-07-12  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part-utils.c (extract_metatag_charset): Removed.
-	(check_html_charset): Replaced with this.
-	(simple_data_wrapper_construct_from_parser): Call
-	check_html_charset if we dont have a charset on the content-type,
-	and we have text/html data.
-	(check_html_charset): We also need to do qp/base64 decoding
-	ourselves, sigh.
-
-	* camel-mime-utils.c (html_meta_param_list_decode): Removed.  This
-	was very wrong, the rules for mail headers vastly different from
-	rules for decoding html elements.
-	(rfc2184_decode): Move the malloc inside the iconv_open worked,
-	otherwise we have a memleak.
-
-	* camel-mime-filter-html.c (camel_mime_filter_html_finalize, init,
-	run, reset): Changed to use camelhtmlparser, and fixed a tiny
-	memleak.
-
-	* camel-html-parser.c: Made the html indexer tokeniser re-usable.
-	ONLY TO BE USED INTERNAL TO CAMEL HOWEVER.
-	(tokenise_step): Slight fix to non-quoted values.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_info_new_from_message): Removed some code i
-	wasn't supposed to commit.
-
-	* providers/local/camel-local-summary.c (local_summary_add): Only
-	set info->size if it is not zero.
-	(local_summary_add): If we dont get a size from the info passed
-	in, calculate it using a null stream write.  Should do #4392.
-
-2001-07-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c (extract_metatag_charset): New function
-	to extract a meta-tag charset value if it exists.
-	(simple_data_wrapper_construct_from_parser): Along the same lines
-	as the code I previously ripped out, but this time use the
-	mime-parser's seek ability to help us along. Currently I read up
-	to a 2k buffer size - this is probably overkill, 1k is probably
-	plenty.
-
-	* camel-mime-utils.c (html_meta_param_list_decode): When we get to
-	an `=', we must skip past it before trying to grab the param
-	value. duh.
-
-2001-07-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Ripped out my code
-	since it was never being used since the mime parser is not using a
-	seekable stream (ever?) which pretty much means my code needs to
-	be done someplace else.
-
-2001-07-11  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed): 
-	Run the filter in its own thread to prevent locking issues.
-	(imap_filter_timeout): New function that does the filtering called
-	as a CamelSession timeout.
-
-2001-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Create
-	the messageinfo itself, so we can properly set the size.
-
-	* camel-movemail.c (camel_movemail_solaris): Write out the from
-	line between each message.
-
-2001-07-10  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-local-summary.c (local_summary_add): Copy
-	the size across from the source message info if supplied.
-
-	* camel-stream-null.c: Added a 'written' member which keeps track
-	of how much has been written to the stream.
-
-	* camel-movemail.c (camel_movemail): If we have BROKEN_SPOOL
-	defined, then use the solaris movemail to quote from lines that
-	sendmail didn't.
-	(camel_movemail_solaris): Compile this in if BROKEN_SPOOL defined.
-
-2001-07-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (html_meta_param_list_decode): New function
-	to parse an HTML meta-tag.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): If the Content-Type
-	did not contain a charset parameter and it's also a text/html
-	part, we have 1 last place to look - in the META html tags. *sigh*
-
-	* camel-mime-message.c (camel_mime_message_get_source):
-	s/gint/unsigned since that's what it should be.
-
-2001-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_sign): Forget the passphrase if the
-	user has set that option.
-	(pgp_clearsign): Same.
-	(pgp_encrypt): And here...
-	(pgp_decrypt): And finally here.
-	(camel_pgp_context_new): Take a `remember' argument.
-
-2001-07-09  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_sync):
-	Oops, e_poolv_set free's it for us, so dont double-free here.
-
-2001-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (camel_vee_folder_finalise): Changed so we
-	dont have the list changing under us, just going to the next node
-	before we call a function that might change the list is
-	potentially dangerous (slight mod of peters fix).  Hmm, i think it
-	would've double-unref'd it too(?)
-
-2001-07-08  Chris Toshok  <toshok@ximian.com>
-
-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):
-	openssl_table is gone.  we now store/get the stream from the
-	SSL_CTX's app_data.
-	(stream_read): rework the non-blocking case to account for SSL
-	possibly buffering data (in which case select will block even
-	though data is ready to be read), and to account for FreeBSD's
-	strange behavior of returning -1/EAGAIN even though select said
-	the fd was ready to be read.
-	(ssl_verify): openssl_table is gone.
-	(open_ssl_connection): set the SSL_CTX's app_data to be the
-	stream, remove the openssl_table code.
-
-2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_encode_param): Don't allow in to be
-	NULL, so instead of doing if (in == NULL) return;, make it a
-	g_return_val_if_fail and later we can make it an assert or
-	something.
-
-	* providers/local/camel-maildir-store.c (get_inbox): Fixes bug
-	#1138.
-
-	* providers/local/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): Make the `day-of-month' digit
-	take up 2 chars by using "%2d". Fixes bug #3989 for lame mailers
-	like Pine.
-
-	* camel-pgp-context.c (crypto_exec_with_passwd): Set the pipe fd's
-	to nonblocking.
-
-2001-07-06  Peter Williams  <peterw@ximian.com>
-
-	* camel-object.c (camel_object_unref): Make sure that after the
-	finalization event has happened and the finalization functions
-	have been called that the object still has a zero refcount.
-
-2001-07-06  Joe Shaw  <joe@ximian.com>
-
-	* providers/nntp/camel-nntp-grouplist.c: Add locking to
-	camel_nntp_get_grouplist_from_server().
-
-	* providers/nntp/camel-nntp-resp-codes.h: Added
-	NNTP_EXTENSIONS_SUPPORTED (202).
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_get_extensions):
-	Check for both NNTP_LIST_FOLLOWS and NNTP_EXTENSIONS_SUPPORTED from
-	a LIST EXTENSIONS request. (Dunno if NNTP_LIST_FOLLOWS ever comes
-	out of this, but that's what was already there...) Also, put some
-	locking around it.
-	(finalize): e_mutex_destroy() the command lock
-	(camel_nntp_store_init): e_mutex_new() the command lock.
-
-	* providers/nntp/camel-nntp-store.h: Add locking macros.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (camel_message_info_string): Added an
-	assert to make sure that `mi' isn't NULL.
-	(camel_message_info_set_string): Same.
-
-	* providers/imap/camel-imap-command.c (camel_imap_response_free):
-	Create and use a temporary CamelException for use with
-	camel_imap_folder_changed.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Send the
-	--no-auto-key-retrieve argument to gpg if we are in offline mode
-	so that we don't have to worry about gpg hanging if it can't
-	connect to the key servers, because now it shouldn't even attempt
-	to.
-
-2001-07-05  Chris Toshok  <toshok@ximian.com>
-
-	* camel-tcp-stream-openssl.c (ssl_verify): use
-	X509_STORE_CTX_get_ex_data to get at the SSL* - don't use the
-	X509_STORE_CTX to look up our stream, since it's not what we used
-	to insert our stream into the hashtable.
-	(open_ssl_connection): insert the stream into the hashtable before
-	calling SSL_connect, as this can cause ssl_verify to be called,
-	and we need to look up the stream there.  remove the stream from
-	the hashtable if there's an error connecting.
-	(stream_connect): pass the CamelTcpStreamOpenSSL* to
-	open_ssl_connection since it handles the hashtable stuff.  remove
-	hashtable stuff from here.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.c (camel_folder_copy_messages_to): if source ==
-	dest, just no-op.
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* camel-vee-folder.c (camel_vee_folder_finalise): Move this before the
-	camel_vee_folder_remove_folder because that function modifies p->folders
-	messing up our iteration.
-	(camel_vee_folder_finalise): Don't unref our summary; camel-folder now
-	does this.
-
-	* camel-object.h (CamelObject): Add a 'destroying' flag to CamelObject.
-
-	* camel-object.c (obj_init): Clear 'destroying'.
-	(camel_object_unref): If 'destroying' then do not send the finalize
-	event and do not call finalize functions. Otherwise, set destroying
-	so just in case we get refed (eg event code) we don't get doubly
-	finalized.
-
-2001-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-filter-basic.c (filter): Fix the assertion slightly,
-	if we have a little bit of input the output size could be larger,
-	since we store upto 3 chars in the state.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_info_new_from_message): When indexing a new
-	record, create a pseudo word 'ibexindexed' so we can always tell
-	that a message has already been idnexed, even if it contains no
-	words of its own.  Things like maildir use this check to see if
-	its already been processed, and it matters if it is incorrect in
-	this case (not just wasted cycles).
-	(camel_message_info_dup_to): Assign the to->strings from the
-	e_poolv_cpy() call, since it may allocaote a new poolv if the
-	lengths do not match.
-
-	(camel_folder_summary_info_new_from_parser): And same here.
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_sync):
-	Changed the logicfor epoolv code to be different, we dont need to
-	update hash references or any tricky stuff.
-	(maildir_summary_check): Samehere.
-
-	* camel-folder-summary.h: Removed include of e-memory.h.
-
-2001-07-03  Joe Shaw  <joe@ximian.com>
-
-	* providers/nntp/camel-nntp-resp-codes.h: Added NNTP_NO_PERMISSION
-	(502) to the list of response codes.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_connect): If we
-	receive a NNTP_NO_PERMISSION, don't get into an infinite loop trying
-	to reconnect, get extensions, etc. Just give up and return FALSE.
-
-2001-07-03  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_clear): Doh. Don't remove things from
-	the hash table while foreach'ing it. (And can't use foreach_remove
-	either because we have to remove them in a weird order). Fixes
-	#3618.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): If the
-	server returns OK from the FETCH BODY, but there's no parseable
-	BODY response, it's probably because there's an UN-parseable BODY
-	response, implying the message is badly formatted, MIMEwise. In
-	that case, fall back to fetching the message as a single part.
-
-2001-07-02  Sam Creasey <sammy@oh.verio.com>
-
-        * providers/nntp/camel-nntp-folder.c: Implemented
-        nntp_folder_search_by_expression and
-        nntp_folder_search_free.  Basic search functionality e.g. unread
-        marking now works for NNTP folders.
-
-        * camel_filter_search.c (get_size): Added get-size sexp directive
-        to get the size of a message for filters.
-
-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new):
-	Always check with the NNTP server after summary load -- this
-	function now always expires old summary entries and syncs with
-	the news server.
-
-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):
-	Only fetch headers for articles not already logged in 
-	the summary file.
-	
-	* providers/nntp/camel-nntp-grouplist.c 
-	(camel_nntp_get_grouplist_from_*): change from g_list_append()
-	to g_list_prepend() + g_list_reverse.  Traversing 40,000 
-	element linked lists sucks.
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command):
-	Should the NNTP connection die with 
-	CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED, make a single retry 
-	attempt.  Timing out the NNTP link is less painful this way.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* README (Introduction): Add comment noting that Camel actually
-	exists now :-)
-
-2001-07-02  Dan Winship  <danw@ximian.com>
-
-	* camel-session.c (camel_session_get_filter_driver): new method to
-	get an application-initialized filter driver.
-
-	* camel-filter-driver.c (camel_filter_driver_new): Remove the
-	get_folder function and data args from here...
-	(camel_filter_driver_set_folder_func): ...and add this function to
-	set/change them.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): If
-	this folder is INBOX and we're filtering INBOX, set a flag on the
-	folder for later.
-	(imap_update_summary): Add another argument (GPtrArray *recents),
-	and if it's non-NULL, add the uids of any \Recent new messages to
-	it.
-	(camel_imap_folder_changed): If doing filtering in this folder,
-	create a recents array and pass it to imap_update_summary. Then
-	get a filter driver and use it to filter the recent messages.
-
-	* providers/imap/camel-imap-summary.h: 
-	* providers/imap/camel-imap-utils.c (imap_parse_flag_list): Add
-	support for the \Recent flag.
-
-	* providers/imap/camel-imap-provider.c (imap_conf_entries): enable
-	the "filter" option.
-
-	* camel-types.h: add CamelFilterDriver typedef here
-
-2001-07-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-lock-client.c (camel_lock_helper_init): properly return
-	error if we can't create pipes.
-
-	* camel-folder-summary.c (summary_build_content_info): re-enable
-	html indexing.
-
-	* camel-mime-filter-html.c: Completely re-implemented using a
-	custom parser.
-
-2001-07-02  Dan Winship  <danw@ximian.com>
-
-	* tests/misc/url.c (main): Change a camel_exception_clear to
-	camel_exception_init to fix a sometimes-crash
-
-2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Added Originator: header as a header to look
-	for when looking for the mailing list.
-
-	* tests/mime-filter/Makefile.am: Build the test-crlf test program.
-
-	* tests/mime-filter/test-crlf.c: New test suite for the crlf
-	filter.
-
-	* camel-mime-filter-crlf.c (filter): Fixed to correctly encode and
-	decode dots.
-
-2001-06-28  Peter Williams  <peterw@ximian.com>
-
-	* camel-mime-filter-stripheader.c: New file. Filter that strips a
-	header from mime output.
-
-	* camel-mime-filter-stripheader.h: New file. Header for the above.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the
-	stripheader filter to remove the "Bcc" header.
-
-	* Makefile.am: Add the stripheader files.
-
-	* tests/lib/Makefile.am (INCLUDES): Get this to compile again.
-
-	* tests/mime-filter/test-stripheader.c: New file. Test suite for
-	the CamelMimeFilterStripHeader.
-
-	* tests/mime-filter/Makefile.am: New test section: mime filters.
-
-2001-06-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_param_list): Fix a memory
-	leak. Also if the decoded value is NULL, that means it wasn't
-	encoded so we don't want to toss the old value.
-	(header_param_list_format_append): Correctly wrap long parameter
-	values according to rfc2184.
-
-2001-06-28  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): If the
-	folder is frozen, don't refresh, just record that we need to do it
-	later.
-	(imap_append_online): If the APPEND doesn't trigger an immediate
-	EXISTS response (because the folder isn't the selected folder, or
-	because the server doesn't do that until the next command), call
-	imap_refresh_info on the folder.
-	(imap_copy_online): Likewise. (Replacing the unconditional NOOP
-	that was there before, which absolutely killed filter performance
-	by forcing the IMAP provider to switch back and forth between
-	folders after every copy or move.)
-	(imap_thaw): If the folder needs a refresh, do it.
-
-	* camel-folder.c (camel_folder_is_frozen): New method
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-transport.c (camel_transport_init): Initialize the private
-	send_lock.
-	(camel_transport_finalize): Free the private send_lock.
-	(camel_transport_get_type): Set the init and finalize functions.
-	(camel_transport_send): Lock the transport.
-	(camel_transport_send_to): Same.
-
-	* camel-private.h: Add CAMEL_TRANSPORT_(UN)LOCK macros.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* tests/folder/test9.c (main): Updated to match the current API.
-
-	* tests/folder/test3.c: #include <gtk/gtk.h> since we use
-	gtk_init().
-
-	* camel-internet-address.c
-	(camel_internet_address_encode_address): Use the new
-	header_address_fold.
-
-	* camel-mime-utils.c: Removed some old #if 0'd code of mine.
-	(rfc2047_encode_word): If enclen is 0, don't write an encoded word
-	token (=?iso-8859-7?Q??= would be an invalid token).
-	(header_address_fold): New function to wrap address headers -
-	header_fold() was force-wrapping rfc2047 encoded words which was
-	making the test suite fail. The *real* solution, however, is to
-	not create rfc2047 encoded words longer than 72 chars.
-
-2001-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (open_folder): Since we want an error
-	opening a folder to result in the message being copied to Inbox
-	(assuming no other filters get a chance to `move` it), don't
-	record any exceptions that may occur in this function.
-
-2001-06-26  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected,
-	imap_append_offline, imap_append_online,
-	camel_imap_folder_changed): lock the cache around accesses
-
-	* providers/imap/camel-imap-store.c (get_folder_online): ref the
-	newly-created folder (as current_folder) before calling
-	camel_imap_folder_selected, in case that needs to do something
-	that causes another folder to become current...
-
-	* camel-service.c (camel_service_get_url): D'oh.
-	s/FALSE/CAMEL_URL_HIDE_PASSWORD/
-
-2001-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-search.c (get_source): g_strdup() the message
-	source here or we will have problems later when we go to free the
-	result ;-)
-
-2001-06-25  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (try_auth): Fix this: IMAP
-	doesn't allow an extra argument to AUTHENTICATE to avoid a useless
-	round trip like some other SASL bindings do.
-
-	* providers/imap/camel-imap-command.c (imap_read_response): Deal
-	with IMAP servers that (incorrectly) return "+\r\n" rather than
-	"+ \r\n" for an empty continuation response.
-	(camel_imap_response_extract_continuation): Likewise.
-
-2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (word_types_compatable): New function that
-	decides if 2 word types are mergeable. An atom and a qstring are
-	mergeable; 2 qstrings are mergeable; and 2 encoded words are
-	mergeable.
-	(header_encode_phrase_merge_words): If 2 words are merged, the new
-	word type is the MAX of the combined types. This means that if we
-	merge a qstring and an atom, the resulting word type is a
-	qstring.
-
-	* camel-internet-address.c (internet_format):
-	s/g_string_sprintfa/g_string_append since this makes more sense in
-	this particular case.
-	(internet_encode): Same here.
-
-2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_send): Use
-	camel_address_length() rather than casting and accessing data
-	members.
-
-2001-06-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_raw_check_mailing_list): If the first
-	char of the mailing-list name is '<', chop it off to make Ettore
-	happy. Fixes bug #2153.
-
-2001-06-19  Not Zed  <NotZed@Ximian.com>
-
-	* camel-lock-helper.c (unlock_id): Fixed a bug when not running
-	setuid it wouldn't unlock.
-
-	* camel-movemail.c (camel_movemail): use new
-	locking daemon, also return an error code.
-
-2001-06-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Note: Except for the info_free(), the NULL checks are
-	g_return's. I felt that since g_free() handles NULL that our
-	_free() functions should also.
-	
-	* camel-folder.c (camel_folder_change_info_free): Check to make
-	sure that the info pointer isn't NULL.
-	(camel_folder_change_info_change_uid): Same.
-	(camel_folder_change_info_changed): Same.
-	(camel_folder_change_info_remove_uid): Same.
-	(camel_folder_change_info_add_uid): Same.
-	(camel_folder_change_info_build_diff): Same.
-	(camel_folder_change_info_cat): Same.
-	(camel_folder_change_info_add_source): Same.
-	(camel_folder_change_info_add_source_list): Same.
-	(camel_folder_change_info_add_update): Same.
-	(camel_folder_change_info_add_update_list): Same.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* tests/stream/Makefile.am (LDADD): 
-	* tests/smime/Makefile.am (LDADD): 
-	* tests/misc/Makefile.am (LDADD): 
-	* tests/message/Makefile.am (LDADD): 
-	* tests/folder/Makefile.am (LDADD): Remove DB3_LDADD
-
-	* Makefile.am (install-exec-local): Set camel-lock-help setgid or
-	setuid as needed
-
-2001-06-18  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-summary.c
-	(camel_folder_summary_info_new_from_parser): Only create a missing
-	uid if we have indexing turned on.
-
-	* camel-lock-helper.c (setup_process): Function to setup
-	process/sanity/security checks.  Change to the real uid as soon as
-	we can.
-	(lock_path): First try to lock as the real uid, if that fails, try
-	the root uid.
-	(unlock_id): Unlock as the uid we created the lock as.
-
-	* Makefile.am (INCLUDES): Added -DCAMEL_SBINDIR for lock helper
-	location.
-
-	* providers/local/camel-spool-folder.c (spool_lock): Implemented,
-	using lock helper locking.  Need to work out if the locking
-	requires a root created lock?
-	(spool_unlock): Likewise.
-
-2001-06-15  Not Zed  <NotZed@Ximian.com>
-
-	* camel-lock-helper.c: Setuid Lock helper process.  Creates and manages
-	.locks, keeping them active, removing them, etc.  What real perms it
-	needs is a little system dependent.
-
-2001-06-14  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-store.c (get_folder_info): Implement.
-	(scan_dir): Does the work of scanning for maildir directories.
-
-2001-06-13  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-store.c (get_folder_info):
-	Implemented, just returns a hardcoded INBOX folder.
-	(free_folder_info): implemented, free's the 1 possible level of
-	folder info.
-
-	* providers/local/camel-spool-folder.c
-	(camel_spool_folder_construct): Set the real unread message
-	count on the folder_created thing.
-
-2001-06-15  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_max_uid): Return the largest real UID in
-	the cache (as an integer). Eventually to be used for an
-	optimization in the new-message fetch code.
-	(cache_put): Keep track of max_uid.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Added Mailing-List header regex so that we
-	can do mlist magic on that header.
-
-2001-05-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_param): Properly handle
-	correct and incorrect (for the common case, ie Outlook and
-	Netscape/Mozilla) rfc2184 values.
-	(header_decode_rfc2184_param): Get the param name and see if we
-	should expect a rfc2184 parameter value.
-	(rfc2184_decode): Decode a rfc2184 value.
-	(hex_decode): hex decode a string.
-	(header_decode_param_list): Handle rfc2184 encoded parameters (ie
-	parameters that have been split and perhaps encoded).
-	(header_param_list_format_append): Encode the value before seeing
-	if it will fit on the line. If the value does get encoded, be sure
-	to put a '*' before the equal-sign.
-	(header_encode_param): New function to rfc2184 encode a parameter
-	value (maybe it should be renamed?)
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part.c (init_header_name_table): Don't try to format
-	the Reply-To header - we don't want to wrap the reply-to address.
-
-2001-06-12  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-spool-*.[ch]: A new provider, for spool
-	mailboxes.  Mostly a cut and paste of the mbox code, but not a
-	subclass CamelLocal*.  Not tested a lot, doesn't lock yet, use
-	with extreme caution.
-
-	* tests/lib/folders.c (test_folder_message_ops): Added spool arg,
-	spool folders can't be deleted, renamed, etc.
-	(test_folder_basic): Same.
-
-	* tests/folder/test2.c (main): Added checks for spool type.
-
-	* tests/[message|stream|folder|misc|smime]/Makefile.am (LDADD):
-	Added db3 flags, so make check compiles, doesn't run though.
-
-2001-05-24  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-local-provider.c
-	(camel_provider_module_init): Added spool provider.
-
-2001-06-07  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Add a
-	separator between the service url and the folder name, if needed.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Added
-	an argument, so that the original source URI of the mbox can be
-	passed in.  This is needed because this function is called
-	post-movemail, so we are never reading from the original mbox
-	anymore.  Without the original mbox URI, the X-Evolution-Source
-	tag gets set incorrectly and filter-on-source will fail to work.
-	(camel_filter_driver_filter_message): Also take an extra arg
-	for the original source URI.  It is the original URI, not the
-	source URI, that is used for filtering and for setting the
-	X-Evolution-Source tag.
-
-2001-06-05  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_rescan): Don't fetch
-	the UID and FLAGS of messages we don't know about yet, since
-	they'll just get discarded.
-
-2001-06-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* tests/smime/pgp.c: Fix to not get into a recursive loop in
-	get_type().
-
-	* tests/smime/pgp-mime.c: Same.
-
-2001-05-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-smime-context.c: Numerous fixes to get it to compile.
-
-	* camel.h: Added camel-cipher-context.h, camel-cms-context.h,
-	camel-smime-context.h, and camel-smime-utils.h
-
-	* camel-cms-context.[c,h]: New virtual class for manipulating
-	cryptographic message syntax messages (like S/MIME).
-
-	* camel-smime-context.[c,h]: Modified to inherit from the
-	CamelCMSContext class rather than the CamelCipherContext class.
-
-	* camel-smime.[c,h]: Removed - just use camel-smime-context
-	directly.
-
-	* camel-smime-utils.[c,h]: New source files. Moved the 2 useful
-	functions from camel-smime.[c,h] into here.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* camel-charset-map.c: Redo the BUILD_MAP code to not depend on
-	libunicode. Now it only generates a map of "popular" 8bit
-	encodings. (It's not worthwhile to support obscure encodings,
-	because any mailer that supports them will support UTF8 too. And
-	Chinese and Japanese use mostly the same UTF8 characters so you
-	need to decide between those encodings based on the locale or
-	the charset of the message you're replying to or the input
-	method you used. So this is sufficient for camel_charset_best's
-	use.)
-
-	* camel-charset-map-private.h: Regenerated.
-
-	* camel.c (camel_shutdown): Move #ifdefs around to prevent a
-	warning.
-
-2001-05-29  Dan Winship  <danw@ximian.com>
-
-	* camel-disco-diary.c: Code for logging and replaying offline
-	operations.
-
-	* camel-disco-store.c (disco_construct): Set disco->status here
-	(where we can base it on the session's offline status) rather than
-	at init time.
-	(disco_connect): If we connect online and have a non-empty diary,
-	switch to RESYNCING mode and replay the diary to the server.
-	(disco_get_folder, disco_get_folder_info): Add _resyncing
-	variants.
-
-	* camel-disco-folder.c (disco_sync, disco_expunge_uids,
-	disco_append_message, disco_copy_messages_to,
-	disco_move_messages_to): Add _resyncing variants to switches.
-	(disco_expunge_uids, disco_append_message, disco_copy_messages_to,
-	disco_move_messages_to): Remove #ifdef'ed out diary code: let the
-	provider do it.
-	(disco_append_message): Redo the append methods to no longer
-	return the UID, since we're no longer doing the logging from here.
-
-	* providers/imap/camel-imap-store.c (imap_connect_online,
-	imap_connect_offline): Create a CamelDiscoDiary.
-	(imap_disconnect_offline): And free it.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	If RESYNCING, don't do any sort of checking that the remote folder
-	matches the summary, beyond making sure that the UIDVALIDITY is
-	correct.
-	(imap_rescan): Add a missing camel_folder_summary_info_free when
-	removing a UID from the summary.
-	(imap_expunge_uids_offline): Implement. Fairly simple.
-	(imap_expunge_uids_resyncing): Implement. If the store supports
-	UIDPLUS, we can just use imap_expunge_uids_online. If not, we need
-	to temporarily undelete any messages marked deleted on the server
-	that aren't supposed to get expunged.
-	(imap_append_offline): Implement, using cache and summary
-	operations, and triggering the folder_changed event by hand.
-	(imap_append_resyncing): Implement. Redo imap_append_online a bit
-	in the process to make them able to share more code.
-	(imap_copy_offline): Implement.
-	(imap_copy_online): Move parts of this out into a helper.
-	(imap_copy_resyncing): Implement. In most cases this is just like
-	imap_copy_online, but if you are copying a message that was itself
-	copied or appended into the folder, and the server doesn't do
-	UIDPLUS, it will be necessary to replace at least part of the copy
-	operation with one or more appends.
-
-	* providers/imap/camel-imap-command.c (imap_read_response): Don't
-	record the current folder in the response when in RESYNCING mode.
-	(This means that EXISTS and EXPUNGE responses won't be processed,
-	which is needed because the summary may not match the folder at
-	this point.)
-	(imap_read_response): On error, call
-	camel_imap_response_free_without_processing, not
-	camel_imap_response_free.
-
-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set): Make
-	this work better when operating on UIDs that aren't in the summary.
-
-	* providers/imap/camel-imap-summary.c
-	(camel_imap_summary_add_offline): New routine used by
-	imap_append_offline and imap_copy_offline to create new summary
-	entries.
-
-2001-05-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_set_param): Use g_strcasecmp()
-	because some systems don't have strcasecmp(). Also, when removing
-	a param, make sure to free the param->name too.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* tests/lib/messages.c (test_message_read_file): Fix an fd leak
-
-	* tests/lib/session.c, tests/lib/session.h: a CamelSession
-	subclass for the test programs.
-
-	* tests/lib/Makefile.am: include session.[ch]
-
-	* tests/folder/test*.c: Use a CamelTestSession from libcameltest
-	instead of cut+pasting everywhere.
-
-	* tests/misc/url.c (main): Update for a camel_url_new change at
-	some point.
-
-	* tests/*/.cvsignore: Add stuff.
-
-	* camel-mime-utils.c (rfc2047_encode_word): Fix a silly ==/!=
-	mixup.
-
-2001-05-26  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c: Add a "need_rescan" flag
-	saying if we want to rescan the entire folder for flag changes
-	next time it's selected.
-	(camel_imap_folder_init): Set need_rescan TRUE.
-	(camel_imap_folder_selected): If need_rescan is TRUE, call
-	imap_rescan.
-	(imap_refresh_info): Only do a full rescan if need_rescan is TRUE.
-	Otherwise just do a NOOP, making this a MUCH more lightweight
-	operation. Also, don't call imap_rescan directly if the folder
-	isn't selected, since that could end up causing the folder to be
-	scanned *twice* (imap_rescan -> camel_imap_command ->
-	camel_imap_folder_selected -> imap_rescan).
-	(imap_rescan): Set need_rescan FALSE.
-	(imap_sync_online): Don't NOOP if no changes were pushed: the
-	caller will call refresh_info if it wants to poll for changes.
-	Fixes evolution-mail doing lots of unnecessary extra work at
-	quit time.
-
-	* providers/imap/camel-imap-store.c (refresh_folder_info): Set
-	need_rescan on each folder before calling refresh_info.
-
-2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Oops. Use a
-	strNcmp to make sure the response begins with a 334 code, not a
-	strcmp. Duh.
-
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	remove the summary info so we are not out-of-sync with the maildir
-	folder.
-
-	* providers/local/camel-mh-folder.c (mh_append_message): remove
-	the summary info so we are not out-of-sync with the mh folder.
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message):
-	remove the summary info so we are not out-of-sync with the mbox.
-
-2001-05-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-smime-context.c (camel_smime_context_new): Oops, I spelled
-	the get-default-db function name wrong.
-
-2001-05-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): s/folder_deleted/folder_created -
-	result of a bad copy/paste.
-
-	* providers/imap/camel-imap-search.c (imap_body_contains):
-	Optimize the match "" case.
-
-2001-05-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info_online):
-	Store the CamelFolderInfo tree that was returned from
-	camel_folder_info_build() in a new variable, 'tree', rather than
-	'fi' since we later use 'fi' when syncing folders. Not only does
-	this fix a memory leak, but it also fixes the bug where the user
-	would only see the last folder in the folder list and/or it's
-	subfolders.
-
-2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-session.c (camel_session_forget_password): The service can
-	be NULL here too, thanks to Wayne Davis for pointing this out.
-
-	* camel-smime-context.c (camel_smime_context_new): We don't need
-	to be passed the certdb path anymore.
-
-2001-05-16  Dan Winship  <danw@ximian.com>
-
-	* camel-medium.c (camel_medium_get_headers): New function to
-	return an array of all headers.
-	(camel_medium_free_headers): And free them.
-
-	* camel-mime-part.c (get_headers, free_headers): Implement this
-	for CamelMimePart. (Works for CamelMimeMessage too.)
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-smime-context.c (camel_smime_context_finalise): Don't
-	close or free (it wasn't allocated) the certdb.
-	(camel_smime_context_new): If we get a NULL certdb handle, then
-	don't bother trying to create a new certdb handle since NSS_Init*
-	should have done that.
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Don't use EXTRA_GNOME_*, use the new CAMEL_*
-	variables so we don't link in tons of extra cruft that we don't
-	need.
-
-	* tests/smime/pkcs7.c: Added to the test suite - tests the S/MIME
-	pkcs7 functions.
-
-2001-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-smime-context.c: Lots of fixes to get this to compile.
-
-	* camel-smime.c (camel_smime_part_verify): Updated to pass in a
-	hash argument to camel_smime_verify().
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Update according
-	to the changes in the context API.
-
-	* camel-pgp-context.c (pgp_verify): Updated to take a
-	CamelCipherHash argument.
-
-	* camel-cipher-context.c (camel_cipher_verify): Now takes a hash
-	argument since the S/MIME code needs this.
-
-	* Makefile.am: Add camel-smime-context.[c,h] and camel-smime.[c,h]
-	to the build.
-	
-	* camel-smime.[c,h]: New source files for manipulating S/MIME
-	message parts.
-
-2001-05-14  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-search-private.c (utf8_get): Replicate the semantics of
-	the libunicode utf8 functions by returning NULL in the arg
-	on invalid utf8.
-
-	* camel-pgp-context.c (pgp_verify): Check for valid utf8,
-	terminate loop if something looks wrong.
-
-	* camel-mime-utils.c (header_encode_phrase_get_words): Properly
-	check for invalid utf8.
-	(header_encode_string): Properly check for invalid utf8.
-
-	* camel-charset-map.c (camel_charset_step): Properly check for
-	invalid utf8.
-
-2001-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* tests/folder/test9.c: 
-	* tests/folder/test8.c:
-	* tests/folder/test7.c: 
-	* tests/folder/test6.c: 
-	* tests/folder/test5.c: 
-	* tests/folder/test4.c:
-	* tests/folder/test3.c: 
-	* tests/folder/test2.c: 
-	* tests/folder/test1.c: 
-	* tests/smime/pgp-mime.c: 
-	* tests/smime/pgp.c: Subclass CamelSession since we can no longer
-	specify the passwd callback any other way and update code
-	accordingly.
-
-2001-05-11  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-utils.c (header_location_decode): Decode
-	Content-Location, either correctly or Netscape-generated-brokenly.
-
-	* camel-mime-part.c (camel_mime_part_set_content_location,
-	camel_mime_part_get_content_location, etc): Deal with
-	Content-Location header.
-
-2001-05-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Don't check
-	the initial auth response until we get into the while-loop
-	otherwise we have problems if the SASL mechanism supported a
-	client initiated challenge (like PLAIN and LOGIN do).
-
-2001-05-11  Dan Winship  <danw@ximian.com>
-
-	* camel-stream-null.c (camel_stream_null_new): Make this return
-	CamelStream * (like the other stream new functions) instead of
-	CamelStreamNull *
-
-2001-05-10  Chris Toshok  <toshok@ximian.com>
-
-	* camel-tcp-stream-ssl.c (stream_connect): call SSL_Enable after
-	the SSL_ImportFD and before PR_Connect.  Otherwise, NSS aborts
-	during the connect.
-
-2001-05-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-session.c (camel_session_get_password): Don't abort if the
-	Service is NULL, this is perfectly valid for cipher contexts.
-
-2001-05-09  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_move_messages_to): Pass
-	appropriate parameters to CF_CLASS and add comment explaining why
-	my initial attempt at a solution didn't work.
-
-2001-05-09  Dan Winship  <danw@ximian.com>
-
-	* camel-disco-store.c (camel_disco_set_status): Set the
-	disconnected status.
-	(camel_disco_store_can_work_offline): Return whether or not a
-	given CamelDiscoStore can work offline or not.
-
-	* camel-disco-folder.c (camel_disco_folder_cache_message):
-	Explicitly tell a folder to cache a message. (Better than using
-	get_message, because for IMAP that doesn't guarantee you'll get
-	all the message parts.)
-	(camel_disco_folder_prepare_for_offline): Prepare a folder for
-	offline use by caching all messages meeting given search criteria
-	(and doing anything else the particular folder implementation
-	needs).
-
-	* camel-session.c (camel_session_set_online,
-	camel_session_is_online): A session-wide online/offline toggle.
-	(camel_session_init): Set online to TRUE.
-
-	* providers/imap/camel-imap-store.c (can_work_offline):
-	Implementation of CamelDiscoStore::can_work_offline. (Checks that
-	the store has been used online at least once.)
-	(imap_get_folder_online, imap_get_folder_offline): Deal with
-	request for "inbox" properly. ("Don't you mean... 'INBOX'?").
-
-	* providers/imap/camel-imap-folder.c (imap_cache_message):
-	Implementation of CamelDiscoFolder::cache_message.
-
-	* camel.h: Add camel-disco-store.h and camel-disco-folder.h
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-part.c (camel_mime_part_set_content_id): Wrap the
-	content-id with <>'s.
-
-2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (connect_to_server): Add
-	support for using OpenSSL.
-
-	* camel-remote-store.c (remote_connect): Add support for using the
-	OpenSSL implementation.
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Hmmmm, don't pass in a
-	NULL as the last argument to alert_user - prototype doesn't take
-	that argument anymore?
-
-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):
-	(ssl_verify): Use a global hash table to try and lookup the
-	CamelTcpStreamOpenSSL object given the ssl context since OpenSSL
-	doesn't think one needs to pass data around, we should all be
-	living in a world of global variables, duh!
-
-2001-05-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (libcamelinclude_HEADERS): Fix another build
-	problem. (Um, anyone else could have done this...)
-
-2001-05-04  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_online): Fix up
-	refcounting on current_folder.
-
-	* camel-disco-folder.c, camel-disco-store.h: Remove
-	CamelDiscoDiary refs that weren't supposed to escape yet.
-
-2001-05-03  Dan Winship  <danw@ximian.com>
-
-	* camel-disco-store.c: new abstract class for disconnectable
-	remote stores
-
-	* camel-disco-folder.c: new abstract class for folders on
-	disconnectable stores.
-
-	* Makefile.am: Add camel-disco-folder.[ch] and
-	camel-disco-store.[ch].
-
-	* providers/imap/camel-imap-store.c: Make this a subclass of
-	CamelDiscoStore, and fix up the offline interfaces for the changes
-	since they were first written (particularly the fact that some
-	IMAP stores don't just use subscribed folders).
-
-	* providers/imap/camel-imap-folder.c: Make this a subclass of
-	CamelDiscoFolder, although most ops still fail in disconnected
-	mode.
-
-	* camel-store.c (camel_store_get_folder_info): Change gboolean,
-	gboolean, gboolean to guint32 in the prototype for this function.
-
-	* providers/local/camel-local-store.c (get_folder_info): Update
-	for prototype change.
-
-2001-05-02  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.h: Clean this up a bit. Add a
-	"tag_prefix" member. Move "useful_lsub" into capabilities.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init):
-	Initialize the tag_prefix, based on a static variable.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Use
-	the store's tag_prefix character rather than "A" at the start of
-	the tag. Makes the verbose debug output easier to parse when
-	connected to multiple IMAP servers. (Well, unless you're connected
-	to more than 26 servers...)
-
-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set): Fix
-	this up... it was losing count in some cases and giving a more
-	verbose answer than it needed to.
-
-	* providers/pop3/camel-pop3-store.c: Rescue the KPOP code from bit
-	rot.
-
-2001-05-01  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Redo
-	command locking. Since command_lock is recursive, we can just get
-	a lock here, and release it either on error, or when the caller
-	frees the response data. (This simplifies a lot of stuff, and
-	fixes some problems with camel_imap_folder_changed being called
-	without the command_lock locked because of the 2001-03-22 change.)
-
-	(camel_imap_response_free): 
-	(camel_imap_response_free_without_processing): 
-	(camel_imap_response_extract): 
-	(camel_imap_response_extract_continuation): These all take a
-	CamelImapStore now as well, to deal with locking.
-
-	* providers/imap/camel-imap-private.h: Add
-	CAMEL_IMAP_STORE_ASSERT_LOCKED, which defaults to a noop, but can
-	be made to call e_mutex_assert_locked.
-
-	* providers/imap/camel-imap-folder.c, camel-imap-search.c,
-	camel-imap-store.c: Simplify using new locking stuff. Add a few
-	CAMEL_IMAP_STORE_ASSERT_LOCKED checks.
-
-2001-05-01  Dan Winship  <danw@ximian.com>
-
-	Support the IMAP UIDPLUS extension (RFC 2359), which lets you
-	resync after disconnected operation more efficiently, but also
-	makes it possible to do appends and moves/copies more efficiently
-	now.
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): If the
-	server supports UIDPLUS, grab the APPENDUID response and cache the
-	message into the folder's message cache.
-	(imap_copy_messages_to): Likewise, for COPYUID, copy any message
-	parts we have cached between the source and destination folder
-	caches.
-	(imap_get_message): If the entire message is already in the cache,
-	just return that rather than building it from parts.
-	(imap_update_summary): Fetch just the "UID FLAGS RFC822.SIZE" of
-	the new messages first, then only fetch the headers for messages
-	where we don't already have the headers cached.
-
-	* providers/imap/camel-imap-message-cache.c: Add gtk-doc comments.
-	(cache_put): Fix refcounting stuff here.
-	(camel_imap_message_cache_insert_stream,
-	camel_imap_message_cache_insert_wrapper): New.
-	(camel_imap_message_cache_get): Fix a bug here so the memory
-	caching actually works.
-	(camel_imap_message_cache_copy): New routine, used by
-	imap_copy_messages_to.
-
-	* providers/imap/camel-imap-utils.c (imap_uid_set_to_array):
-	Inverse operation of imap_uid_array_to_set. Used to parse COPYUID
-	response.
-
-2001-04-30  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set):
-	New-and-improved version of get_uid_set() from
-	camel-imap-folder.c. Looks at the summary as it goes so that if
-	you ask for messages 5, 6, 8, and 9, and there is no message 7,
-	then you get "5:9" instead of "5:6,8:9"
-
-	* providers/imap/camel-imap-folder.c (imap_copy_messages_to): Use
-	imap_uid_array_to_set() rather than get_uid_set().
-	(get_uid_set): Gone
-
-2001-04-27  Dan Winship  <danw@ximian.com>
-
-	* camel-session.c: Redo this a lot so that instead of having a
-	class full of callbacks, we have a subclassable class. Also,
-	replace the increasingly horrifying
-	camel_session_query_authenticator with three new routines,
-	camel_session_get_password, camel_session_forget_password, and
-	camel_session_alert_user.
-
-	* camel-pgp-context.c:
-	* camel-pkcs7-context.c:
-	* camel-smime-context.c: 
-	* providers/imap/camel-imap-store.c: 
-	* providers/pop3/camel-pop3-store.c: 
-	* providers/smtp/camel-smtp-transport.c: 
-	Use camel_session_get_password / camel_session_forget_password.
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Use
-	camel_session_alert_user.
-
-2001-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.c (camel_init): Automagically call camel_shutdown()
-	atexit() ;-)
-	(camel_init): Also initialize NSS databases as read/write for
-	S/MIME and if NSS fails to init, try initializing with volatile
-	databases.
-
-	* camel-file-utils.h: #include <sys/types.h> for off_t.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* camel-file-utils.c: New file, with the int, string, time_t, and
-	off_t encode/decode routines from camel-folder-summary.c moved
-	here and renamed, for the enjoyment of non-CamelFolderSummary
-	subclasses.
-
-	* Makefile.am (libcamel_la_SOURCES): Add camel-file-utils.c
-	(libcamelinclude_HEADERS): and camel-file-utils.h
-
-	* camel-folder-summary.c: Remove functions that were moved to
-	camel-file-utils.c, update uses of them for the new names.
-	(camel_folder_summary_{en,de}code_token are still here.)
-
-	* providers/local/camel-mbox-summary.c: Use camel_file_util_*
-	names
-
-	* providers/imap/camel-imap-summary.c: Use camel_file_util_* names
-
-	* providers/imap/camel-imap-store.c (imap_store_setup_online,
-	imap_store_setup_offline): Use camel_file_util_* names, which
-	makes much more sense since this isn't folder summary stuff.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS (and some other
-	stuff that's redundant with EXTRA_GNOME_CFLAGS)
-	(libcamel_la_LIBADD): Replace UNICODE_LIBS with GAL_LIBS.
-
-	* camel-search-private.c: 
-	* camel-pgp-context.c: 
-	* camel-mime-utils.c: Use gunicode interfaces rather than
-	libunicode.
-
-	* camel-charset-map.c: Use gunicode rather than libunicode. (The
-	charmap-regen code still depends on libunicode though.)
-
-	* camel-mime-filter-charset.h: 
-	* tests/message/test2.c (convert): Use iconv rather than
-	unicode_iconv.
-
-	* providers/smtp/Makefile.am (libcamelsmtp_la_LIBADD): 
-	* providers/pop3/Makefile.am (libcamelpop3_la_LIBADD): 
-	* providers/local/Makefile.am (libcamellocal_la_LIBADD): Remove
-	UNICODE_LIBS.
-
-	* camel.c (camel_init): Remove call to unicode_init.
-
-	* camel-mime-parser.c: Remove unused unicode.h include.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* camel-service.c (get_host): Use e_gethostbyname_r.
-	(camel_service_gethost): Remove unused var.
-
-2001-04-26  Not Zed  <NotZed@Ximian.com>
-
-        * Applied jacob's patches for e-poolv stuff.
-
-2001-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.h: Add camel-vee-folder.h and camel-digest-folder.h
-
-	* camel-digest-folder.[c,h]: New class that can be used to browse
-	a multipart/digest message as if it were a CamelFolder.
-
-2001-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (pgp_verify): Oops, don't use the return
-	value of iconv() as a string length, it only tells us the number
-	of non-reversable character conversions. This fixes it so we
-	actually see the gpg output in the message viewer.
-
-2001-04-23  Mikael Hallendal  <micke@codefactory.se>
-
-	* providers/nntp/Makefile.am (INCLUDES): 
-	Changed GTK_INCLUDEDIR to EXTRA_GNOME_CFLAGS.
-
-2001-04-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-smime-context.c (smime_sign): Implemented using the
-	secmime.h convenience functions.
-	(smime_clearsign): We just error our here, there is no clearsign
-	for smime.
-	(smime_verify): Copied code over from the pkcs7 verify - same
-	state, ugly and unknown :-)
-	(smime_encrypt): Implemented using the secmime.h convenience
-	functions.
-	(smime_decrypt): Same as the code in pkcs7-context.
-
-2001-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pkcs7-context.c (pkcs7_sign): Implemented.
-	(pkcs7_clearsign): Implemented.
-	(get_zero_len_passwd): Convenience function to try a 0-length key
-	on the certificate db - if this works then there is no need to
-	prompt the user.
-	(get_password): Callback to get the password.
-	(camel_cipher_hash_to_nss): Convenience function to convert a
-	CamelCipherHash to an NSS HASH_HashType.
-	(nss_hash_to_sec_oid): Converts a HASH_HashType to a SecOidTag.
-	(pkcs7_digest): Digest function for use with pkcs7_sign().
-	(sign_encode_cb): Callback to write the signed data to the output
-	stream.
-	(pkcs7_verify): Hacked on a bit more but am still a bit on the
-	confused side. This might work but I wouldn't hold my breath. The
-	sign/clearsign should be close if not correct, but this one...god
-	only knows.
-	(pkcs7_decrypt): Implemented.
-	(pkcs7_encrypt): Implemented (mostly, still need to handle when
-	'sign' is TRUE).
-
-2001-04-18  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize):
-	Free base_url and storage_path.
-
-	* providers/pop3/camel-pop3-store.c (finalize): Free the
-	implementation string.
-	(camel_pop3_command): Clarify documentation to mention that
-	@ex isn't set (and *@ret is) on CAMEL_POP3_ERR.
-	(connect_to_server): Set @ex properly on CAMEL_POP3_ERR.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info,
-	pop3_get_message): Set @ex properly on CAMEL_POP3_ERR.
-
-2001-04-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pkcs7-context.[c,h]: New source files to handle Pkcs7
-	encryption, decryption, signing, and verifying. Not yet
-	complete. I'm sensing this is going to take a while seeing as how
-	NSS is just so well documented.
-
-2001-04-17  Dan Winship  <danw@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Fix
-	a memory leak in the error case.
-
-2001-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-mbox-summary.c (summary_rebuild): Don't we
-	want to tell where we are by using the start of the message? I
-	think this should be using camel_mime_parser_tell_start_from()
-	instead. Also divide by the size *before* multiplying by 100 so
-	that we don't overflow the int which was giving us negative values
-	for our progress status (oops).
-
-2001-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-operation.c: Added a prototype for stamp().
-
-	* camel-charset-map.c (camel_charset_locale_name): #include
-	string.h so we don't get a warning about strchr being undefined
-	and also init charset to NULL.
-
-	* camel-pgp-context.c (pgp_verify): Go back to doing the utf8
-	conversion by hand so that we don't depend on gal.
-
-	* Makefile.am: Remove the EXTRA_GNOME_CFLAGS include.
-
-	* camel-store.c (camel_mkdir_hier): Convenience function that it
-	seems a number of camel-store implementations used gal for.
-
-	* providers/nntp/camel-nntp-store.c (ensure_news_dir_exists): Lets
-	not depend on gal for just e_mkdir_hier() - use camel_mkdir_hier()
-	instead.
-
-	* providers/nntp/camel-imap-store.c: Lets not depend on gal for
-	just e_mkdir_hier() - use camel_mkdir_hier() instead.
-
-	* camel-session.c (camel_session_get_storage_path): Don't depend
-	on e_mkdir_heir() anymore, use the CamelStore version.
-
-	* camel-folder-search.h: Removed gal dependency, why was this even
-	there in the first place?
-
-	* providers/imap/camel-imap-folder.c: Don't need gal/util/e-util.h
-	here, so remove it.
-
-	* string-utils.c (strstrcase): New function, well more like old
-	function brought back to life so we don't have to depend on gal.
-
-	* providers/imap/camel-imap-store.c (imap_store_setup_online): Use
-	strstrcase rather than e_strstrcase so we don't depend on gal.
-	(get_unread_online): Same here.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Use
-	strstrcase.
-
-2001-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_raw_check_mailing_list): regex
-	doesn't set errno and regcomp returns 0 on success and any other
-	value for an error (so don't *just* check for -1).
-
-2001-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-cipher-context.c: Check to make sure the context is a
-	valid context in all the user functions.
-
-2001-04-13  Jon Trowbridge  <trow@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect):
-	s/imap_store/store/, fixing a typo that was causing the build to
-	fail.
-
-	* camel-filter-search.c (get_source): Make the (previously unused)
-	get-source command actually do the right thing, properly shrouding
-	any passed-in source and falling back to use the source attached
-	to the mime message.
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* camel-object.c (camel_object_hook_event):
-	* camel-uid-cache.c (camel_uid_cache_get_new_uids):
-	* camel-url.c (camel_url_new_with_base): Plug leaks.
-
-	* camel-remote-store.c (camel_remote_store_init): Don't
-	re-initialize the folders hash table.
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Free
-	authtypes since they'll be re-read on re-connect.
-	(get_folder_info): Free folderinfos that we're discarding from the
-	list.
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (camel_pgp_context_get_type): Oops, lets not
-	get into a recursive call here ;-)
-
-	* tests/smime/pgp.c: Updated to reflect changes to the PGP code.
-
-	* tests/smime/pgp-mime.c: Same.
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-mime.c: Updated to reflect the few changes made to the
-	CamelPgpContext class.
-
-	* camel-pgp-context.c: Updated to subclass of CamelCipherContext.
-
-	* camel-cipher-context.[c,h]: New base class for
-	CamelPgpContext. Also contains the replacement for
-	CamelPgpValidity, CamelCipherValidity.
-
-2001-04-12  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-filter-crlf.c (filter): Fix a pair of array bounds
-	reads noted by purify
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.h: #include the pgp stuff.
-
-2001-04-12  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_remove): 
-	* camel-url.c (camel_url_to_string): Plug memory leaks.
-
-2001-04-11  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_string_generic):
-	Simplify peterw's imap_is_atom_char fix.
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* tests/smime/Makefile.am: Added pgp-mime.c to the tests.
-
-	* tests/smime/pgp-mime.c: Test suite for camel-pgp-mime.c functions.
-
-	* Makefile.am: Add camel-pgp-mime.[c,h] to the build.
-
-	* camel-pgp-mime.c: Made a number of fixes to get it to compile
-	and also fixed a few logic errors (mostly forgetting to reset
-	streams) so that it worked (thanks to the pgp-mime test program).
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* providers/imap/Makefile.am: user GNOME_INCLUDEDIR since gnome
-	files are included in the top level camel headers and the gtk
-	include dir is now versioned and such
-
-	* providers/local/Makefile.am: ditto
-
-	* providers/pop3/Makefile.am: ditto
-
-	* providers/smtp/Makefile.am: ditto
-
-	* providers/sendmail/Makefile.am: ditto
-
-	* camel-service.c: use five arg version of gethostbyname_r if
-	appropriate
-	(camel_get_host_byname): check if msg->herr is non-zero instead of
-	checking if msg->hp is null since we may not always have msg->hp
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-digest-md5.c (digest_response): Use
-	camel_charset_locale_name() to get the locale charset rather than
-	checking the CHARSET environment variable. This is a much less
-	ugly hack. Also: If we fail to be able to convert to UTF8, then
-	disavow all knowledge of the charset parameter.
-
-	* camel-charset-map.c (camel_charset_locale_name): New function to
-	return the locale charset (or NULL if US-ASCII).
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (camel_pgp_verify): Use
-	e_utf8_from_locale_string() rather than trying to do it manually
-	since Lauris's version works much better.
-
-2001-04-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added camel-pgp-context.[c,h] to the build. Also
-	added tests/smime/pgp.c and Makefile.am
-
-	* tests/smime/pgp.c: New test suite for PGP functions.
-
-	* camel-pgp-context.c: Various fixes to get it to build.
-
-2001-04-07  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_string_generic): It
-	would be a good idea to recognize '\0'. Before, this code was running
-	off the ends of strings and intermittently coredumping (if it didn't
-	hit an imap_atom_char first) -- whoops!
-
-2001-04-05  Not Zed  <NotZed@Ximian.com>
-
-	* merge from evolution-0-10-branch to evolution-0-10-merge-0
-
-2001-04-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added tests/ back in
-
-	* camel-mime-utils.c (header_decode_text): Ignore whitespace
-	between encoded words (there were a few cases where it didn't
-	before).
-	(header_encode_string): Preserve whitespace between words that are
-	to be encoded by encoding them too.
-	(header_encode_phrase): Same here but with phrases.
-
-2001-04-03  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): If we don't
-	change any flags or expunge, send a NOOP to give the server a
-	chance to send EXISTS, etc, messages.
-	(imap_get_message): If the server_level < IMAP4rev1, always fetch
-	messages all-at-once, since they don't support the [#.MIME]
-	syntax.
-	(imap_update_summary): When reading message flags, set the
-	server_flags field as well, and don't overwrite any flags set by
-	camel_folder_summary_info_new_from_message. Might help with some
-	of the flag problems...
-
-2001-04-02  Dan Winship  <danw@ximian.com>
-
-	* camel-service.h: Remove the "quick_login" member, which is
-	unnecessary.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Remove the
-	references to quick_login and fix this to use the CamelSasl
-	interfaces correctly to do the same thing.
-	(connect_to_server): Split this out of smtp_connect
-	(smtp_connect): Use connect_to_server. When re-EHLO'ing after
-	auth, ignore errors.
-	(query_auth_types): Use connect_to_server rather than
-	smtp_connect, so it doesn't try to authenticate. Add LOGIN
-	authtype to the list of authtypes to check for.
-
-	* providers/smtp/camel-smtp-provider.c
-	(camel_provider_module_init): Add LOGIN authtype to the authtypes
-	list explicitly.
-
-	* camel-sasl.c (camel_sasl_authtype_list): Don't list LOGIN here:
-	it's not a real SASL authtype and is only used for SMTP.
-	
-	* camel-sasl-plain.c: 
-	* camel-sasl-login.c: 
-	* camel-sasl-kerberos4.c: 
-	* camel-sasl-cram-md5.c: 
-	* camel-sasl-anonymous.c: 
-	* providers/pop3/camel-pop3-provider.c: Remove "quick_login"
-	argument from authtypes.
-
-2001-04-02  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* camel-filter-driver.c: marked missing report status' for translation.
-
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.c (camel_pgp_sign): mutex lock & unlock the
-	context.
-	(camel_pgp_clearsign): Same.
-	(camel_pgp_verify): Same.
-	(camel_pgp_encrypt): Same.
-	(camel_pgp_decrypt): And finally here...
-
-	* camel-pgp-context.h: Update the function prototypes to match
-	those found in camel-pgp-context.c.
-
-	* camel-pgp-context.c: Updated.
-
-	* camel-pgp-mime.c (camel_pgp_mime_part_sign): Implemented.
-	(camel_pgp_mime_part_verify): Implemented.
-	(camel_pgp_mime_part_encrypt): Implemented.
-	(camel_pgp_mime_part_decrypt): Implemented.
-
-2001-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-login.[c,h]: New files to handle the LOGIN SASL
-	mechanism.
-	
-	* camel-sasl-plain.c: Removed the definition of
-	camel_sasl_login_authtype.
-
-	* camel-sasl.c (camel_sasl_new): Oops. I thought LOGIN was an
-	alias to PLAIN. I was wrong. These two SASL objects have to be
-	separate.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Updated to
-	check for and use authmech->quick_login when available.
-
-2001-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-provider.c: Updated the authtypes here
-	too.
-
-	* camel-sasl-plain.c: 
-	* camel-sasl-anonymous.c: 
-	* camel-sasl-digest-md5.c: 
-	* camel-sasl-cram-md5.c: 
-	* camel-sasl-kerberos4.c: Updated the authtype values.
-
-	* camel-service.h: Added another field to CamelServiceAuthType
-	that specifies whether or not the mechanism supports "quick auth"
-	which means that the client can send the initial challenge in the
-	AUTH request.
-
-	* camel-sasl.c (camel_sasl_new): Add support for LOGIN.
-	(camel_sasl_authtype_list): Here too.
-	(camel_sasl_authtype): And finally here.
-
-	* camel-sasl-plain.c: Define camel_sasl_login_authtype.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Only unref
-	the SASL object if it exists.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server,
-	query_auth_types, pop3_connect): Move things around here to make
-	this all work right again (so you don't get prompted for a
-	password when checking the supported authtypes.)
-
-2001-03-30  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-mime-message.c (camel_mime_message_set_source): Shrould
-	our source URL before putting it into X-Evolution-Source.
-
-2001-03-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Don't
-	blindly append "/INBOX", construct a CamelURL and set the path
-	that way.
-	(parse_list_response_as_folder_info): Don't blindly append
-	"/<foldername>", construct a CamelURL and set the path that way
-	instead.
-	(get_folders_offline): And again here.
-
-2001-03-30  Not Zed  <NotZed@Ximian.com>
-
-	* camel-service.c (camel_get_host_byname): Dont overwrite an
-	exception if we got one already.  Added camel_operation status to
-	it, and comment out some debug.
-
-2001-03-29  Not Zed  <NotZed@Ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Free host
-	name info when done ... blah blah.
-
-	* camel-sasl-kerberos4.c (krb4_challenge): Free host name info
-	after we're done with it.
-
-	* camel-sasl-digest-md5.c (digest_md5_challenge): Free host name
-	info after we're done with it.
-
-	* camel-remote-store.c (remote_connect): Free the host name info
-	from get_host after we're finished with it.
-
-	* camel-service.c (camel_get_host_byname): New function to
-	lookup a name, and still be cancellable.
-	(camel_free_host): And a function to free the structure
-	returned.
-	(camel_service_gethost): Call get_host_byname for this.
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Save
-	the source URL using camel_mime_message_set_source.
-
-	* camel-mime-message.c (camel_mime_message_set_source): Renamed
-	camel_mime_message_set_identity to this.  Sets the X-Evolution-Source
-	header.
-	(camel_mime_message_get_source): Returns the X-Evolution-Source
-	header.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* broken-date-parser.c: #include <stdio.h>, <stdlib.h> and <string.h>
-	* broken-date-parser.h: Remove all includes but <glib.h>
-	* camel-address.h: Added #include <glib.h>
-	* camel-data-wrapper.c: Move system includes to the top.
-	* camel-data-wrapper.h: #include <glib.h>
-	* camel-exception.c: #ifdef HAVE_CONFIG_H
-	* camel-exception.h: Remove #include <glib.h>
-	* camel-filter-driver.c: #ifdef HAVE_CONFIG_H and move system
-	headers to top. Mark strings in camel_exception_set*() for i18n.
-	* camel-filter-driver.h: #include <glib.h>
-	* camel-filter-search.c: #ifdef HAVE_CONFIG_H
-	* camel-folder-search.c: #include <config.h>
-	* camel-folder-search.h: Header shuffling
-	* camel-folder-summary.h: Same here
-	* camel-folder-thread.c: #ifdef HAVE_CONFIG_H
-	* camel-folder.c: Here too.
-	* camel-folder.h: #include <glib.h>
-	* camel-internet-address.c: Move system headers up
-	* camel-lock.c: #ifdef HAVE_CONFIG_H
-	* camel-medium.c: Same here
-	* camel-mime-filter-bestenc.c: Move system headers up
-	* camel-mime-filter-from.c: Same here
-	* camel-mime-filter-linewrap.c: And here
-	* camel-mime-filter.c: #include <string.h> to fix warnings from new gcc
-	* camel-mime-filter.h: System headers moved up
-	* camel-mime-message.c: Here too. #ifdef HAVE_CONFIG_H added
-	* camel-mime-part-utils.c: #ifdef HAVE_CONFIG_H added
-	* camel-mime-part.c: Here too, and shuffle headers
-	* camel-mime-utils.c: #ifdef HAVE_CONFIG_H. Remove const from two
-	variables to remove warning.
-	* camel-mime-utils.h: Shuffle headers
-	* camel-movemail.c: #ifdef HAVE_CONFIG_H. Mark string in camel_exception_set
-	* camel-multipart.c: #ifdef HAVE_CONFIG_H. Added includes to remove
-	warnings from new gcc
-	* camel-object.c: #ifdef HAVE_CONFIG_H
-	* camel-object.h: Shuffle headers
-	* camel-operation.c: #ifdef HAVE_CONFIG_H
-	* camel-provider.c: #ifdef HAVE_CONFIG_H. Shuffle headers. Mark a string
-	* camel-remote-store.c: #ifdef HAVE_CONFIG_H
-	* camel-sasl-anonymous.c: #ifdef HAVE_CONFIG_H. #include <string.h>
-	* camel-sasl-cram-md5.c: #ifdef HAVE_CONFIG_H. #include <string.h> and
-	<stdio.h> to remove warnings.
-	* camel-sasl-digest-md5.c: #ifdef HAVE_CONFIG_H. shuffle headers
-	* camel-sasl-digest-md5.h: Shuffle headers.
-	* camel-sasl-kerberos4.c: #ifdef HAVE_CONFIG_H. Shuffle headers.
-	* camel-sasl-kerberos4.h: Shuffle headers.
-	* camel-sasl-plain.c: #ifdef HAVE_CONFIG_H. Shuffle
-	* camel-sasl.c: #ifdef HAVE_CONFIG_H. #include <string.h>
-	* camel-search-private.c: #include <config.h>
-	* camel-seekable-stream.c: #ifdef HAVE_CONFIG_H
-	* camel-seekable-stream.h: Shuffle
-	* camel-seekable-substream.c: #ifdef HAVE_CONFIG_H
-	* camel-service.c: Same
-	* camel-service.h: Shuffle
-	* camel-session.c: #ifdef HAVE_CONFIG_H
-	* camel-store.c: Same
-	* camel-stream-buffer.c: Here too
-	* camel-stream-buffer.h: Shuffle
-	* camel-stream-filter.c: #include <string.h>
-	* camel-stream-fs.c: #ifdef HAVE_CONFIG_H
-	* camel-stream-fs.h: Shuffle headers
-	* camel-stream-mem.c: Same as above
-	* camel-stream-mem.h: Here too
-	* camel-stream-null.c: #ifdef HAVE_CONFIG_H
-	* camel-stream.c: Here too
-	* camel-stream.h: Shuffle
-	* camel-tcp-stream-openssl.c: #ifdef HAVE_CONFIG_H
-	* camel-tcp-stream-raw.c: Same here. and move local includes down
-	* camel-tcp-stream-ssl.c: Same as above
-	* camel-tcp-stream.c: #ifdef HAVE_CONFIG_H
-	* camel-tcp-stream.h: move local include down
-	* camel-transport.c: #ifdef HAVE_CONFIG_H
-	* camel-transport.h: #include <glib.h>
-	* camel-uid-cache.c: #ifdef HAVE_CONFIG_H. Shuffle headers
-	* camel-uid-cache.h: Shuffle
-	* camel-url.c: #ifdef HAVE_CONFIG_H
-	* camel-vee-folder.c: #ifdef HAVE_CONFIG_H. Shuffle headers
-	* camel-vee-folder.h: #include <glib.h>
-	* camel-vee-store.h: Same here
-	* camel.c: #ifdef HAVE_CONFIG_H
-	* gstring-util.c: Here too
-	* hash-table-utils.c: Remove #include <glib.h>
-	* hash-table-utils.h: #include it here instead.
-	* string-utils.c: #ifdef HAVE_CONFIG_H
-	* providers/cache/camel-cache-map.c: #ifdef HAVE_CONFIG_H, shuffle
-	headers and mark strings in camel_exception_set*()
-	* providers/cache/camel-cache-provider.c: #ifdef HAVE_CONFIG_H
-	* providers/cache/camel-cache-store.c: Same here, and mark a string.
-	* providers/imap/camel-imap-command.c: #ifdef HAVE_CONFIG_H
-	* providers/imap/camel-imap-command.h: Shuffle header
-	* providers/imap/camel-imap-folder.c: #ifdef HAVE_CONFIG_H
-	* providers/imap/camel-imap-message-cache.c: #ifdef HAVE_CONFIG_H
-	* providers/imap/camel-imap-provider.c: #ifdef HAVE_CONFIG_H and
-	#include <string.h>
-	* providers/imap/camel-imap-search.c: #ifdef HAVE_CONFIG_H
-	* providers/imap/camel-imap-store.c: #ifdef HAVE_CONFIG_H and mark
-	a string.
-	* providers/imap/camel-imap-summary.c: Shuffle headers
-	* providers/imap/camel-imap-wrapper.c: #ifdef HAVE_CONFIG_H. Shuffle
-	* providers/local/camel-local-folder.c: #ifdef HAVE_CONFIG_H
-	* providers/local/camel-local-provider.c: #ifdef HAVE_CONFIG_H
-	* providers/local/camel-local-store.c: Same here
-	* providers/local/camel-local-summary.c: Here too, shuffle, mark a string
-	* providers/local/camel-maildir-folder.c: #ifdef HAVE_CONFIG_H
-	* providers/local/camel-maildir-store.c: Same
-	* providers/local/camel-maildir-summary.c: Here too
-	* providers/local/camel-mbox-summary.c: And here
-	* providers/local/camel-mbox-store.c: And here
-	* providers/local/camel-mbox-summary.c: #include <config.h>
-	* providers/local/camel-mh-folder.c: #ifdef HAVE_CONFIG_H
-	* providers/local/camel-mh-store.c: same
-	* providers/local/camel-mh-summary.c: #ifdef HAVE_CONFIG_H, shuffle headers
-	and mark a string for translation.
-	* providers/nntp/camel-nntp-auth.c: #include <config.h>
-	* providers/nntp/camel-nntp-store.c: Remove superfluous arg to 
-	CAMEL_SERVICE_CLASS to make it compile
-	* providers/pop3/camel-pop3-provider.c: #ifdef HAVE_CONFIG_H
-	* providers/pop3/camel-pop3-store.c: Same here
-	* providers/sendmail/camel-sendmail-provider.c: Here too
-	* providers/sendmail/camel-sendmail-transport.c: Here too
-	* providers/smtp/camel-smtp-provider.c: Same
-	* providers/smtp/camel-smtp-transport.c: #ifdef HAVE_CONFIG_H, mark
-	strings for translations.
-	
-2001-03-29  Dan Winship  <danw@ximian.com>
-
-	* camel-url.c (camel_url_to_string): change "gboolean show_passwd"
-	to "guint32 flags".
-
-	* tests/misc/url.c (main): Update calls to camel_url_to_string
-
-	* providers/imap/camel-imap-store.c (construct): Call
-	camel_url_to_string with flags to hide password, authtype, and
-	params to create the base_url.
-	(etc): Update for the fact that the base_url no longer has the "/"
-	at the end.
-
-	* camel-service.c (construct): Update calls to camel_url_to_string
-	(pass CAMEL_URL_HIDE_PASSWORD)
-
-2001-04-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_text): Ignore whitespace
-	between encoded words (there were a few cases where it didn't
-	before).
-	(header_encode_string): Preserve whitespace between words that are
-	to be encoded by encoding them too.
-	(header_encode_phrase): Same here but with phrases.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* camel-filter-driver.c: Added #include <config.h>. Marked
-	a bunch of strings for translation.
-	* camel-folder-search.c: Added #include <config.h>.
-	* camel-folder-summary.c: Same here.
-	* camel-movemail.c: Marked strings for translation.
-	* camel-provider.c: Same here.
-	* camel-search-private.c: #include <config.h>
-	* camel-vee-folder.c: Mark string for translation.
-	* providers/local/camel-mbox-summary.c: #include <config.h>
-	
-2001-04-03  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): If we don't
-	change any flags or expunge, send a NOOP to give the server a
-	chance to send EXISTS, etc, messages.
-	(imap_get_message): If the server_level < IMAP4rev1, always fetch
-	messages all-at-once, since they don't support the [#.MIME]
-	syntax.
-
-2001-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Don't
-	blindly append "/INBOX", construct a CamelURL and set the path
-	that way.
-	(parse_list_response_as_folder_info): Don't blindly append
-	"/<foldername>", construct a CamelURL and set the path that way
-	instead.
-	(get_folders_offline): And again here.
-
-2001-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* camel-operation.c (struct _status_stack): change stamp to
-	unsigned to avoid overflow.
-	(camel_operation_end):
-	(camel_operation_progress_count):
-	(camel_operation_progress): Double the delay before transient
-	events start showing their own progress.
-
-2001-03-30  Not Zed  <NotZed@Ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message): Change
-	the pop download into a transient event.
-
-	* camel-operation.c (stamp): Get a timestamp that changes 4x a
-	second (or rather, arbitrarily more often than 1/second).
-	(camel_operation_progress): Use stamp() for time updates.
-	(camel_operation_progress_count): "
-	(camel_operation_start): Store the status as a struct status_stack
-	item.
-	(camel_operation_start_transient): New function to start a
-	transient event, which is only reported if it runs for too
-	long/and is reset afterwards.
-	(camel_operation_progress):
-	(camel_operation_progress_count): Fix for status_stack changes,
-	and account for transient updates. 
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): When
-	we remove things (set deleted), always set seen too, to mirror
-	interface behaviour when you delete.
-	(camel_filter_driver_filter_message): And same here too.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server,
-	query_auth_types, pop3_connect): Move things around here to make
-	this all work right again (so you don't get prompted for a
-	password when checking the supported authtypes.)
-
-2001-03-29  Dan Winship  <danw@ximian.com>
-
-	* camel-url.c (camel_url_to_string): change "gboolean show_passwd"
-	to "guint32 flags".
-
-	* tests/misc/url.c (main): Update calls to camel_url_to_string
-
-	* providers/imap/camel-imap-store.c (construct): Call
-	camel_url_to_string with flags to hide password, authtype, and
-	params to create the base_url.
-	(etc): Update for the fact that the base_url no longer has the "/"
-	at the end.
-
-	* camel-service.c (construct): Update calls to camel_url_to_string
-	(pass CAMEL_URL_HIDE_PASSWORD)
-
-2001-03-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-pgp-context.[c,h]: New class for PGP encrypting,
-	decrypting, signing and verifying. Next I'll be moving the
-	contents of mail/mail-crypto into Camel. These files will
-	basically replace mail/openpgp-utils.[c,h].
-
-2001-03-29  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-search.c (search_body_contains): Optimise the match
-	"" case, just match everything in the folder (if we have it).
-
-	* camel-vtrash-folder.c (vtrash_move_messages_to): Access the
-	folder directly from the message info.
-	(vtrash_move_messages_to): I think we also need to call the real
-	move_messages_to, and not try and bypass the lock, since we dont
-	have the lock for that folder.
-
-	* camel-vee-folder.h: Move CamelVeeMessageInfo to public, so
-	subclasses can get to it.
-
-	* camel-vee-folder.c (camel_vee_folder_add_folder): Dont let you
-	add a vfolder to itself.
-	(folder_changed): 
-	(vee_folder_remove_folder): 
-	(vee_folder_build_folder): Copy changes before triggering changed
-	events, so we can do them outside of locks.
-	(camel_vee_folder_get_message_folder): Removed function.
-	(camel_vee_folder_hash_folder): Made public (renamed from
-	hash_folder), simply for subclasses (probably not needed).
-	(vee_expunge): Oops, call the class sync, not superclass sync.
-	(vee_sync): Remove some accidental debug.
-
-2001-03-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-service.c (get_path): Add the port (if user defined) to
-	the path to fix bug #1996.
-
-	Danw: I'm iffy on the "fix" so I'd like you to comment.
-
-2001-03-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_sync): If we aren't
-	going to even check the resp/free buffer that gets returned from
-	camel_pop3_command, don't even bother using it. Send in NULL
-	instead.
-	(pop3_get_message): Check to make sure that the `result' string is
-	non-NULL. It's possible that some POP servers may return with
-	"+OK\r\n<message>..." rather than the expected 
-	"+OK ### octets\r\n<message>..."
-
-2001-03-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalize): Unref
-	the html filter when done.
-	(summary_build_content_info): Disable using the html parser to
-	help index html mails until it gets sorted out.
-
-	* camel-vee-folder.c (folder_changed): Fix a cut n paste bug, we
-	want uid_removed not uid_changed deref, fixes bug #1999.
-
-2001-03-27  Dan Winship  <danw@ximian.com>
-
-	* camel-sasl.c (camel_sasl_authtype_list): add an argument to say
-	whether or not you want "PLAIN" in the list (so you don't end up
-	with "Password" twice in the config dialog).
-
-	* providers/imap/camel-imap-provider.c (camel_provider_module_init): 
-	* providers/imap/camel-imap-store.c (query_auth_types): We don't
-	want PLAIN.
-
-	* providers/smtp/camel-smtp-provider.c (camel_provider_module_init): 
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): But we
-	do.
-
-2001-03-27  Dan Winship  <danw@ximian.com>
-
-	* camel-provider.h: Add an "extra_conf" field to CamelProvider
-	with structures and defines and stuff, for providers to specify
-	additional configuration options that they want. Also add a
-	"supports ssl" flag to the provider flags.
-
-	* camel-url.c (camel_url_new_with_base): Fix parsing of params.
-	(output_param): And unparsing...
-
-	* camel-remote-store.c: add a "default_ssl_port" field.
-	(remote_construct): If the URL has the "use_ssl" parameter, set
-	the store's use_ssl flag.
-	(remote_connect): If using SSL and no port specified, use the
-	default_ssl_port rather than the default_port.
-
-	* providers/smtp/camel-smtp-provider.c (smtp_provider): add
-	CAMEL_PROVIDER_SUPPORTS_SSL and CAMEL_URL_ALLOW_USER. (The config
-	gui code knows that the ALLOW_USER and ALLOW_AUTH go together.)
-	(ssmtp_provider): gone
-
-	* providers/smtp/camel-smtp-transport.c (smtp_construct): Set a
-	flag if "use_ssl" param is set.
-	(smtp_connect): Check the CamelSmtpTransport use_ssl flag rather
-	than checking if this is smtp or ssmtp.
-
-	* providers/imap/camel-imap-provider.c (imap_conf_entries): Add a
-	bunch of IMAP-specific configuration options, like "check for new
-	mail in all folders" (default TRUE), "show only subscribed
-	folders" (default TRUE), "ignore server-supplied namespace", and
-	"apply filters to INBOX" (not yet implemented).
-	(imap_provider): We support SSL and we no longer allow a path in
-	the URL. (namespace is handled via extra_conf)
-	(simap_provider): Gone
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Set
-	default_ssl_port, don't set CAMEL_STORE_SUBSCRIPTIONS here
-	(construct): remove simap stuff, deal with "use_lsub",
-	"namespace", "check_all", and "filter" parameters. Set base_url
-	to not include params.
-	(imap_store_setup_online): Don't ask for the namespace if it was
-	set explicitly. Don't get subscribed folders if !use_lsub.
-	(imap_concat): Fix a bug.
-	(get_folder_info): Support for not checking all folders.
-
-	* providers/imap/camel-imap-folder.c (imap_get_full_name): Rewrite
-	to use imap_store->namespace, not service->url->path
-
-	* providers/pop3/camel-pop3-provider.c (pop3_conf_entries): "keep
-	on server" (currently still implemented by the mailer code, not
-	here), "delete after N days" (not yet implemented).
-	(pop3_provider): we support SSL
-	(spop_provider): gone
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Set
-	default_ssl_port
-	(pop3_connect): Remove spop code
-
-2001-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-vee-folder.c (vee_folder_construct): Move all of the
-	camel_vee_folder_construct() internals here.
-	(camel_vee_folder_construct): This function basically becomes a
-	wrapper for vee_folder_construct and also checks to make sure that
-	the UNMATCHED vfodler is constructed otherwise constructs it.
-	(camel_vee_folder_new): Call vee_folder_construct() instead so
-	that we don't get into a dead-lock.
-
-2001-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (init_trash): Use camel_vtrash_folder_new() to
-	create the vtrash folder now.
-
-	* camel-vtrash-folder.[c,h]: New subclass of CamelVeeFolder for
-	our vTrash folders.
-
-	* camel-folder.c (camel_folder_copy_messages_to): Don't watch for
-	vtrash folders anymore.
-	(camel_folder_move_messages_to): Same.
-
-	* camel-vee-folder.c (camel_vee_folder_class_init): Update.
-	(vee_move_messages_to): Rewrite to use the new move API.
-
-	* camel-filter-driver.c (do_copy): Updated to reflect
-	copy_message_to changes. Create a temporary uid array and use
-	that.
-	(do_move): Same.
-	(camel_filter_driver_filter_message): And again, here...
-
-	* providers/imap/camel-imap-folder.c (imap_copy_messages_to):
-	Update to the new API.
-	(imap_move_messages_to): Same.
-	(get_uid_set): New function to create a `set' string based on an
-	array of UIDs for use with imap_copy_messages_to.
-
-	* camel-folder.c (camel_folder_copy_messages_to): Replaces
-	camel_folder_copy_message_to
-	(camel_folder_move_message_to): Replaces
-	camel_folder_move_message_to.
-
-2001-03-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel-vee-store.c (vee_get_folder): Added folder_created event
-	here.
-	
-	* camel-vee-folder.c (unmatched_finalise): Removed, moved into
-	main finalise code.
-	(message_changed): Just create a new change entry and promote it
-	to a folder_changed thing.
-	(vee_sync): Always rebuild folder on sync, even when not expunge.
-	(folder_changed): If not autoupdating, make sure we remove any
-	removed entries.
-	(vee_folder_build_folder):
-	(vee_folder_remove_folder): NOP if we're called on
-	folder_unmatched.
-	(vee_search_by_expression): Only search each folder once.  Should
-	we also order the result in summary order?
-
-2001-03-20  Not Zed  <NotZed@Ximian.com>
-
-	* camel-store.c (init_trash): Fix calling for vee_folder_new().
-
-	* camel-folder-summary.c (camel_folder_summary_remove_index):
-	Optimise slightly, use ptr_array_remove_index rather than have to
-	search for the index by using summary_remove.
-
-	* camel-vee-folder.h: Removed local member from VeeFolder, since
-	it was never used.
-
-	* camel-vee-store.c (camel_vee_store_finalise): Setup finalise
-	function.
-
-	* camel-vee-folder.c (camel_vee_folder_set_expression): New
-	function to set the query of an existing vfolder.
-	(camel_vee_folder_construct): New function for
-	convenience/subclasses.
-	(camel_vee_folder_new): Removed exception parameter, no longer
-	needed (since we dont search yet).
-	(camel_vee_folder_new): Changed to use folder_construct, and no
-	longer raise the folder created signal.
-	(vee_folder_build_folder): Make it return error on exception, so
-	we can work without exceptions.
-	(vee_folder_remove_folder): Use remove index rather than
-	remove_uid, this is ok since we have the summary locked for our
-	own access.
-	(camel_vee_folder_add_folder): Only add the folder to the
-	unmatched private if it is not a private folder.
-	(camel_vee_folder_remove_folder): Only remove the folder from
-	unmatched if it is not private.
-	(vee_expunge): Just call sync with expunge set.
-	(vee_sync): If expunging, also refresh the search.
-	(vee_folder_build_folder): We do our own locking now, removed from
-	callers, also trigger changed events here too (within locks),
-	fixed callers appropriately.
-	(vee_folder_remove_folder): Do our own locking, and trigger
-	changed events.
-	(vee_folder_add_info): Renamed of vee_folder_add, we now take a
-	hash of the folder name, rather than use the folders address.
-	(hash_folder): Convert a folder name into an 8 character hash.
-	(vee_get_message, vee_search_by_expression, vee_set_message_flags,
-	vee_set_message_user_flag, vee_move_message_to): Changed the uid
-	to be an 8 byte hash + original uid, with no ':' anymore.
-
-2001-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_text): When writing the last
-	token (if not rfc2047 encoded), don't use g_string_append_len, use
-	append_latin1.
-
-	* camel-mime-message.c (write_to_stream): Don't spew a warning if
-	the message-id wasn't set by the application, not a big deal since
-	we create one right here.
-
-2001-03-26  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): keep a
-	reference on the store's current_folder.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize): 
-	(imap_disconnect): unref the current_folder before clearing it.
-
-	* camel-url.c (camel_url_get_param): Add missing accessor.
-
-	* camel-session.c (camel_session_get_provider): New. Return
-	the provider for a URL.
-
-2001-03-25  Dan Winship  <danw@ximian.com>
-
-	* camel-url.c (camel_url_new_with_base): New URL parser with full
-	RFC1808 relative URL support. Yum.
-	(camel_url_new): Wrapper around camel_url_new_with_base now.
-
-	* tests/Makefile.am: add misc subdir
-
-	* tests/misc/url.c: relative URL test cases from RFC 1808
-
-2001-03-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (do_copy): Don't use copy_to if the source
-	folder doesn't support summary info's.
-	(do_move): Same.
-	(camel_filter_driver_filter_message): And again here.  I think
-	this will fix the problem of "colour" tags not staying with the
-	message when it's copied to a folder during the filter process.
-
-2001-03-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-digest-md5.c (digest_response): Do charset conversion
-	on the username param here if needed.
-	(parse_server_challenge): Protect against possibly empty-string
-	charset values.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Don't call camel_mime_message_set_identity.  (The call is
-	commented out, left over from some earlier experimentation that I
-	want to be able to remember later...)
-
-	* camel-mime-message.c (camel_mime_message_set_identity): Added.
-	A function to set the X-Evolution-Identity header.
-	
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-command.c (imap_read_response): Don't
-	look at untagged responses other than "* BYE"...
-	(camel_imap_response_free): ...do it here instead...
-	(camel_imap_response_free_without_processing): ...but not here.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Remove the "EXISTS" line from the response so
-	camel_imap_response_free won't try to process it.
-	(camel_imap_folder_selected): If we get an EXISTS response mixed
-	in with the FETCH responses, record the new EXISTS value.
-	Use camel_imap_response_free_without_processing so that an EXISTS
-	response won't cause a loop.
-	(imap_rescan): Use camel_imap_response_free_without_processing.
-	(imap_update_summary): Use
-	camel_imap_response_free_without_processing. If an EXISTS response
-	shows up, call imap_update_summary again to get the new messages.
-	(imap_protocol_get_summary_specifier): Use BODY.PEEK[0], not
-	RFC822.HEADER for prev IMAP4rev1, since the FETCH parser won't
-	deal with RFC822.HEADER responses.
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Fix an
-	uninitialized variable
-
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* camel-provider.h: (CamelProvider) add a "GList *authtypes", so
-	you can get the list of authtypes used by a provider without
-	needing to have an actual CamelService object handy. (Will be
-	needed by the new config druid.)
-	(CAMEL_PROVIDER_ALLOWS, CAMEL_PROVIDER_NEEDS): New macros to test
-	the URL part stuff, since the way it works is too complicated and
-	everyone always does it wrong.
-
-	* camel-service.c (camel_service_query_auth_types): Remove the
-	@connected arg again: if you don't want to connect, you can just
-	get the list of authtypes off the provider.
-	(camel_service_free_auth_types): Remove this. All existing
-	implementations do authtypes the same way, so just say the caller
-	should "g_list_free" the list. (Oh, look, removing this function
-	doesn't actually cause the mailer to not build. How 'bout that.)
-	(construct, get_path): Use the new URL part macros.
-
-	* camel-remote-store.c (remote_query_auth_types): Update
-	(remote_free_auth_types): Nuke
-	(camel_remote_store_authtype_list): New function for use by
-	subclasses.
-
-	* providers/imap/camel-imap-provider.c:
-	* providers/pop3/camel-pop3-provider.c:
-	* providers/smtp/camel-smtp-provider.c: Update CamelProvider
-	structures.
-	(camel_provider_module_init): Put all the SSL parts together so
-	there's only 1 #ifdef. Set up the provider authtypes field using
-	the SASL, CamelRemoteStore, and standard authtypes, as
-	appropriate. Copy that from the normal provider to the SSL
-	provider.
-
-	* providers/local/camel-local-provider.c:
-	* providers/sendmail/camel-sendmail-provider.c:
-	* camel-session.c: Update CamelProvider structures.
-
-	* providers/imap/camel-imap-store.c (query_auth_types):
-	* providers/pop3/camel-pop3-store.c (query_auth_types): Update
-
-	* providers/smtp/camel-smtp-store.c (query_auth_types): Update.
-	Remove the no_authtype, because that's what "ALLOW_AUTH" rather
-	than "NEED_AUTH" means.
-	(free_auth_types): Nuke.
-
-2001-03-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Return -1 on fail.
-	(camel_filter_driver_filter_folder): Same.
-	(camel_filter_driver_filter_mbox): Same.
-	(camel_filter_driver_filter_folder): Return -1 if an exception was
-	set as well.
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):
-	Free the expected host.
-	(camel_tcp_stream_openssl_new): Now takes a Service and an
-	expected_host. Set them.
-
-2001-03-20  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_store_check_online): Function to check if the store is
-	online and set an exception if not. Currently controlled by an
-	environment variable, but eventually there will be both a global
-	(session-level) setting and a per-store setting.
-	(construct): Set up storage_path and base_url here rather than at
-	connect-time.
-	(imap_auth_loop): Split out from imap_connect.
-	(imap_setup_online): Split out from imap_connect. Do the
-	post-authentication connection setup, and cache the results to
-	disk.
-	(imap_setup_offline): Set up a CamelImapStore with information
-	saved from a previous imap_setup_online.
-	(imap_connect): If online, do connect_to_server(),
-	imap_auth_loop(), and imap_setup_online(). Otherwise, do
-	imap_setup_offline().
-	(get_folder, get_folder_info): Add offline support.
-	(create_folder, subscribe_folder, unsubscribe_folder): Disable
-	these when offline (for now).
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new):
-	Remove the sync'ing-with-server stuff... it's done by
-	camel_imap_folder_selected now, which only gets called if the
-	store is online.
-	(camel_imap_folder_selected): add the code removed from
-	camel_imap_folder_new. Besides simplifying the folder_new and
-	summary_new code, this also means now that we'll DTRT if a
-	folder's UIDVALIDITY changes while we're connected. Also, when
-	that happens, clear the message cache explicitly.
-	(imap_refresh_info, imap_sync): These are no-ops when offline.
-	(imap_expunge, imap_append_message, imap_copy_message_to,
-	imap_search_by_expression): These don't yet work offline.
-	(imap_get_message, camel_imap_folder_fetch_data): Return an error
-	when trying to fetch a non-cached body part when we're offline.
-
-	* providers/imap/camel-imap-summary.c (camel_imap_summary_new):
-	Rewrite to not check the validity here. (We'll do it from
-	camel_imap_folder_selected instead.)
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Call
-	camel_imap_folder_selected even when the selection is all we're
-	doing, to match the changes in camel-imap-folder.c.
-
-	* providers/imap/camel-imap-message-cache.c
-	(camel_imap_message_cache_clear): New function to clear out a
-	message cache.
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added $(EXTRA_GNOME_CFLAGS)
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the errbuf
-	to NULL after freeing it? I don't think this should fix bug #1801
-	but I guess it can't hurt.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-remote-store.c (remote_recv_line): Protect against a
-	possibly NULL exception.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Document and modify to return a boolean value denoting whether or
-	not errors occured during processing.
-	(camel_filter_driver_filter_mbox): Same as above and also modified
-	to check return codes of filter_message rather than relying only
-	on whether or not the exception was set (as it's possible to pass
-	in NULL for the exception).
-	(camel_filter_driver_filter_folder): Same as above.
-
-	* camel-mime-utils.c (header_param_list_format_append): Quote the
-	param value if it contains whitespace as well.
-
-2001-03-17  Jeffrey Stedfast <fejj@ximian.com>
-
-	* Makefile.am: Don't include system include dir.
-
-	* camel.c: Use quotes around the nss.h include so it doesn't try
-	to use the systen nss.h file.
-
-	* camel-tcp-stream-ssl.c: Same here.
-
-2001-03-17  Not Zed  <NotZed@Ximian.com>
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_sync): 
-	Modified patch from Dan Berger <dberger@ix.netcom.com> to re-check
-	the maildir directory for new/updated messages at sync time.
-
-	* camel-folder.c (camel_folder_ref_message_info): Implemented.
-	(ref_message_info): And default implementation.
-
-	* camel-folder.h: Added ref_message_info virtual method.
-
-2001-03-16  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-thread.c
-	(camel_folder_thread_messages_new_summary): New function to create
-	a thread tree from a supplied summary array.
-	(camel_folder_thread_messages_destroy): Handle thread trees
-	generated by the above function properly.
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-private.h: Same.
-
-	* camel-remote-store.h: Fixed #include to use <>'s instead of ""'s
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Print info about the
-	issuer of the certificate.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Use
-	camel_tcp_stream_get_socket().
-
-	* camel-tcp-stream-openssl.c (stream_get_socket): Implemented.
-
-	* camel-tcp-stream-ssl.c (stream_get_socket): Implemented.
-
-	* camel-tcp-stream-raw.c (stream_get_socket): Implemented.
-
-	* camel-tcp-stream.c (camel_tcp_stream_get_socket): New function.
-
-2001-03-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* providers/pop3/camel-pop3-folder.c: Added #include <config.h>
-	
-2001-03-16  Dan Winship  <danw@ximian.com>
-
-	* camel-mime-utils.c (header_msgid_generate): Don't use
-	getdomainname: it's NIS crap, not DNS.
-
-2001-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.c (camel_init): Don't use the hardcoded cert db directory,
-	use the one passed in.
-
-	* camel-tcp-stream-ssl.c (ssl_get_client_auth): Wrote the default
-	implementation. Not that we'll use this though, since this is the
-	default implementation provided by NSS anyway. This more or less
-	serves as a reference in case we want to change anything.
-	(ssl_auth_cert): Same.
-	(ssl_bad_cert): Changed the prompt string and free it when we're
-	done.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	First batch of disconnected IMAP-related stuff. This adds local
-	caching of message parts, but NOT any actual disconnected support.
-	(But it should speed up IMAP use.)
-
-	* providers/imap/camel-imap-message-cache.c: New class for caching
-	message data to disk, and removing it when it's no longer
-	relevant. Will eventually also support merging message parts
-	together to save on files. Or maybe using a db instead of files?
-
-	* providers/imap/camel-imap-private.h: Add a cache_lock to
-	CamelImapFolderPrivate. This lock must be recursive, so make both
-	locks EMutexes rather than GMutex.
-
-	* providers/imap/camel-imap-folder.c (parse_fetch_response): "The
-	only FETCH response parser you need!" Replaces the various
-	almost-correct bits of code formerly scattered throughout this
-	file with a single fully-correct function that can handle any
-	FETCH response at any time, so we don't get confused by seeing a
-	flags update when we were only expecting a message body, etc.
-	(camel_imap_folder_fetch_data): FETCH a message body part either
-	from the cache or the server
-	(camel_imap_folder_changed): Remove expunged messages from the
-	message cache.
-	(camel_imap_folder_new): Change to take a directory instead of a
-	summary file name. Create a CamelImapMessageCache for the folder.
-	(imap_finalize): Unref the message cache.
-	(camel_imap_folder_selected, imap_rescan, get_content,
-	get_message, imap_get_message, imap_update_summary): Redone a
-	bunch to use parse_fetch_data, CamelImapMessageCache, etc.
-
-	* providers/imap/camel-imap-store.c (get_folder): Pass directory
-	name to camel_imap_folder_new, not summary filename. Use
-	e_path_to_physical to generate a path with /subfolders/ inserted
-	between directory components.
-
-	* providers/imap/camel-imap-wrapper.c (camel_imap_wrapper_new):
-	Call camel_imap_folder_fetch_data (with cache_only TRUE) and if
-	the data is cached, return an online datawrapper rather than an
-	offline one.
-	(write_to_stream): Use camel_imap_folder_fetch_data (with
-	cache_only FALSE) here too
-
-	* providers/imap/camel-imap-utils.c (imap_skip_list): Renamed from
-	skip_list and made non-static.
-
-2001-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.h: Uninclude prnetdb.h since it's not
-	needed here.
-
-	* providers/smtp/camel-smtp-transport.c: #include prnetdb.h here
-	instead of making camel-tcp-stream-ssl.h include it. Prevents some
-	header bloat.
-
-	* providers/smtp/Makefile.am: Include the NSPR_CFLAGS and
-	NSS_CFLAGS.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Update for
-	using CamelTcpStreams and also for using SSL.
-
-	* providers/smtp/libcamelsmtp.urls: defined "ssmtp"
-
-	* providers/smtp/camel-smtp-provider.c: Defined the Secure SMTP
-	provider.
-	(camel_provider_module_init): Register the Secure SMTP provider.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Check for
-	"simap" instead of "imaps".
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Change the
-	port to be 995 for spop.
-
-	* providers/pop3/libcamelpop3.urls: Change to "spop".
-
-	* providers/imap/libcamelimap.urls: Change "imaps" to "simap" to
-	correspond to /etc/services.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Check to see
-	if we are using "pops" and then set the appropriate SSL settings.
-
-	* providers/pop3/libcamelpop3.urls: Add "pops"
-
-	* providers/pop3/camel-pop3-provider.c: Defined the pops provider.
-	(camel_provider_module_init): Register the pops provider.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_new): Ya know what?
-	Lets not ref the service because otherwise we'll start having the
-	same problems we had back with vtrash. Besides, since the store
-	owns the stream, it's not like the store is going anywhere without
-	the stream anyway.
-	(camel_tcp_stream_ssl_finalize): No need to unref the service.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-remote-store.c (remote_connect): Pass the service into the
-	SSL stream, not the session.
-
-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_init): Set the
-	service to NULL.
-	(camel_tcp_stream_ssl_finalize): Unref the service.
-	(camel_tcp_stream_ssl_new): Takes a CamelService arg now rather
-	than a CamelSession arg.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.c (camel_init): So it turns out that NSS_Init *isn't*
-	idempotent, so we have to protect against initializing it more
-	than once(contrary to what their design specs suggest).
-
-	* camel-session.c (camel_session_get_service): Use
-	camel_exception_is_set() - Makes no difference but it's more
-	consistant with how we normally do it.
-
-	* camel-provider.h (CAMEL_URL_ALLOW_SSL): We don't need this.
-
-	* providers/imap/camel-imap-provider.c: Define the imaps provider.
-	(camel_provider_module_init): Register the imaps provider.
-
-	* camel-provider.c (camel_provider_init): Only add the protocol to
-	the hash table if it's non empty. Also, g_strdup() the filename
-	into the hash table.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Eek!
-	So the service's URL isn't set until after this is
-	initialized. This means we can't check for SSL here.
-	(imap_connect): Set the SSL options here instead.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c: Numerous fixes to get it to build
-	correctly with NSS enabled.
-
-	* camel-remote-store.c (remote_connect): Pass in the session and
-	expected host args, oops.
-
-	* camel-provider.h (CAMEL_URL_ALLOW_SSL): Defined.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Check
-	to see if we are supposed to use SSL and set the options
-	accordingly.
-	(imap_connect): Return FALSE here instead of NULL.
-
-	* providers/imap/camel-imap-provider.c: Add CAMEL_URL_ALLOW_SSL.
-
-	* providers/imap/libcamelimap.urls: Add "imaps" which is the
-	protocol for Secure IMAP.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-openssl.[c,h]: Added
-
-	* Makefile.am: Added camel-tcp-stream-openssl.[c,h] to the build.
-
-	* camel-types.h: Added CamelTcpStreamSSL and CamelTcpStreamOpenSSL
-
-2001-03-14  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-filter-charset.c (filter, complete): re-constify
-	inbuf, to remove a warning.
-
-	* camel-mime-parser.c (folder_scan_step): When we're out of data,
-	run the filter_complete.  For some reason the logic that was there
-	was never being run, always try it now, i think it was to work
-	around a buggy filter, rather than fix it the right way.
-
-	* camel-folder-summary.c (summary_build_content_info): If indexing
-	html parts, use the html filter to convert it to some indexable
-	format.
-	(summary_build_content_info): Reset the filters before adding them
-	back to the stream, if they get re-used in a given instance
-	(likely).
-
-	* Makefile.am (libcamelinclude_HEADERS): Added
-	camel-mime-filter-html.[ch].
-	(INCLUDES): Added xml clags
-
-2001-03-05  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-search.c (camel_folder_search_class_init): Setup a
-	new function, "uid" which matches uids.
-	(search_uid): Implement the "match uid" command.
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Check for a new type of mailing list header.
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-raw.c (stream_read): Made cancellable.
-	(stream_write): Same.
-	(stream_connect): Removed checks for DIVINE_INTERVENTION as the
-	code worked fine.
-
-	* camel-tcp-stream-ssl.c (stream_write): get rid of 'w' as it
-	wasn't really needed.
-	(set_errno): New function to set errno based on the NSPR error
-	code.
-	(stream_read): If an error occured, call set_errno().
-	(stream_write): Same.
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added camel-tcp-stream-ssl to the build.
-
-	* camel-remote-store.h: Add a use_ssl member to the
-	CamelRemoteStore object.
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_get_type):
-	Oops. Make this a subclass of CamelTcpStream, not CamelStream.
-
-	* camel-types.h: Add the defs for CamelTcpStream and
-	CamelTcpStreamRaw
-
-	* Makefile.am: Add camel-tcp-stream and camel-tcp-stream-raw to
-	the build.
-
-	* camel-remote-store.c (remote_connect): Update to use
-	CamelTcpStreams.
-
-	* camel-tcp-stream-raw.c (stream_connect): Made cancellable by
-	copying the currently used code in camel-remote-store.c.
-	(stream_setsockopt): Oops, flags = fcntl (..., GET_FL);
-	(camel_tcp_stream_raw_get_type): Oops. Make this a subclass of
-	CamelTcpStream, not CamelStream.
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel.c (camel_init): Since all of the Mozilla libs (including
-	NSPR and NSS) correctly handle reinitializations, we might as well
-	init both NSPR and NSS in camel_init so we can be sure of that
-	these libs have been initialized.
-	(camel_shutdown): New function to call the NSS cleanup stuff.
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.c (camel_folder_copy_message_to): Don't allow the
-	user to copy a message to or from the vtrash folder. Set an
-	exception if they try.
-	(camel_folder_move_message_to): This one is a bit more
-	complicated: 1) If the user tried to move a message from the
-	vtrash into the original folder, just undelete the message. 2) If
-	the user tries to move the message to the vtrash folder, then just
-	mark the message as deleted. 3) If the user tries to move the
-	message from the vTrash to a folder other than the original, use
-	the original folder as the source. As another optimization, I've
-	made it so that if the user tries to move a message to the same
-	folder, just no-op.
-	(move_message_to): Unset the deleted flag before moving (assuming
-	it's there).
-	(copy_message_to): Same.
-
-	* camel-vee-folder.c (camel_vee_folder_get_message_folder): New
-	convenience function to get the folder from which the message uid
-	is derived from.
-
-2001-03-13  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): When trying
-	again after a failed password attempt, check if the connection got
-	dropped (which Courier will do) and deal accordingly.
-
-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send_to,
-	sendmail_send): More fixing for exim: It can't deal with "-tif",
-	you need to say "-t -i -f".
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (init_trash): Rename the folder to "Trash" and
-	i18nify it.
-
-2001-03-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.h: Comment out everything unless HAVE_NSS
-	is defined.
-
-	* camel-tcp-stream-ssl.c (stream_read): Don't use errno, use
-	nspr's error code stuff.
-	(stream_write): Same.
-
-2001-03-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-session.c (camel_session_query_authenticator): Created a
-	new mode (CAMEL_AUTHENTICATOR_ACCEPT) which is a Yes/No prompt to
-	the user. This will be needed by the SSL/TLS code to come. Also
-	changed the return value to a gpointer rather than a char* to
-	allow the returning of TRUE/FALSE values.
-
-	* camel.c: Wrap stuff with HAVE_NSS
-
-2001-03-09  Dan Winship  <danw@ximian.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send,
-	sendmail_send_to): Remove the "-U" for now, because it breaks
-	exim's "sendmail" wrapper. (And it doesn't actually do all that
-	much to sendmail's behavior, and it was working fine before
-	anyway.)
-
-	* camel-mime-utils.c (header_fold): Fix a bug that could make this
-	walk off the end of a string. (The bug has been there since
-	December... maybe this will fix some unreproduceable crashes?)
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_get_folder): Changes so that the
-	folder gets added to the vtrash reguardless of whether or not the
-	store is holding it's own folder lookup hash.
-	(init_trash): Oops, lets try locking the cache before we go and
-	add all the cached folders to the vtrash.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-	These fixes make it so that the CamelStore does not actually hold
-	a ref on it's vTrash folder. The vTrash folder is now created ONLY
-	when it is requested. This solves the problem of not being able to
-	unref a Store and have it disconnect/finalize like we expect it to.
-
-	* camel-store.c (init_trash): When we create the vtrash, add all
-	previously opened folders to it and hook on to the finalize event
-	so that we can then set the store->vtrash to NULL.
-	(get_trash): If a vtrash folder for the store doesn't exist,
-	init_trash() and then try.
-	(construct): No longer need this.
-	(camel_store_class_init): Don't override the construct method.
-	(camel_store_finalize): We no longer hold a ref on the vtrash so
-	don't unref it.
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/pop3/camel-pop3-store.c (init_trash): Implement.
-	(get_trash): Implement.
-	(camel_pop3_store_class_init): Override the default init_trash and
-	get_trash virtual functions. Hopefully this should fix the problem
-	of pop3 sotre's not disconnecting after the send&recv code
-	finishes downloading mail.
-
-	Wonder if I should override the default implementation for the
-	mbox, mh, and maildir too?
-
-2001-03-07  Dan Winship  <danw@ximian.com>
-
-	* camel-remote-store.c (camel_remote_store_connected): Return the
-	return value of camel_service_connect rather than returning
-	!camel_exception_is_set(), since that will be wrong if ex==NULL...
-	Fixes a crash in the IMAP keepalive code, but this same problem
-	probably exists in other places too...
-	(remote_recv_line): Fix another problem...
-
-	* providers/local/camel-mbox-provider.c:
-	* providers/vee/.cvsignore:
-	* providers/vee/libcamelvee.urls: Remove some unused stuff
-	
-2001-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-digest-md5.c (compute_response): Redone so as to save
-	on memory allocations and speed.
-
-2001-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-plain.c (plain_challenge): Don't return NULL if the
-	token is non-NULL. This is why:
-
-	sending : AUTH PLAIN
-        received: 334 ok. go on.                 <-- this is why
-        sending : ZGZPaQpAZ214Lm5ldBBnb29jYXI=
-        received: 235 {mp005-rz3} go ahead
-
-	* camel-sasl.c (camel_sasl_authtype): Add the PLAIN type here.
-	(camel_sasl_authtype_list): And here too.
-
-	* camel-sasl-plain.c: Initialize the camel_sasl_plain_authtype.
-
-	* camel-sasl-plain.h: extern the camel_sasl_plain_authtype.
-
-2001-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): i18n'd some
-	strings in here.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Keep
-	trying to authenticate until either we succeed or until the user
-	cancels.
-
-2001-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Wrote a new version of header_fold() that
-	takes a 'force' option and uses another new function called
-	header_fold_next_space() in place of strchr(inptr, ' ') to get the
-	next whitespace char. The idea of header_fold_next_space() is to
-	not treat spaces between a set of quotes as a space - this way it
-	will be possible to fold (for example) the Content-Type MIME
-	header without worrying about breaking up a boundary string.
-	Note: This code is #if 0'd out until Zucchi approves of the patch.
-	Another Note: We will probably still want to use the "don't fold
-	this header" hash lookup for headers like the Message-Id and
-	possibly a few others.
-
-2001-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-internet-address.c
-	(camel_internet_address_encode_address): Make sure there is a
-	space between the name and the address tokens.
-
-	* camel-mime-utils.c (rfc2047_decode_word): encoded string
-	segments need to be at least 8 chars (7 doesn't leave room for an
-	ecoding value. To be more realistic, even 8 chars isn't enough as
-	this assumes there is no charset nor any encoded text. If the
-	encoding value is not 'Q' or 'B', then return NULL. This fixes bug
-	#1689.
-
-2001-03-03  Not Zed  <NotZed@Ximian.com>
-
-	* camel-vee-folder.c (vee_folder_remove_folder): New function to
-	remove a folder from a vfolder.
-	(camel_vee_folder_remove_folder): New public function to remove a
-	folder from a vfolder.
-
-2001-03-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-provider.c: Doh! Set the
-	CAMEL_URL_ALLOW_AUTH flag.
-
-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):
-	Updated with the extended AUTH return codes.
-
-2001-03-02  Jeffrey Stedfast  <fejj@ximian.com>
-	
-	* providers/imap/camel-imap-store.c (try_auth): Don't forget to
-	unref the SASL object.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types):
-	Implemented.
-	(smtp_auth): Implemented.
-	(smtp_helo): Don't bother parsing the authtypes if we already have
-	them.
-	(smtp_connect): call smtp_auth() here if we found any authtypes.
-	(smtp_disconnect): Updated as I now use a hash table for the
-	supported authtypes rather than a linked list.
-	(esmtp_get_authtypes): modify to use a hash table instead of a
-	linked list and also use isspace() rather than == ' '.
-
-2001-03-02  Dan Winship  <danw@ximian.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send_to,
-	sendmail_send): Use "-f" to set the envelope from address so
-	bounces go to the right place. Also, pass "-U" since the man page
-	says we're supposed to...
-
-2001-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-	
-	* camel-sasl.c: #include "camel-sasl-digest-md5.h"
-	(camel_sasl_authtype_list): add DIGEST-MD5 stuff here.
-	(camel_sasl_authtype): And here too.
-	(camel_sasl_new): And here...
-
-	* camel-sasl-digest-md5.[c,h]: new SASL class for DIGEST-MD5 (has
-	been tested and proven to work).
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* camel-sasl.c (camel_sasl_challenge): Take a GByteArray as input
-	as well. Comment that you can pass %NULL for @token to get the
-	initial auth data for mechanisms that are client-initiated.
-	(camel_sasl_challenge_base64): Convenience function for protocols
-	that use base64-encoded SASL.
-	(camel_sasl_authenticated): Implement this... (it was prototyped
-	already)
-	(camel_sasl_new): Function to take a service name, a mechanism
-	name, and a CamelService, and return a CamelSasl for it.
-	(camel_sasl_authtype, camel_sasl_authtype_list): Functions to
-	return CamelServiceAuthType information about SASL mechanisms, to
-	allow providers to deal with them generically.
-
-	* camel-sasl-anonymous.c, camel-sasl-plain.c: Update/simplify for
-	CamelSasl changes. Both of these are single-round
-	(client-initiated) mechanisms, so they don't need to keep state.
-	(camel_sasl_plain_new): Removed; use camel_sasl_new instead.
-	(Can't get rid of camel_sasl_anonymous_new though...)
-
-	* camel-sasl-cram-md5.c: Update/simplify for CamelSasl changes.
-	(camel_sasl_cram_md5_new): Removed; use camel_sasl_new instead.
-	(cram_md5_challenge): Use md5_get_digest where possible, and
-	various other minor simplifications. CRAM-MD5 only has a single
-	round, so there's no need to keep track of state. This code is now
-	tested (against Cyrus IMAPd) and known to work.
-
-	* camel-sasl-kerberos4.h: Update/simplify for CamelSasl changes.
-	Make only a single #ifdef HAVE_KRB4. Remove stuff from priv that
-	isn't needed between rounds.
-	(camel_sasl_kerberos4_new): Removed; use camel_sasl_new instead
-	(krb4_challenge): Fix up the logic I broke in my previous "at
-	least make it compile" fixes, update to match other changes, and
-	remove IMAP-isms that shouldn't be in the generic code. This still
-	isn't tested, because we're stuck behind a NAT right now...
-
-	* providers/imap/camel-imap-store.c: Add an "authtypes" hash table
-	to CamelImapStore recording the supported authtypes.
-	(connect_to_server): Record supported authtypes in the authtypes
-	hash rather than the capabilities bitmask, since now the IMAP code
-	is no longer responsible for keeping track of which authtypes we
-	support.
-	(query_auth_types): Use camel_sasl_authtype_list to get the
-	SASL-supported authtypes.
-	(try_auth): New function to try a SASL auth mechanism. Sort of
-	formerly imap_try_kerberos_v4_auth.
-	(imap_connect): Get rid of the krb4-specific bits and genericize
-	them for any SASL authtype.
-
-	* providers/imap/Makefile.am: Remove camel-imap-auth.[ch] (moved
-	into camel-imap-store.c since it's now constant size) and the
-	KRB4_CFLAGS and KRB4_LDFLAGS references.
-
-2001-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-anonymous.c (anon_challenge): Don't base64 encode the
-	data, leave that up to the provider to do if it needs to. Also
-	save on some memory allocations and stuff.
-
-	* camel-sasl-cram-md5.c (cram_md5_challenge): Same here. Also get
-	rid of the need for the temp buf as we can just write it to the
-	GByteArray.
-
-2001-03-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (rfc2047_encode_word, rfc2047_decode_word):
-	Reconstify variables to match iconv.
-
-	* camel-search-private.c (camel_ustrstrcase): Change some
-	assertions back into valid returns.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (libcamel_la_LIBADD, INCLUDES): camel depends on
-	krb4 now (where available), for camel-sasl-kerberos4.c
-
-	* camel-sasl-kerberos4.[ch]: Make this at least compile. Dunno if
-	it works yet.
-
-2001-03-01  Peter Williams  <peterw@ximian.com>
-
-	* camel-url.c (camel_url_new): Assert url_string != NULL.
-
-2001-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added camel-sasl-anonymous.[c,h] to the build.
-
-	* camel-sasl-anonymous.[c,h]: new SASL class for ANONYMOUS
-
-	* camel-sasl-plain.c (plain_challenge): Oops, have a state for
-	setting sasl->authenticated = TRUE;
-
-	* camel-sasl-cram-md5.c (cram_md5_challenge): Same here.
-
-2001-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_date): A fix for broken
-	mailers that send 2-digit years (ie "Wed, 28 Feb 01
-	04:59:41"). Fixes bug #1633.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Check
-	to make sure message isn't NULL.
-
-2001-02-28  Dan Winship  <danw@ximian.com>
-
-	* camel-remote-store.c (remote_recv_line): If we get back 0 bytes
-	from camel_stream_buffer_gets, that means the socket got
-	disconnected, so set an exception. (Noticed because of a message
-	that crashes our IMAP server when you try to look at it. :)
-
-2001-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added camel-sasl*.[c,h] to the build.
-
-	* camel-sasl.[c,h]: new "abstract" SASL class
-
-	* camel-sasl-kerberos4.[c,h]: new SASL class for KERBEROS_V4
-
-	* camel-sasl-cram-md5.[c,h]: new SASL class for CRAM-MD5
-
-	* camel-sasl-plain.[c,h]: new SASL class for PLAIN
-
-	* providers/imap/camel-imap-auth.c: Removed the base64 functions.
-
-	* camel-mime-utils.c (base64_encode_simple): Moved here from
-	camel-imap-auth.c
-	(base64_decode_simple): Same.
-
-2001-02-26  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Group messages
-	into sets with the same flags and use the IMAP message set
-	notation rather than doing a separate STORE FLAGS for each one.
-	This cuts the network traffic down to just a handful of commands
-	per sync rather than one per changed message. Removed the progress
-	notification stuff since it's no longer meaningful and should
-	hopefully be unnecessary.
-	(imap_copy_message_to): move the former sync_message function
-	into here, since it's no longer shared with imap_sync.
-
-2001-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Made thread-safe and moved to above the test
-	code.
-
-	* camel-mime-message.c (camel_mime_message_init): Set the
-	message_id to NULL.
-	(camel_mime_message_finalize): Free the message_id.
-	(camel_mime_message_set_message_id): New function to set the
-	Message-Id.
-	(camel_mime_message_get_message_id): New function to get the
-	Message-Id.
-	(process_header): Decode the message-id.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (construct): init the vTrash folder here instead
-	of in store_init.
-	(camel_store_class_init): init service_class->construct.
-	(camel_store_finalize): We only need to unref the vtrash folder.
-	(init_trash): don't create a vstore since we don't need it.
-
-2001-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_class_init): init get_trash and
-	init_trash.
-	(camel_store_init): call the virtual init_trash function.
-	(camel_store_finalize): unref the vtrash folder/store if present.
-	(camel_store_get_folder): Add the new folder to the vtrash
-	vfolder.
-	(init_trash): default implementation of init_trash.
-	(get_trash): default implementation of get_trash.
-
-	* camel-vee-store.c (vee_init_trash): No-op.
-	(vee_get_trash): return NULL
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-summary.c (camel_message_info_new_from_header):
-	Doh, cut and paste problem, use mlist not cc.
-
-	* camel-folder.c (move_message_to): 
-	(copy_message_to): If the source folder doesn't support a
-	summary, dont try and get the message info from it.
-
-	* camel-filter-search.c (check_header): Implement a pseudo-header
-	"x-camel-mlist" which just looks up in the message info for a
-	match.
-
-	* camel-folder-search.c (check_header): Add pseudo-header
-	"x-camel-mlist" which can be used to match on mailing list.
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Add some
-	internal progress reporting.
-	(imap_rescan): Do some progress reporting.
-
-	* camel-mime-part.c (init_header_name_table): Add the message-id
-	to the formatted table, so we dont try and wrap it, and break it.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.h: Remove the 'FIXME: remove because this isn't
-	required...' comment for copy_message_to since we now need and
-	cherish its existance in the filter-driver code ;-)
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Now
-	takes a UID and CamelFolder arguments (which can be NULL) to allow
-	for possible optimizations when copying messages between folders
-	on the same store.
-	(camel_filter_driver_filter_mbox): Updated (passes NULL for both
-	since this case can't be optimized anyway).
-	(camel_filter_driver_filter_folder): Updated to pass in the uid
-	and folder of the message.
-
-2001-02-22  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-summary.h (CAMEL_IMAP_SERVER_FLAGS):
-	#define this as the set of all IMAP system flags
-
-	* providers/imap/camel-imap-folder.c (sync_message): after syncing
-	flags, set server_flags to (flags & CAMEL_IMAP_SERVER_FLAGS)
-	rather than just "flags", since any other flags won't have been
-	synced. Prevents the CAMEL_MESSAGE_ATTACHMENTS flag from getting
-	lost.
-
-2001-02-22  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/*: Removed all files.
-	
-	* camel-private.h: Move camel-vee-private.h stuff into here.
-
-	* camel-session.c: Move the vee_provider here, and initialise it
-	always as part of a session.  The vfolder provider is always
-	available.
-
-	* providers/Makefile.am: Remove "vee" from the build list, now
-	built as part of the main library.
-
-	* Makefile.am (libcamelinclude_HEADERS): 
-	(libcamel_la_SOURCES): Added camel-vee-store.[ch],
-	camel-vee-folder.[ch].
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build): Removed,
-	not used.
-	(camel_vee_folder_new): Removed call to build_folder.
-	(vee_get_message): Dont try and free the mi if we didn't get it.
-
-	* camel-folder.c (camel_folder_change_info_new): Added a hash
-	table of what we have in the lists, plus moved private things into
-	private pointer.
-	(camel_folder_change_info_add_source): Fixed up private accesses.
-	(camel_folder_change_info_add_uid): Changed to use a hashtable to
-	see if we already have the uid, etc.
-	(camel_folder_change_info_remove_uid): Similar.
-	(change_info_remove): Likewise.
-	(camel_folder_change_info_clear): Fixes for privatisations.
-	(camel_folder_change_info_free): "
-
-2001-02-21  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (fetch_medium): Fixes for
-	IMAP4-pre-rev1 from Torsten Schulz.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (mail_list_magic): Take the ^Header: part out
-	of the expression, since we look that up ourselves.
-	(header_raw_check_mailing_list): When getting the match, get match
-	1, not match 0, we dont want the full string match.
-
-	* camel-folder-summary.c (CAMEL_FOLDER_SUMMARY_VERSION): Bumped
-	for summary change.
-	(message_info_new): Extract the mlist info from the headers.
-	(message_info_load): Load mlist from summary.
-	(message_info_save): Save mlist to summary.
-	(message_info_free): Save the mlist entry.
-	(camel_message_info_new_from_header): Extract mailing list header.
-	(camel_message_info_dup_to): Copy the mlist entry.
-	(camel_message_info_free): Free mlist.
-	(message_info_dump): Dump the mlist.
-
-	* camel-folder-summary.h: Add an mlist (mailing list) string to
-	the summary.
-
-2001-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Added
-	flags argument.
-	(message_changed): Add support for the auto-update flag, in which
-	case we auto-match the content as it changes.
-	(camel_vee_folder_init): Remoive "DYNAMIC" optionality
-	(camel_vee_folder_finalise): "
-	(vee_expunge): As we expunge folders, re-sync their content by
-	rerunning the query.
-
-	* providers/vee/camel-vee-store.c (vee_get_folder): Pass flags to
-	folder new.
-
-2001-02-18  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/Makefile.am (noinst_HEADERS): Added
-	camel-vee-private.h.
-
-	* providers/vee/camel-vee-private.h: New file to add locking stuff
-	for vee folders.
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Add
-	locking around unmatched setup.
-	(camel_vee_folder_init): Setup lock.
-	(camel_vee_folder_finalise): Free locks.
-	(folder_changed): Add locking.
-	(unmatched_finalise): "
-	(message_changed): "
-	(vee_folder_build): "
-
-2001-02-17  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_add): Check uid
-	doesn't exist before adding it.
-
-2001-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Create
-	a new virtual virtual folder UNMATCHED, to store all messages that
-	dont match other vfolders.
-	(unmatched_folder_changed): When a vfolder issues a changed event,
-	use its info to update the unmatched folder info.
-	(unmatched_finalise): When a vfolder is finalised, remove any uids
-	it has as if we had a removed event for it.
-
-2001-02-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_finalise): Thaw the
-	defaultfolder.
-	(camel_filter_driver_set_default_folder): Thaw the defaultfolder
-	we're about to replace, and freeze the new defaultfolder.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Emit
-	the folder_created signal here.
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Emit the folder_created signal.
-
-	* providers/local/camel-local-store.c (delete_folder): On error,
-	free the 'name' string so we don't leak. Also emit the
-	folder_deleted signal.
-
-	* providers/imap/camel-imap-store.c (subscribe_folder): Emit the
-	folder_created signal.
-	(unsubscribe_folder): Emit the folder_deleted signal.
-
-	* camel-store.c (camel_store_class_init): Added folder_created and
-	folder_deleted signal defs.
-
-2001-02-15  Dan Winship  <danw@ximian.com>
-
-	* camel-folder-thread.c (container_parent_child): Deal with
-	out-of-order References headers so they don't cause messages to
-	disappear in threaded view.
-
-	* providers/imap/camel-imap-folder.c (fetch_medium): IMAP4
-	(pre-rev1) doesn't allow BODY.PEEK[], so use RFC822.PEEK instead
-	in that case.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* camel-mime-filter-charset.c (complete, filter),
-	camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):
-	Changed this code to match the glibc iconv signature.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* camel-store.c (camel_store_create_folder): New method to create
-	a folder when you don't know its full name.
-
-	* providers/imap/camel-imap-store.c (create_folder): Implement.
-	(create_folder): Oops, and fix bug involving namespaces
-	
-2001-02-12  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part.c (init_header_name_table): Add address headers
-	to list that we dont fold when writing.  The are properly
-	formatted as we build them.
-	(write_to_stream): DOH, lookup the header name in the formatted
-	hash table, not the value, that would never have worked.
-
-	* camel-internet-address.c
-	(camel_internet_address_encode_address): Changed to take a
-	parameter saying how much we've printed so far.  We now fold the
-	header as we format it.  We dont fold addresses, even if they are
-	too long, we simply put them on another line by themselves: this
-	should make the result more parsable by mailers that can't handle
-	split up addresses (which are legal).
-	(internet_encode): Fix for changes to above.
-
-2001-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-provider.c: mbox, mh, and maildir
-	camel-url's need absolute paths.
-
-	* camel-provider.h (CAMEL_URL_PATH_IS_ABSOLUTE): New flaggy flag.
-
-2001-02-08  Dan Winship  <danw@ximian.com>
-
-	* camel-store.c: Rewrite a bunch. Replace the existing folder
-	cache stuff with much simpler code that still handles all the
-	existing cases. Now the folder hash table is always created by the
-	base class, using hash and compare functions provided by the class
-	implementation. (If they are set to NULL, CamelStore won't cache
-	folders.) lookup_folder, cache_folder, and uncache_folder are no
-	longer class methods, and get_name is gone completely.
-
-	(camel_store_get_inbox): Renamed from
-	camel_store_get_default_folder, since that wasn't being used, and
-	this is what we actually need.
-	(camel_store_get_root_folder): Removed, since it's not needed for
-	anything given get_folder_info.
-
-	* camel-remote-store.c:
-	* providers/local/camel-local-store.c:
-	* providers/local/camel-mbox-store.c:
-	* providers/local/camel-mh-store.c:
-	* providers/local/camel-maildir-store.c:
-	* providers/nntp/camel-nntp-store.c:
-	* providers/pop3/camel-pop3-store.c:
-	* providers/vee/camel-vee-store.c: Minor updates for CamelStore
-	changes
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):
-	Update for CamelStore changes.
-	(hash_folder_name, compare_folder_name): treat INBOX
-	case-insensitively, otherwise use g_str_hash and g_str_equal.
-
-	* camel-service.c (camel_service_construct): Remove
-	camel_service_new and create camel_service_construct (as a class
-	method) in its place.
-
-	* camel-session.c (camel_session_get_service): Use
-	camel_object_new and camel_service_construct to replace
-	camel_service_new.
-
-	* providers/local/camel-local-store.c (construct): Append a '/' to
-	the URL path if it doesn't end with one
-
-2001-01-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-tcp-stream-ssl.c: Oops, include the camel-tcp-stream-ssl
-	header instead of the raw one.
-
-2001-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* camel-operation.c (camel_operation_start): Changed to push the
-	operation into a status stack.
-	(camel_operation_progress): Changed to only accept % complete.
-	(camel_operation_reset): Free status stack as well.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message): Get the
-	octect count from the return line, and pass it to
-	get_additional_data().
-	(pop3_refresh_info): Added status stuff.
-
-	* providers/pop3/camel-pop3-store.c
-	(camel_pop3_command_get_additional_data): Added a total bytes
-	expected argument for progress reporting & fixed callers.
-	(camel_pop3_command_get_additional_data): Added progress
-	reporting.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	(mbox_summary_sync_quick):
-	(summary_rebuild): Added progress reporting stuff.
-
-2001-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-search-private.c (CAMEL_SEARCH_COMPARE): Macro for making
-	comparisons easy.
-	(camel_ustrcasecmp): Use CAMEL_SEARCH_COMPARE and check for
-	end-of-string before the utf-8 error check.
-	(camel_ustrncasecmp): Same.
-	(camel_search_header_match): Strip leading spaces before doing
-	anything else. Also use vlen and mlen so as to not need to do 500
-	strlen()'s.
-	(camel_ustrcasecmp): Don't get_utf8() for the 2 strings in the
-	comparison part of the loop because of short-circuit expression
-	evaluation. (blame JPR if this is the wrong term!)
-	(camel_ustrncasecmp): Same.
-
-2001-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-search-private.c (utf8_get): Rewrote using unicode_get_utf8().
-	(camel_ustrcasecmp): Use unicode_char_t
-	(camel_ustrncasecmp): Same.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* camel-mime-filter-charset.c (complete, filter),
-	camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):
-	Made these pass char ** as the second parameter to iconv.
-
-2001-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* camel-session.c: Removed all the camel_cancel stuff.
-
-	* camel-stream-fs.c (stream_read): Change to use camel_operation.	
-	(stream_write): "
-
-	* camel-remote-store.c (socket_connect): Change to use
-	camel_operation rather than camel_cancel stuff.
-	Removed gal include, WTF is that doing there anyway?
-
-	* Makefile.am (libcamel_la_SOURCES): 
-	(libcamelinclude_HEADERS): Added camel-operation.[ch], stuff to
-	handle notification and cancellation.
-
-	* camel-search-private.c: Removed unwanted header.  It was never
-	put in for a reason.  Stop fixing irrelevant warnings.
-	
-	(camel_ustrstrcase): Our own strstrcase impl for utf8 strings.
-	(camel_ustrcasecmp): Ditto for strcasecmp.
-	(camel_ustrncasecmp): And strncasecmp.
-	(utf8_get): Simpler interface to utf8 string processing.
-	(camel_search_header_match): Use the new things.
-
-2001-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder.c (get_summary): Removed some old variables/a small
-	memleak.
-	(free_summary): Removed old variables.
-
-	* camel-mime-utils.c (header_raw_check_mailing_list): New utility
-	function to get the mailing list (if any) that a set of headers
-	came from.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-stream-fs.c: Added a missing #include.
-
-	* camel-search-private.c: Added a missing #include.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-remote-store.c (remote_query_auth_types): Oops. Change
-	this too.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): Updated.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types):
-	Updated.
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): Updated.
-
-	* providers/imap/camel-imap-store.c (query_auth_types): Updated.
-
-	* camel-service.c (camel_service_query_auth_types): Now takes a
-	boolean value to specify whether or not to connect when
-	constructing a supported authtype list.
-
-2001-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* camel-stream-filter.c (do_write): Revert jeff's earlier change,
-	the change below is the more-correct fix.  All his was doing was
-	ignoring the return code & looping actually :)
-
-	* camel-stream-fs.c (stream_write): Since we are non-blocking on
-	the outgoing fd, keep looping if writing out large blocks, so we
-	can keep checking for cancel, etc.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new): When
-	we drop a fake node, dont skip checking the next in the list.
-	(camel_folder_thread_messages_new): Add an assertion check just to
-	make sure we dont get any pseudo nodes, and spit a warning if we
-	do.
-
-2001-02-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-filter.c (do_write): Make do_write loop until the
-	entire buffer is written.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-stream-fs.c: Add missing header for cancel check stuff.
-
-	* camel-session.c (camel_cancel_cancel): Fix a wrong cast.
-
-	* camel-mime-part.c (init_header_name_table): Setup a new table
-	header_formatted_table, that lists headers that we dont want to
-	fold (they've already been folded).
-	(write_to_stream): Check for already formatted headers, and dont
-	try and fold them.  This is a fix for bug #1097.
-
-2001-02-01  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_fold): If we are folding, drop the
-	space at the end of the line.
-
-2001-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* camel-remote-store.c (timeout_cb): Remvoe the stream locking
-	here.  I think this was leading to a deadlock when a keepalive is
-	being sent, in imap.
-
-2001-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-command.c
-	(imap_command_strdup_vprintf): Include the terminating NUL in the
-	calculated string length.  This hit memcheck.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* tests/folder/test3.c: Changed the subject search to handle case
-	sensitive when it is mixed case.
-
-	* Makefile.am (libcamel_la_SOURCES): Added camel-ssearch-private.c
-	(noinst_HEADERS): Added camel-search-private.h
-
-	* camel-folder-search.c (check_header): New function to do the
-	work of the various header checks.
-	(search_header_matches): 
-	(search_header_starts_with): 
-	(search_header_ends_with): 
-	(search_header_contains): Use check_header to do the work.
-	(build_match_regex): Removed.
-
-	* camel-search-private.c (header_soundex):  New
-	function to match words to phrases using soundex algorithm.
-
-	* camel-filter-search.c (soundexcmp): Removed.
-	(check_match): Moved to search-private.h
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* camel-search-private.c (camel_search_build_match_regex): Added
-	extra flags, so the same function can be used for
-	start/end/whole/partial matches.
-	(camel_search_header_match): Convenience function to check a
-	single header against all sorts of different matches.
-
-	* providers/imap/camel-imap-search.c (imap_body_contains): Fix for
-	e_sexp api changes.
-
-	* camel-folder-search.c: Fix for e_sexp api changes.
-	(search_header_contains): Free args/quit on unknown header.
-	(search_header_matches): "
-	(search_header_starts_with): "
-	(search_header_ends_with): "
-	(match_message): Add an exception argument.
-	(search_body_contains): Free args/quit on fatal error.
-	(message_body_contains): Removed (moved to
-	camel-search-private.c), fixed callers.
-
-	* camel-filter-search.c: Fix for e_sexp api changes.
-	(build_match_regex, message_body_contains): Moved into
-	camel-filter-private.c  Fixed callers.
-	(check_header): moved guts to camel-search-private, and
-	changed to use regex's for everything.  Just calls that with the
-	right args.
-	(check_header): GEts the header, decodes it, and checks for
-	failure, and whatnot.
-	(check_match): Removed.
-	(header_soundex): Changed significantly.  Now it soundexes each
-	word in the header separately, and compares it to the first
-	argument.
-
-	* tests/folder/test9.c (main): Fix for api changes.
-	(main): Added tests to see that invalid match and action
-	rules are properly detected.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Remove
-	the 'finished message' bit.
-	(camel_filter_driver_filter_message): Remove an accidentally
-	checked in debug.
-	(camel_filter_driver_filter_message): Fix for e-sexp api changes.
-
-2001-01-23  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-wrapper.c: Add a lock around the
-	delayed loading, so two threads won't try to do it at the same
-	time.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Set the
-	CamelFolder::name to just the base part of the vfolder name (the
-	non-query part)
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-search.c (camel_filter_search_match): Perform error
-	checking on parsing/execution.
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Perform error handling on search expression.
-	(CamelFolderSearchPrivate): Add a camelexception for error
-	returns.
-	(camel_folder_search_execute_expression): Setup exception pointer.
-	(search_match_all): Quit on error.
-
-	* providers/imap/camel-imap-summary.c (message_info_load): Removed
-	some debug 'warnings', as they should now be displayed at the
-	toplevel loader, and just made the code match similar code
-	elsewhere.
-
-	* providers/local/camel-mbox-summary.c (message_info_load): Error
-	handling.
-	(message_info_save): more error handling.
-
-	* camel-folder-summary.c (message_info_load): Add error handling
-	and sanity checking.
-	(camel_folder_summary_load): Add error checks.
-	(perform_content_info_load): Error + sanity checks.
-	(content_info_load): error + sanity checks.
-
-	* camel-filter-driver.c (close_folder): avoid /0 by updating after
-	we've done the sync.
-	(close_folders): Setup the first progress report to start it off.
-	(camel_filter_driver_filter_message): Fix a fixme, check errors in
-	e_sexp parsing, etc.
-
-2001-01-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Initialize the value of the variable exists here.
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* .cvsignore */*/.cvsignore: Added profiling temp
-	files.
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new): When
-	removing phantom nodes, check for the end node too.
-
-	* camel-filter-driver.[ch]: Changed status vars to be
-	CAMEL_FILTER_STATUS_ etc.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_param_list_format_append): Make the
-	output a little prettier. Okay, so I'm anal...
-
-2001-01-21  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-driver.h: Added an exception to
-	CamelFilterGetFolderFunc.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Remove source parameter, as it is determined elsewhere now.
-	(camel_filter_driver_filter_folder): Same here.
-	(camel_filter_driver_filter_mbox): And here.
-	(do_move): If we cannot open a folder, quit, rather than ignoring
-	it.
-	(do_copy): Here too.
-	(open_folder): Pass an exception into get_folder callback.
-	(camel_filter_driver_filter_folder): Report that we're syncing,
-	when we are.
-	(camel_filter_driver_filter_mbox): And here too.
-	(close_folder): And here.
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Set
-	the deleted bit *before* copying to the default folder, this way
-	if they are importing mail and have a rule to delete it, it
-	doesn't get copied to the default folder un-deleted.
-
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c
-	(get_subscribed_folders_by_hand): If LISTing a subscribed folder
-	doesn't return a LIST response, just ignore that folder. Yay
-	RFC2060.
-	(subscribe_folder): add a missing UNLOCK
-
-2001-01-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* providers/smtp/camel-smtp-provider.c: Mark strings for translation.
-	
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-driver.c (report_status): Add a percentage complete
-	indicator to the status thing.
-	(camel_filter_driver_filter_mbox): Add percentage complete to
-	reporting.	
-	(camel_filter_driver_filter_folder): Same.
-
-2001-01-18  Dan Winship  <danw@ximian.com>
-
-	* camel-store.c (camel_folder_info_build): More tweaking... skip
-	separator characters after the namespace character. (Gets rid of
-	the shell folder registration warning some people have had with
-	IMAP)
-
-	* providers/imap/camel-imap-store.c (imap_connect): I'm sure there
-	was some clever reason I was storing the flags of the folder in
-	the hash table rather than just "1", but I don't remember what it
-	was now. Anyway, since we only ever test NULL/non-NULL, store 1,
-	since flags is sometimes 0.
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Oops.
-	Somewhere in one of the reorgs, the code to add new messages to
-	the CamelFolderChangeInfo structure got removed. Fix that.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-summary.c (message_info_load): Add
-	some g_warnings() to help debug later if I ever get the segfaults
-	I was getting earlier. Can't seem to reproduce them after my
-	previous "fix".
-
-	* camel-folder-summary.c (camel_folder_summary_load): Undid my
-	change here, NotZed said it was wrong and that if it gets a NULL
-	mi then it should abort and not continue.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (camel_folder_summary_load): Make sure
-	that the message-info is non-null before we go accessing inner
-	parts of it and/or adding it to the summary array. I may not have
-	handled the error correctly, but it does seem to work
-	correctly. If NotZed could double-check this it'd be great.
-
-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):
-	New smtp error-code to string mapping function.
-	(smtp_connect): Use the new error->string function for reporting
-	useful errors.
-	(smtp_helo): Same. Also use a case-insensitive strstr for 8BITMIEM
-	as it seems Exchange sends back lowercase for that one single SMTP
-	extension. Everything else is uppercase. I'm seeing a lack of love
-	for that extension by Microsoft dudes...
-	(smtp_mail): Use get_smtp_error_string.
-	(smtp_rcpt): Same.
-	(smtp_data): Same.
-	(smtp_quit): Same.
-	(smtp_rset): Same.
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (camel_folder_summary_array): Add an int
-	i so this code will compile. Should I be worried about how well
-	this code will work? ;-)
-
-2001-01-17  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder.c (free_summary): Call
-	camel_folder_summary_array_free() to do the work.
-	(get_summary): Use camel_folder_summary_array() to get the array
-	atomically.  These fixes allow folder/test8 to work again, and fix
-	a sort of race where the summary size can change while we were
-	making a copy of it.
-
-	* camel-folder-summary.c (camel_folder_summary_array): Get the
-	summary array atomically, so it can't contain empty records.
-	(camel_folder_summary_array_free): And free it.
-
-	* tests/lib/camel-test.c (die): If we are verbose & in threads,
-	then goto sleep so we can debug.
-
-	* tests/folder/test8.c (worker): Add a missing pull() for
-	comnparing content.
-
-	* camel-filter-search.c: Fix the symbol table, so match-all is an
-	immediate function, as it should be.
-
-	* tests/folder/test9.c (main): New test, tests some filtering
-	things.
-
-	* tests/message/test3.c (main): Dont use a boundary string with
-	spaces in it.  Folding can corrupt it.  Maybe the folding isn't
-	working entirely right, but anyway.
-
-	* camel-session.c: Debug out the debug.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Plug
-	a messageinfo leak.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	Delayed loading of IMAP message parts.
-
-	* camel-types.h: typedef CamelMessageInfo and
-	CamelMessageContentInfo here
-
-	* camel-folder-summary.h: Add a "size" field to
-	CamelMessageContentInfo.
-
-	* camel-folder-summary.c (camel_folder_summary_content_info_new,
-	camel_folder_summary_content_info_free): Renamed and made
-	non-static for providers that construct their own content info.
-	(content_info_load, content_info_save): load/save size
-
-	* camel-data-wrapper.c (camel_data_wrapper_is_offline): New
-	function to return if a data wrapper's contents are "offline". (So
-	that, for example, we don't make thumbnails of images that haven't
-	been loaded off the IMAP server yet.) Defaults to FALSE.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Fix a bug in re-selecting a folder when messages have been
-	expunged from it by another client in the meantime.
-	(imap_get_message): Rewrite. If the message is larger than a
-	certain size, just create a skeleton message containing
-	CamelImapWrappers that will read parts as needed. This way, large
-	attachments only need to be downloaded if the user looks at them,
-	and multipart/alternative alternatives that aren't used will never
-	be downloaded at all.
-	(imap_update_summary): Rewrite this a bunch too to make the
-	parsing more robust.
-
-	* providers/imap/camel-imap-summary.c
-	(CAMEL_IMAP_SUMMARY_VERSION): bump.
-	(camel_imap_summary_new): Set build_content to TRUE.
-	(content_info_load, content_info_save): Only save/load the content
-	for messages that have it. (The content info gets created as a
-	side effect of imap_get_message.)
-
-	* providers/imap/camel-imap-utils.c (imap_parse_body): New routine
-	(and helpers) to parse an IMAP 'body' FETCH response and fill in a
-	CamelMessageContentInfo from it.
-
-	* providers/imap/Makefile.am (libcamelimap_la_SOURCES,
-	libcamelimap_la_HEADERS): add camel-imap-wrapper.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* camel-tcp-stream-raw.c (stream_getsockopt, stream_setsockopt):
-	* camel-stream-fs.c (stream_read, stream_write): 
-	* camel-remote-store.c (socket_connect): fcntl(fd, F_GETFL)
-	returns the flags as the return value, not via a passed in
-	pointer. And F_SETFL looks for an int, not a long, and you have to
-	pass it what it's expecting because it's a va_arg parameter. (Yes,
-	the man page lies on Linux. But check the UNIX98 spec or the glibc
-	source.) Also, fix another bug in socket_connect: if we manage to
-	connect right away, unset O_NONBLOCK so it doesn't mess us up
-	later.
-
-	Fixes a bunch of problems with non-blocking I/O being done in the
-	allegedly-blocking case and then returning EWOULDBLOCK.
-
-2001-01-16  Chris Toshok  <toshok@ximian.com>
-
-	* providers/Makefile.am (NNTP_DIR): set to nntp if ENABLE_NNTP
-	(SUBDIRS): use $(NNTP_DIR)
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_rcpt): Don't check
-	errno as it's not being set. Fixes bug #1150.
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Ugh, this design is ugly like my butt.
-
-	* camel-session.c (camel_session_query_cert_authenticator): New
-	function which will be useful when we integrate SSL.
-
-	* camel-tcp-stream-ssl.c (ssl_auth_cert): Callback to authenticate
-	a certificate.
-	(ssl_bad_cert): Callback that gets the reason the certificate is
-	bad and then calls camel's cert-authenticator callback to notify
-	the user and to allow the user to override the check.
-	(stream_connect): Set the URL we expect to connect with and setup
-	the auth_cert and bad_cert callbacks.
-	(camel_tcp_stream_ssl_new): Now takes a CamelSession and a
-	expected_host argument that it will use for certificate
-	authentication.
-	(camel_tcp_stream_ssl_finalize): Unref the session and free the
-	expected_host.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-search.c (header_exists): Changed to support
-	multiple args (or'd together).
-	(header_contains): Cleaned up to match the search code.  Why did
-	fejj change it? I'll never know.
-	(header_matches): 
-	(header_starts_with): 
-	(header_ends_with): Big cleanup of fejj's "i'm the cut & paste
-	king" code.  Also properly handle or'ing of additional args to
-	match what the folder-search code should do.
-	(check_match): New function which does the annoying matching
-	stuff (for header matches).
-	(check_header): Similarly, handles or'ing of the matches together.
-	(header_contains):
-	(header_matches): 
-	(header_starts_with): 
-	(header_ends_with): Call check_header to do the actual work.
-	(header_soundex): And here too.
-	(match_all): Yeah like match-all isn't passed expression results,
-	its passed expression terms.  Fix this so match-all works like it
-	should, by executing the contained expression.
-	(message_body_contains): Copied directly from
-	camel-folder-search.c, a more robust/faster/simpler body search
-	code.
-	(mime_part_matches): Removed entirely.
-	(handle_multipart): Removed entirely.
-	(build_match_regex): Copied from camel-folder-search.  Builds a
-	set of simple strings into a regex pattern that matches any of
-	them (for faster & simpler matching).  Expanded to accept regex
-	patterns itself, so it can merge them together.
-	(body_contains): Use build match/match message to match using a
-	built regex.
-	(body_regex): Likewise, this time we tell it we're building a
-	regex though.
-	(header_full_regex): Use build_match_regex to take the drudgery
-	out of it, and expand it to handle multiple regex's at once.
-	(get_full_header): slightly cleaner (well i dunno, the sprintf
-	stuff just got to me).
-	(header_regex): Cleaned up to use build_match_Regex too, and to
-	properly check types.
-	(filter_message_search): Just allocate 'fms' on the stack.
-
-	* camel-filter-driver.c (camel_filter_driver_finalise): 
-	(camel_filter_driver_init): 
-	(camel_filter_driver_class_init): 
-	(camel_filter_driver_get_type): Changed from gtk object to camel
-	object.
-	(camel_filter_driver_add_rule): New function to add a rule to be
-	processed in sexp form.
-	(camel_filter_driver_init): Init the rules list.
-	(camel_filter_driver_finalise): Clear the rules/rules list.
-	(camel_filter_driver_filter_message): Scan rules list directly
-	rather than creating on the fly.
-
-	* Makefile.am (libcamelinclude_HEADERS): Added camel-filter-driver.h
-	(libcamel_la_SOURCES): Added camel-filter-driver.c, code taken
-	from filter-driver, which can drive, uh, filters based on sexp's.
-	(libcamelinclude_HEADERS): 
-	(libcamel_la_SOURCES): Added camel-filter-search.[ch]
-
-	* camel-folder-summary.c (camel_folder_summary_decode_string):
-	Chganged len back to be unsigned.  And do a simple range check on
-	the string value to try and detect corrupted summary files.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Handle
-	cancelled stream reads with an appropriate exception.
-
-	* providers/imap/camel-imap-private.h: Fix the include-once
-	macro.  Doh, confliced with camel-private.h.
-
-	* providers/imap/camel-imap-store.c (imap_store_refresh_folders):
-	A copy of camel_remote_store_refresh_folders.  We avoid locking
-	each folder when we call it though.  This should be removed when i
-	can work out how to remove the folder lock from this function
-	easily.
-
-	* camel-stream-fs.c (stream_write): Fix n' argument of select.
-	(stream_read): Likewise.
-
-	* camel-remote-store.c (socket_connect): Bump the connect timeout
-	upto 4 minutes.
-	(socket_connect): Oops, fix the 'n' argument of select.
-
-	* camel-session.c (camel_cancel_cancel): If we are given no
-	cancellation node, then do it for all active ones.
-
-2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-fs.c (stream_close): If the close() is successful,
-	set the fd to -1.
-
-	* camel-tcp-stream-raw.c: Removed the disconnect() method.
-	(stream_close): If the close() is successful, set the sockfd to
-	-1.
-
-	* camel-tcp-stream-ssl.c: Removed the disconnect() method.
-	(stream_close): If the close() is successful, set the sockfd to
-	NULL.
-
-	* camel-tcp-stream.c (camel_tcp_stream_disconnect): Removed,
-	easier to just use the close() method as it did the same thing
-	anyway.
-
-2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-raw.c (stream_getsockopt): Updated to be able
-	to get the CAMEL_SOCKOPT_NONBLOCKING socket opt.
-	(stream_setsockopt): Updated to be able to set the
-	CAMEL_SOCKOPT_NONBLOCKING socket opt.
-
-2001-01-15  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Lock
-	around the imap_rescan, which needs it.
-
-2001-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* camel-remote-store.c (socket_connect): A cancellable connection
-	routine.
-	(remote_send_string): Return cancelled exception if we were.
-	(remote_send_stream): "
-	(remote_recv_line): "
-
-	* camel-stream-fs.c (stream_read): First cut at cancellation
-	stuff.  Its looking a bit ugly.
-
-2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (stream_connect): Uses an SSL socket now
-	although there's still a few things missing (like certificate
-	handling and such).
-
-	* camel.c (camel_ssl_init): A replacement function for
-	camel_init() that also initializes SSL.
-
-2001-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (stream_getsockopt): Implemented.
-	(stream_setsockopt): Implemented.
-
-	* camel-tcp-stream-raw.c (stream_getsockopt): Implemented.
-	(stream_setsockopt): Implemented.
-
-	* camel-tcp-stream.c (camel_tcp_stream_getsockopt): New method.
-	(camel_tcp_stream_setsockopt): Another new method. I think you get
-	the idea of what these are for so I won't explain them.
-
-2001-01-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-tcp-stream-ssl.[c,h]: New CamelTcpStream class that
-	implements nspr sockets and eventually will use nss for
-	SSL/TLS. Currently doesn't do any SSL/TLS but it should still
-	work. It's functionally equivalent to CamelTcpStreamRaw at the
-	moment only it uses nspr i/o.
-
-	* camel-tcp-stream-raw.[c,h]: New CamelTcpStream class that
-	implements native sockets. Should be usable but may have some bugs
-	yet.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream.[c,h]: New abstract class for TCP streams. The
-	next step is to write child classes (CamelTcpStreamBSD and
-	CamelTcpStreamSSL). The BSD stream will use normal BSD sockets
-	while SSL will use Mozilla's NSPR and NSS libraries to do Secure
-	Socket Layers which wille ventually replace CamelStreamSSL which I
-	just commit'd. Oh well.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-ssl.[c,h]: New stream for handling SSL/TLS
-	connections.
-
-2001-01-12  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new):
-	Perform a final pass, removing any pseudo nodes we added earlier.
-	Quick patch to test the idea.
-	(camel_folder_thread_messages_new): Added casts to rmeove some
-	warnings for the analites out there.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Fix a bug in previous commit: don't check for deleted messages if
-	there are no known messages in the folder (because it would end up
-	sending "FETCH 0 ...").
-	(imap_copy_message_to): Fix this up: sync flags to the server
-	before copying so that they end up correct in the remote folder.
-	And poke the destination folder after doing the copy so it notices
-	the new message right away.
-	(imap_move_message_to): Call imap_copy_message_to for most of the
-	work rather than duplicating the code (since it's much more
-	complicated now).
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	New function to check for added/deleted messages when re-selecting
-	a folder.
-	(imap_refresh_info, imap_rescan, imap_update_summary): Various
-	locking tweaks that turn out to be irrelevant since command_lock
-	is recursive, but whatever.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): When
-	selecting a new folder, call camel_imap_folder_selected on it.
-
-	* camel-folder.c (camel_folder_copy_message_to): Fix a locking
-	problem. (One branch of an if statement was returning with the
-	lock still locked.) Also remove the deprecation comments, to match
-	move_message_to.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/local/camel-local-provider.c: Changed the descriptions
-	for mh, mbox, and maildir to be more "user-friendly".
-
-2001-01-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-types.h: New header to prevent
-	recursive #include problems
-
-	* providers/imap/*.h: Replace some #includes with #include
-	"camel-imap-types.h", remove typedefs that were moved to
-	camel-imap-types.h
-
-	* providers/imap/*.c: Add #includes to make up for #includes
-	removed from .h files
-
-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add
-	camel-imap-types.h
-
-2001-01-10  Dan Winship  <danw@helixcode.com>
-
-	* camel-store.c (camel_store_sync): New class function, parallel
-	to camel_folder_sync. (The default implementation just calls
-	camel_folder_sync on each cached folder.)
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Call
-	camel_store_sync before doing anything else so that the IMAP
-	server and Camel are working from the same data. Don't ask the
-	server for the unread message count of the current folder, since
-	UW will return often-incorrect cached data, and we can calculate
-	it without talking to the server anyway.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	Mostly IMAP changes. Use the NAMESPACE extension (where
-	available). Deal with servers that don't return LIST flags in
-	response to LSUB (like UW) to get rid of the "not a selectable
-	folder" error messages in the UI. Take advantage of the \Marked
-	and \Unmarked flags to try to speed up the folder scan by not
-	doing STATUS on unmarked folders. Some further tweaks on the shape
-	of the resulting folder tree in various situations...
-
-	* camel-store.h: Remove the (read) message_count, since nothing
-	uses it, and we can speed up IMAP a bit this way.
-
-	* camel-store.c (camel_folder_info_build): Redo this a bit to make
-	it more useful for IMAP since that's the only thing that uses it.
-
-	* camel-remote-store.c (camel_remote_store_connected): Public
-	function to check if the store is connected, and try to connect it
-	if it's not.
-	(remote_send_string, remote_send_stream, remote_recv_line): Use
-	that.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize):
-	fix up for changes.
-	(camel_imap_store_init): Initialize subscribed_folders to NULL
-	rather than an empty hash table.
-	(imap_connect): Get the list of subscribed folders here. If the
-	server doesn't claim that any of them are either Marked or
-	Unmarked, then assume that it doesn't do that for LSUB and
-	remember that for later. If the server supports the NAMESPACE
-	extension and the user didn't specify a namespace, use the
-	server-provided one.
-	(imap_disconnect): Free the list of subscribed folders, and the
-	namespace.
-	(get_folder): check camel_remote_store_connected
-	(get_folder_info): check camel_remote_store_connected. Add a bunch
-	of new cleverness. If we learned that the server doesn't do LSUB
-	usefully, do a bunch of LISTs by hand. Then, if we're getting
-	unread counts, only do it for folders that weren't listed as
-	Unmarked. Also, deal with namespaces that end with the separator
-	character, and update for changes to camel_folder_info_build.
-	(folder_subscribed): Add a g_return_val_if_fail.
-	(subscribe_folder, unsubscribe_folder): check
-	camel_remote_store_connected.
-
-	* providers/nntp/camel-nntp-store.c (build_folder_info,
-	build_folder_info_from_grouplist, nntp_store_get_folder_info):
-	Don't fill in message_count since it doesn't exist any more.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	Kill off a long-hated Camel kludge: "empty" URLs and
-	query_auth_types_generic.
-
-	* camel-url.c: Remove "empty" from CamelURL.
-	(camel_url_new): No longer set it.
-	(camel_url_to_string): Treat "" as equivalent to NULL for
-	authmech. (Unrelated change, but it simplifies some stuff with the
-	new config dialog.)
-
-	* camel-service.c (camel_service_new): Remove url->empty check: if
-	the URL isn't valid, we don't create the service.
-	(camel_service_query_auth_types): No longer need to switch between
-	generic and connected variants.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): 
-	* providers/pop3/camel-pop3-store.c (query_auth_types): 
-	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types): 
-	* providers/imap/camel-imap-store.c (query_auth_types): 
-	* camel-remote-store.c (remote_query_auth_types): Remove generic
-	version, rename connected version.
-
-2001-01-06  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Dont
-	try and unref a messageinfo that wasn't there, and use the right
-	free function too.  Modified patch from Iain.
-	(vee_move_message_to): New method, call the real folders'
-	move_message_to method.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* tests/lib/Makefile.am: fix includes for compilation
-
-	* tests/message/Makefile.am: Build test3 again
-
-	* tests/message/test2.c: Kill warnings with header includes
-
-	* tests/message/test3.c: ditto
-
-	* tests/lib/streams.c: ditto
-
-	* tests/lib/camel-test.c: ditto
-
-	* tests/lib/messages.c: ditto
-
-	* tests/lib/folders.c: ditto
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_rescan): Fix two
-	problems in figuring out server-expunged messages.
-
-2001-01-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (thaw): If we have a lot of messages changed,
-	promote it to a folder changed event.
-
-2000-01-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-search.c (search_header_matches): Implemented.
-	(search_header_exists): Implemented.
-	(search_header_starts_with): Implemented.
-	(search_header_ends_with): Implemented.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new):
-	Initialize the exists variable so that we don't do random things
-	if the imap server misbehaves.
-
-2000-12-29  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (camel_folder_move_message_to): REmove warning,
-	this isn't really deprecated, sigh.
-
-	* camel-mime-utils.c (header_fold): Comment out some debug.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/maildir/, providers/mbox/, providers/mh/: Removed
-	these directories since they're unused.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	IMAP randomness.
-
-	* providers/imap/camel-imap-stream.[ch]: Remove. To be replaced.
-
-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Remove
-	camel-imap-stream.h
-
-	* providers/imap/camel-imap-utils.c (imap_parse_flag_list): Take a
-	char ** instead of char *, to return the position at the end of
-	parsing like the string parsing functions.
-	(imap_parse_string_generic): New function to parse a string,
-	nstring, or astring.
-	(imap_parse_nstring, imap_parse_astring): Now macros
-	(imap_parse_string): Added
-
-	* providers/imap/camel-imap-folder.h: Remove the "exists" field
-	from CamelImapFolder.
-
-	* providers/imap/camel-imap-folder.c: Remove unused include of
-	camel-imap-stream.h.
-	(camel_imap_folder_init): Remove no-longer-relevant summary
-	initialization.
-	(camel_imap_folder_new): Update for imap_parse_flag_list change,
-	exists removal, and imap_rescan.
-	(imap_rescan): New function that does most of the work of the old
-	imap_refresh_info, but taking "exists" as an argument instead of
-	getting it from the folder. Also calls camel_imap_folder_changed
-	to do the summary updating and signalling, rather than duplicating
-	that code.
-	(imap_refresh_info): Just call imap_rescan (using the size of the
-	folder summary as "exists").
-	(imap_update_summary): Update for imap_parse_flag_list change
-	(camel_imap_folder_changed): Update for "exists" change.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_content_type_simple): New function to
-	return just foo/bar with no parameters.
-
-	* camel-data-wrapper.c (get_mime_type): Use
-	header_content_type_simple rather than header_content_type_format.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* gmime-content-field.[ch]: Remove this. It was only a thin
-	wrapper around struct _header_content_type anyway, and didn't
-	match the naming scheme of anything else.
-
-	* Makefile.am: Remove gmime-content-field.[ch]
-
-	* camel.h: Remove gmime-content-field.h
-
-	* camel-types.h: Add CamelContentType as a typedef for struct
-	_header_content_type (especially for use outside of camel).
-
-	* camel-multipart.c: 
-	* camel-mime-part.c: 
-	* camel-mime-message.c: 
-	* camel-folder-summary.c:
-	* camel-folder-search.c: 
-	* camel-data-wrapper.[ch]: Use CamelContentType and
-	header_content_type_* functions rather than the GMime stuff. 
-
-	* camel-mime-part-utils.c: 
-	* camel-medium.c: Remove unused gmime-content-field.h include.
-
-2000-12-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Fix the
-	APOP check to not crash on servers that don't return any
-	information on the +OK greeting line.
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-search.c (imap_body_contains): Lock
-	the command channel while searching.
-	(imap_body_contains): If performing a whole uid search, then add
-	references to our own summary items, dont look it up in the
-	folder.  This way they can't vanish unexpectedly.
-
-	* providers/imap/camel-imap-folder.h (CamelImapFolder): Added a
-	private field.
-	(CamelImapFolder): Removed summary again from here.
-
-	* providers/imap/camel-imap-private.h: Added lock for imap
-	searches.
-
-	* Merge from camel-mt-branch.
-	
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Merge
-	fix, use the folder->summary.
-	(imap_get_message_flags, imap_set_message_flags,
-	imap_get_message_user_flag, imap_set_message_user_flag): Removed
-	again.
-	(camel_imap_folder_init): Setup private data/lock.
-	(imap_finalize): Free private data/search lock.
-	(imap_search_free): Lock the search_lock.
-	(imap_search_by_expression): Lock the search lock when using the
-	search object.  Also copy/ref hte summary, rather than getting it
-	directly.
-	(imap_refresh_info): Free any info lookups.  Use folder->summary
-	not imap_folder->summary.  And lock around commands.
-	(camel_imap_folder_changed): Use folder->summary again.
-	(camel_imap_folder_changed): Make sure we unref the summary lookup.
-
-2000-12-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): When
-	getting the top-level folder list, include INBOX even if it's not
-	subscribed. Don't show subscribed folders outside of the given
-	namespace. Do a better job of pruning the namespace from the
-	returned folder tree.
-
-2000-12-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-search.c: New CamelFolderSearch
-	subclass that just reimplements body_contains (using the IMAP
-	SEARCH command). All other kinds of searching are done against the
-	local summary.
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Use a CamelImapSearch to do searching.
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp, etc): No
-	longer needed.
-
-	* camel-folder-search.h: Add missing CAMEL_FOLDER_SEARCH_TYPE
-	#define
-
-2000-12-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (camel_stream_buffer_gets): Update the
-	doc comment: since it always NUL-terminates the buffer, it reads
-	at most @max-1 bytes, not @max.
-
-	* camel-remote-store.c (remote_recv_line): Fix the "did
-	camel_stream_buffer_gets fill the whole buffer" check. Fixes a bug
-	when reading lines longer than 1024 characters (eg, IMAP SEARCH
-	responses in very large folders).
-
-2000-12-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Oops.
-	Don't do "FETCH 1:0" when the folder is empty.
-	(imap_protocol_get_summary_specifier): Request RFC822.SIZE too.
-	(imap_update_summary): Parse RFC822.SIZE and add it to the
-	summary.
-
-2000-12-18  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Add "guint32 server_flags"
-	to CamelImapMessageInfo to keep track of the last known message
-	flag state on the server.
-	(message_info_save, message_info_load): Save/load the
-	server_flags.
-
-	* providers/imap/camel-imap-folder.c: Make this use
-	CamelFolderChangeInfo and emit folder_changed notifications as it
-	gets them rather than only on refresh_info.
-	(imap_refresh_info): Notice flags that get cleared on the server
-	as well as flags that get set.
-	(imap_update_summary): Remove a comment that never actually
-	applied to the committed code.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Change
-	the semantics of fmt: Now %S (capital S) means an IMAP "string",
-	(which can be sent as either a quoted string or a literal). If
-	the server supports LITERAL+, these will be sent as extended
-	literals (which don't require any special escaping). Otherwise
-	they'll be sent as quoted strings (and it now properly deals with
-	" or \ in the string).
-	(imap_command_strdup_vprintf): Utility routine that does the real
-	work for the functionality mentioned above.
-
-	* providers/imap/camel-imap-utils.c (imap_quote_string): Turns a
-	string into a proper IMAP "quoted string".
-
-	* providers/imap/camel-imap-store.c: 
-	* providers/imap/camel-imap-folder.c: Use %S instead of "%s" where
-	appropriate.
-
-2000-12-22  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (GLOBAL_INFO_UNLOCK): Doh, cut and paste
-	victim again, call unlock instead of lock!
-	(summary_assign_uid): Unlock around trying to get a new uid, if we
-	have a clash.
-
-2000-12-21  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/folder/Makefile.am (TESTS): reenabled the tests here.
-
-	* providers/nntp/camel-nntp-newsrc.c (CamelNNTPNewsrc): Add a
-	lock.  Made completely mt-safe.  Sigh, this is all so i can
-	support snooping of the set_flags stuff inside camel-nntp-folder,
-	since i've removed the global folder lock from all of the other
-	folder summary operations.
-	(camel_nntp_newsrc_read_for_server): Setup lock.
-	(camel_nntp_newsrc_get_highest_article_read): Lock internal access.
-	(camel_nntp_newsrc_get_num_articles_read): 
-	(camel_nntp_newsrc_mark_article_read): 
-	(camel_nntp_newsrc_mark_range_read): 
-	(camel_nntp_newsrc_article_is_read): 
-	(camel_nntp_newsrc_group_is_subscribed): 
-	(camel_nntp_newsrc_unsubscribe_group): 
-	(camel_nntp_newsrc_subscribe_group): 
-	(camel_nntp_newsrc_get_subscribed_group_names): 
-	(camel_nntp_newsrc_get_all_group_names): "
-	(camel_nntp_newsrc_write_to_file): Lock internal accesses.
-	(camel_nntp_newsrc_write): Lock around diry stuff.
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_check):
-	Lock around our internal poking of the summary hashtable/array.
-	(maildir_summary_sync): And the same here too.
-
-	* camel-folder-summary.c: Moved the summaryprivate data into
-	camel-private.h.  Only needed for the locks really.
-	(camel_folder_summary_init): Setup locks.
-	(camel_folder_summary_set_filename): Lock.
-	(camel_folder_summary_index): lock
-	(camel_folder_summary_uid): Lock
-	(camel_folder_summary_next_uid): "
-	(camel_folder_summary_set_uid): "
-	(camel_folder_summary_load): Lock around whole load.  Hrm,
-	probably not required.
-	(camel_folder_summary_save): Lock around whole save, this is
-	reqwuired, unless we ref/copy the whole list first, and i couldn't
-	be bothreed.
-	(camel_folder_summary_add): lock
-	(summary_assign_uid): Lock around internal accesses.
-	(camel_folder_summary_info_new_from_parser): Lock around filtr stuff.
-	(camel_folder_summary_info_ref): Add locking.  Could probably use
-	its own lock?
-	(camel_folder_summary_touch): Add locking, likewise.
-	(camel_folder_summary_clear): Lock.  If the preiovus two are
-	changed, then so this will need mroe locking.
-	(camel_folder_summary_info_free): Lock around refcounting.
-	(camel_folder_summary_remove): Locking.
-	(camel_folder_summary_remove_uid): Lock ref, unlock, unref.  Also
-	fixed a bug that would have made this never work, freeing the key,
-	which isn't allocated.
-	(camel_folder_summary_remove_index): lock, ref, unlock unref also.
-	(camel_message_info_ref): Lock using a separate global lock, since
-	we have no context here.
-	(camel_message_info_free): Here too.
-	(content_info_alloc): Use an alocation lock here.  avoids races
-	with setting up content_info_chunks, etc.
-	(camel_folder_summary_info_new): And here too.
-	(camel_folder_summary_load): Changed to use a differnet lock for
-	loading/saving.
-	(camel_folder_summary_init): Doh, i do need a reflock afterall,
-	set one up.
-	(camel_folder_summary_finalize): Free it.
-	(camel_folder_summary_index): Add a reflock.
-	(camel_folder_summary_uid): And here too.
-	(camel_folder_summary_info_free): Use reflock instead of
-	summary_lock.
-	(camel_folder_summary_info_ref): Likewise.
-	(camel_folder_summary_remove_uid): Add reflocking.
-	(camel_folder_summary_remove_index): And here too.
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Setup a
-	summary object.
-	(vee_folder_build): Build each item into the real summary object.
-	(vee_folder_add, vee_folder_add_uid, vee_folder_add_change): New
-	functions to add a single record to the vfolder summary.
-	(vee_folder_build_folder): Use a real summary.
-	(vee_get_uids): Removed, use default impl.
-	(vee_free_message_info): "
-	(vee_get_message_info): "
-	(vee_get_summary): "
-	(vee_get_unread_message_count): "
-	(vee_get_message_count): "
-	(vee_sync): Make vee-folder-sync sync all subordinate folders.
-	Well i dont think this is right, but enough peopl ehave aksed for
-	it.
-	(vee_expunge): Same for expunge.
-	(vee_set_message_flags): Call parent class, then mirror flags to
-	subfolder.
-	(vee_get_message_user_flag): Removed, we just use the default
-	impl, and our flags should always match.
-	(vee_set_message_user_flag): Snoop the set and set on subfolder.
-	(vee_get_message_flags): Removed, jsut use parent impl, assume our
-	copy matches the real ones.
-	(get_real_message): Removed.  We sort ofneed to keep the
-	summaryitem refed while we use it, so this doesn't make as much
-	sense as it did once.
-	(camel_vee_folder_finalise): Unhook listening events as we unref
-	folders.
-	(camel_vee_folder_new): Set the summary messageinfo data size
-	properly.
-	(vfolder_remove_match): Fixed for summary change.
-	(folder_changed): ditto.  Also stopped changed items from being
-	re-searched and possibly removed.  Might have to resort to the old
-	whole-search idea again.
-	(message_changed): Similarly.  Might be easier just not to bother
-	with a whole search.
-
-	* providers/vee/camel-vee-folder.h: Removes summary
-	hashtable/array, and use a real summary object.  Sigh, more work.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_sync): Move
-	summary to folder object.
-	(nntp_folder_get_message_count): Removed, use default impl.
-	(nntp_folder_set_message_flags): Call parent impl to do the work,
-	but snoop for newsrc.
-	(nntp_folder_get_uids): Removed, use default impl.
-	(nntp_folder_get_summary): "
-	(nntp_folder_get_message_info): "
-	(nntp_folder_free_message_info): "
-	(camel_nntp_folder_new): moved summary to folder class
-	
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init):
-	Move summary to folder object.
-	(camel_imap_folder_new): "
-	(imap_finalize): No longer unref the summary (or infact, do
-	anything else either).
-	(imap_refresh_info): move summary to folder object.
-	(imap_sync): "
-	(imap_get_message_count): Removed, use default impl.
-	(imap_get_unread_message_count): "
-	(imap_get_uids): "
-	(imap_get_summary): "
-	(imap_free_summary): "
-	(imap_get_message_info): "
-	(imap_free_message_info): "
-	(imap_get_message_flags): "
-	(imap_set_message_flags): "
-	(imap_get_message_user_flag): ", this changes functionality, but
-	only by providing non-permanent flags.
-	(imap_set_message_user_flag): "
-	(imap_update_summary): move summary to folder object, and use
-	camel_folder_summary_info_new_from_header, instead of calling the
-	virtual function directly.
-
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	move summary to folder object, again.
-	(maildir_get_message): "
-
-	* providers/local/camel-mh-folder.c (mh_append_message): move
-	summary to folder object.
-	(mh_get_message): "
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message): Move
-	summary to folder object
-	(mbox_get_message): "
-	(mbox_set_message_user_flag): We need our own copy of this, sigh,
-	so we can track if the xev needs a rewrite (probably, its only a
-	guide anyway).
-	(mbox_set_message_user_tag): Same same with this one.
-	(camel_mbox_folder_class_init): Link in these new virtual functions.
-
-	* providers/local/camel-local-folder.h (CamelLocalFolder): removed
-	summary.
-
-	* providers/local/camel-local-folder.c (local_get_message_count): 
-	(local_get_unread_message_count): 
-	(local_get_uids): 
-	(local_get_summary): 
-	(local_free_summary): 
-	(local_get_message_info): 
-	(local_free_message_info): 
-	(local_get_message_flags): 
-	(local_set_message_flags): 
-	(local_get_message_user_flag): 
-	(local_set_message_user_flag): 
-	(local_get_message_user_tag): 
-	(local_set_message_user_tag): Removed, all now use default
-	implementation.
-	(camel_local_folder_class_init): Removed overrides.
-	(local_init): Clear folder->summary.
-	(local_finalize): move summary to folder.
-	(camel_local_folder_construct): "
-	(local_sync): "
-
-	* camel-folder.c (free_summary): Provide a real impl.
-	(get_summary): "
-	(free_uids): "
-	(get_uids): "
-	(free_message_info): "
-	(get_message_info): "
-	(set_message_user_tag): "
-	(get_message_user_tag): "
-	(set_message_user_flag): "
-	(get_message_user_flag): "  Sigh, the last so far.
-	(get_message_flags): Sigh, 1 more afterall.
-	(get_unread_message_count): And and this.
-	(get_message_count): and this!
-	(set_message_flags): Sigh, and this.
-	(camel_folder_finalize): Unref the summary if we have it.
-	(camel_folder_free_uids): Remove locking.
-	(camel_folder_get_message_flags): Remove locks, since the summary
-	is now mt-safe.
-	(camel_folder_set_message_flags): "
-	(camel_folder_get_message_user_flag): "
-	(camel_folder_set_message_user_flag): "
-	(camel_folder_get_message_user_tag): "
-	(camel_folder_set_message_user_tag): "
-	(camel_folder_get_message_info): "
-	(camel_folder_free_message_info): "
-	(camel_folder_get_uids): "
-	(camel_folder_free_summary): "
-	(camel_folder_get_unread_message_count): "
-	(get_unread_message_count): Check we got info, no big deal, but
-	the summary might change while we're counting, and upset the count
-	slightly.
-	(camel_folder_get_message_count): Remove locks.
-
-	* camel-folder.h (struct _CamelFolder): Added CamelFolderSummary
-	to the base folder object.  Sigh, this is going to be a lot of
-	work ...
-
-	* camel-service.c (camel_service_init, finalise): changed
-	connect_lock to be recursive e_mutex.
-
-	* camel-remote-store.c (camel_remote_store_init, finalise): Changed
-	stream_lock to recursive e_mutex.
-
-	* camel-private.h (RemoteStorePrivate, ServicePrivate): Use
-	recursive mutexes for connect_lock & stream_lock.  Ick.  Because
-	of the imap code.
-
-	* providers/imap/camel-imap-private.h: Change the command_lock to
-	be an EMutex.
-
-	* providers/imap/camel-imap-store.c (connect_to_server): Removed
-	the command_lock stuff.  If we are just connected again, it should
-	be safe to assume we have exclusive access at this point without
-	it (and yes, removes a deadlock).
-	(imap_create): Remove a lock that wasn't even supposed to be
-	there.
-	(camel_imap_store_finalize, init): g_mutex->e_mutex(E_MUTEX_REC).
-	Use a recursive mutex since the imap code is multiply recursivly
-	calling some functions (sigh, it would be nice to fix this).
-
-2000-12-20  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (folder_changed): Change the locks to inside the
-	if.  Stops a deadloc,k and we dont need a lock to read a value.
-	(message_changed): Likewise.
-
-	* camel.c (camel_init): Blah, comment out g_thread_init, leave it
-	to the caller, since it can only ever be done once.
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new): Ref
-	and save the folder in the thread return.  Also get the summary
-	once, and access that for the messageinfo's.  Added bonus that now
-	threads should come out in a similar order.  We need to do this so
-	that the messageinfo's dont get unref'd under us, and using the
-	summary directly simplifies memory management.
-	(camel_folder_thread_messages_destroy): Free the summary/unref the
-	folder.
-
-	* camel-folder-thread.h: Add a folder to CamelFolderThread struct.
-
-2000-12-19  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Unref
-	using e_sexp_unref, since it is no longer an object.
-
-	* tests/lib/camel-test.c: Added a global lock, and made it
-	thread-aware.
-
-	* camel-exception.c: Add a global lock.  Not sure its really
-	needed here, but it doesn't really hurt.
-	(camel_exception_clear): Lock around access.
-	(camel_exception_set): Same.
-	(camel_exception_setv): "
-	(camel_exception_xfer): "
-
-	* providers/local/Makefile.am (noinst_HEADERS): Added, for
-	camel-local-private.h
-
-	* camel-folder.c (camel_folder_search_by_expression): Removed
-	locking here, now upto the implementing class to lock.
-	(camel_folder_search_free): Removed the folder lock here too, for
-	consistency really, and the locking probably wasn't needed.
-
-	* providers/local/camel-local-folder.c (local_get_summary):
-	Changed to copy/ref the summary items.
-	(local_free_summary): Unref the summary items/free the array.
-	(local_get_unread_message_count): Free info lookups.
-	(local_search_by_expression): Perform more fine-grained locking,
-	and dont lock the whole folder while searching, just the search
-	object.  Dum de dum, it *would* be possible to not even have to
-	lock the search, by using our own copy of the search object each
-	time.  Could be investigated.
-	(local_init): Init priaate data/lock.
-	(local_finalize): Free private data/lock.
-	(local_search_free): Also lock around the search object, because
-	it accesses global data inside.
-
-	* README.mt: Some info about the mt code development.
-
-	* camel-folder-search.c (match_message): Put in a warning, this
-	plain deadlocks so far, but i'm going to bed now.
-	(camel_folder_search_finalize): Use e_sexp_unref() since its no
-	longer an object.
-
-	* camel-session.c (camel_session_init): Init private data/lock.
-	(camel_session_finalise): Free private data/lock.
-	(camel_session_register_provider): Lock hash insert.
-	(service_cache_remove): Lock.
-	(camel_session_list_providers): "
-	(camel_session_get_service): Lock the whole function.
-
-	* camel-session.h (struct _CamelSession): Added private data.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Setup
-	private data.
-	(camel_imap_store_finalize): Free private data.
-	(connect_to_server): Lock around command calls.  I dont think its
-	needed, but it shouldn't hurt either.
-	(imap_connect): Lock around command calls.  Again, I don think it
-	is needed, but wont hurt.
-	(imap_disconnect): ditto for this one.
-	(imap_create): Lock around command.
-	(get_folder): "
-	(get_folder_info): "
-	(subscribe_folder): "
-	(unsubscribe_folder): "
-	(imap_keepalive): "
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Lock
-	around calling a command.
-	(imap_refresh_info): Likewise.
-	(imap_sync): "
-	(imap_append_message): "
-	(imap_copy_message_to): "
-	(imap_move_message_to): "
-	(imap_get_message): "
-	(imap_update_summary): "
-	(imap_search_by_expression): ", also minor logic cleanup.
-	(imap_get_summary): Copy/ref the summary items.
-	(imap_free_summary): And free it now too.
-
-	* providers/imap/camel-imap-auth.c (imap_try_kerberos_v4_auth):
-	Lock the command stream for the command session.
-
-	* providers/imap/camel-imap-private.h: Private (locking info)
-	stuff for imap provider.
-	(CAMEL_IMAP_STORE_UNLOCK): Fix to call unlock, rather than lock!
-
-	* camel-service.c (camel_service_query_auth_types): Lock also for
-	the connection here, incase the service needs to connect.
-
-	* camel-remote-store.c (camel_remote_store_init): Init private
-	data/lock.
-	(camel_remote_store_finalise): Readded, free private data/lock.
-	(remote_send_stream): Changed to return the number of bytes
-	written, like a good little stream function should.
-	(camel_remote_store_send_string): Lock for stream access.
-	(camel_remote_store_send_stream): Same here.
-	(camel_remote_store_recv_line): And here.
-	(camel_remote_store_refresh_folders): Lock the store for cache
-	access.
-	(timeout_cb): Lock for stream access.
-
-2000-12-18  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-service.c (camel_service_init): Init private data.
-	(camel_service_finalise): Free private data.
-	(camel_service_connect): Lock around connection access.
-	(camel_service_disconnect): "
-
-	* camel-service.h (struct _CamelService): Added private field.
-
-	* camel-store.c (camel_store_init): Init private data/lock.
-	(camel_store_finalize): Free private data/lock.
-	(camel_store_get_folder): Lock internal calls.
-	(camel_store_delete_folder): "
-	(camel_store_rename_folder): "
-	(camel_store_get_root_folder): "
-	(camel_store_get_default_folder): "
-	(camel_store_get_folder_info): "
-	(camel_store_folder_subscribed): "
-	(camel_store_subscribe_folder): "
-	(camel_store_unsubscribe_folder): "
-	(lookup_folder): Lock accesses to the folder cache.
-	(cache_folder): "
-	(uncache_folder): And here too.
-
-	* camel-store.h (struct _CamelStore): Added a private field.
-
-	* Makefile.am (noinst_HEADERS): Add camel-private.h.  There is a
-	comment in that header as to why it ins't installed.
-
-	* camel-private.h: New header for private data, that subclasses
-	can get to.
-
-	* tests/lib/camel-test.c (camel_test_init): If we do have threads
-	enabled already, dont call g_thread_init().
-	
-	* tests/lib/folders.c (test_folder_counts): Add free of info.
-	(test_folder_message): And here too.
-
-	* providers/local/camel-maildir-summary.c (remove_summary): Free
-	info.
-	(maildir_summary_check): Free info lookups.
-
-	* providers/local/camel-mh-summary.c (message_info_new): Removed,
-	didn't add value.
-	(remove_summary): free info after being used.
-	(mh_summary_check): Free info lookups.
-	(mh_summary_sync): and here too.
-
-	* providers/local/camel-mbox-summary.c (summary_update): Free info
-	lookups.
-	(mbox_summary_sync_full): Likewise.
-	(mbox_summary_sync_quick): And here.
-	(mbox_summary_sync):  ... and here.
-
-	* providers/local/camel-maildir-folder.c (maildir_get_message):
-	Free messageinfo lookups.
-
-	* providers/local/camel-mh-folder.c (mh_get_message): Free
-	messageinfo lookups.
-
-	* providers/local/camel-mbox-folder.c (mbox_get_message): Free
-	messageinfo lookups.
-
-	* providers/local/camel-local-summary.c
-	(message_info_new_from_message): Removed, since it wasn't doing
-	anything useful.
-	(message_info_new_from_parser): Same.  And some other dead code.
-
-	* providers/local/camel-local-folder.c (local_get_message_info):
-	deconstify.
-	(local_free_message_info):new func to free info.
-	(local_get_uids): 
-	(local_get_message_flags): 
-	(local_set_message_flags): 
-	(local_get_message_user_flag): 
-	(local_set_message_user_flag): 
-	(local_get_message_user_tag): 
-	(local_set_message_user_tag): Free all info lookups.
-	(local_expunge): Dont call camel_folder_* functions, to avoid a deadlock.
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_get_message_info): deconstify.
-	(nntp_folder_free_message_info): Free summary item.
-	(nntp_folder_get_message_flags): Free summary lookup.
-	(nntp_folder_set_message_flags): and here.
-	(nntp_folder_get_uids): And here.
-
-	* providers/imap/camel-imap-auth.c: Make base64_*_simple optional
-	with the HAVE_KRB4 flag.
-
-	* providers/imap/camel-imap-folder.c (imap_free_message_info):
-	Added a free of the message info.
-	(imap_refresh_info): 
-	(imap_sync): 
-	(imap_refresh_info): 
-	(imap_get_unread_message_count): 
-	(imap_get_uids): 
-	(imap_get_message_flags): 
-	(imap_set_message_flags): Free any summary lookups.
-	(imap_get_message_flags): Get the message info directly from the
-	summary, not via the folder interface.
-	(imap_move_message_to): Dont call folder functions directly
-	(delete_message), as it will deadlock since we already have the
-	lock.
-
-	* providers/vee/camel-vee-folder.c (vee_free_message_info): Free/unref
-	the messageinfo.
-	(vee_get_message_info): First ref the internal copy, then return it.
-	(folder_changed): Free all got message info's.
-	(message_changed): And here.
-	(get_real_message): And here.
-	(vee_folder_build): and here.
-	(vee_folder_build_folder): ... and here.
-
-	* camel-folder-summary.c (camel_folder_summary_info_new):
-	Initialise the messageinfo refcount to 1.
-	(camel_folder_summary_info_free): Down the refcount till we need
-	to free.
-	(camel_folder_summary_info_ref): New function to up the refcount.
-	(camel_message_info_dup_to): Sewt the refcount of the dest to 1.
-	(camel_message_info_new): Set refcount to 1.
-	(camel_message_info_new_from_header): Dont allocate the mi
-	ourselves.
-	(camel_message_info_free): Handle refcounting.
-	(camel_message_info_ref): New function.
-	(camel_folder_summary_index): Ref the messageinfo before returning
-	it.
-	(camel_folder_summary_uid): Likewise.
-	(camel_folder_summary_save): Access the messageinfo array
-	directly, rather than through accessors (saves ref/unref).
-	(camel_folder_summary_clear): Likewise.
-	(camel_folder_summary_remove_index): Likewise.
-	(main): Free lookups.
-
-	* camel-folder-summary.h (CamelMessageInfo): Added a refcount
-	value.
-
-	* camel-folder.c (camel_folder_free_message_info): New function to
-	'free' a message info.
-	(camel_folder_get_message_info): Deconstify return.
-	(camel_folder_lock): New (internal) function to thread-lock the
-	folder.
-	(camel_folder_unlock): Likewise for unlocking.
-	(freeze): 
-	(thaw): Lock around access to folder->frozen/changed_frozen.
-	(folder_changed): Likewise.
-	(message_changed): Likewise.
-	(camel_folder_init): Init private data, locks and moved frozen
-	info.
-	(camel_folder_finalize): Free new private data, locks and moved
-	frozen info.
-	(copy_message_to): Free the messageinfo after we've used it.
-	(move_message_to): And here too.
-	(camel_folder_sync): Lock around virtual method invocation.  Just
-	locking around any virtual method that is known to need it.  This
-	is the first cut at locking.
-	(camel_folder_refresh_info): "
-	(camel_folder_expunge): "
-	(camel_folder_get_message_count): "
-	(camel_folder_get_unread_message_count): "
-	(camel_folder_append_message): "
-	(camel_folder_set_message_flags): "
-	(camel_folder_get_message_flags): "
-	(camel_folder_get_message_user_flag): "
-	(camel_folder_set_message_user_flag): "
-	(camel_folder_get_message_user_tag): "
-	(camel_folder_set_message_user_tag): "
-	(camel_folder_get_message): "
-	(camel_folder_get_uids): "
-	(camel_folder_free_uids): "
-	(camel_folder_get_summary): "
-	(camel_folder_search_by_expression): "
-	(camel_folder_free_summary): "
-	(camel_folder_search_free): "
-	(camel_folder_move_message_to): "
-	(camel_folder_copy_message_to): "
-	(copy_message_to): Dont call any of our own folder functions
-	directly, otherwise we will deadlock.
-	(move_message_to): Likewise.
-
-	* camel-folder.h (CamelFolder): Added free_message_info() function
-	& deconstify get_message_info()'s return.
-	(CamelFolder): Add a private field (for	locks).
-	(struct _CamelFolder): Moved changed_changed/frozen into private
-	data, since it really is private and now needs locked access.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (header_fold): When checking to see if we
-	need to fold the header, when we come accross a \n, make sure to
-	start at p + 1 the next time through the loop or else we get into
-	an infinite loop.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* Namespace cleanup: change a bunch of IS_CAMEL_* macros to
-	CAMEL_IS_*
-
-2000-12-13  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/imap/camel-imap-auth.c: add #include <sys/types.h> for
-	freebsd.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-summary.c, camel-folder-summary.h: Added #ifndef
-	NO_WARNINGS around a #warning.  Added (void) to the prototype and
-	declaration of camel_message_info_new.
-
-	* camel-mime-message.h: Added an include for
-	camel-mime-filter-bestenc.h.  Added a prototype for
-	camel_mime_message_set_best_encoding.  Reformatted prototypes to
-	line up.
-
-	* camel-mime-parser.c: Added #if d(!)0 around the states string
-	lookup table since it's only used in debugging output.
-
-	* camel-seekable-substream.c (stream_flush): Added a cast.
-
-	* providers/imap/camel-imap-auth.c: Added #include <netinet/in.h>.
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Made uid
-	and flags const to fix warnings here.
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Made p
-	const to fix warnings here.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* tests/lib/Makefile.am: Add missing .h file. (From campd.)
-
-2000-12-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Remove use of
-	linewrap filter.  Headers are now wrapped.  encode_8bit already
-	enforces a 998 octet line limit.
-	(smtp_data): Also fixed a memleak, we always have to unref our own
-	copy of the filters.  We also dont need to remove them manually,
-	so dont bother.  The type's an int too ...
-
-	* camel-internet-address.c (internet_unformat): When scanning past
-	quotes, remove them also.
-	(camel_internet_address_format_address): If the name contains "'s,
-	or ','s then strip and quotes and wrap the whole lot in one set of
-	quotes.
-	
-	* Makefile.am (noinst_HEADERS): We dont want to install
-	camel-charset-map-private.h, ever.  There are probably other
-	similar files ..?
-
-	* camel-mime-part.c (write_to_stream): Fold header lines
-	appropriately as we're writing them out.
-
-	* camel-mime-utils.c (header_fold): Add a new argument, headerlen,
-	tells it how long the associated header token is.
-	(header_fold): Also,k check to see if we need to fold first, using
-	a better algorithm, and also accept already-folded lines, and
-	re-process accordingly.
-	(rfc2047_decode_word): Add a little buffer space to iconv output
-	for shifting overheads?
-	(rfc2047_decode_word): finish the iconv with a null call, to flush
-	shift state, etc.
-	(rfc2047_encode_word): Attempt to break up long words into
-	appropriately sized, independent, chunks.  See rfc2047, section 2.
-	(header_decode_mailbox): Dont add in extra spaces into the output
-	if we are decoding adjacent encoded words.  We can only guess this
-	case, as some broken mailers put encoded words inside quoted
-	words.
-	(header_encode_phrase): Dont merge words if they are going to end
-	up too long.  Also change back ot only merge consecutive words of
-	the same type.  e.g. 'foo. blah fum.' -> "foo." blah "fum."  or
-	'iam an. idiot' -> iam "an." idiot
-
-	* camel-medium.c (camel_medium_set_header): Hrm, we actually want
-	to call set_header, not add_header here, probably explains some
-	duplicate X-Evolution headers i was trying to track down.  Also
-	changed the api to handle a NULL value == remove the header.
-
-	* providers/local/camel-maildir-summary.c
-	(maildir_summary_decode_x_evolution): Always return error, we dont
-	use x-evolution for maildir.
-	(maildir_summary_encode_x_evolution): Always return a NULL string,
-	likewise.
-	(maildir_summary_add): Hook in here, since the _new function
-	doesn't have access to any flags from the caller.  If we have
-	flags, then update the filename again.  Not ideal, but should
-	work.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* tests/message/Makefile.am: Remove test3 from build until the files
-	show up
-	
-2000-12-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_date): Change the
-	sign of the default date offset when none is supplied.
-	(camel_mime_message_set_date): Also do dst if its dst (forward 1
-	hour).  Fixes #928 + some.
-
-2000-12-06  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/lib/camel-test.h (check): Change line no format so that
-	emacs can detect it.
-
-2000-12-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): We want
-	to bitwise-or the server and cached flags here so that we keep the
-	flags that we have set locally and set any additional flags that a
-	parallel connection may have set.
-
-2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the data
-	wrapper fails to be written to the stream, unref it and the
-	filters before returning.
-
-2000-12-05  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): use
-	BODY.PEEK[] rather than RFC822, so the message doesn't get marked
-	as \Seen.
-	(imap_refresh_info): Fix a really really really dumb bug.
-
-2000-12-05  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): Fix
-	the check for "flags aren't actually changing".
-
-	* providers/local/camel-local-folder.c (local_set_message_flags,
-	local_set_message_user_flag, local_set_message_user_tag): Don't
-	emit message_changed unless the flags actually changed.
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): Don't emit message_changed unless
-	the flags actually changed. Fix the check for marked as seen.
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-seekable-substream.c (stream_flush): stream_flush does
-	make sense for a substream afterall (if you have a stream_write).
-	(stream_write): Implement this.
-	(stream_seek): Change the STREAM_END behaviour to be more sane.
-	if bounded go from the end of the bound, if unbounded, go from the
-	end of the parent stream.
-
-	* camel-stream-mem.c (stream_read): Dont return error if reading
-	past the end of data, just return 0.
-
-	* camel-stream-fs.c (camel_stream_fs_init): Initialise the stream
-	to be unbound.
-	(stream_seek): Fix the logic when seeking from the end of an
-	unbounded stream.
-	(camel_stream_fs_new_with_fd): If the fd is invalid (-1), then
-	return NULL immediately.
-	(stream_seek): Range check a SEEK_END so it fits within
-	bound_start.
-
-2000-12-01  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/lib/folders.c (test_folder_basic): New test to perform
-	basic store operations on folders (taken from folders/test1).
-	(test_folder_message_ops): Tkane the guts out of folders/test2.
-
-2000-12-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): i18n-ize
-	exception strings.
-	(get_name): And here.
-	(_send_to): Here too.
-	(smtp_helo): And here and there...
-	(smtp_mail): And around the square...
-	(smtp_rcpt): Saying catch me if you can...
-	(smtp_data): And here three.
-	(smtp_rset): And here.
-	(smtp_quit): And finally here.
-
-2000-12-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-search.h: Added system_flag to CamelFolderSearchClass
-
-	* camel-folder-summary.c (camel_system_flag_get): Convenience
-	function to return whether or not a flag is set using a string as
-	the flag name.
-	(camel_system_flag): Return the integer value of the flag string.
-
-	* camel-folder-search.c (search_system_flag): New ESExp callback
-	for allowing vfoldering on CamelMessageInfo flags.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_disconnect): Don't
-	g_return_if_fail if the service is already disconnected. Just
-	return.
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate):
-	Return FALSE (don't try again) if we get CAMEL_POP3_FAIL.
-	(pop3_connect): If we don't succeed, disconnect.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(parse_list_response_as_folder_info): Fix a possible bug where
-	'name' could be uninitialized.
-
-	* camel-folder-summary.c (camel_message_info_new): New convenience
-	function, doesn't do much but it sure makes code cleaner to read.
-	(camel_message_info_new_from_header): This one makes my life heaven.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c (camel_imap_summary_new):
-	Handle the case where the summary failed to load - clear the
-	summary and then set the dirty bit so that it is sure to save
-	later. Is this the right fix?
-
-2000-11-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-exception.c (camel_exception_setv): Remove unused
-	variable.
-
-2000-11-30  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-mbox-folder.c (mbox_get_message): Remove
-	assertion that content is there, when it no longer can be.
-
-	* camel-folder-summary.h: Removed pos/bodypos/endpos from
-	camelmeessagecontentinfo.
-	(CamelMessageFlags): Added an attachments flag.
-
-	* providers/local/camel-local-summary.h: Added load virtual
-	function.
-
-	* tests/lib/folders.c (test_message_info): Accessors.
-	(test_folder_message): "
-
-	* camel-folder-thread.c (get_root_subject): Fix accessors.
-	(dump_tree_rec): "
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Accessors for messageinfo.
-	(search_match_all): "
-	(search_header_contains): "
-	(search_header_contains): "
-	(search_body_contains): "
-	(camel_folder_search_execute_expression): Use mepool_strdup.
-
-	* providers/local/camel-mbox-summary.c (summary_update): Accessors
-	for messageinfo.
-	(mbox_summary_sync_full): "
-
-	* providers/local/camel-mh-summary.c (remove_summary): Accessors
-	for messageinfo.
-	(mh_summary_check): "
-	(mh_summary_sync_message): "
-	(mh_summary_sync): "
-
-	* providers/local/camel-mh-folder.c (mh_append_message): Use
-	accessor for uid.
-
-	* providers/local/camel-local-summary.c
-	(local_summary_decode_x_evolution): Use accessor to uid.
-	(local_summary_encode_x_evolution): Likewise.
-	(message_info_new): And here.
-	(camel_local_summary_load): Call virtual load function.
-	(local_summary_load): Default load function, load summary.
-	(camel_local_summary_load): Check file exists before trying to
-	load.
-	(camel_local_summary_construct): Turn off building content info!
-	(CAMEL_LOCAL_SUMMARY_VERSION): Bump, since we dont build content
-	info anymore.
-	(camel_local_summary_load): After a successful load/check, do a
-	save too so we dont have to go through it again randomly.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): Use
-	accessors for messageinfo.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_uids): Use
-	accessors for uid.
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Use
-	accessor for uid.
-	(imap_sync): Likewise.
-	(imap_get_uids): Likewise.
-	(imap_update_summary): And here.
-
-	* providers/vee/camel-vee-folder.c (vfolder_remove_match): Use
-	accessor for uid.
-	(vfolder_add_match): Handle estrv stuff.
-	(vfolder_change_match): Accessor for uid.
-	(get_real_message): "
-	(vee_get_uids): "
-	(vee_folder_build): " + estrv.
-	(vee_folder_build_folder): "
-
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	Use acccessors for uid's.
-	(maildir_get_message): Here too.
-
-	* providers/local/camel-maildir-summary.c
-	(camel_maildir_summary_init): Setup the string count for us.
-	(message_info_new): Access the string array directly.
-	(message_info_free): No need to free string if using array.
-	(camel_maildir_summary_info_to_name): Use accessor to get to uid.
-	(remove_summary): And here.
-	(maildir_summary_check): Likewise.
-	(maildir_summary_sync): And here.
-	(maildir_summary_load): Load up a cache of uid->filename mappings
-	before loading the actual summary file.  This saves us having to
-	waste the diskspace storing the filenames in the summary itself,
-	and also helps us sync the summary better on load.
-	(message_info_load): If we have the load_map setup, and the uid
-	exists, then set the filename cache from it, and update the flags
-	from the name, incase our summary mismatches it.
-
-	* camel-folder-summary.c (camel_folder_summary_init): Setup string
-	count for compressed info record.  An optional compile mode which
-	stores all strings for a given messageinfo into a packed array,
-	which should save 36-50 bytes/record.
-	(camel_folder_summary_info_new): Init the string array.
-	(message_info_new): Set the string array items, as required.
-	(message_info_load): And here too.
-	(message_info_save): Use accessors to get to strings.
-	(message_info_free): Free strings as one.
-	(camel_message_info_dup_to): Handle packed array case.
-	(camel_folder_summary_add): Use accessors.  And pack the strv
-	before storing it.
-	(summary_assign_uid): New function to assign a unique uid to a
-	message, if it doesn't have one.
-	(camel_folder_summary_add): Call assign_uid instead of doing it
-	ourselves.
-	(camel_folder_summary_info_new_from_parser): "
-	(camel_folder_summary_info_new_from_message): "
-	(camel_folder_summary_encode_string): constify.
-	(camel_folder_summary_encode_token): "
-	(summary_build_content_info_message): Fix accessors to messageinfo.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped, for removal of
-	contentinfo->pos data.
-	(camel_folder_summary_info_new_from_parser): Calculate the size
-	based on the parser position, not the removed contentinfo stuff.
-	(camel_folder_summary_info_new_from_message): Remove size stuff.
-	(camel_folder_summary_offset_content): Removed, no longer means anything.
-	(content_info_new): 
-	(content_info_load): 
-	(content_info_save): 
-	(summary_build_content_info): Remove stuff for contentinfo->pos*.
-	(summary_build_content_info): Take a msginfo argument, set
-	attachments flag if we find any attachments.
-	(summary_build_content_info_message): set attachments flag if we
-	find any attachments.
-	(camel_folder_summary_info_new_from_parser): Always scan the
-	content info, even if we dont save it.
-	(camel_folder_summary_info_new_from_message): And here too.
-	(summary_build_content_info): Only create the contentinfo stuff if
-	we have it turned on, otherwise just parse and discard.
-	(summary_build_content_info_message): Likewise.
-
-2000-11-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-store.c (camel_store_get_folder): Updated the gtk-doc
-	comment.
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c: 
-	* camel-mime-filter-charset.c: Use iconv instead of unicode_iconv.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix
-	some off-by-one-ness.
-
-	* camel-stream-buffer.c (stream_read): Fix another bug found in
-	previously-unused code here.
-
-2000-11-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* tests/lib/Makefile.am (INCLUDES): `$(top_srcdir)' for builddir
-	!= srcdir compilation.
-
-2000-11-29  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/message/test2.c (main): Add a missed unref.
-
-	* camel-stream-mem.c (camel_stream_mem_set_buffer): We must set
-	ourselves as the owner of the byte-array.
-	Weird, someone has modified this file (its been reindented), but i
-	can't see any changelogs ...
-
-	* tests/lib/messages.c (content_finalise): Fix memleak in tester,
-	free byte array when our content object is deleted.
-
-	* camel-folder-search.c (camel_folder_search_finalize): Yeah
-	great, so the sexp is a gtk object, not a camel object.  Isn't
-	that going to be fun to fix?
-
-	* camel-session.c (camel_session_finalise): Free the storage path.
-
-	* providers/local/camel-local-store.c (camel_local_store_init): If
-	store->folders is setup, free it first, then overwrite.  Hmm,
-	this seems a bit crappy to me.
-
-	* camel-store.c (camel_store_init): Dont setup store->folders if
-	its already setup.
-
-	* camel-exception.c (camel_exception_setv): Removed a memleak.  no
-	need to strdup after a strdup_printf!!!
-
-	* camel-address.c (camel_address_finalize): Free the address
-	ptrarray, once finished.
-
-	* providers/local/camel-local-folder.c (local_finalize): Make sure
-	we dont leave the folder locked on close.
-	(local_finalize): Free summary/search.
-
-	* providers/local/camel-mh-summary.c (mh_summary_next_uid_string):
-	Small memleak, always free name after using it.
-
-	* camel-mime-part.c (set_content_object): Free txt after setting
-	the header.
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_check):
-	Fix a memleak, close the dir after scanning new.
-	(message_info_free): Added so we can free the filename cached in
-	the messageinfo.
-	(camel_maildir_summary_finalise): Free the hostname.
-
-	* tests/folder/test[12].c (main): Clear out camel-test before
-	starting.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):
-	Because encode_x_evolution folds the line (sigh, because
-	encode_param does, unlike every other function in
-	camel-mime-utils), unfold the encoded result before comparing.
-	(mbox_summary_sync_quick): Another small memleak, free xevnew once
-	finished with it.
-
-	* camel-mime-utils.c (header_decode_quoted_string): Removed a
-	redundant check for c=0.
-	(header_unfold): New function to un-fold headers.
-
-	* providers/local/camel-local-summary.c
-	(local_summary_encode_x_evolution): some problems with encoding
-	tags, using the wrong output strings.
-	(local_summary_encode_x_evolution): We dont need to append a ;
-	either, param_list_format_append() will do it for us.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* camel-lock.c: No longer hard code the enabled lock types
-
-2000-11-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-remote-store.c (remote_recv_line): Don't set exception to
-	g_strerror (errno) when nread == 0, because it won't have been
-	set.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_finalize): Don't try to
-	free things if they haven't been set yet.
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Clear the
-	exception if EHLO fails before trying HELO in the cases where the
-	SMTP provider doesn't announce its ESMTPness.
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-maildir-summary.c
-	(camel_maildir_summary_init): Set the info size's properly, oops!
-
-	* tests/lib/folders.[ch]: Folder testing helpers.
-
-	* tests/folder/test2.c: Test basic message ops on folders.
-
-	* tests/folder/test1.c (main): Test basic folder ops on (local)
-	stores.
-
-	* providers/local/camel-local-provider.c
-	(camel_provider_module_init): Removed some debug.
-
-	* providers/local/camel-maildir-folder.c
-	(camel_maildir_folder_class_init): fix parent class.
-
-	* providers/local/camel-mh-folder.c (camel_mh_folder_class_init):
-	Fix parent class (damn cut & paste).
-
-	* providers/local/camel-maildir-store.c (get_folder): Call parent
-	impl.
-	(camel_maildir_store_class_init): Fix parent class setup.
-	(delete_folder): Check the folder exists before trying to delete
-	it.
-	(delete_folder): Try and make the delete operation atomic/rollback
-	failures.  e.g. if one directory isn't empty, then create the
-	other empty ones back.  Also clear the tmp directory fully first.
-
-	* providers/local/camel-mbox-store.c (get_folder): Call parent
-	impl.
-	(camel_mbox_store_class_init): parent class is camel_local_store,
-	not camel_folder, oops.
-	(delete_folder): Return an error if it doesn't exist, rather than
-	covering it up.
-
-	* providers/local/camel-mh-store.c (get_folder): Call parent impl.
-	(camel_mh_store_class_init): fix parent class setup.
-	(delete_folder): Error if it doesn't exist now.
-
-	* camel-folder.c (camel_folder_move_message_to):
-	(camel_folder_copy_message_to): Added warnings as these functions
-	are going to be removed later.
-
-	* camel-store.c (camel_store_get_root_folder): Fix for an early
-	api change.  We want CAMEL_STORE_FOLDER_CREATE, not TRUE, since
-	its a flag.
-	(camel_store_get_default_folder): And here too.
-
-	* providers/local/camel-local-store.c (xrename): Handle renaming
-	folders differently to renaming files.
-	(get_default_folder_name): local stores dont have a default
-	folder, so make it so.  Or at least, it doesn't seem to make sense
-	to have one.
-	(get_root_folder_name): Same for root.
-	(get_folder): Added parent implementation, that makes sure the
-	service path exists, if we are creating a new folder (but doesn't
-	create the folder).
-
-2000-11-27  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-local-store.c (xrename): Fixed races.  Use
-	link/unlink, rather than rename, to properly detect overwriting
-	another file.  And allow some files to be missing.
-
-2000-11-28  Radek Doulik  <rodo@helixcode.com>
-
-	* providers/local/camel-local-summary.c
-	(local_summary_decode_x_evolution): add scan = scan->next; to
-	avoid infinite loop
-
-2000-11-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Make
-	this gratuitously more complicated. No wait, I mean, fix bugs. Now
-	fully handles NULs in the data stream (which "can't happen" but
-	do) and also handles responses containing multiple literals. Also
-	does less copying than the original code.
-
-	* camel-stream-buffer.c (stream_read): Fix a bug that could make
-	it lose sync and/or overrun buffers.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* providers/local/.cvsignore: shush
-
-2000-11-27  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed mh, mbox, added local, to the default.
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/data/getaddr.pl: little util to scan mailboxes for any and
-	every address they contain.
-
-	* tests/message/test2.c (main): Added a bunch of stuff to test
-	decoding/reencoding/etc of internationalised addresses.
-
-	* tests/message/lib/address-data.h: Copy of some unicode/other
-	testing data.  **Beware** of editing this file in emacs, it'll
-	probably try and convert all the characters to something
-	unusable.
-
-	* tests/lib/camel-test.c (camel_test_break): Add a debugger hook
-	point.
-
-	* camel-mime-utils.c (quoted_encode): Check for space and convert
-	to _ separately.
-	(header_decode_mailbox): Fixed the 'check comments for realname'
-	code, problem was the domain getting code was skipping all
-	whitespace/comments before we could get a look-in.  This is
-	approximate but fairly robust.
-	(header_decode_text): Dont use the c-type isspace func here, we
-	want a specific whitespace only.
-	(header_decode_text): If we have decoded words next to each other,
-	do not insert whitespaces between them, which is what rfc2047 requires.
-	(header_decode_text): Make c unsigned too.
-
-	* tests/README: Added at least some explanation of all this stuff.
-
-	* tests/lib/camel-test.h (check_msg): Added a non-gcc version of
-	the fail command, we dont get the expression that failed, but no
-	matter.  Should be (more) portable now.
-	(check, check_msg): Put the file/lineno in the default message.
-
-	* Makefile.am (SUBDIRS): Add tests.
-
-	* camel-mime-filter-basic.c (filter): Well, I'll add the extra
-	bytes here too, lathough not strictly needed, might save a
-	re-malloc when we get to complete().
-
-	* camel-mime-filter-charset.c (filter): Make sure we have room if
-	we only convert very short data.
-	(complete): and here too.
-
-	* tests/Makefile.am: Initial test harness & tests.  Requires gcc
-	for this.
-
-	* camel-internet-address.c (d): Turn off debug.
-
-	* camel-charset-map.c (camel_charset_step): Oops, & masks for set
-	intersection, not | them.  Dunno how this got even close to
-	working.
-
-2000-11-23  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (filter): For base64 encoding, the
-	output size for 0, 1, or 2 bytes of input can exceed input*2, so
-	make sure we account for that as well.
-	(complete): And here.
-	(complete): Similarly for qp encoding, if we have a trailing
-	space, we need some extra bytes (not needed for 'filter()', as any
-	such bytes are stored in state/save).
-
-	* camel-mime-utils.c (quoted_decode_step): Removed fixme not required.
-	(quoted_encode_close): Dont append a trailing afterall.  Otherwise
-	a pass through the encode/decode will grow the message each time.
-
-2000-11-22  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (header_msgid_generate): check for return
-	values
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-lock.c: 
-	* camel-movemail.c: add #ifdef HAVE_ALLOCA_H
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-mh-summary.c (mh_summary_sync_message):
-	Shite, -1 on error, >=0 on success.  So i've just been truncating
-	all the messages I touched, good one zed.
-	(mh_summary_sync_message): Sigh, and write to the right damn fd as
-	well.
-	(mh_summary_sync_message): Argh, and we need to compare the length
-	of the old xev -1 to the new xev, to check if we can optimise it.
-
-	* camel-folder.c (camel_folder_change_info_new): Init the pool.
-	(camel_folder_change_info_add_source): Allocate string in the
-	pool.
-	(camel_folder_change_info_add_source_list): 
-	(camel_folder_change_info_add_update): No longer free the key, as
-	it cannot be yet.
-	(change_info_add_uid): Add a new arg, copy, telling it whether to
-	copy the uid argument or not, and copy using mempool_strdup.
-	(change_info_cat): Tell add_uid to copy the string.
-	(camel_folder_change_info_add_update): Call add_uid directly.
-	(change_info_remove): Call add_uid directly, with no copy, and
-	dont free the key.
-	(change_info_free_update): No longer required since we dont malloc
-	the keys.
-	(camel_folder_change_info_add_uid): Fix for add_uid change.
-	(camel_folder_change_info_remove_uid): 
-	(camel_folder_change_info_change_uid): 
-	(change_info_clear): No longer needed, just set the size to 0 on
-	the array directly.
-	(camel_folder_change_info_clear): Empty the arrays directly, and
-	flush the mempool too, and also clear uid_source, incase anyone
-	was silly enough to call us in the wrong order.
-	(camel_folder_change_info_free): Dont bother clearing the array's
-	contents, just free the pool and throw away all the indexes.
-
-	* camel-folder.h: Added a mempool to CamelFolderChangeInfo to
-	store the uid's we get.
-
-	* camel-folder-search.c (search_match_all): If we are only
-	matching a single info, just use that/do the search.
-	(camel_folder_search_match_expression): New function.  Matches a
-	single message info against an expression.
-	(camel_folder_search_init): Init a hash table used to map the
-	returned gptrarrays' to mempools.
-	(camel_folder_search_execute_expression): Store all of the string
-	data in a mempool, slightly faster, less wasted space (usually),.
-	(camel_folder_search_free_result): Check for the mempool that
-	stores the data for the list, and free that if we have it,
-	otherwise assume we need to use g_free() (which should only happen
-	if the list is empty at the moment).
-	: commented out the debugging prints.  Got sick of 'executing
-	header search' crap.
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_init): Init
-	changes.
-	(camel_vee_folder_finalise): Free changes.
-	(vfolder_add_match): Simple helper to add a new matching info
-	record.
-	(camel_vee_folder_add_folder): Only trigger a changed event if we
-	have changes.
-	(vfolder_change_match): New function, changes our local vfolder
-	info to match the source.
-	(vfolder_add_match): Add a new info to the vfolder list.
-	(vfolder_remove_match): Remove a no-longer matching info from the
-	vfolder summary.
-	(message_changed): check if the message still matches, and
-	remove/etc as required.
-	(camel_vee_folder_finalise, init): init/free search object.
-	(vee_folder_build_folder): Build the changes to the folder into
-	the changes data, as we go.
-	(folder_changed): If the folder gave us an explicit list of
-	changes, then process each one separately (unless there's a lot
-	added/changed).
-
-	* providers/vee/camel-vee-folder.h: Added a changes field to the
-	folder.
-
-	* Makefile.am (libcamel_la_SOURCES): Added
-	camel-folder-thread.[ch].
-
-	* camel-folder-thread.c: message-threading algorithm, taken from
-	evolutions' mail component, as it is generally more useful than
-	just for evolution itself.  Changed to use e-memchunks as well to
-	speed it up a little and use less mem.
-
-2000-11-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-remote-store.c (remote_recv_line): Fixed to return the
-	correct bytecount in all cases which is the real fix to
-	imap_parse_nstring.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Again,
-	don't use strlen for the post-data, use 'n'.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): Undo my
-	previous temp-fix.
-
-2000-11-20  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): Fixes for
-	the summary messageid changes.  Hash the messageid and store it.
-	(get_XOVER_headers): Use camel_folder_summary_info_new() to create
-	the summary item before adding it.
-
-	* camel-folder-summary.h (CamelMessageInfo): Changed the
-	messgae-id to be an 8 byte md5 hash, and the references list to be
-	an array of these.
-
-	* providers/local/camel-mh-summary.c (mh_summary_sync_message):
-	New function, sync out the message info stuff.  Only updates the
-	X-Ev header if it can get away with it, otherwise writes out a
-	whole new message.
-	(mh_summary_sync): Added more functionality.  All summary info is
-	now written to the X-Ev header, etc, and new messages re-written
-	if required during the sync process.
-
-	* providers/local/camel-local-folder.c
-	(local_set_message_user_flag): Set the XEVCHANGE flag.
-	(local_set_message_user_tag): And here too.
-
-	* providers/local/camel-local-summary.h: New flag
-	CAMEL_MESSAGE_FOLDER_XEVCHANGE to indicate the XEV header has
-	probably changed size and needs to be rewritten in whole.
-
-	* camel-folder-summary.c (next_uid_string): Want this static, not
-	const.
-	(message_info_new): Store the references and message-id values as
-	64 bit, binary hashes.
-	(message_info_load): fix for message-id/references changes.
-	(message_info_save): Likewise.
-	(camel_message_info_dup_to): And here.
-	(camel_message_info_free): And here too.  No longer free
-	message_id, and simple free for references array.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.
-	(camel_folder_summary_init): Init memchunk allocators to empty.
-	(camel_folder_summary_finalize): Free memchunk allocators if
-	there.
-	(message_info_new): Use the chunk allocator to allocate message
-	info's.	
-	(camel_folder_summary_info_new): New helper to allocate the
-	message info, and setup the memchunk if required.
-	(content_info_alloc): Likewise for content info's.
-	(message_info_load): Use summary_info_new_empty.
-	(content_info_new): Use content_info_alloc.
-	(content_info_load): "
-	(content_info_free): Free the content info as a memchunk.
-	(message_info_free): Free everything directly and the base as a
-	memchunk, rather than calling camel_message_info_free(), which
-	assumes a malloc'd array.
-
-	* providers/local/camel-local-summary.c: Include ctype.h, kill a
-	warning.
-	(local_summary_decode_x_evolution): If we get a NULL message info,
-	then dont try and set anything, just check for validity.
-	(camel_local_summary_write_headers): New function to write a set
-	of headers to an fd.
-	(camel_local_summary_check): Added some statistic generation
-	stuff for memory profiling.
-
-	* providers/local/camel-mbox-summary.c (header_write): Changed to
-	use stdoi functions to write out the header to a buffered stream,
-	instead of using writev, which is apparently slow (and writing
-	each line separately is slow anyway).
-	(mbox_summary_sync_full): New implementation.  Does things
-	differently, doesn't use or require the content info stuff.
-	(summary_rebuild): Dont return an error if we start scanning at
-	the end of file.
-	(mbox_summary_sync_full): If we are not writing out new headers,
-	make sure we copy the From line as we go, and update frompos
-	appropriately.
-	(mbox_summary_sync_full): Always copy the From line from the
-	existing one, rather than trying to make one up ourselves.
-	(mbox_summary_sync): If we can get by with a quick-sync, then try
-	it, if that fails, then try a full sync anyway.
-	(mbox_summary_sync_quick): Quick sync.  Only update system flags,
-	etc.
-	(mbox_summary_sync_full): Use the proper local summary encode_xev
-	function.
-	(header_evolution_decode): Removed, no longer needed.
-	(header_evolution_encode): Same.
-	(copy_block): No longer needed, removed.
-	(header_write): Removed, replaced with
-	camel_local_summary_write_headers.
-	(mbox_summary_sync_full): Fixed for header_write change.
-
-	* camel-mime-parser.c (folder_scan_step): Implement the new
-	optional parser state HSCAN_PRE_FROM, that returns the (currently
-	unfiltered) input data.
-	(folder_scan_drop_step): Do the right thing for the PRE_FROM
-	state.
-	(camel_mime_parser_scan_from): Update the doco.
-	(camel_mime_parser_scan_pre_from): Ok, make this behaviour
-	optional, it simplifies a lot of loops that dont otherwise need to
-	know about it.
-	(folder_scan_step): Made the PRE_FROM state optional.
-	(struct _header_scan_state): Made the bool vars 1 bit.
-	(folder_pull_part): Free the from_line buffer if it is there.
-	(folder_scan_skip_line): Added a new arg, can save the skpped data
-	to a byte_array, as we go.
-	(folder_scan_step): Fixed calls to skip_line approrpiately.  Now
-	we save the from line as we parse it.
-	(camel_mime_parser_read): New function to read from the mime
-	parser buffer directly.  Useful if you use the parser to read the
-	first/some headers, then need to scan the rest of the data,
-	without needing to use a seek(), or allocate your own buffers.
-
-	* camel-mime-parser.h (struct _header_state): Added a new parser state,
-	pre-from which returns any data found before a from line during
-	parsing (all other data can be retrieved by the caller except
-	this).
-
-2000-11-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): When
-	extracting a literal string, capture up until the end of the last
-	line - this we we don't lose any data if the byte count is off.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Use
-	the byte-read count to decrement the number of bytes left to read
-	rather than using strlen. Not only does this protect against a DoS
-	(embedded NUL chars in the literal string would make strlen
-	inaccurate) but it also improves performace a little.
-
-	* camel-remote-store.c (remote_recv_line): *Sigh* Return the
-	number of bytes read on success rather than 0. Also don't use
-	camel_stream_buffer_read_line since we can't get an accurate octet
-	count.
-
-2000-11-17  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-local-summary.c (local_summary_add): Clear
-	the NOXEV/FLAGGED bits, since we do have an xev header.  um m,
-	maybe this is right, this assumes a write is following.  Maybe
-	this should be done in folder::append() instead ...
-
-	* camel-stream-buffer.c (camel_stream_buffer_gets): We should
-	always terminate the string.  No need to check outptr is in range,
-	its already been checked.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): When
-	we update the summary, do it from mbox_summary->folder_size, not
-	the content info endpos (which isn't any good anymore anyway).
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message): Set
-	the frompos from the current folder size, since summary_add wont
-	have initialised it to anything useful.
-
-2000-11-16  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-local-summary.c
-	(local_summary_encode_x_evolution): Check the uid string is all
-	digits before trying to write a 'standard' x-ev header.
-
-	* providers/local/camel-maildir-summary.c
-	(camel_maildir_summary_info_to_name): Convert an info into a
-	maildir name:info filename.
-	(camel_maildir_summary_name_to_info): Convert a name:info filename
-	into an info, and tell us if it didn't match it.
-	(message_info_new): When creating a new filename, gets its info
-	from the flags field.  Likewise if creating from an existing file,
-	extract the flags.
-	(maildir_summary_sync): Remove a small memleak.  Also, if our
-	flags and that requires a filename change, perform that here.
-	(message_info_new): Get the received date from the filename.
-	Also, dont overwirte the uid if we have one.
-	(maildir_summary_check): Sort the summary in received order before
-	completion.
-	(maildir_summary_next_uid_string): Test the name for collusions
-	before we give it out.  Retry, and if that fails, well, I guess we
-	collide :(
-
-	* providers/local/camel-mbox-folder.c (mbox_lock): Implement mbox
-	locking.
-	(mbox_unlock): And unlocking.
-	(mbox_append_message): Lock the folder for write before doing
-	anything.
-	(mbox_get_message): Lock the folder for read before doing
-	anything.
-
-	* providers/local/camel-local-folder.c (camel_local_folder_lock):
-	Implement something here.  We handle the recursive ability but
-	pass the locking to the folder itself.
-	(camel_local_folder_unlock): Likewise for unlocking.
-	(local_lock): Default - do nothing, return success.
-	(local_unlock): Same.
-	(local_sync): Changed slightly for locking api changes, and also,
-	only lock around the sync process itself.
-
-	* camel-lock.c: New file - utility functions for locking using
-	different strategies and/or for locking folders safely.
-
-	* Makefile.am (libcamel_la_SOURCES): Adde camel-lock.[ch]
-
-2000-11-15  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c: mime_guess_type_from_file_name moved back to
-	composer as it introduced unwanted VFS dependency
-	removed  #include <libgnomevfs/gnome-vfs.h>
-
-2000-11-15  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed local again, not quite ready.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (message_info_new_from_message): Use
-	message_info_new to create the summary from headers, instead of
-	getting directly from the message.
-	(format_recipients): No longer required.
-
-	* providers/Makefile.am (SUBDIRS): Added local.
-
-2000-11-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_push_part): Make sure 'atleast' is
-	at least 1, always.  This is possibly a temporary fix for a
-	bad failure mode on bad multipart messages.
-	(folder_scan_content): Go until inend, not inend+1.  Changed the
-	continuation and retry logic to be simpler and more robust.  If we
-	can't find a marker within
-	the atleast we need, just set it to 1, and try again, rather than
-	just going to the next smaller limit (boundary check checks the
-	length anyway).
-	(header_append): streamline the empty line case.  And strip
-	trailing \r's if there are any (\n's already stripped).
-	(folder_scan_header): Reordered and cleaned up a lot.  Check for
-	continuation only once, and compress lwsp then.	Assume the header
-	buffer already has end of line's stripped, and simplify some things:
-		Only check for end of headers once and easier.
-		Dont check to remove end of line character
-	Dont bother testing inptr-start if we get a boundary match - it is
-	always zero.
-	(folder_scan_header): Removed the unused part variable, and a few
-	pointless assignments.
-	(folder_scan_header): Change the end limit to be 1 higher, to make
-	sure we get all content.
-	(folder_scan_content): And here too.
-	(folder_scan_header): Killed a warning.
-	(folder_push_part): Removed a bad comment.  Actually
-	boundarylenfinal can be zero for a new message not in a
-	multipart.  So we fix that here.
-
-2000-11-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_decode_param_list): Renamed from
-	header_param_list_decode.
-	(header_param_list_decode): New external function to decode a
-	parameter list.
-	(header_param_list_format_append): Made public.
-	(header_param_list_format): Another new public helper function for
-	formatting just a param list.
-
-	* camel-folder-summary.c (next_uid_string): Default implementation
-	is the same as before.
-	(camel_folder_summary_class_init): And set it up.
-
-	* camel-folder-summary.h: Make next_uid_string a virtual function.
-
-	* camel-folder.c (camel_folder_change_info_changed): New function
-	to return true if the changeset contains any changes.
-
-2000-11-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-stream.c (camel_stream_printf): Don't cast an int to a
-	ssize_t.
-
-2000-11-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): put a space before a single-digit
-	day of the month since it seems some mailers are fantastically
-	picky about this. (bugs.gnome.org #27232)
-
-2000-11-10  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (header_msgid_generate): fix ids ending with '.'
-
-2000-11-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-auth.c (imap_try_kerberos_v4_auth):
-	Fix error handling. (Only send a "*" to bail out of authentication
-	if the server hasn't already bailed on us.)
-
-2000-11-08  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (mime_guess_type_from_file_name): new
-	function, moved from composer
-
-2000-11-08  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (find_best_encoding): Keep track of the
-	caller bestenc flags that make sense.
-	
-	* camel-mime-filter-bestenc.c (filter): Added code to detect when
-	we have "^From " lines in the sequence of text.
-	(camel_mime_filter_bestenc_get_best_encoding): Added a new flag
-	CAMEL_BESTENC_NO_FROM: if set, it will not allow any lines
-	matching "^From " to appear in the output - currently forcing
-	base64 encoding to achieve this.
-
-	* camel-mime-parser.c (folder_scan_step): Call
-	camel_mime-filter_complete() once we're done, rather than
-	filter_filter().
-	(folder_scan_content): Some fixes for state changing; so that when
-	we do find another boundary it is properly flagged.  Since we
-	strip the last \n off all data, we must take that into account
-	too.  Sigh.  Fixes a rather nasty set of bugs where multipart
-	messages could start including following messages as parts, etc.
-	(struct _header_scan_stack): Added new parameter,
-	boundarylenfinal, which holds the length of the final boundary, if
-	it is different (e.g. for From lines, whihc aren't)
-	(folder_scan_step): Setup teh boundarylenfinal value when creating
-	a new boundary.
-	(folder_scan_content): Hmm, if we hit the end-of-buffer sentinal,
-	reset the scanner back to leave 'atleast' chars in the buffer
-	still, dump that content, and retry again.  Stops us losing a
-	check for a boundary on some data we haven't really looked at yet!
-	(folder_scan_content): Use boundarylenfinal to calculate
-	'atleast'.
-	(folder_scan_header): And here too.
-	(folder_boundary_check): Use the atleast value directly, dont
-	truncate it.  Use the boundarylen/boundarylenfinal values directly
-	too.
-	(struct _header_scan_stack): Add an atleast parameter to cache the
-	atleast info.
-	(folder_push_part): Determine/set 'atleast', every time we add a
-	new part.
-	(folder_scan_header): Get the cached atleast info from the current
-	part.
-	(folder_scan_content): And here too.
-	(folder_scan_header): Fix a problem where a part starting with
-	" text" would be interpreted as a followon header wrongly.
-
-	* camel-mime-filter-charset.c (complete): Add some assertions to
-	find a bug.
-
-2000-11-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-service.c (get_name): Strdup the "???" string you return,
-	so that the expected semantics for `::get_name()' is respected.
-
-2000-11-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-filter.c (d): Kill debugging, as it causes lots of
-	evolution-mail spewage.
-
-2000-11-07  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-bestenc.c (complete): Implement a complete()
-	function, now we need one.
-	(filter): Upgraded to match rfrc2045 properly.  Checks also for
-	length of line and valid CRLF sequences.
-	(camel_mime_filter_bestenc_get_best_encoding): Do the work of
-	working out what is the best encoding given what we found about
-	the stream.
-
-	* camel-mime-part.c (camel_mime_part_encoding_to_string): Use a
-	lookup table to get the encoding naem, and add the binary type.
-	(camel_mime_part_encoding_from_string): Likewise for the reverse.
-
-	* camel-mime-part.h: Added the binary encoding type, see rfc2045.
-
-	* camel-mime-utils.c (header_param_list_format_append): Dont put a
-	space before ;'s in parameter lists, makes them more
-	readable/consistent.
-
-	* camel-mime-message.c (multipart_has_8bit_parts): Cleaned up the
-	old stuff, well removed it.
-	(camel_mime_message_set_best_encoding): Added another argument
-	that lets you select what you want to set the best of.  i.e. for
-	smtp transport we only need 7 bit, and dont need to optimise the
-	charset (although of course, we should always).
-	(find_best_encoding): Implement this feature, if we are not
-	getting the best charset, use the one we have.
-	(best_encoding): Set the charset on the part appropriately.  Sigh,
-	the interfaces for this are nonexistant.
-	(find_best_encoding): Tell the bestenc filter that lf should be
-	treated as crlf for the purposes of determining encodings.
-
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-charset-map.c (camel_charset_init): Init function for an
-	iterative charset determinator.
-	(camel_charset_step): Iterate another buffer.
-	(camel_charset_mask): Removed, since it couldn't have worked.
-	(camel_charset_best): Use the iterative interface to do the work.
-	(camel_charset_best_name): Get the best name for a charset so far.
-
-	* camel-mime-filter-bestenc.c: New class, a stream
-	filter that can be used to memory-efficiently determine the best
-	encoding and/or charset to use for a given stream of bytes.
-
-	* Makefile.am (libcamelinclude_HEADERS): Added stream-null*.
-	(libcamel_la_SOURCES): Added bestenc*
-
-	* camel-stream-null.c: New class, a null-stream, that always
-	succeeds, and never has any contents.
-
-	* camel-stream.c: Minor pointless changes.  Was going to do
-	something else but changed my mind.  Added trivial default
-	implementations for all callbacks.
-
-	* camel-mime-message.h: Cleaned up some old cruft.
-
-	* camel-folder-summary.c (camel_folder_summary_format_address):
-	address_list_format() no longer encodes, so we dont need to decode
-	it.
-
-	* camel-address.c (camel_address_unformat): New function, attempts
-	to reverse the formatting process on display addresses.
-	(camel_address_length): New function to get the number of
-	addresses, without having to peek the structure.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Fix a typo.
-	(camel_mime_message_finalize): Only unref from/reply_to if we have
-	it.
-	(camel_mime_message_set_recipients): New function - set the
-	recipients as a CamelInternetAddress.  This function effectively
-	deprecates the older recipient setting functions.
-	(camel_mime_message_add_recipient): What the hell, i'll bite the
-	bullet.  Terminate this function.  The old api was ambiguious and
-	inefficient and didn't work right anyway.
-	(camel_mime_message_remove_recipient_address): And this one.
-	(camel_mime_message_remove_recipient_name): And this one too.
-	(camel_mime_message_set_recipients): If we set an empty header,
-	then remove it from the header list.  Allow a null receipient
-	object to clear a header.
-	(camel_mime_message_set_from): Likewise, if setting an empty from
-	address.
-	(camel_mime_message_encode_8bit_parts): Eeek!!
-	camel_stream_mem_new_with_byte_array owns the byte_array we give
-	it, so make sure we dont free any of it!
-	(camel_mime_message_encode_8bit_parts):  Infact, i'll just rewrite
-	the whole lot, its a bit of a mess.  Should really rename it and
-	make it a little more useful too, lets see ...
-	(best_encoding): This has a string interface?  Oh boy.
-	(camel_mime_message_foreach_part): New experimental function to
-	iterate over all message parts.  Might not remain.
-	(camel_mime_message_has_8bit_parts): New implementation using
-	foreach_part.  Fixed a couple of problems.
-	(find_best_encoding): New function, that finds the best encoding
-	for a given part (will probably be moved to camel-mime-part), and
-	also the best charset to use if it is a text part.  Since one
-	affects the other it is a two pass process, but uses streams and
-	not memory to achieve this.
-	(camel_mime_message_set_best_encoding): Uses the function above to
-	configure an entire message for the best encoding possible given
-	transport constraints.
-	(camel_mime_message_encode_8bit_parts): Reimplemented to use the
-	function above to perform the work.
-
-	* camel-internet-address.c
-	(camel_internet_address_format_address): Dont put <> around a lone
-	address with no real name.
-	(camel_internet_address_encode_address): Similarly.
-	(internet_decode): Actually return the count of decoded addresses.
-	(internet_unformat): Implement the unformatting routine.
-
-2000-11-05  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Changed to get
-	the internetaddress directly, rather than having to parse it
-	itself.
-
-	* camel-address.c (camel_address_format): Added a new function
-	which will format address, suitable for display.
-	(camel_address_cat): Concatentate 1 camel address onto another.
-	It is upto the caller to ensure the addresses are of compatible
-	types.
-	(camel_address_new_clone): New function to create a new address by
-	copying an existing one of the same type.
-	(camel_address_copy): New helper function to copy an address.
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed cached
-	copy of date string.
-	(struct _CamelMimeMessage): Added date_received info.
-
-	* camel-mime-message.c (camel_mime_message_get_date_string):
-	Removed.  Nothing uses it anyway, and it is redundant.
-	(camel_mime_message_finalize): No more date_str.
-	(camel_mime_message_init): No more date_str, initialise
-	date_received*
-	(write_to_stream): Change the check for a date header.
-	(process_header): No longer track the date_str.
-	(camel_mime_message_get_received_date): Removed.  totally invalid
-	anyway.
-	(camel_mime_message_get_sent_date): Removed.  Redundant.  The only
-	'date' is the sent date, the received date is just made up.
-	(camel_mime_message_get_date): Args changed to be more consistent
-	with utility functions.
-	(camel_mime_message_get_date): Dont set the date when we're asked
-	for it (if its not set by the time its written, it'll be set
-	then).
-	(camel_mime_message_get_date_received): Actually do 'the right
-	thing' here, if we have a received header, use that to determine
-	the received date.  And return the data in the same format as
-	get_date.
-	(camel_mime_message_set_from): Changed the api to better match
-	what we should be doing.  Pass a camelinternetaddress, etc.
-	(camel_mime_message_set_reply_to): Cahnged similarly to take an
-	internetaddress.
-	(camel_mime_message_get_reply_to): Likewise.
-	(camel_mime_message_finalize): Unref the from/reply_to objects.
-	(format_address): Removed, no longer needed.
-	(process_header): Changed to store the from/reply_to as
-	internetaddress's.
-	(write_to_stream): Set the from header directly to empty, if we
-	dont have one.  Maybe we should just abort, and/or create one
-	based on the current user.
-
-	* camel-mime-utils.c (header_address_list_format): Renamed to
-	header_address_list_encode, which is what it is actually doing.
-	(header_address_list_format_append): Similarly.
-	(encoding_map[]): Removed, no longer used.
-	(header_address_list_encode_append): Take another arg, do we
-	encode the address (for internet), or not (for display - utf8
-	only).
-	(header_address_list_format): Re-added this function, but now it
-	generates a display version only.  Surprise surprise, that is all
-	anythign needs to generate anyway.  Sigh.
-
-	* camel-internet-address.c (camel_internet_address_get): Return
-	false if we get an invalid index only.
-	(camel_internet_address_encode_address): Helper function to encode
-	a single address for mailing.
-	(internet_encode): Use the above function to format it.
-	(camel_internet_address_format_address): Format a single address
-	for display.
-	(internet_format): Implement the display version.
-	(camel_internet_address_class_init): Init the internet_format
-	virtual function.
-	(internet_cat): Implement virtual function to concatenate
-	addresses.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_info_new_from_header): new function, only
-	build the summary info, dont add it.
-	(camel_folder_summary_info_new_from_parser): Likewise, for new
-	info from parser.
-	(camel_folder_summary_add_from_parser): Cahnged to call function
-	above to build info.
-	(camel_folder_summary_add_from_header): Changed to call function
-	above, to build info.
-	(camel_folder_summary_info_free): New function to free the summary
-	message info.
-	(camel_folder_summary_clear): Changed to clal above to free info.
-	(camel_folder_summary_remove): Likewise.
-	(camel_folder_summary_add): Cleaned up the clashing uid
-	re-assignment logic a little bit.
-	(camel_folder_summary_decode_uint32): Fixed a typo, 01 != -1.
-	(camel_folder_summary_decode_time_t): Return -1 on error.
-	(camel_folder_summary_encode_off_t): New function to encode an
-	off_t type.
-	(camel_folder_summary_decode_off_t): And likewise for the reverse.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped the summary version, since
-	we're now encoding time/off_t's right.
-	(summary_header_save): Use time_t encoder to save the timestamp.
-	(summary_header_load): Likewise for decoding the timestamp.
-	(content_info_load): Decode off_t types directly, now we can.
-	(content_info_save): And likewise for encoding.
-	(camel_folder_summary_add_from_message): New function, create a
-	summary item from an existing message and add it.
-	(camel_folder_summary_info_new_from_message): New function, create
-	a summary item from an existing message.
-	(summary_build_content_info_message): New function to do the dirty
-	work of building the conent info/indexing, from a message source.
-	(format_recipients): Format an internetaddress suitable for the
-	summary.
-	(message_info_new_from_message): Build a new summary item from a
-	mime message.
-	(content_info_new_from_message): Build a new conent info from a
-	mime part.
-	(camel_folder_summary_class_init): Init the new class functions.
-	(message_info_new_from_message): Fixed for message api change.
-
-	Added documentation to the functions.
-	
-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-30  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Correct
-	parameters to g_hash_table_lookup_extended.
-
-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 7937c7aa1c..0000000000
--- a/camel/Makefile.am
+++ /dev/null
@@ -1,274 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = providers tests
-
-libcamelincludedir = $(includedir)/camel
-
-sbin_PROGRAMS =	camel-lock-helper camel-index-control
-
-lib_LTLIBRARIES = libcamel.la
-noinst_LTLIBRARIES = libcamel-static.la
-
-INCLUDES = -I.. -I$(srcdir)/.. 			 	\
-	-I$(top_srcdir)/intl			 	\
-	-I$(top_srcdir)/e-util			 	\
-	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 	\
-	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
-	-DG_LOG_DOMAIN=\"camel\"			\
-	$(CAMEL_CFLAGS)
-
-libcamel_la_SOURCES = 				\
-	broken-date-parser.c			\
-	camel-address.c				\
-	camel-arg.c				\
-	camel-block-file.c			\
-	camel-cipher-context.c			\
-	camel-cms-context.c			\
-	camel-data-cache.c			\
-	camel-data-wrapper.c			\
-	camel-digest-folder.c			\
-	camel-digest-store.c			\
-	camel-disco-diary.c			\
-	camel-disco-folder.c			\
-	camel-disco-store.c			\
-	camel-exception.c			\
-	camel-file-utils.c			\
-	camel-filter-driver.c			\
-	camel-filter-search.c			\
-	camel-folder-search.c			\
-	camel-folder-summary.c			\
-	camel-folder-thread.c			\
-	camel-folder.c				\
-	camel-html-parser.c			\
-	camel-http-stream.c			\
-	camel-index.c				\
-	camel-internet-address.c		\
-	camel-lock.c				\
-	camel-lock-client.c			\
-	camel-medium.c				\
-	camel-mime-filter-bestenc.c		\
-	camel-mime-filter-basic.c		\
-	camel-mime-filter-charset.c		\
-	camel-mime-filter-chomp.c		\
-	camel-mime-filter-crlf.c		\
-	camel-mime-filter-from.c		\
-	camel-mime-filter-html.c		\
-	camel-mime-filter-tohtml.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-operation.c			\
-	camel-partition-table.c			\
-	camel-pgp-context.c			\
-	camel-pgp-mime.c			\
-	camel-smime-context.c			\
-	camel-smime-utils.c			\
-	camel-provider.c			\
-	camel-remote-store.c			\
-	camel-sasl.c				\
-	camel-sasl-anonymous.c			\
-	camel-sasl-cram-md5.c			\
-	camel-sasl-digest-md5.c			\
-	camel-sasl-kerberos4.c			\
-	camel-sasl-login.c			\
-	camel-sasl-ntlm.c			\
-	camel-sasl-plain.c			\
-	camel-sasl-popb4smtp.c			\
-	camel-search-private.c			\
-	camel-seekable-stream.c			\
-	camel-seekable-substream.c		\
-	camel-service.c				\
-	camel-session.c				\
-	camel-store.c				\
-	camel-store-summary.c			\
-	camel-stream-buffer.c			\
-	camel-stream-filter.c			\
-	camel-stream-fs.c			\
-	camel-stream-mem.c			\
-	camel-stream-null.c			\
-	camel-stream.c				\
-	camel-text-index.c			\
-	camel-tcp-stream-raw.c			\
-	camel-tcp-stream-ssl.c			\
-	camel-tcp-stream-openssl.c		\
-	camel-tcp-stream.c			\
-	camel-transport.c			\
-	camel-uid-cache.c			\
-	camel-url.c				\
-	camel-vee-folder.c			\
-	camel-vee-store.c			\
-	camel-vtrash-folder.c			\
-	camel-charset-map.c			\
-	camel.c					\
-	gstring-util.c				\
-	hash-table-utils.c			\
-	string-utils.c
-
-libcamelinclude_HEADERS =			\
-	broken-date-parser.h			\
-	camel-address.h				\
-	camel-arg.h				\
-	camel-block-file.h			\
-	camel-charset-map.h			\
-	camel-cipher-context.h			\
-	camel-cms-context.h			\
-	camel-data-cache.h			\
-	camel-data-wrapper.h			\
-	camel-digest-folder.h			\
-	camel-digest-store.h			\
-	camel-disco-diary.h			\
-	camel-disco-folder.h			\
-	camel-disco-store.h			\
-	camel-exception-list.def		\
-	camel-exception.h			\
-	camel-file-utils.h			\
-	camel-filter-driver.h			\
-	camel-filter-search.h			\
-	camel-folder-search.h			\
-	camel-folder-summary.h			\
-	camel-folder-thread.h			\
-	camel-folder.h				\
-	camel-http-stream.h			\
-	camel-index.h				\
-	camel-internet-address.h		\
-	camel-lock.h				\
-	camel-lock-client.h			\
-	camel-medium.h				\
-	camel-mime-filter-bestenc.h		\
-	camel-mime-filter-basic.h		\
-	camel-mime-filter-charset.h		\
-	camel-mime-filter-chomp.h		\
-	camel-mime-filter-crlf.h		\
-	camel-mime-filter-from.h		\
-	camel-mime-filter-html.h		\
-	camel-mime-filter-tohtml.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-operation.h			\
-	camel-partition-table.h			\
-	camel-pgp-context.h			\
-	camel-pgp-mime.h			\
-	camel-smime-context.h			\
-	camel-smime-utils.h			\
-	camel-provider.h			\
-	camel-remote-store.h			\
-	camel-sasl.h				\
-	camel-sasl-anonymous.h			\
-	camel-sasl-cram-md5.h			\
-	camel-sasl-digest-md5.h			\
-	camel-sasl-kerberos4.h			\
-	camel-sasl-login.h			\
-	camel-sasl-ntlm.h			\
-	camel-sasl-plain.h			\
-	camel-sasl-popb4smtp.h			\
-	camel-seekable-stream.h			\
-	camel-seekable-substream.h		\
-	camel-service.h				\
-	camel-session.h				\
-	camel-store.h				\
-	camel-store-summary.h			\
-	camel-stream-buffer.h			\
-	camel-stream-filter.h			\
-	camel-stream-fs.h			\
-	camel-stream-mem.h			\
-	camel-stream-null.h			\
-	camel-stream.h				\
-	camel-text-index.h			\
-	camel-tcp-stream-raw.h			\
-	camel-tcp-stream-ssl.h			\
-	camel-tcp-stream.h			\
-	camel-transport.h			\
-	camel-types.h				\
-	camel-uid-cache.h			\
-	camel-url.h				\
-	camel-vee-folder.h			\
-	camel-vee-store.h			\
-	camel-vtrash-folder.h			\
-	camel.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 	\
-	$(CAMEL_LIBS)
-
-libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)
-libcamel_static_la_LIBADD  = $(libcamel_la_LIBADD)
-libcamel_static_la_LDFLAGS = --all-static
-
-camel_lock_helper_SOURCES = 			\
-	camel-lock-helper.c 			\
-	camel-lock-helper.h			\
-	camel-lock.c				\
-	camel-lock.h
-
-camel_index_control_SOURCES =			\
-	camel-index-control.c
-
-camel_index_control_LDADD =			\
-	$(libcamel_la_LIBADD)			\
-	libcamel.la				\
-	$(EVOLUTION_MAIL_LIBS)
-
-install-exec-hook:
-	@if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \
-	    if test `whoami` = root ; then \
-	 	chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
-		chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
-	    else \
-	    	echo '*** WARNING ***' ; \
-		    echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
-		    echo "    1. Become root" ; \
-		    echo "    2. chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
-		    echo "    3. chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
-		    echo '*** WARNING ***' ; \
-	    fi \
-	else \
-	    echo "No user to chown to"; \
-	fi
-	@if test -n "$(CAMEL_LOCK_HELPER_GROUP)"; then \
-	    if test `whoami` = root ; then \
-	    	chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
-		    chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
-	    else \
-	    	echo '*** WARNING ***' ; \
-		    echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
-		    echo "    1. Become root" ; \
-		    echo "    2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
-		    echo "    3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
-		    echo '*** WARNING ***' ; \
-	    fi \
-	else \
-	    echo "No user to chown to"; \
-	fi
-
-noinst_HEADERS =				\
-	camel-charset-map-private.h		\
-	camel-private.h				\
-	camel-search-private.h			\
-	camel-html-parser.h
-
-EXTRA_DIST =					\
-	README
diff --git a/camel/README b/camel/README
deleted file mode 100644
index 89b57ad3c7..0000000000
--- a/camel/README
+++ /dev/null
@@ -1,54 +0,0 @@
-
-                                   CAMEL
-     
-
-			A generic Messaging Library
-
-
-                                   ----
-				
-
-Introduction:
--------------
-
-Camel is a generic messaging library. It supports the standard 
-messaging system for receiving and sending messages. It is the 
-messaging backend for Evolution.
-
-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.
-
- 
-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 bad1b76eb8..0000000000
--- a/camel/README.COPYRIGHT
+++ /dev/null
@@ -1,46 +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 software with licenses incompatible with the
-GPL. For this reason, the copyright has to be owned by a unique
-entity.  Be sure, however, that Camel will always be available under
-the GPL.  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
-GPL.
-
-Thus, when adding code in Camel, always add the following lines at the
-begining of the file:
-
-/* 
- * Copyright 1999, 200x Ximian, Inc. (http://www.ximian.com)
- * 
- * Author: Your name <your.email@address>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 list inside this
-header.
-
-Please contact Ximian, Inc. (http://www.ximian.com) if you want to discuss 
-this copyright issue.
-
-Happy hacking,
-
-Ximian, Inc.
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/README.mt b/camel/README.mt
deleted file mode 100644
index aeece1b0bb..0000000000
--- a/camel/README.mt
+++ /dev/null
@@ -1,171 +0,0 @@
-
-This version of camel is working towards being multi-thread safe
-(MT-SAFE).  At least, for the important api's.
-
-This code has now been merged into the main head, but this file
-will remain here as a log of how it was done, incase any issues
-arise.  The ChangeLog of course has a much more detailed list
-of changes.
-
-Intended method
-===============
-
-I intend working on it in several stages:
-
-1. Making the api multi-threadable.  Basically removing some const-returns,
-and copying some data where it wasn't before.  The api should
-still continue to work if not being used in a multithreaded
-application.  There is not a significant amount of work here since
-this was more or less the intention all along.
-
-Some functions where references to objects are returned may have to be
-changed slightly, so that refcounts are incremented before return.
-This doesn't affect much though.
-
-camel_folder::get_message_info				done
-camel_folder_summary::uid				done
-camel_folder_summary::index				done
-camel_folder::get_summary
-	Needs to ref each summary item it points to.	done
-camel_folder::free_summary
-	Needs to unref each summary item it points to.	done
-camel_folder_get_message_tag
-	needs to copy the tag return
-camel_maildir_summary filename string
-	should not be able to modify the string
-	array contents after it has been added to
-	the summary.
-camel_folder						done
-	Make every camel-folder use a camel-folder-summary.
-	This just reduces some of the code duplication,
-	since everything but vee-folder does this already.
-
-2. Adding high level locks for proof of concept.  The locks will
-be stored in private or global data, so the api should remain the same for
-non-threaded applications.
-
-A per-folder lock which governs access to the folder
-	summary, the folder file or
-	communications socket, etc.			done
-Locking for exceptions.					done
-Per store locks for internal stuff.			done
-Per-service locks for various internal lists and
-	caches						done
-
-3. Further fine-grained locking where it can be done/is worthwhile.
-
-A per-index lock for libibex				done
-Locking for the search object				half done
-Internal lock for the folder_summary itself
-	So that searching can be detatched from other
-	folder operations, etc.				done
-Possibly a lock for access to parts of a mime-part
-	or message
-
-4. A method to cancel operations.
-
-Individual outstanding operations must be cancellable, and not just
-'all current operations'.  This will probably not use pthread_cancel
-type of cancelling.
-
-This will however, probably use a method for starting a new thread,
-through camel, that can then be cancelled, and/or some method of
-registering that a thread can be cancelled.  Blocking states within
-camel, within that thread, will then act as checkpoints for if the
-operation, and if it is cancelled, the operation will abort
-(i.e. fail, with an appropriate exception code).
-
-Operation cancelling should also function when the application is not
-multi-threaded.  Not sure of the api for this yet, probably a callback
-system.  Hopefully the api for both scenarios can be made the same.
-
-Other thoughts
-==============
-
-Basically much of the code in camel that does the actual work does NOT
-need to be thread safe to make it safely usable in an mt context.
-
-camel-folder, camel-summary, camel-imap-search, and the camel-service
-classes (at least) are the important ones to be made multithreaded.
-
-For other things, they are either resources that are created
-one-off (for example, camel-mime-message, and its associated
-parts, like camel-internet-address), or multithreadedness
-doesn't make a lot of sense - e.g. camel-stream, or camel-mime-parser.
-
-So basically the approach is a low-risk one.  Adding the minimum
-number of locks to start with, and providing further fine-grained
-locks as required.  The locks should not need to be particularly
-fine-grained in order to get reasonable results.
-
-Log of changes
-==============
-
-Changed CamelFolder:get_message_info() to return a ref'd copy, requiring
-all get_message_info()'s to have a matching free_message_info().
-
-Moved the CamelFolder frozen changelog data to a private structure.
-
-Added a mutex for CamelFolder frozen changelog stuff (it was just easy
-to do, although it isn't needed yet).
-
-Added a single mutex around all other CamelFolder functions that need
-it, this is just the first cut at mt'edness.
-
-Fixed all camel-folder implementations that call any other
-camel-folder functions to call via virtual methods, to bypass the locks.
-
-Added camel-store private data.
-
-Added a single mutex lock for camel-store's folder functions.
-
-Added camel-service private data.
-
-Added a single mutex lock for camel-service's connect stuff.
-
-Added a mutex for remote-store stream io stuff.
-
-Added a mutex for imap, so it can bracket a compound command
-exclusively.  Pop doesn't need this since you can only have a single
-folder per store, and the folder interface is already forced
-single-threaded.
-
-Added mutex for camel-session, most operations.
-
-Running the tests finds at least 1 deadlock so far.  Need to
-work on that.
-
-Fixed get_summary to ref/unref its items.
-
-Removed the global folder lock from the toplevel
-camel_folder_search(), each implementation must now handle locking.
-
-Fixed the local-folder implementation of searching.  imap-folder
-searching should already be mt-safe through the command lock.
-
-Fixed imap summary to ref/unref too.
-
-Built some test cases, and expanded the test framework library to
-handle multiple threads.  It works!
-
-Next, added a recursive mutex class, so that locking inside imap had
-any chance of working.  Got imap working.
-
-Moved the camel folder summary into the base folder class, and fixed
-everything to use it that way.
-
-Made the vfolder use a real camel-folder-summary rather than a
-hashtable + array that it was using, and probably fixed some problems
-which caused evolution-mail not to always catch flag updates.  Oh, and
-made it sync/expunge all its subfolders when sync/expungeing.
-
-Made the camel-folder summary completely mt-safe.
-
-Removed all of the locks on the folder functions dealing directly with
-the summary, so now for example all summary lookups will not be
-interupted by long operations.
-
-Made the nntp newsrc thing mt-safe, because of some unfortunate
-sideeffect of it being called from the summary interaction code in
-nntp-folder.
-
diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c
deleted file mode 100644
index 7bcff0ffd4..0000000000
--- a/camel/broken-date-parser.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include "broken-date-parser.h"
-
-#define d(x) x
-
-#define NUMERIC_CHARS          "1234567890"
-#define WEEKDAY_CHARS          "SundayMondayTuesdayWednesdayThursdayFridaySaturday"
-#define MONTH_CHARS            "JanuaryFebruaryMarchAprilMayJuneJulyAugustSeptemberOctoberNovemberDecember"
-#define TIMEZONE_ALPHA_CHARS   "UTCGMTESTEDTCSTCDTMSTPSTPDTZAMNY()"
-#define TIMEZONE_NUMERIC_CHARS "-+1234567890"
-#define TIME_CHARS             "1234567890:"
-
-#define DATE_TOKEN_NON_NUMERIC          (1 << 0)
-#define DATE_TOKEN_NON_WEEKDAY          (1 << 1)
-#define DATE_TOKEN_NON_MONTH            (1 << 2)
-#define DATE_TOKEN_NON_TIME             (1 << 3)
-#define DATE_TOKEN_HAS_COLON            (1 << 4)
-#define DATE_TOKEN_NON_TIMEZONE_ALPHA   (1 << 5)
-#define DATE_TOKEN_NON_TIMEZONE_NUMERIC (1 << 6)
-#define DATE_TOKEN_HAS_SIGN             (1 << 7)
-
-static unsigned char datetok_table[256] = {
-        128,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111, 79, 79,111,175,111,175,111,111,
-         38, 38, 38, 38, 38, 38, 38, 38, 38, 38,119,111,111,111,111,111,
-        111, 75,111, 79, 75, 79,105, 79,111,111,107,111,111, 73, 75,107,
-         79,111,111, 73, 77, 79,111,109,111, 79, 79,111,111,111,111,111,
-        111,105,107,107,109,105,111,107,105,105,111,111,107,107,105,105,
-        107,111,105,105,105,105,107,111,111,105,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-};
-
-/* 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 *tm_months[] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *tm_days[] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-
-struct _date_token {
-	struct _date_token *next;
-	const unsigned char *start;
-	unsigned int len;
-	unsigned int mask;
-};
-
-/* This is where it gets ugly... */
-static struct _date_token *
-datetok (const char *date)
-{
-	struct _date_token *tokens = NULL, *token, *tail = (struct _date_token *) &tokens;
-	const unsigned char *start, *end;
-	unsigned int mask;
-	
-	start = date;
-	while (*start) {
-		/* kill leading whitespace */
-		for ( ; *start && isspace ((int) *start); start++);
-		
-		mask = 0;
-		
-		/* find the end of this token */
-		for (end = start; *end && !strchr ("-/,\t\r\n ", *end); end++) {
-			mask |= datetok_table[*end];
-		}
-		
-		if (end != start) {
-			token = g_malloc (sizeof (struct _date_token));
-			token->next = NULL;
-			token->start = start;
-			token->len = end - start;
-			token->mask = mask;
-			
-			tail->next = token;
-			tail = token;
-		}
-		
-		if (*end)
-			start = end + 1;
-		else
-			break;
-	}
-	
-	return tokens;
-}
-
-static int
-decode_int (const unsigned char *in, unsigned int inlen)
-{
-	register const unsigned char *inptr;
-	const unsigned char *inend;
-	int sign = 1, val = 0;
-	
-	inptr = in;
-	inend = in + inlen;
-	
-	if (*inptr == '-') {
-		sign = -1;
-		inptr++;
-	} else if (*inptr == '+')
-		inptr++;
-	
-	for ( ; inptr < inend; inptr++) {
-		if (!isdigit ((int) *inptr))
-			return  -1;
-		else
-			val = (val * 10) + (*inptr - '0');
-	}
-	
-	val *= sign;
-	
-	return val;
-}
-
-static int
-get_wday (const unsigned char *in, unsigned int inlen)
-{
-	int wday;
-	
-	if (inlen < 3)
-		return -1;
-	
-	for (wday = 0; wday < 7; wday++)
-		if (!strncasecmp (in, tm_days[wday], 3))
-			return wday;
-	
-	return -1;  /* unknown week day */
-}
-
-static int
-get_mday (const unsigned char *in, unsigned int inlen)
-{
-	int mday;
-	
-	mday = decode_int (in, inlen);
-	
-	if (mday < 0 || mday > 31)
-		mday = -1;
-	
-	return mday;
-}
-
-static int
-get_month (const unsigned char *in, unsigned int inlen)
-{
-	int i;
-	
-	if (inlen < 3)
-		return -1;
-	
-	for (i = 0; i < 12; i++)
-		if (!strncasecmp (in, tm_months[i], 3))
-			return i;
-	
-	return -1;  /* unknown month */
-}
-
-static int
-get_year (const unsigned char *in, unsigned int inlen)
-{
-	int year;
-	
-	year = decode_int (in, inlen);
-	if (year == -1)
-		return -1;
-	
-	if (year < 100)
-		year += (year < 70) ? 2000 : 1900;
-	
-	if (year < 1969)
-		return -1;
-	
-	return year;
-}
-
-static gboolean
-get_time (const unsigned char *in, unsigned int inlen, int *hour, int *min, int *sec)
-{
-	register const unsigned char *inptr;
-	const unsigned char *inend;
-	int *val, colons = 0;
-	
-	*hour = *min = *sec = 0;
-	
-	inend = in + inlen;
-	val = hour;
-	for (inptr = in; inptr < inend; inptr++) {
-		if (*inptr == ':') {
-			colons++;
-			switch (colons) {
-			case 1:
-				val = min;
-				break;
-			case 2:
-				val = sec;
-				break;
-			default:
-				return FALSE;
-			}
-		} else if (!isdigit ((int) *inptr))
-			return FALSE;
-		else
-			*val = (*val * 10) + (*inptr - '0');
-	}
-	
-	return TRUE;
-}
-
-static int
-get_tzone (struct _date_token **token)
-{
-	int i;
-	
-	for (i = 0; *token && i < 2; *token = (*token)->next, i++) {
-		const unsigned char *inptr = (*token)->start;
-		unsigned int inlen = (*token)->len;
-		
-		if (*inptr == '+' || *inptr == '-') {
-			return decode_int (inptr, inlen);
-		} else {
-			int t;
-			
-			if (*inptr == '(')
-				inptr++;
-			
-			for (t = 0; t < 15; t++) {
-				unsigned int len = MIN (strlen (tz_offsets[t].name), inlen - 1);
-				
-				if (!strncmp (inptr, tz_offsets[t].name, len))
-					return tz_offsets[t].offset;
-			}
-		}
-	}
-	
-	return -1;
-}
-
-/* This is where things get interesting... ;-) */
-
-#define date_token_mask(t)  (((struct _date_token *) t)->mask)
-#define is_numeric(t)       ((date_token_mask (t) & DATE_TOKEN_NON_NUMERIC) == 0)
-#define is_weekday(t)       ((date_token_mask (t) & DATE_TOKEN_NON_WEEKDAY) == 0)
-#define is_month(t)         ((date_token_mask (t) & DATE_TOKEN_NON_MONTH) == 0)
-#define is_time(t)          (((date_token_mask (t) & DATE_TOKEN_NON_TIME) == 0) && (date_token_mask (t) & DATE_TOKEN_HAS_COLON))
-#define is_tzone_alpha(t)   ((date_token_mask (t) & DATE_TOKEN_NON_TIMEZONE_ALPHA) == 0)
-#define is_tzone_numeric(t) (((date_token_mask (t) & DATE_TOKEN_NON_TIMEZONE_NUMERIC) == 0) && (date_token_mask (t) & DATE_TOKEN_HAS_SIGN))
-#define is_tzone(t)         (is_tzone_alpha (t) || is_tzone_numeric (t))
-
-static time_t
-decode_broken_date (struct _date_token *tokens, int *tzone)
-{
-	gboolean got_wday, got_month, got_tzone;
-	int hour, min, sec, offset, n;
-	struct _date_token *token;
-	struct tm tm;
-	time_t time;
-	
-	memset ((void *) &tm, 0, sizeof (struct tm));
-	got_wday = got_month = got_tzone = FALSE;
-	offset = 0;
-	
-	token = tokens;
-	while (token) {
-		if (is_weekday (token) && !got_wday) {
-			if ((n = get_wday (token->start, token->len)) != -1) {
-				d(printf ("weekday; "));
-				got_wday = TRUE;
-				tm.tm_wday = n;
-				goto next_token;
-			}
-		}
-		
-		if (is_month (token) && !got_month) {
-			if ((n = get_month (token->start, token->len)) != -1) {
-				d(printf ("month; "));
-				got_month = TRUE;
-				tm.tm_mon = n;
-				goto next_token;
-			}
-		}
-		
-		if (is_time (token) && !tm.tm_hour && !tm.tm_min && !tm.tm_sec) {
-			if (get_time (token->start, token->len, &hour, &min, &sec)) {
-				d(printf ("time; "));
-				tm.tm_hour = hour;
-				tm.tm_min = min;
-				tm.tm_sec = sec;
-				goto next_token;
-			}
-		}
-		
-		if (is_tzone (token) && !got_tzone) {
-			struct _date_token *t = token;
-			
-			if ((n = get_tzone (&t)) != -1) {
-				d(printf ("tzone; "));
-				got_tzone = TRUE;
-				offset = n;
-				goto next_token;
-			}
-		}
-		
-		if (is_numeric (token)) {
-			if (token->len == 4 && !tm.tm_year) {
-				if ((n = get_year (token->start, token->len)) != -1) {
-					d(printf ("year; "));
-					tm.tm_year = n - 1900;
-					goto next_token;
-				}
-			} else {
-				if (!got_month && !got_wday && token->next && is_numeric (token->next)) {
-					d(printf ("mon; "));
-					n = decode_int (token->start, token->len);
-					got_month = TRUE;
-					tm.tm_mon = n - 1;
-					goto next_token;
-				} else if (!tm.tm_mday && (n = get_mday (token->start, token->len)) != -1) {
-					d(printf ("mday; "));
-					tm.tm_mday = n;
-					goto next_token;
-				} else if (!tm.tm_year) {
-					d(printf ("2-digit year; "));
-					n = get_year (token->start, token->len);
-					tm.tm_year = n - 1900;
-					goto next_token;
-				}
-			}
-		}
-		
-		d(printf ("???; "));
-		
-	next_token:
-		
-		token = token->next;
-	}
-	
-	d(printf ("\n"));
-	
-	time = mktime (&tm);
-#if defined (HAVE_TIMEZONE)
-	time -= timezone;
-#elif defined (HAVE_TM_GMTOFF)
-	time += 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 ... */
-	
-	/* this should convert the time to the GMT equiv time */
-	time -= ((offset / 100) * 60 * 60) + (offset % 100) * 60;
-	
-	if (tzone)
-		*tzone = offset;
-	
-	return time;
-}
-
-
-/**
- * parse_broken_date:
- * @datestr: input date string
- * @saveoffset:
- *
- * Decodes the rfc822/broken date string and saves the GMT offset into
- * @saveoffset if non-NULL.
- *
- * Returns the time_t representation of the date string specified by
- * @in. If 'saveoffset' is non-NULL, the value of the timezone offset
- * will be stored.
- **/
-time_t
-parse_broken_date (const char *datestr, int *saveoffset)
-{
-	struct _date_token *token, *tokens;
-	time_t date;
-	
-	tokens = datetok (datestr);
-	
-	date = decode_broken_date (tokens, saveoffset);
-	
-	/* cleanup */
-	while (tokens) {
-		token = tokens;
-		tokens = tokens->next;
-		g_free (token);
-	}
-	
-	return date;
-}
-
-
-
-
-
-#ifdef DATETOK_STANDALONE
-
-static void
-table_init ()
-{
-	int i;
-	
-	memset (datetok_table, 0, sizeof (datetok_table));
-	
-	for (i = 0; i < 256; i++) {
-		if (!strchr (NUMERIC_CHARS, i))
-			datetok_table[i] |= DATE_TOKEN_NON_NUMERIC;
-		
-		if (!strchr (WEEKDAY_CHARS, i))
-			datetok_table[i] |= DATE_TOKEN_NON_WEEKDAY;
-		
-		if (!strchr (MONTH_CHARS, i))
-			datetok_table[i] |= DATE_TOKEN_NON_MONTH;
-		
-		if (!strchr (TIME_CHARS, i))
-			datetok_table[i] |= DATE_TOKEN_NON_TIME;
-		
-		if (!strchr (TIMEZONE_ALPHA_CHARS, i))
-			datetok_table[i] |= DATE_TOKEN_NON_TIMEZONE_ALPHA;
-		
-		if (!strchr (TIMEZONE_NUMERIC_CHARS, i))
-			datetok_table[i] |= DATE_TOKEN_NON_TIMEZONE_NUMERIC;
-		
-		if (((char) i) == ':')
-			datetok_table[i] |= DATE_TOKEN_HAS_COLON;
-		
-		if (strchr ("+-", i))
-			datetok_table[i] |= DATE_TOKEN_HAS_SIGN;
-	}
-	
-	printf ("static unsigned int datetok_table[256] = {");
-	for (i = 0; i < 256; i++) {
-		if (i % 16 == 0)
-			printf ("\n\t");
-		printf ("%3d,", datetok_table[i]);
-	}
-	printf ("\n};\n");
-}
-
-
-int main (int argc, char **argv)
-{
-	time_t date;
-	int offset;
-	
-	/*table_init ();*/
-	
-	date = parse_broken_date (argv[1], &offset);
-	printf ("%d; %d\n", date, offset);
-	
-	return 0;
-}
-
-#endif /* DATETOK_STANDALONE */
diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h
deleted file mode 100644
index b69d7636d7..0000000000
--- a/camel/broken-date-parser.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <time.h>
-
-/* prototypes for functions dealing with broken date formats */
-
-time_t parse_broken_date (const char *datestr, int *saveoffset);
-
-
-
-
-
diff --git a/camel/camel-address.c b/camel/camel-address.c
deleted file mode 100644
index a25e9ba791..0000000000
--- a/camel/camel-address.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-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);
-	g_ptr_array_free(((CamelAddress *)obj)->addresses, TRUE);
-}
-
-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_new_clone:
- * @in: 
- * 
- * Clone an existing address type.
- * 
- * Return value: 
- **/
-CamelAddress *
-camel_address_new_clone(const CamelAddress *in)
-{
-	CamelAddress *new = CAMEL_ADDRESS(camel_object_new(CAMEL_OBJECT_GET_TYPE(in)));
-
-	camel_address_cat(new, in);
-	return new;
-}
-
-/**
- * camel_address_length:
- * @a: 
- * 
- * Return the number of addresses stored in the address @a.
- * 
- * Return value: 
- **/
-int
-camel_address_length(CamelAddress *a)
-{
-	return a->addresses->len;
-}
-
-/**
- * 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(CAMEL_IS_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(CAMEL_IS_ADDRESS(a), NULL);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->encode(a);
-}
-
-/**
- * camel_address_unformat:
- * @a: 
- * @raw: 
- * 
- * Attempt to convert a previously formatted and/or edited
- * address back into internal form.
- * 
- * Return value: -1 if it could not be parsed, or the number
- * of valid addresses found.
- **/
-int
-camel_address_unformat(CamelAddress *a, const char *raw)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), -1);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->unformat(a, raw);
-}
-
-/**
- * camel_address_format:
- * @a: 
- * 
- * Format an address in a format suitable for display.
- * 
- * Return value: The formatted address.
- **/
-char *
-camel_address_format	(CamelAddress *a)
-{
-	if (a == NULL)
-		return NULL;
-
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), NULL);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->format(a);
-}
-
-/**
- * camel_address_cat:
- * @dest: 
- * @source: 
- * 
- * Concatenate one address onto another.  The addresses must
- * be of the same type.
- * 
- * Return value: 
- **/
-int
-camel_address_cat	(CamelAddress *dest, const CamelAddress *source)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(dest), -1);
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(source), -1);
-
-	return CAMEL_ADDRESS_CLASS(CAMEL_OBJECT_GET_CLASS(dest))->cat(dest, source);
-}
-
-/**
- * camel_address_copy:
- * @dest: 
- * @source: 
- * 
- * Copy an address contents.
- * 
- * Return value: 
- **/
-int
-camel_address_copy	(CamelAddress *dest, const CamelAddress *source)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(dest), -1);
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(source), -1);
-
-	camel_address_remove(dest, -1);
-	return camel_address_cat(dest, source);
-}
-
-/**
- * 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(CAMEL_IS_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 caf7e97755..0000000000
--- a/camel/camel-address.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_ADDRESS_H
-#define _CAMEL_ADDRESS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.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 CAMEL_IS_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 *);
-
-	int   (*unformat)	(CamelAddress *, const char *raw);
-	char *(*format)		(CamelAddress *);
-
-	int   (*cat)		(CamelAddress *, const CamelAddress *);
-
-	void  (*remove)		(CamelAddress *, int index);
-};
-
-CamelType	camel_address_get_type	(void);
-CamelAddress   *camel_address_new	(void);
-CamelAddress   *camel_address_new_clone	(const CamelAddress *);
-int		camel_address_length	(CamelAddress *);
-
-int	        camel_address_decode	(CamelAddress *, const char *);
-char	       *camel_address_encode	(CamelAddress *);
-int	        camel_address_unformat	(CamelAddress *, const char *);
-char	       *camel_address_format	(CamelAddress *);
-
-int		camel_address_cat	(CamelAddress *, const CamelAddress *);
-int		camel_address_copy	(CamelAddress *, const CamelAddress *);
-
-void		camel_address_remove	(CamelAddress *, int index);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_ADDRESS_H */
diff --git a/camel/camel-arg.c b/camel/camel-arg.c
deleted file mode 100644
index bc6ececd2e..0000000000
--- a/camel/camel-arg.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
- *
- * Author:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "camel-arg.h"
-
-int camel_argv_build(CamelArgV *tv)
-{
-	register guint32 tag;
-	register int i;
-	register CamelArg *a;
-	int more = TRUE;
-
-	for (i=0;i<CAMEL_ARGV_MAX;i++) {
-		a = &tv->argv[i];
-
-		if ( (tag = va_arg(tv->ap, guint32)) == 0) {
-			more = FALSE;
-			break;
-		}
-
-		a->tag = tag;
-
-		switch((tag & CAMEL_ARG_TYPE)) {
-		case CAMEL_ARG_OBJ:
-			a->ca_object = va_arg(tv->ap, void *);
-			break;
-		case CAMEL_ARG_INT:
-			a->ca_int = va_arg(tv->ap, int);
-			break;
-		case CAMEL_ARG_DBL:
-			a->ca_double = va_arg(tv->ap, double);
-			break;
-		case CAMEL_ARG_STR:
-			a->ca_str = va_arg(tv->ap, char *);
-			break;
-		case CAMEL_ARG_PTR:
-			a->ca_ptr = va_arg(tv->ap, void *);
-			break;
-		default:
-			printf("Error, unknown type, truncating result\n");
-			more = FALSE;
-			goto fail;
-		}
-
-	}
-fail:
-	tv->argc = i;
-
-	return more;
-}
-
-int camel_arggetv_build(CamelArgGetV *tv)
-{
-	register guint32 tag;
-	register int i;
-	register CamelArgGet *a;
-	int more = TRUE;
-
-	for (i=0;i<CAMEL_ARGV_MAX;i++) {
-		a = &tv->argv[i];
-
-		if ( (tag = va_arg(tv->ap, guint32)) == 0) {
-			more = FALSE;
-			break;
-		}
-
-		a->tag = tag;
-
-		switch((tag & CAMEL_ARG_TYPE)) {
-		case CAMEL_ARG_OBJ:
-			a->ca_object = va_arg(tv->ap, void **);
-			*a->ca_object = NULL;
-			break;
-		case CAMEL_ARG_INT:
-			a->ca_int = va_arg(tv->ap, int *);
-			*a->ca_int = 0;
-			break;
-		case CAMEL_ARG_DBL:
-			a->ca_double = va_arg(tv->ap, double *);
-			*a->ca_double = 0.0;
-			break;
-		case CAMEL_ARG_STR:
-			a->ca_str = va_arg(tv->ap, char **);
-			*a->ca_str = NULL;
-			break;
-		case CAMEL_ARG_PTR:
-			a->ca_ptr = va_arg(tv->ap, void **);
-			*a->ca_ptr = NULL;
-			break;
-		default:
-			printf("Error, unknown type, truncating result\n");
-			more = FALSE;
-			goto fail;
-		}
-
-	}
-fail:
-	tv->argc = i;
-
-	return more;
-}
diff --git a/camel/camel-arg.h b/camel/camel-arg.h
deleted file mode 100644
index 7846018149..0000000000
--- a/camel/camel-arg.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_ARG_H
-#define CAMEL_ARG_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-
-#include <glib.h>
-#include <stdarg.h>
-
-enum camel_arg_t {
-	CAMEL_ARG_END = 0,
-	CAMEL_ARG_IGNORE = 1,	/* override/ignore an arg in-place */
-
-	CAMEL_ARG_FIRST = 1024,	/* 1024 args reserved for arg system */
-
-	CAMEL_ARG_TYPE = 0xf0000000, /* type field for tags */
-	CAMEL_ARG_TAG = 0x0fffffff, /* tag field for args */
-
-	CAMEL_ARG_OBJ = 0x00000000, /* object */
-	CAMEL_ARG_INT = 0x10000000, /* int */
-	CAMEL_ARG_DBL = 0x20000000, /* double */
-	CAMEL_ARG_STR = 0x30000000, /* c string */
-	CAMEL_ARG_PTR = 0x40000000, /* ptr */
-};
-
-typedef struct _CamelArg CamelArg;
-typedef struct _CamelArgV CamelArgV;
-
-typedef struct _CamelArgGet CamelArgGet;
-typedef struct _CamelArgGetV CamelArgGetV;
-
-struct _CamelArg {
-	guint32 tag;
-	union {
-		void *ca_object;
-		int ca_int;
-		double ca_double;
-		char *ca_str;
-		void *ca_ptr;
-	} u;
-};
-struct _CamelArgGet {
-	guint32 tag;
-	union {
-		void **ca_object;
-		int *ca_int;
-		double *ca_double;
-		char **ca_str;
-		void **ca_ptr;
-	} u;
-};
-#define ca_object u.ca_object
-#define ca_int u.ca_int
-#define ca_double u.ca_double
-#define ca_str u.ca_str
-#define ca_ptr u.ca_ptr
-
-/* maximum no of args processed at any one time, not the max of all args */
-#define CAMEL_ARGV_MAX (20)
-
-struct _CamelArgV {
-	va_list ap;
-	int argc;
-	CamelArg argv[CAMEL_ARGV_MAX];
-};
-
-struct _CamelArgGetV {
-	va_list ap;
-	int argc;
-	CamelArgGet argv[CAMEL_ARGV_MAX];
-};
-
-#define camel_argv_start(tv, last) (va_start((tv)->ap, last))
-#define camel_argv_end(tv) (va_end((tv)->ap))
-int camel_argv_build(CamelArgV *tv);
-int camel_arggetv_build(CamelArgGetV *tv);
-
-/* set an arg ignored */
-#define camel_argv_ignore(tv, i) ((tv)->argv[i].tag = ((tv)->argv[i].tag & CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE)
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif				/* CAMEL_ARG_H */
diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
deleted file mode 100644
index 1ec1f74061..0000000000
--- a/camel/camel-block-file.c
+++ /dev/null
@@ -1,1138 +0,0 @@
-/*
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "e-util/e-msgport.h"
-
-#include "camel-block-file.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
-
-#ifdef ENABLE_THREADS
-
-/* Locks must be obtained in the order defined */
-
-struct _CamelBlockFilePrivate {
-	/* We use the private structure to form our lru list from */
-	struct _CamelBlockFilePrivate *next;
-	struct _CamelBlockFilePrivate *prev;
-
-	struct _CamelBlockFile *base;
-
-	pthread_mutex_t root_lock; /* for modifying the root block */
-	pthread_mutex_t cache_lock; /* for refcounting, flag manip, cache manip */
-	pthread_mutex_t io_lock; /* for all io ops */
-};
-
-#define CAMEL_BLOCK_FILE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
-#define CAMEL_BLOCK_FILE_TRYLOCK(kf, lock) (pthread_mutex_trylock(&(kf)->priv->lock))
-#define CAMEL_BLOCK_FILE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
-
-#define LOCK(x) pthread_mutex_lock(&x)
-#define UNLOCK(x) pthread_mutex_unlock(&x)
-
-static pthread_mutex_t block_file_lock = PTHREAD_MUTEX_INITIALIZER;
-
-#else
-#define CAMEL_BLOCK_FILE_LOCK(kf, lock)
-#define CAMEL_BLOCK_FILE_TRYLOCK(kf, lock)
-#define CAMEL_BLOCK_FILE_UNLOCK(kf, lock)
-#define LOCK(x)
-#define UNLOCK(x)
-#endif
-
-/* lru cache of block files */
-static EDList block_file_list = E_DLIST_INITIALISER(block_file_list);
-/* list to store block files that are actually intialised */
-static EDList block_file_active_list = E_DLIST_INITIALISER(block_file_active_list);
-static int block_file_count = 0;
-static int block_file_threshhold = 10;
-
-#define CBF_CLASS(o) ((CamelBlockFileClass *)(((CamelObject *)o)->klass))
-
-static int sync_nolock(CamelBlockFile *bs);
-static int sync_block_nolock(CamelBlockFile *bs, CamelBlock *bl);
-
-static int
-block_file_validate_root(CamelBlockFile *bs)
-{
-	struct stat st;
-	CamelBlockRoot *br;
-
-	br = bs->root;
-
-	fstat(bs->fd, &st);
-
-	d(printf("Validate root: '%s'\n", bs->path));
-	d(printf("version: %.8s (%.8s)\n", bs->root->version, bs->version));
-	d(printf("block size: %d (%d)%s\n", br->block_size, bs->block_size,
-		br->block_size != bs->block_size ? " BAD":" OK"));
-	d(printf("free: %ld (%d add size < %ld)%s\n", (long)br->free, br->free / bs->block_size * bs->block_size, (long)st.st_size,
-		(br->free > st.st_size) || (br->free % bs->block_size) != 0 ? " BAD":" OK"));
-	d(printf("last: %ld (%d and size: %ld)%s\n", (long)br->last, br->last / bs->block_size * bs->block_size, (long)st.st_size,
-		(br->last != st.st_size) || ((br->last % bs->block_size) != 0) ? " BAD": " OK"));
-	d(printf("flags: %s\n", (br->flags & CAMEL_BLOCK_FILE_SYNC)?"SYNC":"unSYNC"));
-
-	if (br->last == 0
-	    || memcmp(bs->root->version, bs->version, 8) != 0
-	    || br->block_size != bs->block_size
-	    || (br->free % bs->block_size) != 0
-	    || (br->last % bs->block_size) != 0
-	    || fstat(bs->fd, &st) == -1
-	    || st.st_size != br->last
-	    || br->free > st.st_size
-	    || (br->flags & CAMEL_BLOCK_FILE_SYNC) == 0) {
-		g_warning("Invalid root: '%s'", bs->path);
-		g_warning("version: %.8s (%.8s)", bs->root->version, bs->version);
-		g_warning("block size: %d (%d)%s", br->block_size, bs->block_size,
-			  br->block_size != bs->block_size ? " BAD":" OK");
-		g_warning("free: %ld (%d add size < %ld)%s", (long)br->free, br->free / bs->block_size * bs->block_size, (long)st.st_size,
-			  (br->free > st.st_size) || (br->free % bs->block_size) != 0 ? " BAD":" OK");
-		g_warning("last: %ld (%d and size: %ld)%s", (long)br->last, br->last / bs->block_size * bs->block_size, (long)st.st_size,
-			  (br->last != st.st_size) || ((br->last % bs->block_size) != 0) ? " BAD": " OK");
-		g_warning("flags: %s", (br->flags & CAMEL_BLOCK_FILE_SYNC)?"SYNC":"unSYNC");
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-block_file_init_root(CamelBlockFile *bs)
-{
-	CamelBlockRoot *br = bs->root;
-
-	memset(br, 0, bs->block_size);
-	memcpy(br->version, bs->version, 8);
-	br->last = bs->block_size;
-	br->flags = CAMEL_BLOCK_FILE_SYNC;
-	br->free = 0;
-	br->block_size = bs->block_size;
-
-	return 0;
-}
-
-static void
-camel_block_file_class_init(CamelBlockFileClass *klass)
-{
-	klass->validate_root = block_file_validate_root;
-	klass->init_root = block_file_init_root;
-}
-
-static guint
-block_hash_func(const void *v)
-{
-	return ((camel_block_t)v) >> CAMEL_BLOCK_SIZE_BITS;
-}
-
-static void
-camel_block_file_init(CamelBlockFile *bs)
-{
-	struct _CamelBlockFilePrivate *p;
-
-	bs->fd = -1;
-	bs->block_size = CAMEL_BLOCK_SIZE;
-	e_dlist_init(&bs->block_cache);
-	bs->blocks = g_hash_table_new((GHashFunc)block_hash_func, NULL);
-	/* this cache size and the text index size have been tuned for about the best
-	   with moderate memory usage.  Doubling the memory usage barely affects performance. */
-	bs->block_cache_limit = 256;
-
-	p = bs->priv = g_malloc0(sizeof(*bs->priv));
-	p->base = bs;
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_init(&p->root_lock, NULL);
-	pthread_mutex_init(&p->cache_lock, NULL);
-	pthread_mutex_init(&p->io_lock, NULL);
-#endif
-
-	/* link into lru list */
-	LOCK(block_file_lock);
-	e_dlist_addhead(&block_file_list, (EDListNode *)p);
-
-#if 0
-	{
-		printf("dumping block list\n");
-		printf(" head = %p p = %p\n", block_file_list.head, p);
-		p = block_file_list.head;
-		while (p->next) {
-			printf(" '%s'\n", p->base->path);
-			p = p->next;
-		}
-	}
-#endif
-
-	UNLOCK(block_file_lock);
-}
-
-static void
-camel_block_file_finalise(CamelBlockFile *bs)
-{
-	CamelBlock *bl, *bn;
-	struct _CamelBlockFilePrivate *p;
-
-	p = bs->priv;
-
-	if (bs->root_block)
-		camel_block_file_sync(bs);
-
-	/* remove from lru list */
-	LOCK(block_file_lock);
-	if (bs->fd != -1)
-		block_file_count--;
-	e_dlist_remove((EDListNode *)p);
-	UNLOCK(block_file_lock);
-
-	bl = (CamelBlock *)bs->block_cache.head;
-	bn = bl->next;
-	while (bn) {
-		if (bl->refcount != 0)
-			g_warning("Block '%d' still referenced", bl->id);
-		g_free(bl);
-		bl = bn;
-		bn = bn->next;
-	}
-
-	if (bs->root_block)
-		camel_block_file_unref_block(bs, bs->root_block);
-	g_free(bs->path);
-	close(bs->fd);
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_destroy(&p->io_lock);
-	pthread_mutex_destroy(&p->cache_lock);
-	pthread_mutex_destroy(&p->root_lock);
-#endif
-	g_free(p);
-}
-
-CamelType
-camel_block_file_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelBlockFile",
-					   sizeof (CamelBlockFile),
-					   sizeof (CamelBlockFileClass),
-					   (CamelObjectClassInitFunc) camel_block_file_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_block_file_init,
-					   (CamelObjectFinalizeFunc) camel_block_file_finalise);
-	}
-	
-	return type;
-}
-
-/* 'use' a block file for io */
-static int
-block_file_use(CamelBlockFile *bs)
-{
-	struct _CamelBlockFilePrivate *nw, *nn, *p = bs->priv;
-	CamelBlockFile *bf;
-	int err;
-
-	/* We want to:
-	    remove file from active list
-	    lock it
-
-	   Then when done:
-	    unlock it
-	    add it back to end of active list
-	*/
-
-	CAMEL_BLOCK_FILE_LOCK(bs, io_lock);
-
-	if (bs->fd != -1)
-		return 0;
-	else
-		d(printf("Turning block file online: %s\n", bs->path));
-
-	if ((bs->fd = open(bs->path, bs->flags, 0600)) == -1) {
-		err = errno;
-		CAMEL_BLOCK_FILE_UNLOCK(bs, io_lock);
-		errno = err;
-		return -1;
-	}
-
-	LOCK(block_file_lock);
-	e_dlist_remove((EDListNode *)p);
-	e_dlist_addtail(&block_file_active_list, (EDListNode *)p);
-
-	block_file_count++;
-
-	nw = (struct _CamelBlockFilePrivate *)block_file_list.head;
-	nn = nw->next;
-	while (block_file_count > block_file_threshhold && nn) {
-		/* We never hit the current blockfile here, as its removed from the list first */
-		bf = nw->base;
-		if (bf->fd != -1) {
-			/* Need to trylock, as any of these lock levels might be trying
-			   to lock the block_file_lock, so we need to check and abort if so */
-			if (CAMEL_BLOCK_FILE_TRYLOCK(bf, root_lock) == 0) {
-				if (CAMEL_BLOCK_FILE_TRYLOCK(bf, cache_lock) == 0) {
-					if (CAMEL_BLOCK_FILE_TRYLOCK(bf, io_lock) == 0) {
-						d(printf("[%d] Turning block file offline: %s\n", block_file_count-1, bf->path));
-						sync_nolock(bf);
-						close(bf->fd);
-						bf->fd = -1;
-						block_file_count--;
-						CAMEL_BLOCK_FILE_UNLOCK(bf, io_lock);
-					}
-					CAMEL_BLOCK_FILE_UNLOCK(bf, cache_lock);
-				}
-				CAMEL_BLOCK_FILE_UNLOCK(bf, root_lock);
-			}
-		}
-		nw = nn;
-		nn = nw->next;
-	}
-
-	UNLOCK(block_file_lock);
-
-	return 0;
-}
-
-static void
-block_file_unuse(CamelBlockFile *bs)
-{
-	LOCK(block_file_lock);
-	e_dlist_remove((EDListNode *)bs->priv);
-	e_dlist_addtail(&block_file_list, (EDListNode *)bs->priv);
-	UNLOCK(block_file_lock);
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, io_lock);
-}
-
-/*
-o = camel_cache_get(c, key);
-camel_cache_unref(c, key);
-camel_cache_add(c, key, o);
-camel_cache_remove(c, key);
-*/
-
-/**
- * camel_block_file_new:
- * @path: 
- * @: 
- * @block_size: 
- * 
- * Allocate a new block file, stored at @path.  @version contains an 8 character
- * version string which must match the head of the file, or the file will be
- * intitialised.
- * 
- * @block_size is currently ignored and is set to CAMEL_BLOCK_SIZE.
- *
- * Return value: The new block file, or NULL if it could not be created.
- **/
-CamelBlockFile *camel_block_file_new(const char *path, int flags, const char version[8], size_t block_size)
-{
-	CamelBlockFile *bs;
-
-	bs = (CamelBlockFile *)camel_object_new(camel_block_file_get_type());
-	memcpy(bs->version, version, 8);
-	bs->path = g_strdup(path);
-	bs->flags = flags;
-
-	bs->root_block = camel_block_file_get_block(bs, 0);
-	if (bs->root_block == NULL) {
-		camel_object_unref((CamelObject *)bs);
-		return NULL;
-	}
-	camel_block_file_detach_block(bs, bs->root_block);
-	bs->root = (CamelBlockRoot *)&bs->root_block->data;
-
-	/* we only need these flags on first open */
-	bs->flags &= ~(O_CREAT|O_EXCL|O_TRUNC);
-
-	/* Do we need to init the root block? */
-	if (CBF_CLASS(bs)->validate_root(bs) == -1) {
-		d(printf("Initialise root block: %.8s\n", version));
-
-		CBF_CLASS(bs)->init_root(bs);
-		camel_block_file_touch_block(bs, bs->root_block);
-		if (block_file_use(bs) == -1) {
-			camel_object_unref((CamelObject *)bs);
-			return NULL;
-		}
-		if (sync_block_nolock(bs, bs->root_block) == -1
-		    || ftruncate(bs->fd, bs->root->last) == -1) {
-			block_file_unuse(bs);
-			camel_object_unref((CamelObject *)bs);
-			return NULL;
-		}
-		block_file_unuse(bs);
-	}
-
-	return bs;
-}
-
-int
-camel_block_file_rename(CamelBlockFile *bs, const char *path)
-{
-	int ret;
-	struct stat st;
-	int err;
-
-	CAMEL_BLOCK_FILE_LOCK(bs, io_lock);
-
-	ret = rename(bs->path, path);
-	if (ret == -1) {
-		/* Maybe the rename actually worked */
-		err = errno;
-		if (stat(path, &st) == 0
-		    && stat(bs->path, &st) == -1
-		    && errno == ENOENT)
-			ret = 0;
-		errno = err;
-	}
-
-	if (ret != -1) {
-		g_free(bs->path);
-		bs->path = g_strdup(path);
-	}
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, io_lock);
-
-	return ret;
-}
-
-/**
- * camel_block_file_new_block:
- * @bs: 
- * 
- * Allocate a new block, return a pointer to it.  Old blocks
- * may be flushed to disk during this call.
- * 
- * Return value: The block, or NULL if an error occured.
- **/
-CamelBlock *camel_block_file_new_block(CamelBlockFile *bs)
-{
-	CamelBlock *bl;
-
-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);
-
-	if (bs->root->free) {
-		bl = camel_block_file_get_block(bs, bs->root->free);
-		if (bl == NULL)
-			goto fail;
-		bs->root->free = ((camel_block_t *)bl->data)[0];
-	} else {
-		bl = camel_block_file_get_block(bs, bs->root->last);
-		if (bl == NULL)
-			goto fail;
-		bs->root->last += CAMEL_BLOCK_SIZE;
-	}
-
-	bs->root_block->flags |= CAMEL_BLOCK_DIRTY;
-
-	bl->flags |= CAMEL_BLOCK_DIRTY;
-	memset(bl->data, 0, CAMEL_BLOCK_SIZE);
-fail:
-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);
-
-	return bl;
-}
-
-/**
- * camel_block_file_free_block:
- * @bs: 
- * @id: 
- * 
- * 
- **/
-int camel_block_file_free_block(CamelBlockFile *bs, camel_block_t id)
-{
-	CamelBlock *bl;
-
-	bl = camel_block_file_get_block(bs, id);
-	if (bl == NULL)
-		return -1;
-
-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);
-
-	((camel_block_t *)bl->data)[0] = bs->root->free;
-	bs->root->free = bl->id;
-	bs->root_block->flags |= CAMEL_BLOCK_DIRTY;
-	bl->flags |= CAMEL_BLOCK_DIRTY;
-	camel_block_file_unref_block(bs, bl);
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);
-
-	return 0;
-}
-
-/**
- * camel_block_file_get_block:
- * @bs: 
- * @id: 
- * 
- * Retreive a block @id.
- * 
- * Return value: The block, or NULL if blockid is invalid or a file error
- * occured.
- **/
-CamelBlock *camel_block_file_get_block(CamelBlockFile *bs, camel_block_t id)
-{
-	CamelBlock *bl, *flush, *prev;
-
-	/* Sanity check: Dont allow reading of root block (except before its been read)
-	   or blocks with invalid block id's */
-	if ((bs->root == NULL && id != 0)
-	    || (bs->root != NULL && (id > bs->root->last || id == 0))
-	    || (id % bs->block_size) != 0) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);
-
-	bl = g_hash_table_lookup(bs->blocks, (void *)id);
-
-	d(printf("Get  block %08x: %s\n", id, bl?"cached":"must read"));
-
-	if (bl == NULL) {
-		/* LOCK io_lock */
-		if (block_file_use(bs) == -1) {
-			CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-			return NULL;
-		}
-
-		bl = g_malloc0(sizeof(*bl));
-		bl->id = id;
-		if (lseek(bs->fd, id, SEEK_SET) == -1
-		    || read(bs->fd, bl->data, CAMEL_BLOCK_SIZE) == -1) {
-			block_file_unuse(bs);
-			CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-			g_free(bl);
-			return NULL;
-		}
-
-		bs->block_cache_count++;
-		g_hash_table_insert(bs->blocks, (void *)bl->id, bl);
-
-		/* flush old blocks */
-		flush = (CamelBlock *)bs->block_cache.tailpred;
-		prev = flush->prev;
-		while (bs->block_cache_count > bs->block_cache_limit && prev) {
-			if (flush->refcount == 0) {
-				if (sync_block_nolock(bs, flush) != -1) {
-					g_hash_table_remove(bs->blocks, (void *)flush->id);
-					e_dlist_remove((EDListNode *)flush);
-					g_free(flush);
-					bs->block_cache_count--;
-				}
-			}
-			flush = prev;
-			prev = prev->prev;
-		}
-		/* UNLOCK io_lock */
-		block_file_unuse(bs);
-	} else {
-		e_dlist_remove((EDListNode *)bl);
-	}
-
-	e_dlist_addhead(&bs->block_cache, (EDListNode *)bl);
-	bl->refcount++;
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-
-	d(printf("Got  block %08x\n", id));
-
-	return bl;
-}
-
-/**
- * camel_block_file_detach_block:
- * @bs: 
- * @bl: 
- * 
- * Detatch a block from the block file's cache.  The block should
- * be unref'd or attached when finished with.  The block file will
- * perform no writes of this block or flushing of it if the cache
- * fills.
- **/
-void camel_block_file_detach_block(CamelBlockFile *bs, CamelBlock *bl)
-{
-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);
-
-	g_hash_table_remove(bs->blocks, (void *)bl->id);
-	e_dlist_remove((EDListNode *)bl);
-	bl->flags |= CAMEL_BLOCK_DETACHED;
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-}
-
-/**
- * camel_block_file_attach_block:
- * @bs: 
- * @bl: 
- * 
- * Reattach a block that has been detached.
- **/
-void camel_block_file_attach_block(CamelBlockFile *bs, CamelBlock *bl)
-{
-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);
-
-	g_hash_table_insert(bs->blocks, (void *)bl->id, bl);
-	e_dlist_addtail(&bs->block_cache, (EDListNode *)bl);
-	bl->flags &= ~CAMEL_BLOCK_DETACHED;
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-}
-
-/**
- * camel_block_file_touch_block:
- * @bs: 
- * @bl: 
- * 
- * Mark a block as dirty.  The block will be written to disk if
- * it ever expires from the cache.
- **/
-void camel_block_file_touch_block(CamelBlockFile *bs, CamelBlock *bl)
-{
-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);
-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);
-
-	bl->flags |= CAMEL_BLOCK_DIRTY;
-
-	if ((bs->root->flags & CAMEL_BLOCK_FILE_SYNC) && bl != bs->root_block) {
-		d(printf("turning off sync flag\n"));
-		bs->root->flags &= ~CAMEL_BLOCK_FILE_SYNC;
-		bs->root_block->flags |= CAMEL_BLOCK_DIRTY;
-		camel_block_file_sync_block(bs, bs->root_block);
-	}
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);
-}
-
-/**
- * camel_block_file_unref_block:
- * @bs: 
- * @bl: 
- * 
- * Mark a block as unused.  If a block is used it will not be
- * written to disk, or flushed from memory.
- *
- * If a block is detatched and this is the last reference, the
- * block will be freed.
- **/
-void camel_block_file_unref_block(CamelBlockFile *bs, CamelBlock *bl)
-{
-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);
-
-	if (bl->refcount == 1 && (bl->flags & CAMEL_BLOCK_DETACHED))
-		g_free(bl);
-	else
-		bl->refcount--;
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-}
-
-static int
-sync_block_nolock(CamelBlockFile *bs, CamelBlock *bl)
-{
-	d(printf("Sync block %08x: %s\n", bl->id, (bl->flags & CAMEL_BLOCK_DIRTY)?"dirty":"clean"));
-
-	if (bl->flags & CAMEL_BLOCK_DIRTY) {
-		if (lseek(bs->fd, bl->id, SEEK_SET) == -1
-		    || write(bs->fd, bl->data, CAMEL_BLOCK_SIZE) != CAMEL_BLOCK_SIZE) {
-			return -1;
-		}
-		bl->flags &= ~CAMEL_BLOCK_DIRTY;
-	}
-
-	return 0;
-}
-
-static int
-sync_nolock(CamelBlockFile *bs)
-{
-	CamelBlock *bl, *bn;
-	int work = FALSE;
-
-	bl = (CamelBlock *)bs->block_cache.head;
-	bn = bl->next;
-	while (bn) {
-		if (bl->flags & CAMEL_BLOCK_DIRTY) {
-			work = TRUE;
-			if (sync_block_nolock(bs, bl) == -1)
-				return -1;
-		}
-		bl = bn;
-		bn = bn->next;
-	}
-
-	if (!work
-	    && (bs->root_block->flags & CAMEL_BLOCK_DIRTY) == 0
-	    && (bs->root->flags & CAMEL_BLOCK_FILE_SYNC) != 0)
-		return 0;
-
-	d(printf("turning on sync flag\n"));
-
-	bs->root->flags |= CAMEL_BLOCK_FILE_SYNC;
-
-	return sync_block_nolock(bs, bs->root_block);
-}
-
-/**
- * camel_block_file_sync_block:
- * @bs: 
- * @bl: 
- * 
- * Flush a block to disk immediately.  The block will only
- * be flushed to disk if it is marked as dirty (touched).
- * 
- * Return value: -1 on io error.
- **/
-int camel_block_file_sync_block(CamelBlockFile *bs, CamelBlock *bl)
-{
-	int ret;
-
-	/* LOCK io_lock */
-	if (block_file_use(bs) == -1)
-		return -1;
-
-	ret = sync_block_nolock(bs, bl);
-
-	block_file_unuse(bs);
-
-	return ret;
-}
-
-/**
- * camel_block_file_sync:
- * @bs: 
- * 
- * Sync all dirty blocks to disk, including the root block.
- * 
- * Return value: -1 on io error.
- **/
-int camel_block_file_sync(CamelBlockFile *bs)
-{
-	int ret;
-
-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);
-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);
-
-	/* LOCK io_lock */
-	if (block_file_use(bs) == -1)
-		ret = -1;
-	else {
-		ret = sync_nolock(bs);
-		block_file_unuse(bs);
-	}
-
-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);
-
-	return ret;
-}
-
-/* ********************************************************************** */
-
-struct _CamelKeyFilePrivate {
-	struct _CamelKeyFilePrivate *next;
-	struct _CamelKeyFilePrivate *prev;
-
-	struct _CamelKeyFile *base;
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_t lock;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_KEY_FILE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
-#define CAMEL_KEY_FILE_TRYLOCK(kf, lock) (pthread_mutex_trylock(&(kf)->priv->lock))
-#define CAMEL_KEY_FILE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
-
-static pthread_mutex_t key_file_lock = PTHREAD_MUTEX_INITIALIZER;
-
-#else
-#define CAMEL_KEY_FILE_LOCK(kf, lock)
-#define CAMEL_KEY_FILE_TRYLOCK(kf, lock)
-#define CAMEL_KEY_FILE_UNLOCK(kf, lock)
-#endif
-
-/* lru cache of block files */
-static EDList key_file_list = E_DLIST_INITIALISER(key_file_list);
-static EDList key_file_active_list = E_DLIST_INITIALISER(key_file_active_list);
-static int key_file_count = 0;
-static int key_file_threshhold = 10;
-
-static void
-camel_key_file_class_init(CamelKeyFileClass *klass)
-{
-}
-
-static void
-camel_key_file_init(CamelKeyFile *bs)
-{
-	struct _CamelKeyFilePrivate *p;
-
-	p = bs->priv = g_malloc0(sizeof(*bs->priv));
-	p->base = bs;
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_init(&p->lock, NULL);
-#endif
-
-	LOCK(key_file_lock);
-	e_dlist_addhead(&key_file_list, (EDListNode *)p);
-	UNLOCK(key_file_lock);
-}
-
-static void
-camel_key_file_finalise(CamelKeyFile *bs)
-{
-	struct _CamelKeyFilePrivate *p = bs->priv;
-
-	LOCK(key_file_lock);
-	e_dlist_remove((EDListNode *)p);
-	UNLOCK(key_file_lock);
-
-	if (bs->fp)
-		fclose(bs->fp);
-	g_free(bs->path);
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_destroy(&p->lock);
-#endif
-
-	g_free(p);
-}
-
-CamelType
-camel_key_file_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelKeyFile",
-					   sizeof (CamelKeyFile),
-					   sizeof (CamelKeyFileClass),
-					   (CamelObjectClassInitFunc) camel_key_file_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_key_file_init,
-					   (CamelObjectFinalizeFunc) camel_key_file_finalise);
-	}
-	
-	return type;
-}
-
-/* 'use' a key file for io */
-static int
-key_file_use(CamelKeyFile *bs)
-{
-	struct _CamelKeyFilePrivate *nw, *nn, *p = bs->priv;
-	CamelKeyFile *bf;
-	int err, fd;
-	char *flag;
-
-	/* We want to:
-	    remove file from active list
-	    lock it
-
-	   Then when done:
-	    unlock it
-	    add it back to end of active list
-	*/
-
-	/* TODO: Check header on reset? */
-
-	CAMEL_KEY_FILE_LOCK(bs, lock);
-
-	if (bs->fp != NULL)
-		return 0;
-	else
-		d(printf("Turning key file online: '%s'\n", bs->path));
-
-	if ((bs->flags & O_ACCMODE) == O_RDONLY)
-		flag = "r";
-	else
-		flag = "a+";
-
-	if ((fd = open(bs->path, bs->flags, 0600)) == -1
-	    || (bs->fp = fdopen(fd, flag)) == NULL) {
-		err = errno;
-		close(fd);
-		CAMEL_KEY_FILE_UNLOCK(bs, lock);
-		errno = err;
-		return -1;
-	}
-
-	LOCK(key_file_lock);
-	e_dlist_remove((EDListNode *)p);
-	e_dlist_addtail(&key_file_active_list, (EDListNode *)p);
-
-	key_file_count++;
-
-	nw = (struct _CamelKeyFilePrivate *)key_file_list.head;
-	nn = nw->next;
-	while (key_file_count > key_file_threshhold && nn) {
-		/* We never hit the current keyfile here, as its removed from the list first */
-		bf = nw->base;
-		if (bf->fp != NULL) {
-			/* Need to trylock, as any of these lock levels might be trying
-			   to lock the key_file_lock, so we need to check and abort if so */
-			if (CAMEL_BLOCK_FILE_TRYLOCK(bf, lock) == 0) {
-				d(printf("Turning key file offline: %s\n", bf->path));
-				fclose(bf->fp);
-				bf->fp = NULL;
-				key_file_count--;
-				CAMEL_BLOCK_FILE_UNLOCK(bf, lock);
-			}
-		}
-		nw = nn;
-		nn = nw->next;
-	}
-
-	UNLOCK(key_file_lock);
-
-	return 0;
-}
-
-static void
-key_file_unuse(CamelKeyFile *bs)
-{
-	LOCK(key_file_lock);
-	e_dlist_remove((EDListNode *)bs->priv);
-	e_dlist_addtail(&key_file_list, (EDListNode *)bs->priv);
-	UNLOCK(key_file_lock);
-
-	CAMEL_KEY_FILE_UNLOCK(bs, lock);
-}
-
-/**
- * camel_key_file_new:
- * @path: 
- * @flags: open flags
- * @version[]: Version string (header) of file.  Currently
- * written but not checked.
- * 
- * Create a new key file.  A linked list of record blocks.
- * 
- * Return value: A new key file, or NULL if the file could not
- * be opened/created/initialised.
- **/
-CamelKeyFile *
-camel_key_file_new(const char *path, int flags, const char version[8])
-{
-	CamelKeyFile *kf;
-	off_t last;
-	int err;
-
-	d(printf("New key file '%s'\n", path));
-
-	kf = (CamelKeyFile *)camel_object_new(camel_key_file_get_type());
-	kf->path = g_strdup(path);
-	kf->fp = NULL;
-	kf->flags = flags;
-	kf->last = 8;
-
-	if (key_file_use(kf) == -1) {
-		camel_object_unref((CamelObject *)kf);
-		kf = NULL;
-	} else {
-		fseek(kf->fp, 0, SEEK_END);
-		last = ftell(kf->fp);
-		if (last == 0) {
-			fwrite(version, 8, 1, kf->fp);
-			last += 8;
-		}
-		kf->last = last;
-
-		err = ferror(kf->fp);
-		key_file_unuse(kf);
-
-		/* we only need these flags on first open */
-		kf->flags &= ~(O_CREAT|O_EXCL|O_TRUNC);
-
-		if (err) {
-			camel_object_unref((CamelObject *)kf);
-			kf = NULL;
-		}
-	}
-
-	return kf;
-}
-
-int
-camel_key_file_rename(CamelKeyFile *kf, const char *path)
-{
-	int ret;
-	struct stat st;
-	int err;
-
-	CAMEL_KEY_FILE_LOCK(kf, lock);
-
-	ret = rename(kf->path, path);
-	if (ret == -1) {
-		/* Maybe the rename actually worked */
-		err = errno;
-		if (stat(path, &st) == 0
-		    && stat(kf->path, &st) == -1
-		    && errno == ENOENT)
-			ret = 0;
-		errno = err;
-	}
-
-	if (ret != -1) {
-		g_free(kf->path);
-		kf->path = g_strdup(path);
-	}
-
-	CAMEL_KEY_FILE_UNLOCK(kf, lock);
-
-	return ret;
-}
-
-/**
- * camel_key_file_write:
- * @kf: 
- * @parent: 
- * @len: 
- * @records: 
- * 
- * Write a new list of records to the key file.
- * 
- * Return value: -1 on io error.  The key file will remain unchanged.
- **/
-int
-camel_key_file_write(CamelKeyFile *kf, camel_block_t *parent, size_t len, camel_key_t *records)
-{
-	camel_block_t next;
-	guint32 size;
-	int ret = -1;
-
-	d(printf("write key %08x len = %d\n", *parent, len));
-
-	if (len == 0) {
-		d(printf(" new parent = %08x\n", *parent));
-		return 0;
-	}
-
-	/* LOCK */
-	if (key_file_use(kf) == -1)
-		return -1;
-
-	size = len;
-
-	/* FIXME: Use io util functions? */
-	next = kf->last;
-	fseek(kf->fp, kf->last, SEEK_SET);
-	fwrite(parent, sizeof(*parent), 1, kf->fp);
-	fwrite(&size, sizeof(size), 1, kf->fp);
-	fwrite(records, sizeof(records[0]), len, kf->fp);
-
-	if (ferror(kf->fp)) {
-		clearerr(kf->fp);
-	} else {
-		kf->last = ftell(kf->fp);
-		*parent = next;
-		ret = len;
-	}
-
-	/* UNLOCK */
-	key_file_unuse(kf);
-
-	d(printf(" new parent = %08x\n", *parent));
-
-	return ret;
-}
-
-/**
- * camel_key_file_read:
- * @kf: 
- * @start: The record pointer.  This will be set to the next record pointer on success.
- * @len: Number of records read, if != NULL.
- * @records: Records, allocated, must be freed with g_free, if != NULL.
- * 
- * Read the next block of data from the key file.  Returns the number of
- * records.
- * 
- * Return value: -1 on io error.
- **/
-int
-camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, size_t *len, camel_key_t **records)
-{
-	guint32 size;
-	long pos = *start;
-	camel_block_t next;
-	int ret = -1;
-
-	if (pos == 0)
-		return 0;
-
-	/* LOCK */
-	if (key_file_use(kf) == -1)
-		return -1;
-
-	if (fseek(kf->fp, pos, SEEK_SET) == -1
-	    || fread(&next, sizeof(next), 1, kf->fp) != 1
-	    || fread(&size, sizeof(size), 1, kf->fp) != 1
-	    || size > 1024) {
-		clearerr(kf->fp);
-		goto fail;
-	}
-
-	if (len)
-		*len = size;
-
-	if (records) {
-		camel_key_t *keys = g_malloc(size * sizeof(camel_key_t));
-
-		if (fread(keys, sizeof(camel_key_t), size, kf->fp) != size) {
-			g_free(keys);
-			goto fail;
-		}
-		*records = keys;
-	}
-
-	*start = next;
-
-	ret = 0;
-fail:
-	/* UNLOCK */
-	key_file_unuse(kf);
-
-	return ret;
-}
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
deleted file mode 100644
index e78254e1ed..0000000000
--- a/camel/camel-block-file.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_BLOCK_FILE_H
-#define _CAMEL_BLOCK_FILE_H
-
-#include <camel/camel-object.h>
-#include <glib.h>
-#include <e-util/e-msgport.h>
-#include <stdio.h>
-
-typedef guint32 camel_block_t;	/* block offset, absolute, bottom BLOCK_SIZE_BITS always 0 */
-typedef guint32 camel_key_t;	/* this is a bitfield of (block offset:BLOCK_SIZE_BITS) */
-
-typedef struct _CamelBlockRoot CamelBlockRoot;
-typedef struct _CamelBlock CamelBlock;
-typedef struct _CamelBlockFile CamelBlockFile;
-typedef struct _CamelBlockFileClass CamelBlockFileClass;
-
-#define CAMEL_BLOCK_FILE_SYNC (1<<0)
-
-#define CAMEL_BLOCK_SIZE (1024)
-#define CAMEL_BLOCK_SIZE_BITS (10) /* # bits to contain block_size bytes */
-
-#define CAMEL_BLOCK_DIRTY (1<<0)
-#define CAMEL_BLOCK_DETACHED (1<<1)
-
-struct _CamelBlockRoot {
-	char version[8];	/* version number */
-
-	guint32 flags;		/* flags for file */
-	guint32 block_size;	/* block size of this file */
-	camel_block_t free;	/* free block list */
-	camel_block_t last;	/* pointer to end of blocks */
-
-	/* subclasses tack on, but no more than CAMEL_BLOCK_SIZE! */
-};
-
-/* LRU cache of blocks */
-struct _CamelBlock {
-	struct _CamelBlock *next;
-	struct _CamelBlock *prev;
-
-	camel_block_t id;
-	guint32 flags;
-	guint32 refcount;
-	guint32 align00;
-
-	unsigned char data[CAMEL_BLOCK_SIZE];
-};
-
-struct _CamelBlockFile {
-	CamelObject parent;
-
-	struct _CamelBlockFilePrivate *priv;
-
-	char version[8];
-	char *path;
-	int flags;
-
-	int fd;
-	size_t block_size;
-
-	CamelBlockRoot *root;
-	CamelBlock *root_block;
-
-	/* make private? */
-	int block_cache_limit;
-	int block_cache_count;
-	EDList block_cache;
-	GHashTable *blocks;
-};
-
-struct _CamelBlockFileClass {
-	CamelObjectClass parent;
-
-	int (*validate_root)(CamelBlockFile *);
-	int (*init_root)(CamelBlockFile *);
-};
-
-CamelType camel_block_file_get_type(void);
-
-CamelBlockFile *camel_block_file_new(const char *path, int flags, const char version[8], size_t block_size);
-int camel_block_file_rename(CamelBlockFile *bs, const char *path);
-
-CamelBlock *camel_block_file_new_block(CamelBlockFile *bs);
-int camel_block_file_free_block(CamelBlockFile *bs, camel_block_t id);
-CamelBlock *camel_block_file_get_block(CamelBlockFile *bs, camel_block_t id);
-void camel_block_file_detach_block(CamelBlockFile *bs, CamelBlock *bl);
-void camel_block_file_attach_block(CamelBlockFile *bs, CamelBlock *bl);
-void camel_block_file_touch_block(CamelBlockFile *bs, CamelBlock *bl);
-void camel_block_file_unref_block(CamelBlockFile *bs, CamelBlock *bl);
-int camel_block_file_sync_block(CamelBlockFile *bs, CamelBlock *bl);
-int camel_block_file_sync(CamelBlockFile *bs);
-
-/* ********************************************************************** */
-
-typedef struct _CamelKeyFile CamelKeyFile;
-typedef struct _CamelKeyFileClass CamelKeyFileClass;
-
-struct _CamelKeyFile {
-	CamelObject parent;
-
-	struct _CamelKeyFilePrivate *priv;
-
-	FILE *fp;
-	char *path;
-	int flags;
-	off_t last;
-};
-
-struct _CamelKeyFileClass {
-	CamelObjectClass parent;
-};
-
-CamelType      camel_key_file_get_type(void);
-
-CamelKeyFile * camel_key_file_new(const char *path, int flags, const char version[8]);
-int	       camel_key_file_rename(CamelKeyFile *kf, const char *path);
-
-int            camel_key_file_write(CamelKeyFile *kf, camel_block_t *parent, size_t len, camel_key_t *records);
-int            camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, size_t *len, camel_key_t **records);
-
-
-#endif /* ! _CAMEL_BLOCK_FILE_H */
diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h
deleted file mode 100644
index 35556db87e..0000000000
--- a/camel/camel-charset-map-private.h
+++ /dev/null
@@ -1,621 +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, 0xbf, 0xbf, 0xbf, 0xbf, 
-	0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 
-	0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 
-	0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 
-	0xbf, 0xbf, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 
-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 
-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 
-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 
-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 
-	0xff, 0x80, 0xc0, 0xe0, 0xc3, 0xc0, 0xe0, 0xf3, 
-	0xe3, 0xec, 0x80, 0xe0, 0xe0, 0xf3, 0xc0, 0xc2, 
-	0xef, 0xe0, 0xec, 0xe0, 0xc3, 0xc0, 0xc0, 0xec, 
-	0xc3, 0xc0, 0x80, 0xe0, 0xc0, 0xe0, 0xc0, 0x80, 
-	0x80, 0x83, 0x83, 0x82, 0x83, 0x82, 0x82, 0x81, 
-	0x80, 0x83, 0x80, 0x83, 0x80, 0x83, 0x83, 0x80, 
-	0x00, 0x80, 0x80, 0x81, 0x83, 0x82, 0x83, 0xc3, 
-	0x82, 0x80, 0x83, 0x82, 0x83, 0x01, 0x00, 0x83, 
-	0x80, 0x83, 0x83, 0x82, 0x83, 0x82, 0x82, 0x81, 
-	0x80, 0x83, 0x80, 0x83, 0x80, 0x83, 0x83, 0x80, 
-	0x00, 0x80, 0x80, 0x81, 0x83, 0x82, 0x83, 0xcf, 
-	0x82, 0x80, 0x83, 0x82, 0x83, 0x01, 0x00, 0x80, 
-};
-
-static unsigned char m001[256] = {
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-	0x07, 0x02, 0x03, 0x03, 0x05, 0x02, 0x05, 0x07, 
-	0x00, 0x07, 0x02, 0x07, 0x07, 0x07, 0x07, 0x02, 
-	0x07, 0x07, 0x03, 0x03, 0x00, 0x07, 0x07, 0x07, 
-	0x00, 0x03, 0x02, 0x07, 0x01, 0x01, 0x01, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, 
-	0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x03, 
-	0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x03, 
-	0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, 
-	0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x03, 
-	0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 
-};
-
-static unsigned char m010[256] = {
-	0x02, 0x02, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x01, 0x01, 
-	0x03, 0x03, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 
-	0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x80, 0x80, 
-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 
-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 
-	0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 
-	0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x81, 0x81, 
-	0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x03, 0x00, 0x03, 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 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 m040[256] = {
-	0x00, 0x1c, 0x10, 0x10, 0x18, 0x10, 0x18, 0x18, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
-	0x00, 0x1c, 0x10, 0x10, 0x18, 0x10, 0x18, 0x18, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 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, 
-	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, 
-};
-
-static unsigned char m041[256] = {
-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 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, 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, 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, 
-	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, 
-};
-
-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 m200[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, 
-	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, 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, 0x04, 0x04, 0x00, 0x00, 0x00, 
-	0x04, 0x05, 0x04, 0x00, 0x05, 0x05, 0x05, 0x00, 
-	0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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, 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, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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 m220[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, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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 m230[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, 
-	0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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 m250[256] = {
-	0x0c, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x0c, 0x0c, 0x04, 0x0c, 0x04, 0x04, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x04, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x04, 0x0c, 0x04, 0x04, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x04, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	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;
-} camel_charmap[256] = {
-	{ m000, m001, }, { m010, m011, }, { m020, 0, }, { m030, 0, }, { m040, m041, }, { m050, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ m200, m201, }, { m210, m211, }, { m220, 0, }, { m230, 0, }, { 0, 0, }, { m250, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, 
-};
-
-struct {
-	const char *name;
-	unsigned int bit;
-} camel_charinfo[] = {
-	{ "iso-8859-2", 0x0001 },
-	{ "iso-8859-4", 0x0002 },
-	{ "koi8-r", 0x0004 },
-	{ "koi8-u", 0x0008 },
-	{ "iso-8859-5", 0x0010 },
-	{ "iso-8859-7", 0x0020 },
-	{ "iso-8859-8", 0x0040 },
-	{ "iso-8859-9", 0x0080 },
-	{ "iso-8859-13", 0x0100 },
-	{ "iso-8859-15", 0x0200 },
-	{ "windows-1251", 0x0400 },
-};
-
-#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)
-
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
deleted file mode 100644
index 4368e52018..0000000000
--- a/camel/camel-charset-map.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */
-
-/* 
- * Authors:
- *   Michael Zucchi <notzed@ximian.com>
- *   Dan Winship <danw@ximian.com>
- *
- * Copyright 2000, 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <errno.h>
-#include <stdio.h>
-
-/*
-  if you want to build the charset map, compile this with something like:
-    gcc -DBUILD_MAP camel-charset-map.c `glib-config --cflags`
-  (plus any -I/-L/-l flags you need for iconv), then run it as 
-    ./a.out > camel-charset-map-private.h
-
-  Note that the big-endian variant isn't tested...
-
-  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 <iconv.h>
-#include <glib.h>
-
-static struct {
-	char *name;
-	unsigned int bit;	/* assigned bit */
-} tables[] = {
-	/* These are the 8bit character sets (other than iso-8859-1,
-	 * which is special-cased) which are supported by both other
-	 * mailers and the GNOME environment. Note that the order
-	 * they're listed in is the order they'll be tried in, so put
-	 * the more-popular ones first.
-	 */
-	{ "iso-8859-2", 0 },	/* Central/Eastern European */
-	{ "iso-8859-4", 0 },	/* Baltic */
-	{ "koi8-r", 0 },	/* Russian */
-	{ "koi8-u", 0 },	/* Ukranian */
-	{ "iso-8859-5", 0 },	/* Least-popular Russian encoding */
-	{ "iso-8859-7", 0 },	/* Greek */
-	{ "iso-8859-8", 0 },    /* Hebrew; Visual */
-	{ "iso-8859-9", 0 },	/* Turkish */
-	{ "iso-8859-13", 0 },	/* Baltic again */
-	{ "iso-8859-15", 0 },	/* New-and-improved iso-8859-1, but most
-				 * programs that support this support UTF8
-				 */
-	{ "windows-1251", 0 },	/* Russian */
-	{ 0, 0 }
-};
-
-unsigned int encoding_map[256 * 256];
-
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-#define UCS "UCS-4BE"
-#else
-#define UCS "UCS-4LE"
-#endif
-
-int main (void)
-{
-	int i, j;
-	int max, min;
-	int bit = 0x01;
-	int k;
-	int bytes;
-	iconv_t cd;
-	char in[128];
-	guint32 out[128];
-	char *inptr, *outptr;
-	size_t inlen, outlen;
-
-	/* dont count the terminator */
-	bytes = ((sizeof(tables)/sizeof(tables[0]))+7-1)/8;
-
-	for (i = 0; i < 128; i++)
-		in[i] = i + 128;
-
-	for (j = 0; tables[j].name; j++) {
-		cd = iconv_open (UCS, tables[j].name);
-		inptr = in;
-		outptr = (char *)(out);
-		inlen = sizeof (in);
-		outlen = sizeof (out);
-		while (iconv (cd, &inptr, &inlen, &outptr, &outlen) == -1) {
-			if (errno == EILSEQ) {
-				inptr++;
-				inlen--;
-			} else {
-				printf ("%s\n", strerror (errno));
-				exit (1);
-			}
-		}
-		iconv_close (cd);
-
-		for (i = 0; i < 128 - outlen / 4; i++) {
-			encoding_map[i] |= bit;
-			encoding_map[out[i]] |= bit;
-		}
-
-		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].name;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");
-	
-	return 0;
-}
-
-#else
-
-#include "camel-charset-map.h"
-#include "camel-charset-map-private.h"
-#include "hash-table-utils.h"
-#include <gal/unicode/gunicode.h>
-#include <locale.h>
-#include <string.h>
-#include <ctype.h>
-#include <glib.h>
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-void
-camel_charset_init (CamelCharset *c)
-{
-	c->mask = ~0;
-	c->level = 0;
-}
-
-void
-camel_charset_step (CamelCharset *c, const char *in, int len)
-{
-	register unsigned int mask;
-	register int level;
-	const char *inptr = in, *inend = in+len;
-
-	mask = c->mask;
-	level = c->level;
-
-	/* check what charset a given string will fit in */
-	while (inptr < inend) {
-		gunichar c;
-		const char *newinptr;
-		newinptr = g_utf8_next_char(inptr);
-		c = g_utf8_get_char(inptr);
-		if (newinptr == NULL || !g_unichar_validate (c)) {
-			inptr++;
-			continue;
-		}
-
-		inptr = newinptr;
-		if (c<=0xffff) {
-			mask &= 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);
-		}
-	}
-
-	c->mask = mask;
-	c->level = level;
-}
-
-/* gets the best charset from the mask of chars in it */
-static 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";
-}
-
-const char *
-camel_charset_best_name (CamelCharset *charset)
-{
-	if (charset->level == 1)
-		return "ISO-8859-1";
-	else if (charset->level == 2)
-		return camel_charset_best_mask (charset->mask);
-	else
-		return NULL;
-
-}
-
-/* finds the minimum charset for this string NULL means US-ASCII */
-const char *
-camel_charset_best (const char *in, int len)
-{
-	CamelCharset charset;
-
-	camel_charset_init (&charset);
-	camel_charset_step (&charset, in, len);
-	return camel_charset_best_name (&charset);
-}
-
-
-/**
- * camel_charset_iso_to_windows:
- * @isocharset: an ISO charset
- *
- * Returns the equivalent Windows charset.
- **/
-const char *
-camel_charset_iso_to_windows (const char *isocharset)
-{
-	/* According to http://czyborra.com/charsets/codepages.html,
-	 * the charset mapping is as follows:
-	 *
-	 * iso-8859-1  maps to windows-cp1252
-	 * iso-8859-2  maps to windows-cp1250
-	 * iso-8859-3  maps to windows-cp????
-	 * iso-8859-4  maps to windows-cp????
-	 * iso-8859-5  maps to windows-cp1251
-	 * iso-8859-6  maps to windows-cp1256
-	 * iso-8859-7  maps to windows-cp1253
-	 * iso-8859-8  maps to windows-cp1255
-	 * iso-8859-9  maps to windows-cp1254
-	 * iso-8859-10 maps to windows-cp????
-	 * iso-8859-11 maps to windows-cp????
-	 * iso-8859-12 maps to windows-cp????
-	 * iso-8859-13 maps to windows-cp1257
-	 *
-	 * Assumptions:
-	 *  - I'm going to assume that since iso-8859-4 and
-	 *    iso-8859-13 are Baltic that it also maps to
-	 *    windows-cp1257.
-	 */
-	
-	if (!strcasecmp (isocharset, "iso-8859-1"))
-		return "windows-cp1252";
-	else if (!strcasecmp (isocharset, "iso-8859-2"))
-		return "windows-cp1250";
-	else if (!strcasecmp (isocharset, "iso-8859-4"))
-		return "windows-cp1257";
-	else if (!strcasecmp (isocharset, "iso-8859-5"))
-		return "windows-cp1251";
-	else if (!strcasecmp (isocharset, "iso-8859-6"))
-		return "windows-cp1256";
-	else if (!strcasecmp (isocharset, "iso-8859-7"))
-		return "windows-cp1253";
-	else if (!strcasecmp (isocharset, "iso-8859-8"))
-		return "windows-cp1255";
-	else if (!strcasecmp (isocharset, "iso-8859-9"))
-		return "windows-cp1254";
-	else if (!strcasecmp (isocharset, "iso-8859-13"))
-		return "windows-cp1257";
-	
-	return isocharset;
-}
-
-#endif /* !BUILD_MAP */
-
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
deleted file mode 100644
index ab60ef5bf5..0000000000
--- a/camel/camel-charset-map.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CHARSET_MAP_H
-#define _CAMEL_CHARSET_MAP_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <iconv.h>
-
-typedef struct _CamelCharset CamelCharset;
-
-struct _CamelCharset {
-	unsigned int mask;
-	int level;
-};
-
-void camel_charset_init(CamelCharset *);
-void camel_charset_step(CamelCharset *, const char *in, int len);
-const char *camel_charset_best_name(CamelCharset *);
-
-/* helper function */
-const char *camel_charset_best(const char *in, int len);
-
-const char *camel_charset_iso_to_windows (const char *isocharset);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-cipher-context.c b/camel/camel-cipher-context.c
deleted file mode 100644
index feefff5565..0000000000
--- a/camel/camel-cipher-context.c
+++ /dev/null
@@ -1,448 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-cipher-context.h"
-
-#include <glib.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#define CIPHER_LOCK(ctx)   g_mutex_lock (((CamelCipherContext *) ctx)->priv->lock)
-#define CIPHER_UNLOCK(ctx) g_mutex_unlock (((CamelCipherContext *) ctx)->priv->lock);
-#else
-#define CIPHER_LOCK(ctx)
-#define CIPHER_UNLOCK(ctx)
-#endif
-
-#define d(x)
-
-#define CCC_CLASS(o) CAMEL_CIPHER_CONTEXT_CLASS(CAMEL_OBJECT_GET_CLASS(o))
-
-struct _CamelCipherContextPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#endif
-};
-
-static int                  cipher_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-					 CamelStream *istream, CamelStream *ostream, CamelException *ex);
-static int                  cipher_clearsign (CamelCipherContext *context, const char *userid,
-					      CamelCipherHash hash, CamelStream *istream,
-					      CamelStream *ostream, CamelException *ex);
-static CamelCipherValidity *cipher_verify (CamelCipherContext *context, CamelCipherHash hash,
-					   CamelStream *istream, CamelStream *sigstream,
-					   CamelException *ex);
-static int                  cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,
-					    GPtrArray *recipients, CamelStream *istream,
-					    CamelStream *ostream, CamelException *ex);
-static int                  cipher_decrypt (CamelCipherContext *context, CamelStream *istream,
-					    CamelStream *ostream, CamelException *ex);
-
-static CamelObjectClass *parent_class;
-
-static void
-camel_cipher_context_init (CamelCipherContext *context)
-{
-	context->priv = g_new0 (struct _CamelCipherContextPrivate, 1);
-#ifdef ENABLE_THREADS
-	context->priv->lock = g_mutex_new ();
-#endif
-}
-
-static void
-camel_cipher_context_finalise (CamelObject *o)
-{
-	CamelCipherContext *context = (CamelCipherContext *)o;
-	
-	camel_object_unref (CAMEL_OBJECT (context->session));
-	
-#ifdef ENABLE_THREADS
-	g_mutex_free (context->priv->lock);
-#endif
-	
-	g_free (context->priv);
-}
-
-static void
-camel_cipher_context_class_init (CamelCipherContextClass *camel_cipher_context_class)
-{
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-	
-	camel_cipher_context_class->sign = cipher_sign;
-	camel_cipher_context_class->clearsign = cipher_clearsign;
-	camel_cipher_context_class->verify = cipher_verify;
-	camel_cipher_context_class->encrypt = cipher_encrypt;
-	camel_cipher_context_class->decrypt = cipher_decrypt;
-}
-
-CamelType
-camel_cipher_context_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (),
-					    "CamelCipherContext",
-					    sizeof (CamelCipherContext),
-					    sizeof (CamelCipherContextClass),
-					    (CamelObjectClassInitFunc) camel_cipher_context_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_cipher_context_init,
-					    (CamelObjectFinalizeFunc) camel_cipher_context_finalise);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_cipher_context_new:
- * @session: CamelSession
- *
- * This creates a new CamelCipherContext object which is used to sign,
- * verify, encrypt and decrypt streams.
- *
- * Return value: the new CamelCipherContext
- **/
-CamelCipherContext *
-camel_cipher_context_new (CamelSession *session)
-{
-	CamelCipherContext *context;
-	
-	g_return_val_if_fail (session != NULL, NULL);
-	
-	context = CAMEL_CIPHER_CONTEXT (camel_object_new (CAMEL_CIPHER_CONTEXT_TYPE));
-	
-	camel_object_ref (CAMEL_OBJECT (session));
-	context->session = session;
-	
-	return context;
-}
-
-
-/**
- * camel_cipher_context_construct:
- * @context: CamelCipherContext
- * @session: CamelSession
- *
- * Constucts the CamelCipherContext
- **/
-void
-camel_cipher_context_construct (CamelCipherContext *context, CamelSession *session)
-{
-	g_return_if_fail (CAMEL_IS_CIPHER_CONTEXT (context));
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	
-	camel_object_ref (CAMEL_OBJECT (session));
-	context->session = session;
-}
-
-
-static int
-cipher_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-	     CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-			     _("Signing is not supported by this cipher"));
-	return -1;
-}
-
-/**
- * camel_cipher_sign:
- * @context: Cipher Context
- * @userid: private key to use to sign the stream
- * @hash: preferred Message-Integrity-Check hash algorithm
- * @istream: input stream
- * @ostream: output stream
- * @ex: exception
- *
- * Signs the input stream and writes the resulting signature to the output stream.
- *
- * Return value: 0 for success or -1 for failure.
- **/
-int
-camel_cipher_sign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,
-		   CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	int retval;
-	
-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);
-	
-	CIPHER_LOCK(context);
-	
-	retval = CCC_CLASS (context)->sign (context, userid, hash, istream, ostream, ex);
-	
-	CIPHER_UNLOCK(context);
-	
-	return retval;
-}
-
-
-static int
-cipher_clearsign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,
-		  CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-			     _("Clearsigning is not supported by this cipher"));
-	return -1;
-}
-
-/**
- * camel_cipher_clearsign:
- * @context: Cipher Context
- * @userid: key id or email address of the private key to sign with
- * @hash: preferred Message-Integrity-Check hash algorithm
- * @istream: input stream
- * @ostream: output stream
- * @ex: exception
- *
- * Clearsigns the input stream and writes the resulting clearsign to the output stream.
- *
- * Return value: 0 for success or -1 for failure.
- **/
-int
-camel_cipher_clearsign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,
-			CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	int retval;
-	
-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);
-	
-	CIPHER_LOCK(context);
-	
-	retval = CCC_CLASS (context)->clearsign (context, userid, hash, istream, ostream, ex);
-	
-	CIPHER_UNLOCK(context);
-	
-	return retval;
-}
-
-
-static CamelCipherValidity *
-cipher_verify (CamelCipherContext *context, CamelCipherHash hash, CamelStream *istream,
-	       CamelStream *sigstream, CamelException *ex)
-{
-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-			     _("Verifying is not supported by this cipher"));
-	return NULL;
-}
-
-/**
- * camel_cipher_verify:
- * @context: Cipher Context
- * @istream: input stream
- * @sigstream: optional detached-signature stream
- * @ex: exception
- *
- * Verifies the signature. If @istream is a clearsigned stream,
- * you should pass %NULL as the sigstream parameter. Otherwise
- * @sigstream is assumed to be the signature stream and is used to
- * verify the integirity of the @istream.
- *
- * Return value: a CamelCipherValidity structure containing information
- * about the integrity of the input stream or %NULL on failure to
- * execute at all.
- **/
-CamelCipherValidity *
-camel_cipher_verify (CamelCipherContext *context, CamelCipherHash hash, CamelStream *istream,
-		     CamelStream *sigstream, CamelException *ex)
-{
-	CamelCipherValidity *valid;
-	
-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), NULL);
-	
-	CIPHER_LOCK(context);
-	
-	valid = CCC_CLASS (context)->verify (context, hash, istream, sigstream, ex);
-	
-	CIPHER_UNLOCK(context);
-	
-	return valid;
-}
-
-
-static int
-cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid, GPtrArray *recipients,
-		CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-			     _("Encryption is not supported by this cipher"));
-	return -1;
-}
-
-/**
- * camel_cipher_encrypt:
- * @context: Cipher Context
- * @sign: sign as well as encrypt
- * @userid: key id (or email address) to use when signing (assuming @sign is %TRUE)
- * @recipients: an array of recipient key ids and/or email addresses
- * @istream: cleartext input stream
- * @ostream: ciphertext output stream
- * @ex: exception
- *
- * Encrypts (and optionally signs) the cleartext input stream and
- * writes the resulting ciphertext to the output stream.
- *
- * Return value: 0 for success or -1 for failure.
- **/
-int
-camel_cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid, GPtrArray *recipients,
-		      CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	int retval;
-	
-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);
-	
-	CIPHER_LOCK(context);
-	
-	retval = CCC_CLASS (context)->encrypt (context, sign, userid, recipients, istream, ostream, ex);
-	
-	CIPHER_UNLOCK(context);
-	
-	return retval;
-}
-
-
-static int
-cipher_decrypt (CamelCipherContext *context, CamelStream *istream,
-		CamelStream *ostream, CamelException *ex)
-{
-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-			     _("Decryption is not supported by this cipher"));
-	return -1;
-}
-
-/**
- * camel_cipher_decrypt:
- * @context: Cipher Context
- * @ciphertext: ciphertext stream (ie input stream)
- * @cleartext: cleartext stream (ie output stream)
- * @ex: exception
- *
- * Decrypts the ciphertext input stream and writes the resulting
- * cleartext to the output stream.
- *
- * Return value: 0 for success or -1 for failure.
- **/
-int
-camel_cipher_decrypt (CamelCipherContext *context, CamelStream *istream,
-		      CamelStream *ostream, CamelException *ex)
-{
-	int retval;
-	
-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);
-	
-	CIPHER_LOCK(context);
-	
-	retval = CCC_CLASS (context)->decrypt (context, istream, ostream, ex);
-	
-	CIPHER_UNLOCK(context);
-	
-	return retval;
-}
-
-
-/* Cipher Validity stuff */
-struct _CamelCipherValidity {
-	gboolean valid;
-	gchar *description;
-};
-
-CamelCipherValidity *
-camel_cipher_validity_new (void)
-{
-	CamelCipherValidity *validity;
-	
-	validity = g_new (CamelCipherValidity, 1);
-	validity->valid = FALSE;
-	validity->description = NULL;
-	
-	return validity;
-}
-
-void
-camel_cipher_validity_init (CamelCipherValidity *validity)
-{
-	g_assert (validity != NULL);
-	
-	validity->valid = FALSE;
-	validity->description = NULL;
-}
-
-gboolean
-camel_cipher_validity_get_valid (CamelCipherValidity *validity)
-{
-	if (validity == NULL)
-		return FALSE;
-	
-	return validity->valid;
-}
-
-void
-camel_cipher_validity_set_valid (CamelCipherValidity *validity, gboolean valid)
-{
-	g_assert (validity != NULL);
-	
-	validity->valid = valid;
-}
-
-gchar *
-camel_cipher_validity_get_description (CamelCipherValidity *validity)
-{
-	if (validity == NULL)
-		return NULL;
-	
-	return validity->description;
-}
-
-void
-camel_cipher_validity_set_description (CamelCipherValidity *validity, const gchar *description)
-{
-	g_assert (validity != NULL);
-	
-	g_free (validity->description);
-	validity->description = g_strdup (description);
-}
-
-void
-camel_cipher_validity_clear (CamelCipherValidity *validity)
-{
-	g_assert (validity != NULL);
-	
-	validity->valid = FALSE;
-	g_free (validity->description);
-	validity->description = NULL;
-}
-
-void
-camel_cipher_validity_free (CamelCipherValidity *validity)
-{
-	if (validity == NULL)
-		return;
-	
-	g_free (validity->description);
-	g_free (validity);
-}
diff --git a/camel/camel-cipher-context.h b/camel/camel-cipher-context.h
deleted file mode 100644
index 5147cc5ebc..0000000000
--- a/camel/camel-cipher-context.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CIPHER_CONTEXT_H
-#define CAMEL_CIPHER_CONTEXT_H
-
-#include <camel/camel-session.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-exception.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CAMEL_CIPHER_CONTEXT_TYPE     (camel_cipher_context_get_type ())
-#define CAMEL_CIPHER_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CIPHER_CONTEXT_TYPE, CamelCipherContext))
-#define CAMEL_CIPHER_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CIPHER_CONTEXT_TYPE, CamelCipherContextClass))
-#define CAMEL_IS_CIPHER_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CIPHER_CONTEXT_TYPE))
-
-typedef struct _CamelCipherValidity CamelCipherValidity;
-
-typedef enum {
-	CAMEL_CIPHER_HASH_DEFAULT,
-	CAMEL_CIPHER_HASH_MD2,
-	CAMEL_CIPHER_HASH_MD5,
-	CAMEL_CIPHER_HASH_SHA1,
-	CAMEL_CIPHER_HASH_RIPEMD160
-} CamelCipherHash;
-
-typedef struct _CamelCipherContext {
-	CamelObject parent_object;
-	
-	struct _CamelCipherContextPrivate *priv;
-	
-	CamelSession *session;
-	
-} CamelCipherContext;
-
-typedef struct _CamelCipherContextClass {
-	CamelObjectClass parent_class;
-	
-	int                   (*sign)      (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-					    CamelStream *istream, CamelStream *ostream, CamelException *ex);
-	
-	int                   (*clearsign) (CamelCipherContext *context, const char *userid, CamelCipherHash hash,
-					    CamelStream *istream, CamelStream *ostream, CamelException *ex);
-	
-	CamelCipherValidity * (*verify)    (CamelCipherContext *context, CamelCipherHash hash,
-					    CamelStream *istream, CamelStream *sigstream,
-					    CamelException *ex);
-	
-	int                   (*encrypt)   (CamelCipherContext *context, gboolean sign, const char *userid,
-					    GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,
-					    CamelException *ex);
-	
-	int                   (*decrypt)   (CamelCipherContext *context, CamelStream *istream, CamelStream *ostream,
-					    CamelException *ex);
-	
-} CamelCipherContextClass;
-
-CamelType            camel_cipher_context_get_type (void);
-
-CamelCipherContext  *camel_cipher_context_new (CamelSession *session);
-
-void                 camel_cipher_context_construct (CamelCipherContext *context, CamelSession *session);
-
-/* cipher routines */
-int                  camel_cipher_sign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,
-					CamelStream *istream, CamelStream *ostream, CamelException *ex);
-
-int                  camel_cipher_clearsign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,
-					     CamelStream *istream, CamelStream *ostream, CamelException *ex);
-
-CamelCipherValidity *camel_cipher_verify (CamelCipherContext *context, CamelCipherHash hash,
-					  CamelStream *istream, CamelStream *sigstream,
-					  CamelException *ex);
-
-int                  camel_cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,
-					   GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,
-					   CamelException *ex);
-
-int                  camel_cipher_decrypt (CamelCipherContext *context, CamelStream *istream, CamelStream *ostream,
-					   CamelException *ex);
-
-/* CamelCipherValidity utility functions */
-CamelCipherValidity *camel_cipher_validity_new (void);
-
-void                 camel_cipher_validity_init (CamelCipherValidity *validity);
-
-gboolean             camel_cipher_validity_get_valid (CamelCipherValidity *validity);
-
-void                 camel_cipher_validity_set_valid (CamelCipherValidity *validity, gboolean valid);
-
-char                *camel_cipher_validity_get_description (CamelCipherValidity *validity);
-
-void                 camel_cipher_validity_set_description (CamelCipherValidity *validity, const char *description);
-
-void                 camel_cipher_validity_clear (CamelCipherValidity *validity);
-
-void                 camel_cipher_validity_free (CamelCipherValidity *validity);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CIPHER_CONTEXT_H */
diff --git a/camel/camel-cms-context.c b/camel/camel-cms-context.c
deleted file mode 100644
index 252bb81300..0000000000
--- a/camel/camel-cms-context.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-cms-context.h"
-
-#include <glib.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#define CMS_LOCK(ctx)   g_mutex_lock (((CamelCMSContext *) ctx)->priv->lock)
-#define CMS_UNLOCK(ctx) g_mutex_unlock (((CamelCMSContext *) ctx)->priv->lock);
-#else
-#define CMS_LOCK(ctx)
-#define CMS_UNLOCK(ctx)
-#endif
-
-#define d(x)
-
-#define CCC_CLASS(o) CAMEL_CMS_CONTEXT_CLASS(CAMEL_OBJECT_GET_CLASS(o))
-
-struct _CamelCMSContextPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#endif
-};
-
-static CamelMimeMessage *cms_sign      (CamelCMSContext *ctx, CamelMimeMessage *message,
-					const char *userid, gboolean signing_time,
-					gboolean detached, CamelException *ex);
-
-static CamelMimeMessage *cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,
-					const char *userid, GPtrArray *recipients,
-					CamelException *ex);
-
-static CamelMimeMessage *cms_encrypt   (CamelCMSContext *ctx, CamelMimeMessage *message,
-					const char *userid, GPtrArray *recipients, 
-					CamelException *ex);
-
-static CamelMimeMessage *cms_envelope  (CamelCMSContext *ctx, CamelMimeMessage *message,
-					const char *userid, GPtrArray *recipients, 
-					CamelException *ex);
-
-static CamelMimeMessage *cms_decode    (CamelCMSContext *ctx, CamelMimeMessage *message,
-					CamelCMSValidityInfo **info, CamelException *ex);
-
-static CamelObjectClass *parent_class;
-
-static void
-camel_cms_context_init (CamelCMSContext *context)
-{
-	context->priv = g_new0 (struct _CamelCMSContextPrivate, 1);
-#ifdef ENABLE_THREADS
-	context->priv->lock = g_mutex_new ();
-#endif
-}
-
-static void
-camel_cms_context_finalise (CamelObject *o)
-{
-	CamelCMSContext *context = (CamelCMSContext *)o;
-	
-	camel_object_unref (CAMEL_OBJECT (context->session));
-	
-#ifdef ENABLE_THREADS
-	g_mutex_free (context->priv->lock);
-#endif
-	
-	g_free (context->priv);
-}
-
-static void
-camel_cms_context_class_init (CamelCMSContextClass *camel_cms_context_class)
-{
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-	
-	camel_cms_context_class->sign = cms_sign;
-	camel_cms_context_class->certsonly = cms_certsonly;
-	camel_cms_context_class->encrypt = cms_encrypt;
-	camel_cms_context_class->envelope = cms_envelope;
-	camel_cms_context_class->decode = cms_decode;
-}
-
-CamelType
-camel_cms_context_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (),
-					    "CamelCMSContext",
-					    sizeof (CamelCMSContext),
-					    sizeof (CamelCMSContextClass),
-					    (CamelObjectClassInitFunc) camel_cms_context_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_cms_context_init,
-					    (CamelObjectFinalizeFunc) camel_cms_context_finalise);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_cms_context_new:
- * @session: CamelSession
- * @encryption_key: preferred encryption key nickname
- *
- * This creates a new CamelCMSContext object which is used to sign,
- * encrypt, envelope and decode CMS messages.
- *
- * Return value: the new CamelCMSContext
- **/
-CamelCMSContext *
-camel_cms_context_new (CamelSession *session)
-{
-	CamelCMSContext *context;
-	
-	g_return_val_if_fail (session != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-	
-	context = CAMEL_CMS_CONTEXT (camel_object_new (CAMEL_CMS_CONTEXT_TYPE));
-	
-	camel_object_ref (CAMEL_OBJECT (session));
-	context->session = session;
-	
-	return context;
-}
-
-
-/**
- * camel_cms_context_construct:
- * @context: CMS Context
- * @session: CamelSession
- *
- * Construct the CMS Context.
- **/
-void
-camel_cms_context_construct (CamelCMSContext *context, CamelSession *session)
-{
-	g_return_if_fail (CAMEL_IS_CMS_CONTEXT (context));
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	
-	camel_object_ref (CAMEL_OBJECT (session));
-	context->session = session;
-}
-
-
-static CamelMimeMessage *
-cms_sign (CamelCMSContext *ctx, CamelMimeMessage *message,
-	  const char *userid, gboolean signing_time,
-	  gboolean detached, CamelException *ex)
-{
-	g_warning ("Using default CamelCMSContext::sign() method.");
-	
-	return NULL;
-}
-
-
-CamelMimeMessage *
-camel_cms_sign (CamelCMSContext *ctx, CamelMimeMessage *message,
-		const char *userid, gboolean signing_time,
-		gboolean detached, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	g_return_val_if_fail (userid != NULL, NULL);
-	
-	return CCC_CLASS (ctx)->sign (ctx, message, userid, signing_time, detached, ex);
-}
-
-
-static CamelMimeMessage *
-cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,
-	       const char *userid, GPtrArray *recipients,
-	       CamelException *ex)
-{
-	g_warning ("Using default CamelCMSContext::certsonly() method.");
-	
-	return NULL;
-}
-
-
-CamelMimeMessage *
-camel_cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,
-		     const char *userid, GPtrArray *recipients,
-		     CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	g_return_val_if_fail (userid != NULL, NULL);
-	g_return_val_if_fail (recipients != NULL, NULL);
-	
-	return CCC_CLASS (ctx)->certsonly (ctx, message, userid, recipients, ex);
-}
-
-
-static CamelMimeMessage *
-cms_envelope (CamelCMSContext *ctx, CamelMimeMessage *message,
-	      const char *userid, GPtrArray *recipients, 
-	      CamelException *ex)
-{
-	g_warning ("Using default CamelCMSContext::envelope() method.");
-	
-	return NULL;
-}
-
-
-CamelMimeMessage *
-camel_cms_envelope (CamelCMSContext *ctx, CamelMimeMessage *message,
-		    const char *userid, GPtrArray *recipients, 
-		    CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	g_return_val_if_fail (userid != NULL, NULL);
-	g_return_val_if_fail (recipients != NULL, NULL);
-	
-	return CCC_CLASS (ctx)->envelope (ctx, message, userid, recipients, ex);
-}
-
-
-static CamelMimeMessage *
-cms_encrypt (CamelCMSContext *ctx, CamelMimeMessage *message,
-	     const char *userid, GPtrArray *recipients, 
-	     CamelException *ex)
-{
-	g_warning ("Using default CamelCMSContext::encrypt() method.");
-	
-	return NULL;
-}
-
-
-CamelMimeMessage *
-camel_cms_encrypt (CamelCMSContext *ctx, CamelMimeMessage *message,
-		   const char *userid, GPtrArray *recipients, 
-		   CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	g_return_val_if_fail (userid != NULL, NULL);
-	g_return_val_if_fail (recipients != NULL, NULL);
-	
-	return CCC_CLASS (ctx)->encrypt (ctx, message, userid, recipients, ex);
-}
-
-
-static CamelMimeMessage *
-cms_decode (CamelCMSContext *ctx, CamelMimeMessage *message,
-	    CamelCMSValidityInfo **info, CamelException *ex)
-{
-	g_warning ("Using default CamelCMSContext::decode() method.");
-	
-	return NULL;
-}
-
-
-CamelMimeMessage *
-camel_cms_decode (CamelCMSContext *ctx, CamelMimeMessage *message,
-		  CamelCMSValidityInfo **info, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	
-	return CCC_CLASS (ctx)->decode (ctx, message, info, ex);
-}
-
-
-void
-camel_cms_signer_free (CamelCMSSigner *signer)
-{
-	CamelCMSSigner *next;
-	
-	if (!signer)
-		return;
-	
-	while (signer) {
-		next = signer->next;
-		g_free (signer->signercn);
-		g_free (signer->status);
-		g_free (signer);
-		signer = next;
-	}
-}
-
-
-void
-camel_cms_validity_info_free (CamelCMSValidityInfo *info)
-{
-	CamelCMSValidityInfo *next;
-	
-	if (!info)
-		return;
-	
-	while (info) {
-		next = info->next;
-		if (info->type == CAMEL_CMS_TYPE_SIGNED)
-			camel_cms_signer_free (info->signers);
-		g_free (info);
-		info = next;
-	}
-}
diff --git a/camel/camel-cms-context.h b/camel/camel-cms-context.h
deleted file mode 100644
index 946f7a747f..0000000000
--- a/camel/camel-cms-context.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CMS_CONTEXT_H
-#define CAMEL_CMS_CONTEXT_H
-
-#include <camel/camel-session.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-mime-message.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CAMEL_CMS_CONTEXT_TYPE     (camel_cms_context_get_type ())
-#define CAMEL_CMS_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CMS_CONTEXT_TYPE, CamelCMSContext))
-#define CAMEL_CMS_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CMS_CONTEXT_TYPE, CamelCMSContextClass))
-#define CAMEL_IS_CMS_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CMS_CONTEXT_TYPE))
-
-typedef enum {
-	CAMEL_CMS_TYPE_DATA,
-	CAMEL_CMS_TYPE_SIGNED,
-	CAMEL_CMS_TYPE_ENVELOPED,
-	CAMEL_CMS_TYPE_ENCRYPTED
-} CamelCMSType;
-
-typedef struct _CamelCMSSigner {
-	struct _CamelCMSSigner *next;
-	char *signercn;
-	char *status;
-} CamelCMSSigner;
-
-typedef struct _CamelCMSValidityInfo {
-	struct _CamelCMSValidityInfo *next;
-	CamelCMSType type;
-	CamelCMSSigner *signers;
-} CamelCMSValidityInfo;
-
-
-typedef struct _CamelCMSContext {
-	CamelObject parent_object;
-	
-	struct _CamelCMSContextPrivate *priv;
-	
-	CamelSession *session;
-} CamelCMSContext;
-
-typedef struct _CamelCMSContextClass {
-	CamelObjectClass parent_class;
-	
-	CamelMimeMessage *(*sign)       (CamelCMSContext *ctx, CamelMimeMessage *message,
-					 const char *userid, gboolean signing_time,
-					 gboolean detached, CamelException *ex);
-	
-	CamelMimeMessage *(*certsonly)  (CamelCMSContext *ctx, CamelMimeMessage *message,
-					 const char *userid, GPtrArray *recipients,
-					 CamelException *ex);
-	
-	CamelMimeMessage *(*encrypt)    (CamelCMSContext *ctx, CamelMimeMessage *message,
-					 const char *userid, GPtrArray *recipients, 
-					 CamelException *ex);
-	
-	CamelMimeMessage *(*envelope)   (CamelCMSContext *ctx, CamelMimeMessage *message,
-					 const char *userid, GPtrArray *recipients, 
-					 CamelException *ex);
-	
-	CamelMimeMessage *(*decode)     (CamelCMSContext *ctx, CamelMimeMessage *message,
-					 CamelCMSValidityInfo **info, CamelException *ex);
-	
-} CamelCMSContextClass;
-
-CamelType         camel_cms_context_get_type (void);
-
-CamelCMSContext  *camel_cms_context_new (CamelSession *session);
-
-void              camel_cms_context_construct (CamelCMSContext *context, CamelSession *session);
-
-/* cms routines */
-CamelMimeMessage *camel_cms_sign      (CamelCMSContext *ctx, CamelMimeMessage *message,
-				       const char *userid, gboolean signing_time,
-				       gboolean detached, CamelException *ex);
-
-CamelMimeMessage *camel_cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,
-				       const char *userid, GPtrArray *recipients,
-				       CamelException *ex);
-
-CamelMimeMessage *camel_cms_encrypt   (CamelCMSContext *ctx, CamelMimeMessage *message,
-				       const char *userid, GPtrArray *recipients, 
-				       CamelException *ex);
-
-CamelMimeMessage *camel_cms_envelope  (CamelCMSContext *ctx, CamelMimeMessage *message,
-				       const char *userid, GPtrArray *recipients, 
-				       CamelException *ex);
-
-CamelMimeMessage *camel_cms_decode    (CamelCMSContext *ctx, CamelMimeMessage *message,
-				       CamelCMSValidityInfo **info, CamelException *ex);
-
-
-void              camel_cms_signer_free        (CamelCMSSigner *signer);
-
-void              camel_cms_validity_info_free (CamelCMSValidityInfo *info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CMS_CONTEXT_H */
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
deleted file mode 100644
index 9f44a89f5c..0000000000
--- a/camel/camel-data-cache.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-message-cache.c: Class for a Camel cache.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <sys/types.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include "camel-data-cache.h"
-#include "camel-exception.h"
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
-#include "camel-file-utils.h"
-
-extern int camel_verbose_debug;
-#define dd(x) (camel_verbose_debug?(x):0)
-#define d(x)
-
-static void stream_finalised(CamelObject *o, void *event_data, void *data);
-
-/* how many 'bits' of hash are used to key the toplevel directory */
-#define CAMEL_DATA_CACHE_BITS (6)
-#define CAMEL_DATA_CACHE_MASK ((1<<CAMEL_DATA_CACHE_BITS)-1)
-
-/* timeout before a cache dir is checked again for expired entries,
-   once an hour should be enough */
-#define CAMEL_DATA_CACHE_CYCLE_TIME (60*60)
-
-struct _CamelDataCachePrivate {
-	GHashTable *busy_stream;
-	GHashTable *busy_path;
-
-	int expire_inc;
-	time_t expire_last[1<<CAMEL_DATA_CACHE_BITS];
-
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#define CDC_LOCK(c, l) g_mutex_lock(((CamelDataCache *)(c))->priv->l)
-#define CDC_UNLOCK(c, l) g_mutex_unlock(((CamelDataCache *)(c))->priv->l)
-#else
-#define CDC_LOCK(c, l)
-#define CDC_UNLOCK(c, l)
-#endif
-};
-
-static CamelObject *camel_data_cache_parent;
-
-static void data_cache_class_init(CamelDataCacheClass *klass)
-{
-	camel_data_cache_parent = (CamelObject *)camel_type_get_global_classfuncs (camel_object_get_type ());
-
-#if 0
-	klass->add = data_cache_add;
-	klass->get = data_cache_get;
-	klass->close = data_cache_close;
-	klass->remove = data_cache_remove;
-	klass->clear = data_cache_clear;
-#endif
-}
-
-static void data_cache_init(CamelDataCache *cdc, CamelDataCacheClass *klass)
-{
-	struct _CamelDataCachePrivate *p;
-
-	p = cdc->priv = g_malloc0(sizeof(*cdc->priv));
-
-	p->busy_stream = g_hash_table_new(NULL, NULL);
-	p->busy_path = g_hash_table_new(g_str_hash, g_str_equal);
-
-#ifdef ENABLE_THREADS
-	p->lock = g_mutex_new();
-#endif
-}
-
-static void
-free_busy(CamelStream *stream, char *path, CamelDataCache *cdc)
-{
-	d(printf(" Freeing busy stream %p path %s\n", stream, path));
-	camel_object_unhook_event((CamelObject *)stream, "finalize", stream_finalised, cdc);
-	camel_object_unref((CamelObject *)stream);
-	g_free(path);
-}
-
-static void data_cache_finalise(CamelDataCache *cdc)
-{
-	struct _CamelDataCachePrivate *p;
-
-	p = cdc->priv;
-
-	d(printf("cache finalised, %d (= %d?) streams reamining\n", g_hash_table_size(p->busy_stream), g_hash_table_size(p->busy_path)));
-
-	g_hash_table_foreach(p->busy_stream, (GHFunc)free_busy, cdc);
-	g_hash_table_destroy(p->busy_path);
-	g_hash_table_destroy(p->busy_stream);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(p->lock);
-#endif
-	g_free(p);
-	
-	g_free (cdc->path);
-}
-
-CamelType
-camel_data_cache_get_type(void)
-{
-	static CamelType camel_data_cache_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_data_cache_type == CAMEL_INVALID_TYPE) {
-		camel_data_cache_type = camel_type_register(
-			CAMEL_OBJECT_TYPE, "CamelDataCache",
-			sizeof (CamelDataCache),
-			sizeof (CamelDataCacheClass),
-			(CamelObjectClassInitFunc) data_cache_class_init,
-			NULL,
-			(CamelObjectInitFunc) data_cache_init,
-			(CamelObjectFinalizeFunc) data_cache_finalise);
-	}
-
-	return camel_data_cache_type;
-}
-
-/**
- * camel_data_cache_new:
- * @path: Base path of cache, subdirectories will be created here.
- * @flags: Open flags, none defined.
- * @ex: 
- * 
- * Create a new data cache.
- * 
- * Return value: A new cache object, or NULL if the base path cannot
- * be written to.
- **/
-CamelDataCache *
-camel_data_cache_new(const char *path, guint32 flags, CamelException *ex)
-{
-	CamelDataCache *cdc;
-
-	if (camel_file_util_mkdir(path, 0700) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Unable to create cache path"));
-		return NULL;
-	}
-
-	cdc = (CamelDataCache *)camel_object_new(CAMEL_DATA_CACHE_TYPE);
-
-	cdc->path = g_strdup(path);
-	cdc->flags = flags;
-	cdc->expire_age = -1;
-	cdc->expire_access = -1;
-
-	return cdc;
-}
-
-/**
- * camel_data_cache_set_expire_age:
- * @cdc: 
- * @when: Timeout for age expiry, or -1 to disable.
- * 
- * Set the cache expiration policy for aged entries.
- * 
- * Items in the cache older than @when seconds may be
- * flushed at any time.  Items are expired in a lazy
- * manner, so it is indeterminate when the items will
- * physically be removed.
- *
- * Note you can set both an age and an access limit.  The
- * age acts as a hard limit on cache entries.
- **/
-void
-camel_data_cache_set_expire_age(CamelDataCache *cdc, time_t when)
-{
-	cdc->expire_age = when;
-}
-
-/**
- * camel_data_cache_set_expire_access:
- * @cdc: 
- * @when: Timeout for access, or -1 to disable access expiry.
- * 
- * Set the cache expiration policy for access times.
- *
- * Items in the cache which haven't been accessed for @when
- * seconds may be expired at any time.  Items are expired in a lazy
- * manner, so it is indeterminate when the items will
- * physically be removed.
- *
- * Note you can set both an age and an access limit.  The
- * age acts as a hard limit on cache entries.
- **/
-void
-camel_data_cache_set_expire_access(CamelDataCache *cdc, time_t when)
-{
-	cdc->expire_access = when;
-}
-
-static void
-data_cache_expire(CamelDataCache *cdc, const char *path, const char *keep, time_t now)
-{
-	DIR *dir;
-	struct dirent *d;
-	GString *s;
-	struct stat st;
-	char *oldpath;
-	CamelStream *stream;
-
-	dir = opendir(path);
-	if (dir == NULL)
-		return;
-
-	s = g_string_new("");
-	while ( (d = readdir(dir)) ) {
-		if (strcmp(d->d_name, keep) == 0)
-			continue;
-
-		g_string_sprintf(s, "%s/%s", path, d->d_name);
-		dd(printf("Checking '%s' for expiry\n", s->str));
-		if (stat(s->str, &st) == 0
-		    && S_ISREG(st.st_mode)
-		    && ((cdc->expire_age != -1 && st.st_mtime + cdc->expire_age < now)
-			|| (cdc->expire_access != -1 && st.st_atime + cdc->expire_access < now))) {
-			dd(printf("Has expired!  Removing!\n"));
-			unlink(s->str);
-			if (g_hash_table_lookup_extended(cdc->priv->busy_path, s->str, (void **)&oldpath, (void **)&stream)) {
-				g_hash_table_remove(cdc->priv->busy_path, path);
-				g_hash_table_remove(cdc->priv->busy_stream, stream);
-				g_free(oldpath);
-			}
-		}
-	}
-	g_string_free(s, TRUE);
-	closedir(dir);
-}
-
-/* Since we have to stat the directory anyway, we use this opportunity to
-   lazily expire old data.
-   If it is this directories 'turn', and we haven't done it for CYCLE_TIME seconds,
-   then we perform an expiry run */
-static char *
-data_cache_path(CamelDataCache *cdc, int create, const char *path, const char *key)
-{
-	char *dir, *real, *tmp;
-	guint32 hash;
-
-	hash = g_str_hash(key);
-	hash = (hash>>5)&CAMEL_DATA_CACHE_MASK;
-	dir = alloca(strlen(cdc->path) + strlen(path) + 8);
-	sprintf(dir, "%s/%s/%02x", cdc->path, path, hash);
-	if (access(dir, F_OK) == -1) {
-		if (create)
-			camel_file_util_mkdir(dir, 0700);
-	} else if (cdc->priv->expire_inc == hash
-		   && (cdc->expire_age != -1 || cdc->expire_access != -1)) {
-		time_t now;
-
-		dd(printf("Checking expire cycle time on dir '%s'\n", dir));
-
-		now = time(0);
-		if (cdc->priv->expire_last[hash] + CAMEL_DATA_CACHE_CYCLE_TIME < now) {
-			data_cache_expire(cdc, dir, key, now);
-			cdc->priv->expire_last[hash] = now;
-		}
-		cdc->priv->expire_inc = (cdc->priv->expire_inc + 1) & CAMEL_DATA_CACHE_MASK;
-	}
-
-	tmp = camel_file_util_safe_filename(key);
-	real = g_strdup_printf("%s/%s", dir, tmp);
-	g_free(tmp);
-
-	return real;
-}
-
-static void
-stream_finalised(CamelObject *o, void *event_data, void *data)
-{
-	CamelDataCache *cdc = data;
-	char *key;
-
-	d(printf("Stream finalised '%p'\n", data));
-
-	CDC_LOCK(cdc, lock);
-	key = g_hash_table_lookup(cdc->priv->busy_stream, o);
-	if (key) {
-		d(printf("  For path '%s'\n", key));
-		g_hash_table_remove(cdc->priv->busy_path, key);
-		g_hash_table_remove(cdc->priv->busy_stream, o);
-		g_free(key);
-	} else {
-		d(printf("  Unknown stream?!\n"));
-	}
-	CDC_UNLOCK(cdc, lock);
-}
-
-/**
- * camel_data_cache_add:
- * @cdc: 
- * @path: Relative path of item to add.
- * @key: Key of item to add.
- * @ex: 
- * 
- * Add a new item to the cache.
- *
- * The key and the path combine to form a unique key used to store
- * the item.
- * 
- * Potentially, expiry processing will be performed while this call
- * is executing.
- *
- * Return value: A CamelStream (file) opened in read-write mode.
- * The caller must unref this when finished.
- **/
-CamelStream *
-camel_data_cache_add(CamelDataCache *cdc, const char *path, const char *key, CamelException *ex)
-{
-	char *real, *oldpath;
-	CamelStream *stream;
-
-	CDC_LOCK(cdc, lock);
-
-	real = data_cache_path(cdc, TRUE, path, key);
-	if (g_hash_table_lookup_extended(cdc->priv->busy_path, real, (void **)&oldpath, (void **)&stream)) {
-		g_hash_table_remove(cdc->priv->busy_path, oldpath);
-		g_hash_table_remove(cdc->priv->busy_stream, stream);
-		unlink(oldpath);
-		g_free(oldpath);
-	}
-
-	stream = camel_stream_fs_new_with_name(real, O_RDWR|O_CREAT|O_TRUNC, 0600);
-	if (stream) {
-		camel_object_hook_event((CamelObject *)stream, "finalize", stream_finalised, cdc);
-		g_hash_table_insert(cdc->priv->busy_stream, stream, real);
-		g_hash_table_insert(cdc->priv->busy_path, real, stream);
-	} else {
-		g_free(real);
-	}
-
-	CDC_UNLOCK(cdc, lock);
-
-	return stream;
-}
-
-/**
- * camel_data_cache_get:
- * @cdc: 
- * @path: Path to the (sub) cache the item exists in.
- * @key: Key for the cache item.
- * @ex: 
- * 
- * Lookup an item in the cache.  If the item exists, a stream
- * is returned for the item.  The stream may be shared by
- * multiple callers, so ensure the stream is in a valid state
- * through external locking.
- * 
- * Return value: A cache item, or NULL if the cache item does not exist.
- **/
-CamelStream *
-camel_data_cache_get(CamelDataCache *cdc, const char *path, const char *key, CamelException *ex)
-{
-	char *real;
-	CamelStream *stream;
-
-	CDC_LOCK(cdc, lock);
-
-	real = data_cache_path(cdc, FALSE, path, key);
-	stream = g_hash_table_lookup(cdc->priv->busy_path, real);
-	if (stream) {
-		camel_object_ref((CamelObject *)stream);
-		g_free(real);
-	} else {
-		stream = camel_stream_fs_new_with_name(real, O_RDWR, 0600);
-		if (stream) {
-			camel_object_hook_event((CamelObject *)stream, "finalize", stream_finalised, cdc);
-			g_hash_table_insert(cdc->priv->busy_stream, stream, real);
-			g_hash_table_insert(cdc->priv->busy_path, real, stream);
-		}
-	}
-
-	CDC_UNLOCK(cdc, lock);
-
-	return stream;
-}
-
-/**
- * camel_data_cache_remove:
- * @cdc: 
- * @path: 
- * @key: 
- * @ex: 
- * 
- * Remove/expire a cache item.
- * 
- * Return value: 
- **/
-int
-camel_data_cache_remove(CamelDataCache *cdc, const char *path, const char *key, CamelException *ex)
-{
-	CamelStream *stream;
-	char *real, *oldpath;
-	int ret;
-
-	CDC_LOCK(cdc, lock);
-
-	real = data_cache_path(cdc, FALSE, path, key);
-	if (g_hash_table_lookup_extended(cdc->priv->busy_path, real, (void **)&oldpath, (void **)&stream)) {
-		g_hash_table_remove(cdc->priv->busy_path, path);
-		g_hash_table_remove(cdc->priv->busy_stream, stream);
-		g_free(oldpath);
-	}
-
-	/* maybe we were a mem stream */
-	if (unlink(real) == -1 && errno != ENOENT) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not remove cache entry: %s: %s"),
-				     real, strerror(errno));
-		ret = -1;
-	} else {
-		ret = 0;
-	}
-
-	g_free(real);
-
-	CDC_UNLOCK(cdc, lock);
-
-	return ret;
-}
-
-/**
- * camel_data_cache_rename:
- * @cache: 
- * @old: 
- * @new: 
- * @ex: 
- * 
- * Rename a cache path.  All cache items accessed from the old path
- * are accessible using the new path.
- *
- * CURRENTLY UNIMPLEMENTED
- * 
- * Return value: -1 on error.
- **/
-int camel_data_cache_rename(CamelDataCache *cache,
-			    const char *old, const char *new, CamelException *ex)
-{
-	/* blah dont care yet */
-	return -1;
-}
-
-/**
- * camel_data_cache_clear:
- * @cache: 
- * @path: Path to clear, or NULL to clear all items in
- * all paths.
- * @ex: 
- * 
- * Clear all items in a given cache path or all items in the cache.
- * 
- * CURRENTLY_UNIMPLEMENTED
- *
- * Return value: -1 on error.
- **/
-int
-camel_data_cache_clear(CamelDataCache *cache, const char *path, CamelException *ex)
-{
-	/* nor for this? */
-	return -1;
-}
diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
deleted file mode 100644
index ab6c29a622..0000000000
--- a/camel/camel-data-cache.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-data-cache.h: Class for a Camel filesystem cache
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_CACHE_H
-#define CAMEL_DATA_CACHE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-#include <camel/camel-stream.h>
-#include <camel/camel-exception.h>
-
-#define CAMEL_DATA_CACHE_TYPE     (camel_data_cache_get_type ())
-#define CAMEL_DATA_CACHE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_CACHE_TYPE, CamelFolder))
-#define CAMEL_DATA_CACHE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_CACHE_TYPE, CamelFolderClass))
-#define CAMEL_IS_DATA_CACHE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_CACHE_TYPE))
-
-typedef struct _CamelDataCache CamelDataCache;
-typedef struct _CamelDataCacheClass CamelDataCacheClass;
-
-struct _CamelDataCache {
-	CamelObject parent_object;
-
-	struct _CamelDataCachePrivate *priv;
-
-	char *path;
-	guint32 flags;
-
-	time_t expire_age;
-	time_t expire_access;
-};
-
-struct _CamelDataCacheClass {
-	CamelObjectClass parent_class;
-
-	/* None are virtual yet */
-#if 0
-	/* Virtual methods */
-	CamelStream *(*add)(CamelDataCache *cmc, const char *path, const char *key, CamelException *ex);
-	CamelStream *(*get)(CamelDataCache *cmc, const char *path, const char *key, CamelException *ex);
-	int (*close)(CamelDataCache *cmc, CamelStream *stream, CamelException *ex);
-	int (*remove)(CamelDataCache *cmc, const char *path, const char *key, CamelException *ex);
-
-	int (*clear)(CamelDataCache *cmc, const char *path, CamelException *ex);
-#endif
-};
-
-/* public methods */
-CamelDataCache *camel_data_cache_new(const char *path, guint32 flags, CamelException *ex);
-
-void camel_data_cache_set_expire_age(CamelDataCache *cache, time_t when);
-void camel_data_cache_set_expire_access(CamelDataCache *cdc, time_t when);
-
-int             camel_data_cache_rename(CamelDataCache *cache,
-					const char *old, const char *new, CamelException *ex);
-
-CamelStream    *camel_data_cache_add(CamelDataCache *cache,
-				     const char *path, const char *key, CamelException *ex);
-CamelStream    *camel_data_cache_get(CamelDataCache *cache,
-				     const char *path, const char *key, CamelException *ex);
-int             camel_data_cache_remove(CamelDataCache *cache,
-					const char *path, const char *key, CamelException *ex);
-
-int             camel_data_cache_clear(CamelDataCache *cache,
-				       const char *path, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_data_cache_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DATA_CACHE_H */
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
deleted file mode 100644
index de0e2e2cf0..0000000000
--- a/camel/camel-data-wrapper.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */
-/* camel-data-wrapper.c : Abstract class for a data_wrapper */
-
-/*
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <errno.h>
-
-#include "camel-data-wrapper.h"
-#include "camel-mime-utils.h"
-#include "camel-stream.h"
-#include "camel-exception.h"
-#include "camel-private.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 CamelContentType *get_mime_type_field (CamelDataWrapper *data_wrapper);
-static void set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type);
-static gboolean is_offline (CamelDataWrapper *data_wrapper);
-
-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;
-	camel_data_wrapper_class->is_offline = is_offline;
-}
-
-static void
-camel_data_wrapper_init (gpointer object, gpointer klass)
-{
-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
-	
-	camel_data_wrapper->priv = g_malloc (sizeof (struct _CamelDataWrapperPrivate));
-#ifdef ENABLE_THREADS
-	pthread_mutex_init (&camel_data_wrapper->priv->stream_lock, NULL);
-#endif
-	
-	camel_data_wrapper->mime_type = header_content_type_new ("application", "octet-stream");
-	camel_data_wrapper->offline = FALSE;
-	camel_data_wrapper->rawtext = FALSE;
-}
-
-static void
-camel_data_wrapper_finalize (CamelObject *object)
-{
-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
-	
-#ifdef ENABLE_THREADS
-	pthread_mutex_destroy (&camel_data_wrapper->priv->stream_lock);
-#endif
-	g_free (camel_data_wrapper->priv);
-	
-	if (camel_data_wrapper->mime_type)
-		header_content_type_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)
-{
-	int ret;
-	
-	if (data_wrapper->stream == NULL) {
-		return -1;
-	}
-	
-	CAMEL_DATA_WRAPPER_LOCK (data_wrapper, stream_lock);
-	if (camel_stream_reset (data_wrapper->stream) == -1) {
-		CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock);
-		return -1;
-	}
-	
-	ret = camel_stream_write_to_stream (data_wrapper->stream, stream);
-	CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock);
-	
-	return ret;
-}
-
-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)
-{
-	if (data_wrapper->mime_type)
-		header_content_type_unref (data_wrapper->mime_type);
-	data_wrapper->mime_type = header_content_type_decode (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 header_content_type_simple (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,
- * which the caller must free.
- **/
-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 CamelContentType *
-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
- **/
-CamelContentType *
-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,
-		     CamelContentType *mime_type)
-{
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
-	g_return_if_fail (mime_type != NULL);
-
-	if (data_wrapper->mime_type)
-		header_content_type_unref (data_wrapper->mime_type);
-	data_wrapper->mime_type = mime_type;
-	if (mime_type)
-		header_content_type_ref (data_wrapper->mime_type);
-}
-
-void
-camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
-					CamelContentType *mime_type)
-{
-	CDW_CLASS (data_wrapper)->set_mime_type_field (data_wrapper, mime_type);
-}
-
-
-static gboolean
-is_offline (CamelDataWrapper *data_wrapper)
-{
-	return data_wrapper->offline;
-}
-
-/**
- * camel_data_wrapper_is_offline:
- * @data_wrapper: a data wrapper
- *
- * Return value: whether @data_wrapper is "offline" (data stored
- * remotely) or not. Some optional code paths may choose to not
- * operate on offline data.
- **/
-gboolean
-camel_data_wrapper_is_offline (CamelDataWrapper *data_wrapper)
-{
-	return CDW_CLASS (data_wrapper)->is_offline (data_wrapper);
-}
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
deleted file mode 100644
index d8c7fbe50b..0000000000
--- a/camel/camel-data-wrapper.h
+++ /dev/null
@@ -1,98 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <camel/camel-object.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;
-	struct _CamelDataWrapperPrivate *priv;
-	
-	CamelContentType *mime_type;
-	CamelStream *stream;
-	
-	unsigned int offline:1;
-	unsigned int rawtext:1;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */
-	void                (*set_mime_type)          (CamelDataWrapper *data_wrapper,
-						       const gchar * mime_type);
-	gchar *             (*get_mime_type)          (CamelDataWrapper *data_wrapper);
-	CamelContentType *  (*get_mime_type_field)    (CamelDataWrapper *data_wrapper);
-	void                (*set_mime_type_field)    (CamelDataWrapper *data_wrapper,
-						       CamelContentType *mime_type_field);
-
-	int                 (*write_to_stream)        (CamelDataWrapper *data_wrapper,
-						       CamelStream *stream);
-
-	int                 (*construct_from_stream)  (CamelDataWrapper *data_wrapper,
-						       CamelStream *);
-
-	gboolean            (*is_offline)             (CamelDataWrapper *data_wrapper);
-
-} 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);
-CamelContentType *  camel_data_wrapper_get_mime_type_field      (CamelDataWrapper *data_wrapper);
-void                camel_data_wrapper_set_mime_type_field      (CamelDataWrapper *data_wrapper,
-								 CamelContentType *mime_type);
-
-int                 camel_data_wrapper_construct_from_stream    (CamelDataWrapper *data_wrapper, CamelStream *stream);
-
-gboolean            camel_data_wrapper_is_offline               (CamelDataWrapper *data_wrapper);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DATA_WRAPPER_H */
diff --git a/camel/camel-digest-folder.c b/camel/camel-digest-folder.c
deleted file mode 100644
index 2454b0f637..0000000000
--- a/camel/camel-digest-folder.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-digest-folder.h"
-
-#include "camel-exception.h"
-#include "camel-multipart.h"
-#include "camel-mime-message.h"
-#include "camel-folder-summary.h"
-
-#define d(x)
-
-#define _PRIVATE(o) (((CamelDigestFolder *)(o))->priv)
-
-struct _CamelDigestFolderPrivate {
-	CamelMimeMessage *message;
-	GHashTable *info_hash;
-	GPtrArray *summary;
-	GPtrArray *uids;
-};
-
-static CamelFolderClass *parent_class = NULL;
-
-static void digest_refresh_info (CamelFolder *folder, CamelException *ex);
-static void digest_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static const char *digest_get_full_name (CamelFolder *folder);
-static void digest_expunge (CamelFolder *folder, CamelException *ex);
-
-static GPtrArray *digest_get_uids (CamelFolder *folder);
-static void digest_free_uids (CamelFolder *folder, GPtrArray *uids);
-static CamelMessageInfo *digest_get_message_info (CamelFolder *folder, const char *uid);
-
-/* message manipulation */
-static CamelMimeMessage *digest_get_message (CamelFolder *folder, const gchar *uid,
-					     CamelException *ex);
-static void digest_append_message (CamelFolder *folder, CamelMimeMessage *message,
-				   const CamelMessageInfo *info, char **appended_uid, CamelException *ex);
-static void digest_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
-					 CamelFolder *dest, GPtrArray **transferred_uids,
-					 gboolean delete_originals, CamelException *ex);
-
-
-static void
-camel_digest_folder_class_init (CamelDigestFolderClass *camel_digest_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_digest_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 = digest_refresh_info;
-	camel_folder_class->sync = digest_sync;
-	camel_folder_class->expunge = digest_expunge;
-	camel_folder_class->get_full_name = digest_get_full_name;
-	
-	camel_folder_class->get_uids = digest_get_uids;
-	camel_folder_class->free_uids = digest_free_uids;
-	camel_folder_class->get_message_info = digest_get_message_info;
-	
-	camel_folder_class->get_message = digest_get_message;
-	camel_folder_class->append_message = digest_append_message;
-	camel_folder_class->transfer_messages_to = digest_transfer_messages_to;
-}
-
-static void
-camel_digest_folder_init (gpointer object, gpointer klass)
-{
-	CamelDigestFolder *digest_folder = CAMEL_DIGEST_FOLDER (object);
-	CamelFolder *folder = CAMEL_FOLDER (object);
-	
-	folder->folder_flags |= CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;
-	
-	digest_folder->priv = g_new0 (struct _CamelDigestFolderPrivate, 1);
-	digest_folder->priv->info_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static void           
-digest_finalize (CamelObject *object)
-{
-	CamelDigestFolder *digest_folder = CAMEL_DIGEST_FOLDER (object);
-	GPtrArray *summary;
-	
-	camel_object_unref (CAMEL_OBJECT (digest_folder->priv->message));
-	
-	g_hash_table_destroy (digest_folder->priv->info_hash);
-	
-	summary = digest_folder->priv->summary;
-	if (summary) {
-		int i;
-		
-		for (i = 0; i < summary->len; i++)
-			camel_message_info_free (summary->pdata[i]);
-		
-		g_ptr_array_free (summary, TRUE);
-	}
-	
-	if (digest_folder->priv->uids)
-		g_ptr_array_free (digest_folder->priv->uids, TRUE);
-	
-	g_free (digest_folder->priv);
-}
-
-CamelType
-camel_digest_folder_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_FOLDER_TYPE,
-					    "CamelDigestFolder",
-					    sizeof (CamelDigestFolder),
-					    sizeof (CamelDigestFolderClass),
-					    (CamelObjectClassInitFunc) camel_digest_folder_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_digest_folder_init,
-					    (CamelObjectFinalizeFunc) digest_finalize);
-	}
-	
-	return type;
-}
-
-static gboolean
-multipart_contains_message_parts (CamelMultipart *multipart)
-{
-	gboolean has_message_parts = FALSE;
-	CamelDataWrapper *wrapper;
-	CamelMimePart *part;
-	int i, parts;
-	
-	parts = camel_multipart_get_number (multipart);
-	for (i = 0; i < parts && !has_message_parts; i++) {
-		part = camel_multipart_get_part (multipart, i);
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		if (CAMEL_IS_MULTIPART (wrapper)) {
-			has_message_parts = multipart_contains_message_parts (CAMEL_MULTIPART (wrapper));
-		} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			has_message_parts = TRUE;
-		}
-	}
-	
-	return has_message_parts;
-}
-
-CamelFolder *
-camel_digest_folder_new (CamelStore *parent_store, CamelMimeMessage *message)
-{
-	CamelDigestFolder *digest_folder;
-	CamelDataWrapper *wrapper;
-	CamelFolder *folder;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	if (!wrapper || !CAMEL_IS_MULTIPART (wrapper))
-		return NULL;
-	
-	/* Make sure we have a multipart/digest subpart or at least some message/rfc822 attachments... */
-	if (!header_content_type_is (CAMEL_MIME_PART (message)->content_type, "multipart", "digest")) {
-		if (!multipart_contains_message_parts (CAMEL_MULTIPART (wrapper)))
-			return NULL;
-	}
-	
-	folder = CAMEL_FOLDER (camel_object_new (camel_digest_folder_get_type ()));
-	digest_folder = CAMEL_DIGEST_FOLDER (folder);
-	
-	camel_folder_construct (folder, parent_store, "folder_name", "short_name");
-	
-	camel_object_ref (CAMEL_OBJECT (message));
-	digest_folder->priv->message = message;
-	
-	return folder;
-}
-
-static void
-digest_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	
-}
-
-static void
-digest_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	/* no-op */
-}
-
-static void
-digest_expunge (CamelFolder *folder, CamelException *ex)
-{
-	/* no-op */
-}
-
-static void
-digest_add_multipart (CamelMultipart *multipart, GPtrArray *summary,
-		      GPtrArray *uids, GHashTable *info_hash,
-		      const char *preuid)
-{
-	CamelDataWrapper *wrapper;
-	CamelMessageInfo *info;
-	CamelMimePart *part;
-	int parts, i;
-	char *uid;
-	
-	parts = camel_multipart_get_number (multipart);
-	for (i = 0; i < parts; i++) {
-		part = camel_multipart_get_part (multipart, i);
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		
-		if (CAMEL_IS_MULTIPART (wrapper)) {
-			uid = g_strdup_printf ("%s%d.", preuid, i);
-			digest_add_multipart (CAMEL_MULTIPART (wrapper),
-					      summary, uids, info_hash, uid);
-			g_free (uid);
-			continue;
-		} else if (!CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			continue;
-		}
-		
-		info = camel_message_info_new_from_header (CAMEL_MIME_PART (wrapper)->headers);
-		
-		uid = g_strdup_printf ("%s%d", preuid, i);
-		camel_message_info_set_uid (info, g_strdup (uid));
-		
-		g_ptr_array_add (uids, uid);
-		g_ptr_array_add (summary, info);
-		g_hash_table_insert (info_hash, uid, info);
-	}
-}
-
-static GPtrArray *
-digest_get_uids (CamelFolder *folder)
-{
-	CamelDigestFolder *digest_folder = CAMEL_DIGEST_FOLDER (folder);
-	CamelDataWrapper *wrapper;
-	GHashTable *info_hash;
-	GPtrArray *summary;
-	GPtrArray *uids;
-	
-	if (digest_folder->priv->uids)
-		return digest_folder->priv->uids;
-	
-	uids = g_ptr_array_new ();
-	summary = g_ptr_array_new ();
-	info_hash = digest_folder->priv->info_hash;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (digest_folder->priv->message));
-	digest_add_multipart (CAMEL_MULTIPART (wrapper), summary, uids, info_hash, "");
-	
-	digest_folder->priv->uids = uids;
-	digest_folder->priv->summary = summary;
-	
-	return uids;
-}
-
-static void
-digest_free_uids (CamelFolder *folder, GPtrArray *uids)
-{
-	/* no-op */
-}
-
-static CamelMessageInfo *
-digest_get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelDigestFolder *digest = CAMEL_DIGEST_FOLDER (folder);
-	
-	return g_hash_table_lookup (digest->priv->info_hash, uid);
-}
-
-static const char *
-digest_get_full_name (CamelFolder *folder)
-{
-	return folder->full_name;
-}
-
-static void
-digest_append_message (CamelFolder *folder, CamelMimeMessage *message,
-		       const CamelMessageInfo *info, char **appended_uid,
-		       CamelException *ex)
-{
-	/* no-op */
-	if (appended_uid)
-		*appended_uid = NULL;
-}
-
-static void
-digest_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
-			     CamelFolder *dest, GPtrArray **transferred_uids,
-			     gboolean delete_originals, CamelException *ex)
-{
-	/* no-op */
-	if (transferred_uids)
-		*transferred_uids = NULL;
-}
-
-static CamelMimeMessage *
-digest_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	CamelDigestFolder *digest = CAMEL_DIGEST_FOLDER (folder);
-	CamelDataWrapper *wrapper;
-	CamelMimeMessage *message;
-	CamelMimePart *part;
-	char *subuid;
-	int id;
-	
-	part = CAMEL_MIME_PART (digest->priv->message);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	do {
-		id = strtoul (uid, &subuid, 10);
-		if (!CAMEL_IS_MULTIPART (wrapper))
-			return NULL;
-		
-		part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), id);
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		uid = subuid + 1;
-	} while (*subuid == '.');
-	
-	if (!CAMEL_IS_MIME_MESSAGE (wrapper))
-		return NULL;
-	
-	message = CAMEL_MIME_MESSAGE (wrapper);
-	camel_object_ref (CAMEL_OBJECT (message));
-	
-	return message;
-}
diff --git a/camel/camel-digest-folder.h b/camel/camel-digest-folder.h
deleted file mode 100644
index 1035930f56..0000000000
--- a/camel/camel-digest-folder.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_DIGEST_FOLDER_H
-#define _CAMEL_DIGEST_FOLDER_H
-
-#include <glib.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-
-#define CAMEL_DIGEST_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_digest_folder_get_type (), CamelDigestFolder)
-#define CAMEL_DIGEST_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_folder_get_type (), CamelDigestFolderClass)
-#define CAMEL_IS_DIGEST_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_digest_folder_get_type ())
-
-typedef struct _CamelDigestFolderClass CamelDigestFolderClass;
-
-struct _CamelDigestFolder {
-	CamelFolder parent;
-	
-	struct _CamelDigestFolderPrivate *priv;
-};
-
-struct _CamelDigestFolderClass {
-	CamelFolderClass parent_class;
-	
-};
-
-CamelType    camel_digest_folder_get_type (void);
-
-CamelFolder *camel_digest_folder_new      (CamelStore *parent_store, CamelMimeMessage *message);
-
-#endif /* ! _CAMEL_DIGEST_FOLDER_H */
diff --git a/camel/camel-digest-store.c b/camel/camel-digest-store.c
deleted file mode 100644
index e3870e3672..0000000000
--- a/camel/camel-digest-store.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.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.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-
-#include "camel-exception.h"
-#include "camel-digest-store.h"
-#include "camel-digest-folder.h"
-
-#include "camel-private.h"
-
-#define d(x)
-
-static CamelFolder *digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static void digest_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex);
-static void digest_rename_folder (CamelStore *store, const char *old, const char *new, CamelException *ex);
-static void digest_init_trash (CamelStore *store);
-static CamelFolder *digest_get_trash  (CamelStore *store, CamelException *ex);
-
-static CamelFolderInfo *digest_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);
-
-static void camel_digest_store_class_init (CamelDigestStoreClass *klass);
-static void camel_digest_store_init       (CamelDigestStore *obj);
-static void camel_digest_store_finalise   (CamelObject *obj);
-
-static int digest_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-static int digest_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-static CamelStoreClass *parent_class = NULL;
-
-
-CamelType
-camel_digest_store_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_store_get_type (),
-					    "CamelDigestStore",
-					    sizeof (CamelDigestStore),
-					    sizeof (CamelDigestStoreClass),
-					    (CamelObjectClassInitFunc) camel_digest_store_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_digest_store_init,
-					    (CamelObjectFinalizeFunc) camel_digest_store_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_digest_store_class_init (CamelDigestStoreClass *klass)
-{
-	CamelObjectClass *object_class = (CamelObjectClass *) klass;
-	CamelStoreClass *store_class = (CamelStoreClass *) klass;
-	
-	parent_class = CAMEL_STORE_CLASS(camel_type_get_global_classfuncs (camel_store_get_type ()));
-	
-	/* virtual method overload */
-	object_class->setv = digest_setv;
-	object_class->getv = digest_getv;
-	
-	store_class->get_folder = digest_get_folder;
-	store_class->rename_folder = digest_rename_folder;
-	store_class->delete_folder = digest_delete_folder;
-	store_class->get_folder_info = digest_get_folder_info;
-	store_class->free_folder_info = camel_store_free_folder_info_full;
-	
-	store_class->init_trash = digest_init_trash;
-	store_class->get_trash = digest_get_trash;
-}
-
-static void
-camel_digest_store_init (CamelDigestStore *obj)
-{
-	CamelStore *store = (CamelStore *) obj;
-	
-	/* we dont want a vtrash on this one */
-	store->flags &= ~(CAMEL_STORE_VTRASH);	
-}
-
-static void
-camel_digest_store_finalise (CamelObject *obj)
-{
-	
-}
-
-static int
-digest_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
-	/* CamelDigestStore doesn't currently have anything to set */
-	return CAMEL_OBJECT_CLASS (parent_class)->setv (object, ex, args);
-}
-
-static int
-digest_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	/* CamelDigestStore doesn't currently have anything to get */
-	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
-}
-
-
-/**
- * camel_digest_store_new:
- * @url:
- *
- * Create a new CamelDigestStore object.
- * 
- * Return value: A new CamelDigestStore widget.
- **/
-CamelStore *
-camel_digest_store_new (const char *url)
-{
-	CamelStore *store;
-	CamelURL *uri;
-	
-	uri = camel_url_new (url, NULL);
-	if (!uri)
-		return NULL;
-	
-	store = CAMEL_STORE (camel_object_new (camel_digest_store_get_type ()));
-	CAMEL_SERVICE (store)->url = uri;
-	
-	return store;
-}
-
-static CamelFolder *
-digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	return NULL;
-}
-
-static void
-digest_init_trash (CamelStore *store)
-{
-	/* no-op */
-	;
-}
-
-static CamelFolder *
-digest_get_trash (CamelStore *store, CamelException *ex)
-{
-	return NULL;
-}
-
-static CamelFolderInfo *
-digest_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex)
-{
-	return NULL;
-}
-
-static void
-digest_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	
-}
-
-static void
-digest_rename_folder (CamelStore *store, const char *old, const char *new, CamelException *ex)
-{
-	
-}
diff --git a/camel/camel-digest-store.h b/camel/camel-digest-store.h
deleted file mode 100644
index 90e802f09f..0000000000
--- a/camel/camel-digest-store.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.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_DIGEST_STORE_H__
-#define __CAMEL_DIGEST_STORE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <camel/camel-store.h>
-
-#define CAMEL_DIGEST_STORE(obj)         CAMEL_CHECK_CAST (obj, camel_digest_store_get_type (), CamelDigestStore)
-#define CAMEL_DIGEST_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_store_get_type (), CamelDigestStoreClass)
-#define CAMEL_IS_DIGEST_STORE(obj)      CAMEL_CHECK_TYPE (obj, camel_digest_store_get_type ())
-
-typedef struct _CamelDigestStoreClass CamelDigestStoreClass;
-
-struct _CamelDigestStore {
-	CamelStore parent;
-	
-};
-
-struct _CamelDigestStoreClass {
-	CamelStoreClass parent_class;
-	
-};
-
-CamelType camel_digest_store_get_type (void);
-
-CamelStore *camel_digest_store_new (const char *url);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAMEL_DIGEST_STORE_H__ */
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
deleted file mode 100644
index 8c41f2a098..0000000000
--- a/camel/camel-disco-diary.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-disco-diary.c: class for a disconnected operation log */
-
-/* 
- * Authors: Dan Winship <danw@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "camel-disco-diary.h"
-#include "camel-disco-folder.h"
-#include "camel-disco-store.h"
-#include "camel-exception.h"
-#include "camel-file-utils.h"
-#include "camel-folder.h"
-#include "camel-operation.h"
-#include "camel-session.h"
-#include "camel-store.h"
-
-#include <errno.h>
-
-
-static void
-camel_disco_diary_class_init (CamelDiscoDiaryClass *camel_disco_diary_class)
-{
-	/* virtual method definition */
-}
-
-static void
-camel_disco_diary_init (CamelDiscoDiary *diary)
-{
-	diary->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	diary->uidmap = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static void
-unref_folder (gpointer key, gpointer value, gpointer data)
-{
-	camel_object_unref (value);
-}
-
-static void
-free_uid (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-static void
-camel_disco_diary_finalize (CamelDiscoDiary *diary)
-{
-	if (diary->file)
-		fclose (diary->file);
-	if (diary->folders) {
-		g_hash_table_foreach (diary->folders, unref_folder, NULL);
-		g_hash_table_destroy (diary->folders);
-	}
-	if (diary->uidmap) {
-		g_hash_table_foreach (diary->uidmap, free_uid, NULL);
-		g_hash_table_destroy (diary->uidmap);
-	}
-}
-
-CamelType
-camel_disco_diary_get_type (void)
-{
-	static CamelType camel_disco_diary_type = CAMEL_INVALID_TYPE;
-
-	if (camel_disco_diary_type == CAMEL_INVALID_TYPE) {
-		camel_disco_diary_type = camel_type_register (
-			CAMEL_OBJECT_TYPE, "CamelDiscoDiary",
-			sizeof (CamelDiscoDiary),
-			sizeof (CamelDiscoDiaryClass),
-			(CamelObjectClassInitFunc) camel_disco_diary_class_init,
-			NULL,
-			(CamelObjectInitFunc) camel_disco_diary_init,
-			(CamelObjectFinalizeFunc) camel_disco_diary_finalize);
-	}
-
-	return camel_disco_diary_type;
-}
-
-
-static int
-diary_encode_uids (CamelDiscoDiary *diary, GPtrArray *uids)
-{
-	int i, status;
-
-	status = camel_file_util_encode_uint32 (diary->file, uids->len);
-	for (i = 0; status != -1 && i < uids->len; i++)
-		status = camel_file_util_encode_string (diary->file, uids->pdata[i]);
-	return status;
-}
-
-void
-camel_disco_diary_log (CamelDiscoDiary *diary, CamelDiscoDiaryAction action,
-		       ...)
-{
-	va_list ap;
-	int status;
-
-	/* You may already be a loser. */
-	if (!diary->file)
-		return;
-
-	status = camel_file_util_encode_uint32 (diary->file, action);
-	if (status == -1)
-		goto lose;
-
-	va_start (ap, action);
-	switch (action) {
-	case CAMEL_DISCO_DIARY_FOLDER_EXPUNGE:
-	{
-		CamelFolder *folder = va_arg (ap, CamelFolder *);
-		GPtrArray *uids = va_arg (ap, GPtrArray *);
-
-		status = camel_file_util_encode_string (diary->file, folder->full_name);
-		if (status != -1)
-			status = diary_encode_uids (diary, uids);
-		break;
-	}
-
-	case CAMEL_DISCO_DIARY_FOLDER_APPEND:
-	{
-		CamelFolder *folder = va_arg (ap, CamelFolder *);
-		char *uid = va_arg (ap, char *);
-
-		status = camel_file_util_encode_string (diary->file, folder->full_name);
-		if (status != -1)
-			status = camel_file_util_encode_string (diary->file, uid);
-		break;
-	}
-
-	case CAMEL_DISCO_DIARY_FOLDER_TRANSFER:
-	{
-		CamelFolder *source = va_arg (ap, CamelFolder *);
-		CamelFolder *destination = va_arg (ap, CamelFolder *);
-		GPtrArray *uids = va_arg (ap, GPtrArray *);
-		gboolean delete_originals = va_arg (ap, gboolean);
-
-		status = camel_file_util_encode_string (diary->file, source->full_name);
-		if (status == -1)
-			break;
-		status = camel_file_util_encode_string (diary->file, destination->full_name);
-		if (status == -1)
-			break;
-		status = diary_encode_uids (diary, uids);
-		if (status == -1)
-			break;
-		status = camel_file_util_encode_uint32 (diary->file, delete_originals);
-		break;
-	}
-
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-
-	va_end (ap);
-
- lose:
-	if (status == -1) {
-		char *msg;
-
-		msg = g_strdup_printf (_("Could not write log entry: %s\n"
-					 "Further operations on this server "
-					 "will not be replayed when you\n"
-					 "reconnect to the network."),
-				       g_strerror (errno));
-		camel_session_alert_user (camel_service_get_session (CAMEL_SERVICE (diary->store)),
-					  CAMEL_SESSION_ALERT_ERROR,
-					  msg, FALSE);
-		g_free (msg);
-
-		fclose (diary->file);
-		diary->file = NULL;
-	}
-}
-
-static void
-free_uids (GPtrArray *array)
-{
-	while (array->len--)
-		g_free (array->pdata[array->len]);
-	g_ptr_array_free (array, TRUE);
-}
-
-static GPtrArray *
-diary_decode_uids (CamelDiscoDiary *diary)
-{
-	GPtrArray *uids;
-	char *uid;
-	guint32 i;
-
-	if (camel_file_util_decode_uint32 (diary->file, &i) == -1)
-		return NULL;
-	uids = g_ptr_array_new ();
-	while (i--) {
-		if (camel_file_util_decode_string (diary->file, &uid) == -1) {
-			free_uids (uids);
-			return NULL;
-		}
-		g_ptr_array_add (uids, uid);
-	}
-
-	return uids;
-}
-
-static CamelFolder *
-diary_decode_folder (CamelDiscoDiary *diary)
-{
-	CamelFolder *folder;
-	char *name;
-
-	if (camel_file_util_decode_string (diary->file, &name) == -1)
-		return NULL;
-	folder = g_hash_table_lookup (diary->folders, name);
-	if (!folder) {
-		CamelException ex;
-		char *msg;
-
-		camel_exception_init (&ex);
-		folder = camel_store_get_folder (CAMEL_STORE (diary->store),
-						 name, 0, &ex);
-		if (folder)
-			g_hash_table_insert (diary->folders, name, folder);
-		else {
-			msg = g_strdup_printf (_("Could not open `%s':\n%s\nChanges made to this folder will not be resynchronized."),
-					       name, camel_exception_get_description (&ex));
-			camel_exception_clear (&ex);
-			camel_session_alert_user (camel_service_get_session (CAMEL_SERVICE (diary->store)),
-						  CAMEL_SESSION_ALERT_WARNING,
-						  msg, FALSE);
-			g_free (msg);
-			g_free (name);
-		}
-	} else
-		g_free (name);
-	return folder;
-}
-
-static void
-close_folder (gpointer name, gpointer folder, gpointer data)
-{
-	g_free (name);
-	camel_folder_sync (folder, FALSE, NULL);
-	camel_object_unref (folder);
-}
-
-void
-camel_disco_diary_replay (CamelDiscoDiary *diary, CamelException *ex)
-{
-	guint32 action;
-	off_t size;
-	double pc;
-
-	fseek (diary->file, 0, SEEK_END);
-	size = ftell (diary->file);
-	g_return_if_fail (size != 0);
-	rewind (diary->file);
-
-	camel_operation_start (NULL, _("Resynchronizing with server"));
-	while (!camel_exception_is_set (ex)) {
-		pc = ftell (diary->file) / size;
-		camel_operation_progress (NULL, pc * 100);
-
-		if (camel_file_util_decode_uint32 (diary->file, &action) == -1)
-			break;
-		if (action == CAMEL_DISCO_DIARY_END)
-			break;
-
-		switch (action) {
-		case CAMEL_DISCO_DIARY_FOLDER_EXPUNGE:
-		{
-			CamelFolder *folder;
-			GPtrArray *uids;
-
-			folder = diary_decode_folder (diary);
-			uids = diary_decode_uids (diary);
-			if (!uids)
-				goto lose;
-
-			if (folder)
-				camel_disco_folder_expunge_uids (folder, uids, ex);
-			free_uids (uids);
-			break;
-		}
-
-		case CAMEL_DISCO_DIARY_FOLDER_APPEND:
-		{
-			CamelFolder *folder;
-			char *uid, *ret_uid;
-			CamelMimeMessage *message;
-			CamelMessageInfo *info;
-
-			folder = diary_decode_folder (diary);
-			if (camel_file_util_decode_string (diary->file, &uid) == -1)
-				goto lose;
-
-			if (!folder) {
-				g_free (uid);
-				continue;
-			}
-
-			message = camel_folder_get_message (folder, uid, NULL);
-			if (!message) {
-				/* The message was appended and then deleted. */
-				g_free (uid);
-				continue;
-			}
-			info = camel_folder_get_message_info (folder, uid);
-
-			camel_folder_append_message (folder, message, info, &ret_uid, ex);
-			camel_folder_free_message_info (folder, info);
-
-			if (ret_uid) {
-				camel_disco_diary_uidmap_add (diary, uid, ret_uid);
-				g_free (ret_uid);
-			}
-			g_free (uid);
-
-			break;
-		}
-
-		case CAMEL_DISCO_DIARY_FOLDER_TRANSFER:
-		{
-			CamelFolder *source, *destination;
-			GPtrArray *uids, *ret_uids;
-			guint32 delete_originals;
-			int i;
-
-			source = diary_decode_folder (diary);
-			destination = diary_decode_folder (diary);
-			uids = diary_decode_uids (diary);
-			if (!uids)
-				goto lose;
-			if (camel_file_util_decode_uint32 (diary->file, &delete_originals) == -1)
-				goto lose;
-
-			if (!source || !destination) {
-				free_uids (uids);
-				continue;
-			}
-
-			camel_folder_transfer_messages_to (source, uids, destination, &ret_uids, delete_originals, ex);
-
-			if (ret_uids) {
-				for (i = 0; i < uids->len; i++) {
-					if (!ret_uids->pdata[i])
-						continue;
-					camel_disco_diary_uidmap_add (diary, uids->pdata[i], ret_uids->pdata[i]);
-					g_free (ret_uids->pdata[i]);
-				}
-				g_ptr_array_free (ret_uids, TRUE);
-			}
-			free_uids (uids);
-			break;
-		}
-
-		}
-	}
-
- lose:
-	camel_operation_end (NULL);
-
-	/* Close folders */
-	g_hash_table_foreach (diary->folders, close_folder, diary);
-	g_hash_table_destroy (diary->folders);
-	diary->folders = NULL;
-
-	/* Truncate the log */
-	ftruncate (fileno (diary->file), 0);
-}
-
-CamelDiscoDiary *
-camel_disco_diary_new (CamelDiscoStore *store, const char *filename, CamelException *ex)
-{
-	CamelDiscoDiary *diary;
-
-	g_return_val_if_fail (CAMEL_IS_DISCO_STORE (store), NULL);
-	g_return_val_if_fail (filename != NULL, NULL);
-
-	diary = CAMEL_DISCO_DIARY (camel_object_new (CAMEL_DISCO_DIARY_TYPE));
-	diary->store = store;
-
-	diary->file = fopen (filename, "a+");
-	if (!diary->file) {
-		camel_object_unref (CAMEL_OBJECT (diary));
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not open journal file: %s",
-				      g_strerror (errno));
-		return NULL;
-	}
-
-	return diary;
-}
-
-gboolean
-camel_disco_diary_empty  (CamelDiscoDiary *diary)
-{
-	return ftell (diary->file) == 0;
-}
-
-void
-camel_disco_diary_uidmap_add (CamelDiscoDiary *diary, const char *old_uid,
-			      const char *new_uid)
-{
-	g_hash_table_insert (diary->uidmap, g_strdup (old_uid),
-			     g_strdup (new_uid));
-}
-
-const char *
-camel_disco_diary_uidmap_lookup (CamelDiscoDiary *diary, const char *uid)
-{
-	return g_hash_table_lookup (diary->uidmap, uid);
-}
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
deleted file mode 100644
index b177d8ef6f..0000000000
--- a/camel/camel-disco-diary.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * camel-disco-diary.h: class for logging disconnected operation
- *
- * Authors: Dan Winship <danw@ximian.com>
- *
- * Copyright 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_DISCO_DIARY_H
-#define CAMEL_DISCO_DIARY_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-object.h"
-#include <stdarg.h>
-#include <stdio.h>
-
-#define CAMEL_DISCO_DIARY_TYPE     (camel_disco_diary_get_type ())
-#define CAMEL_DISCO_DIARY(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiary))
-#define CAMEL_DISCO_DIARY_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiaryClass))
-#define CAMEL_IS_DISCO_DIARY(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_DIARY_TYPE))
-
-typedef enum {
-	CAMEL_DISCO_DIARY_END = 0,
-
-	CAMEL_DISCO_DIARY_FOLDER_EXPUNGE,
-	CAMEL_DISCO_DIARY_FOLDER_APPEND,
-	CAMEL_DISCO_DIARY_FOLDER_TRANSFER,
-} CamelDiscoDiaryAction;
-
-typedef enum {
-	CAMEL_DISCO_DIARY_ARG_NONE = 0,
-
-	CAMEL_DISCO_DIARY_ARG_FOLDER,
-	CAMEL_DISCO_DIARY_ARG_UID,
-	CAMEL_DISCO_DIARY_ARG_UID_LIST
-} CamelDiscoDiaryArgType;
-
-struct _CamelDiscoDiary {
-	CamelObject parent_object;
-
-	CamelDiscoStore *store;
-	FILE *file;
-	GHashTable *folders, *uidmap;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-} CamelDiscoDiaryClass;
-
-
-/* public methods */
-CamelDiscoDiary *camel_disco_diary_new    (CamelDiscoStore *store,
-					   const char *filename,
-					   CamelException *ex);
-
-gboolean         camel_disco_diary_empty  (CamelDiscoDiary *diary);
-
-void             camel_disco_diary_log    (CamelDiscoDiary *diary,
-					   CamelDiscoDiaryAction action,
-					   ...);
-void             camel_disco_diary_replay (CamelDiscoDiary *diary,
-					   CamelException *ex);
-
-/* Temporary->Permanent UID map stuff */
-void        camel_disco_diary_uidmap_add    (CamelDiscoDiary *diary,
-					     const char *old_uid,
-					     const char *new_uid);
-const char *camel_disco_diary_uidmap_lookup (CamelDiscoDiary *diary,
-					     const char *uid);
-
-/* Standard Camel function */
-CamelType camel_disco_diary_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DISCO_DIARY_H */
diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
deleted file mode 100644
index 3d3d9212bd..0000000000
--- a/camel/camel-disco-folder.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-disco-folder.c: abstract class for a disconnectable folder */
-
-/* 
- * Authors: Dan Winship <danw@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "camel-disco-folder.h"
-#include "camel-disco-store.h"
-#include "camel-exception.h"
-
-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (o)))
-#define CDF_CLASS(o) (CAMEL_DISCO_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (o)))
-
-static CamelFolderClass *parent_class = NULL;
-
-static void disco_refresh_info (CamelFolder *folder, CamelException *ex);
-static void disco_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static void disco_expunge (CamelFolder *folder, CamelException *ex);
-
-static void disco_append_message (CamelFolder *folder, CamelMimeMessage *message,
-				  const CamelMessageInfo *info, char **appended_uid, CamelException *ex);
-static void disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
-					CamelFolder *destination,
-					GPtrArray **transferred_uids,
-					gboolean delete_originals,
-					CamelException *ex);
-
-static void disco_cache_message       (CamelDiscoFolder *disco_folder,
-				       const char *uid, CamelException *ex);
-static void disco_prepare_for_offline (CamelDiscoFolder *disco_folder,
-				       const char *expression,
-				       CamelException *ex);
-
-static void
-camel_disco_folder_class_init (CamelDiscoFolderClass *camel_disco_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_disco_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	/* virtual method definition */
-	camel_disco_folder_class->cache_message = disco_cache_message;
-	camel_disco_folder_class->prepare_for_offline = disco_prepare_for_offline;
-
-	/* virtual method overload */
-	camel_folder_class->refresh_info = disco_refresh_info;
-	camel_folder_class->sync = disco_sync;
-	camel_folder_class->expunge = disco_expunge;
-
-	camel_folder_class->append_message = disco_append_message;
-	camel_folder_class->transfer_messages_to = disco_transfer_messages_to;
-}
-
-CamelType
-camel_disco_folder_get_type (void)
-{
-	static CamelType camel_disco_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_disco_folder_type == CAMEL_INVALID_TYPE) {
-		camel_disco_folder_type = camel_type_register (
-			CAMEL_FOLDER_TYPE, "CamelDiscoFolder",
-			sizeof (CamelDiscoFolder),
-			sizeof (CamelDiscoFolderClass),
-			(CamelObjectClassInitFunc) camel_disco_folder_class_init,
-			NULL, NULL, NULL);
-	}
-
-	return camel_disco_folder_type;
-}
-
-
-static void
-disco_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	if (camel_disco_store_status (CAMEL_DISCO_STORE (folder->parent_store)) != CAMEL_DISCO_STORE_ONLINE)
-		return;
-	CDF_CLASS (folder)->refresh_info_online (folder, ex);
-}
-
-static void
-disco_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	if (expunge) {
-		disco_expunge (folder, ex);
-		if (camel_exception_is_set (ex))
-			return;
-	}
-
-	switch (camel_disco_store_status (CAMEL_DISCO_STORE (folder->parent_store))) {
-	case CAMEL_DISCO_STORE_ONLINE:
-		CDF_CLASS (folder)->sync_online (folder, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_OFFLINE:
-		CDF_CLASS (folder)->sync_offline (folder, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_RESYNCING:
-		CDF_CLASS (folder)->sync_resyncing (folder, ex);
-		break;
-	}
-}
-
-static void
-disco_expunge_uids (CamelFolder *folder, GPtrArray *uids, CamelException *ex)
-{
-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (folder->parent_store);
-
-	if (uids->len == 0)
-		return;
-
-	switch (camel_disco_store_status (disco)) {
-	case CAMEL_DISCO_STORE_ONLINE:
-		CDF_CLASS (folder)->expunge_uids_online (folder, uids, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_OFFLINE:
-		CDF_CLASS (folder)->expunge_uids_offline (folder, uids, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_RESYNCING:
-		CDF_CLASS (folder)->expunge_uids_resyncing (folder, uids, ex);
-		break;
-	}
-}
-
-static void
-disco_expunge (CamelFolder *folder, CamelException *ex)
-{
-	GPtrArray *uids;
-	int i, count;
-	CamelMessageInfo *info;
-
-	uids = g_ptr_array_new ();
-	count = camel_folder_summary_count (folder->summary);
-	for (i = 0; i < count; i++) {
-		info = camel_folder_summary_index (folder->summary, i);
-		if (info->flags & CAMEL_MESSAGE_DELETED)
-			g_ptr_array_add (uids, g_strdup (camel_message_info_uid (info)));
-		camel_folder_summary_info_free (folder->summary, info);
-	}
-
-	disco_expunge_uids (folder, uids, ex);
-
-	for (i = 0; i < uids->len; i++)
-		g_free (uids->pdata[i]);
-	g_ptr_array_free (uids, TRUE);
-}
-
-static void
-disco_append_message (CamelFolder *folder, CamelMimeMessage *message,
-		      const CamelMessageInfo *info, char **appended_uid,
-		      CamelException *ex)
-{
-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (folder->parent_store);
-
-	switch (camel_disco_store_status (disco)) {
-	case CAMEL_DISCO_STORE_ONLINE:
-		CDF_CLASS (folder)->append_online (folder, message, info,
-						   appended_uid, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_OFFLINE:
-		CDF_CLASS (folder)->append_offline (folder, message, info,
-						    appended_uid, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_RESYNCING:
-		CDF_CLASS (folder)->append_resyncing (folder, message, info,
-						      appended_uid, ex);
-		break;
-	}
-}
-
-static void
-disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
-			    CamelFolder *dest, GPtrArray **transferred_uids,
-			    gboolean delete_originals, CamelException *ex)
-{
-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (source->parent_store);
-
-	switch (camel_disco_store_status (disco)) {
-	case CAMEL_DISCO_STORE_ONLINE:
-		CDF_CLASS (source)->transfer_online (source, uids,
-						     dest, transferred_uids,
-						     delete_originals, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_OFFLINE:
-		CDF_CLASS (source)->transfer_offline (source, uids,
-						      dest, transferred_uids,
-						      delete_originals, ex);
-		break;
-
-	case CAMEL_DISCO_STORE_RESYNCING:
-		CDF_CLASS (source)->transfer_resyncing (source, uids,
-							dest, transferred_uids,
-							delete_originals, ex);
-		break;
-	}
-}
-
-
-/**
- * camel_disco_folder_expunge_uids:
- * @folder: a (disconnectable) folder
- * @uids: array of UIDs to expunge
- * @ex: a CamelException
- *
- * This expunges the messages in @uids from @folder. It should take
- * whatever steps are needed to avoid expunging any other messages,
- * although in some cases it may not be possible to avoid expunging
- * messages that are marked deleted by another client at the same time
- * as the expunge_uids call is running.
- **/
-void
-camel_disco_folder_expunge_uids (CamelFolder *folder, GPtrArray *uids,
-				 CamelException *ex)
-{
-	disco_expunge_uids (folder, uids, ex);
-}
-
-
-static void
-disco_cache_message (CamelDiscoFolder *disco_folder, const char *uid,
-		     CamelException *ex)
-{
-	g_warning ("CamelDiscoFolder::cache_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_folder)));
-}
-
-/**
- * camel_disco_folder_cache_message:
- * @disco_folder: the folder
- * @uid: the UID of the message to cache
- * @ex: a CamelException
- *
- * Requests that @disco_folder cache message @uid to disk.
- **/
-void
-camel_disco_folder_cache_message (CamelDiscoFolder *disco_folder,
-				  const char *uid, CamelException *ex)
-{
-	CDF_CLASS (disco_folder)->cache_message (disco_folder, uid, ex);
-}
-
-
-static void
-disco_prepare_for_offline (CamelDiscoFolder *disco_folder,
-			   const char *expression,
-			   CamelException *ex)
-{
-	CamelFolder *folder = CAMEL_FOLDER (disco_folder);
-	GPtrArray *uids;
-	int i;
-
-	camel_operation_start(NULL, _("Preparing folder '%s' for offline"), folder->full_name);
-
-	if (expression)
-		uids = camel_folder_search_by_expression (folder, expression, ex);
-	else
-		uids = camel_folder_get_uids (folder);
-
-	if (!uids) {
-		camel_operation_end(NULL);
-		return;
-	}
-
-	for (i = 0; i < uids->len; i++) {
-		int pc = i * 100 / uids->len;
-
-		camel_disco_folder_cache_message (disco_folder, uids->pdata[i], ex);
-		camel_operation_progress(NULL, pc);
-		if (camel_exception_is_set (ex))
-			break;
-	}
-
-	if (expression)
-		camel_folder_search_free (folder, uids);
-	else
-		camel_folder_free_uids (folder, uids);
-
-	camel_operation_end(NULL);
-}
-
-/**
- * camel_disco_folder_prepare_for_offline:
- * @disco_folder: the folder
- * @expression: an expression describing messages to synchronize, or %NULL
- * if all messages should be sync'ed.
- * @ex: a CamelException
- *
- * This prepares @disco_folder for offline operation, by downloading
- * the bodies of all messages described by @expression (using the
- * same syntax as camel_folder_search_by_expression() ).
- **/
-void 
-camel_disco_folder_prepare_for_offline (CamelDiscoFolder *disco_folder,
-					const char *expression,
-					CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_DISCO_FOLDER (disco_folder));
-
-	CDF_CLASS (disco_folder)->prepare_for_offline (disco_folder, expression, ex);
-}
diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
deleted file mode 100644
index 0d857c0b9b..0000000000
--- a/camel/camel-disco-folder.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * camel-disco-folder.h: Abstract class for a disconnectable folder
- *
- * Authors: Dan Winship <danw@ximian.com>
- *
- * Copyright 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_DISCO_FOLDER_H
-#define CAMEL_DISCO_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-
-#define CAMEL_DISCO_FOLDER_TYPE     (camel_disco_folder_get_type ())
-#define CAMEL_DISCO_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolder))
-#define CAMEL_DISCO_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolderClass))
-#define CAMEL_IS_DISCO_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_FOLDER_TYPE))
-
-struct _CamelDiscoFolder {
-	CamelFolder parent_object;
-
-};
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	void (*refresh_info_online) (CamelFolder *folder, CamelException *ex);
-
-	void (*sync_online)    (CamelFolder *folder, CamelException *ex);
-	void (*sync_offline)   (CamelFolder *folder, CamelException *ex);
-	void (*sync_resyncing) (CamelFolder *folder, CamelException *ex);
-
-	void (*expunge_uids_online)    (CamelFolder *folder, GPtrArray *uids,
-					CamelException *ex);
-	void (*expunge_uids_offline)   (CamelFolder *folder, GPtrArray *uids,
-					CamelException *ex);
-	void (*expunge_uids_resyncing) (CamelFolder *folder, GPtrArray *uids,
-					CamelException *ex);
-
-	void (*append_online)    (CamelFolder *folder,
-				  CamelMimeMessage *message,
-				  const CamelMessageInfo *info,
-				  char **appended_uid,
-				  CamelException *ex);
-	void (*append_offline)   (CamelFolder *folder,
-				  CamelMimeMessage *message,
-				  const CamelMessageInfo *info,
-				  char **appended_uid,
-				  CamelException *ex);
-	void (*append_resyncing) (CamelFolder *folder,
-				  CamelMimeMessage *message,
-				  const CamelMessageInfo *info,
-				  char **appended_uid,
-				  CamelException *ex);
-
-	void (*transfer_online)    (CamelFolder *source, GPtrArray *uids,
-				    CamelFolder *destination,
-				    GPtrArray **transferred_uids,
-				    gboolean delete_originals,
-				    CamelException *ex);
-	void (*transfer_offline)   (CamelFolder *source, GPtrArray *uids,
-				    CamelFolder *destination,
-				    GPtrArray **transferred_uids,
-				    gboolean delete_originals,
-				    CamelException *ex);
-	void (*transfer_resyncing) (CamelFolder *source, GPtrArray *uids,
-				    CamelFolder *destination,
-				    GPtrArray **transferred_uids,
-				    gboolean delete_originals,
-				    CamelException *ex);
-
-	void (*cache_message)       (CamelDiscoFolder *disco_folder,
-				     const char *uid, CamelException *ex);
-	void (*prepare_for_offline) (CamelDiscoFolder *disco_folder,
-				     const char *expression,
-				     CamelException *ex);
-
-	void (*update_uid) (CamelFolder *folder, const char *old_uid,
-			    const char *new_uid);
-} CamelDiscoFolderClass;
-
-
-/* public methods */
-void camel_disco_folder_expunge_uids (CamelFolder *folder, GPtrArray *uids,
-				      CamelException *ex);
-
-void camel_disco_folder_cache_message       (CamelDiscoFolder *disco_folder,
-					     const char *uid,
-					     CamelException *ex);
-void camel_disco_folder_prepare_for_offline (CamelDiscoFolder *disco_folder,
-					     const char *expression,
-					     CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_disco_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DISCO_FOLDER_H */
diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c
deleted file mode 100644
index 45207e4538..0000000000
--- a/camel/camel-disco-store.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-disco-store.c: abstract class for a disconnectable remote store */
-
-/*
- *  Authors: Dan Winship <danw@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-disco-store.h"
-#include "camel-disco-diary.h"
-#include "camel-exception.h"
-#include "camel-session.h"
-
-#define CDS_CLASS(o) (CAMEL_DISCO_STORE_CLASS (CAMEL_OBJECT_GET_CLASS (o)))
-
-static CamelRemoteStoreClass *parent_class = NULL;
-
-static void disco_construct (CamelService *service, CamelSession *session,
-			     CamelProvider *provider, CamelURL *url,
-			     CamelException *ex);
-static gboolean disco_connect (CamelService *service, CamelException *ex);
-static void disco_cancel_connect (CamelService *service);
-static gboolean disco_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static CamelFolder *disco_get_folder (CamelStore *store, const char *name,
-				      guint32 flags, CamelException *ex);
-static CamelFolderInfo *disco_get_folder_info (CamelStore *store,
-					       const char *top, guint32 flags,
-					       CamelException *ex);
-static void set_status (CamelDiscoStore *disco_store,
-			CamelDiscoStoreStatus status,
-			CamelException *ex);
-static gboolean can_work_offline (CamelDiscoStore *disco_store);
-
-static int disco_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-static int disco_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-static void
-camel_disco_store_class_init (CamelDiscoStoreClass *camel_disco_store_class)
-{
-	CamelObjectClass *camel_object_class =
-		CAMEL_OBJECT_CLASS (camel_disco_store_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_disco_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_disco_store_class);
-	
-	parent_class = CAMEL_REMOTE_STORE_CLASS (camel_type_get_global_classfuncs (camel_remote_store_get_type ()));
-	
-	/* virtual method definition */
-	camel_disco_store_class->set_status = set_status;
-	camel_disco_store_class->can_work_offline = can_work_offline;
-	
-	/* virtual method overload */
-	camel_object_class->setv = disco_setv;
-	camel_object_class->getv = disco_getv;
-	
-	camel_service_class->construct = disco_construct;
-	camel_service_class->connect = disco_connect;
-	camel_service_class->disconnect = disco_disconnect;
-	camel_service_class->cancel_connect = disco_cancel_connect;
-	
-	camel_store_class->get_folder = disco_get_folder;
-	camel_store_class->get_folder_info = disco_get_folder_info;
-}
-
-CamelType
-camel_disco_store_get_type (void)
-{
-	static CamelType camel_disco_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_disco_store_type == CAMEL_INVALID_TYPE) {
-		camel_disco_store_type = camel_type_register (
-			CAMEL_REMOTE_STORE_TYPE, "CamelDiscoStore",
-			sizeof (CamelDiscoStore),
-			sizeof (CamelDiscoStoreClass),
-			(CamelObjectClassInitFunc) camel_disco_store_class_init,
-			NULL,
-			NULL,
-			NULL);
-	}
-
-	return camel_disco_store_type;
-}
-
-static int
-disco_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
-	/* CamelDiscoStore doesn't currently have anything to set */
-	return CAMEL_OBJECT_CLASS (parent_class)->setv (object, ex, args);
-}
-
-static int
-disco_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	/* CamelDiscoStore doesn't currently have anything to get */
-	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
-}
-
-static void
-disco_construct (CamelService *service, CamelSession *session,
-		 CamelProvider *provider, CamelURL *url,
-		 CamelException *ex)
-{
-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (service);
-
-	CAMEL_SERVICE_CLASS (parent_class)->construct (service, session, provider, url, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	disco->status = camel_session_is_online (session) ?
-		CAMEL_DISCO_STORE_ONLINE : CAMEL_DISCO_STORE_OFFLINE;
-}
-
-static gboolean
-disco_connect (CamelService *service, CamelException *ex)
-{
-	CamelDiscoStore *store = CAMEL_DISCO_STORE (service);
-	CamelDiscoStoreStatus status;
-
-	status = camel_disco_store_status (store);
-	if (status != CAMEL_DISCO_STORE_OFFLINE) {
-		if (!CAMEL_SERVICE_CLASS (parent_class)->connect (service, ex)) {
-			status = camel_disco_store_status (store);
-			if (status != CAMEL_DISCO_STORE_OFFLINE)
-				return FALSE;
-			camel_exception_clear (ex);
-		}
-	}
-
-	switch (status) {
-	case CAMEL_DISCO_STORE_ONLINE:
-	case CAMEL_DISCO_STORE_RESYNCING:
-		if (!CDS_CLASS (service)->connect_online (service, ex))
-			return FALSE;
-		if (camel_disco_diary_empty (store->diary))
-			return TRUE;
-
-		/* Need to resync */
-		store->status = CAMEL_DISCO_STORE_RESYNCING;
-		camel_disco_diary_replay (store->diary, ex);
-		store->status = CAMEL_DISCO_STORE_ONLINE;
-		if (camel_exception_is_set (ex))
-			return FALSE;
-
-		if (!camel_service_disconnect (service, TRUE, ex))
-			return FALSE;
-		return camel_service_connect (service, ex);
-
-	case CAMEL_DISCO_STORE_OFFLINE:
-		return CDS_CLASS (service)->connect_offline (service, ex);
-	}
-
-	g_assert_not_reached ();
-	return FALSE;
-}
-
-static void
-disco_cancel_connect (CamelService *service)
-{
-	CamelDiscoStore *store = CAMEL_DISCO_STORE (service);
-
-	/* Fall back */
-	store->status = CAMEL_DISCO_STORE_OFFLINE;
-
-	CAMEL_SERVICE_CLASS (parent_class)->cancel_connect (service);
-}
-
-static gboolean
-disco_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelDiscoStore *store = CAMEL_DISCO_STORE (service);
-
-	switch (camel_disco_store_status (store)) {
-	case CAMEL_DISCO_STORE_ONLINE:
-	case CAMEL_DISCO_STORE_RESYNCING:
-		if (!CDS_CLASS (service)->disconnect_online (service, clean, ex))
-			return FALSE;
-		break;
-
-	case CAMEL_DISCO_STORE_OFFLINE:
-		if (!CDS_CLASS (service)->disconnect_offline (service, clean, ex))
-			return FALSE;
-		break;
-
-	}
-
-	return CAMEL_SERVICE_CLASS (parent_class)->disconnect (service, clean, ex);
-}
-
-static CamelFolder *
-disco_get_folder (CamelStore *store, const char *name,
-		  guint32 flags, CamelException *ex)
-{
-	CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (store);
-	
-	switch (camel_disco_store_status (disco_store)) {
-	case CAMEL_DISCO_STORE_ONLINE:
-		return CDS_CLASS (store)->get_folder_online (store, name, flags, ex);
-		
-	case CAMEL_DISCO_STORE_OFFLINE:
-		return CDS_CLASS (store)->get_folder_offline (store, name, flags, ex);
-		
-	case CAMEL_DISCO_STORE_RESYNCING:
-		return CDS_CLASS (store)->get_folder_resyncing (store, name, flags, ex);	
-	}
-	
-	g_assert_not_reached ();
-	return NULL;
-}
-
-static CamelFolderInfo *
-disco_get_folder_info (CamelStore *store, const char *top,
-		       guint32 flags, CamelException *ex)
-{
-	CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (store);
-
-	/* Do this first so if we get forced offline, we'll switch to
-	 * the correct branch below. (FIXME: This only works because
-	 * we know that get_folder_info is the first call that the
-	 * mailer makes on a store.)
-	 */
-	if (CAMEL_SERVICE (store)->status == CAMEL_SERVICE_DISCONNECTED) {
-		if (!camel_service_connect (CAMEL_SERVICE (store), ex))
-			return NULL;
-	}
-
-	switch (camel_disco_store_status (disco_store)) {
-	case CAMEL_DISCO_STORE_ONLINE:
-		return CDS_CLASS (store)->get_folder_info_online (store, top, flags, ex);
-		
-	case CAMEL_DISCO_STORE_OFFLINE:
-		/* Can't edit subscriptions while offline */
-		if ((store->flags & CAMEL_STORE_SUBSCRIPTIONS) &&
-		    !(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)) {
-			camel_disco_store_check_online (disco_store, ex);
-			return NULL;
-		}
-		
-		return CDS_CLASS (store)->get_folder_info_offline (store, top, flags, ex);
-		
-	case CAMEL_DISCO_STORE_RESYNCING:
-		return CDS_CLASS (store)->get_folder_info_resyncing (store, top, flags, ex);
-	}
-	
-	g_assert_not_reached ();
-	return NULL;
-}
-
-
-/**
- * camel_disco_store_status:
- * @store: a disconnectable store
- *
- * Return value: the current online/offline status of @store.
- **/
-CamelDiscoStoreStatus
-camel_disco_store_status (CamelDiscoStore *store)
-{
-	CamelService *service = CAMEL_SERVICE (store);
-
-	g_return_val_if_fail (CAMEL_IS_DISCO_STORE (store), CAMEL_DISCO_STORE_ONLINE);
-
-	if (service->status == CAMEL_SERVICE_CONNECTING &&
-	    store->status == CAMEL_DISCO_STORE_ONLINE &&
-	    !camel_session_is_online (service->session))
-		store->status = CAMEL_DISCO_STORE_OFFLINE;
-
-	return store->status;
-}
-
-
-static void
-set_status (CamelDiscoStore *disco_store, CamelDiscoStoreStatus status,
-	    CamelException *ex)
-{
-	if (disco_store->status == status)
-		return;
-
-	camel_store_sync (CAMEL_STORE (disco_store), ex);
-	if (camel_exception_is_set (ex))
-		return;
-	if (!camel_service_disconnect (CAMEL_SERVICE (disco_store), TRUE, ex))
-		return;
-
-	disco_store->status = status;
-	camel_service_connect (CAMEL_SERVICE (disco_store), ex);
-}
-
-/**
- * camel_disco_store_set_status:
- * @store: a disconnectable store
- * @status: the new status
- * @ex: a CamelException
- *
- * Sets @store to @status. If an error occurrs and the status cannot
- * be set to @status, @ex will be set.
- **/
-void
-camel_disco_store_set_status (CamelDiscoStore *store,
-			      CamelDiscoStoreStatus status,
-			      CamelException *ex)
-{
-	CDS_CLASS (store)->set_status (store, status, ex);
-}
-
-
-static gboolean
-can_work_offline (CamelDiscoStore *disco_store)
-{
-	g_warning ("CamelDiscoStore::can_work_offline not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_store)));
-	return FALSE;
-}
-
-/**
- * camel_disco_store_can_work_offline:
- * @store: a disconnectable store
- *
- * Return value: whether or not @store can be used offline. (Will be
- * %FALSE if the store is not caching data to local disk, for example.)
- **/
-gboolean
-camel_disco_store_can_work_offline (CamelDiscoStore *store)
-{
-	return CDS_CLASS (store)->can_work_offline (store);
-}
-
-
-/**
- * camel_disco_store_check_online:
- * @store: a disconnectable store
- * @ex: a CamelException
- *
- * This checks that @store is online, and sets @ex if it is not. This
- * can be used as a simple way to set a generic error message in @ex
- * for operations that won't work offline.
- *
- * Return value: whether or not @store is online.
- **/
-gboolean
-camel_disco_store_check_online (CamelDiscoStore *store, CamelException *ex)
-{
-	if (camel_disco_store_status (store) != CAMEL_DISCO_STORE_ONLINE) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				     _("You must be working online to "
-				       "complete this operation"));
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h
deleted file mode 100644
index 01d11645e2..0000000000
--- a/camel/camel-disco-store.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-disco-store.h: abstruct class for a disconnectable store */
-
-/* 
- * Authors: Dan Winship <danw@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_DISCO_STORE_H
-#define CAMEL_DISCO_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-remote-store.h"
-
-#define CAMEL_DISCO_STORE_TYPE     (camel_disco_store_get_type ())
-#define CAMEL_DISCO_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DISCO_STORE_TYPE, CamelDiscoStore))
-#define CAMEL_DISCO_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_STORE_TYPE, CamelDiscoStoreClass))
-#define CAMEL_IS_DISCO_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_STORE_TYPE))
-
-enum {
-	CAMEL_DISCO_STORE_ARG_FIRST  = CAMEL_REMOTE_STORE_ARG_FIRST + 100,
-};
-
-typedef enum {
-	CAMEL_DISCO_STORE_ONLINE,
-	CAMEL_DISCO_STORE_OFFLINE,
-	CAMEL_DISCO_STORE_RESYNCING
-} CamelDiscoStoreStatus;
-
-struct _CamelDiscoStore {
-	CamelRemoteStore parent_object;	
-
-	CamelDiscoStoreStatus status;
-	CamelDiscoDiary *diary;
-};
-
-
-typedef struct {
-	CamelRemoteStoreClass parent_class;
-
-	void              (*set_status)              (CamelDiscoStore *,
-						      CamelDiscoStoreStatus,
-						      CamelException *);
-	gboolean          (*can_work_offline)        (CamelDiscoStore *);
-
-
-	gboolean          (*connect_online)          (CamelService *,
-						      CamelException *);
-	gboolean          (*connect_offline)         (CamelService *,
-						      CamelException *);
-
-	gboolean          (*disconnect_online)       (CamelService *, gboolean,
-						      CamelException *);
-	gboolean          (*disconnect_offline)      (CamelService *, gboolean,
-						      CamelException *);
-
-	CamelFolder *     (*get_folder_online)       (CamelStore *store,
-						      const char *name,
-						      guint32 flags,
-						      CamelException *ex);
-	CamelFolder *     (*get_folder_offline)      (CamelStore *store,
-						      const char *name,
-						      guint32 flags,
-						      CamelException *ex);
-	CamelFolder *     (*get_folder_resyncing)    (CamelStore *store,
-						      const char *name,
-						      guint32 flags,
-						      CamelException *ex);
-
-	CamelFolderInfo * (*get_folder_info_online)    (CamelStore *store,
-							const char *top,
-							guint32 flags,
-							CamelException *ex);
-	CamelFolderInfo * (*get_folder_info_offline)   (CamelStore *store,
-							const char *top,
-							guint32 flags,
-							CamelException *ex);
-	CamelFolderInfo * (*get_folder_info_resyncing) (CamelStore *store,
-							const char *top,
-							guint32 flags,
-							CamelException *ex);
-
-} CamelDiscoStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_disco_store_get_type (void);
-
-/* Public methods */
-CamelDiscoStoreStatus camel_disco_store_status           (CamelDiscoStore *);
-void                  camel_disco_store_set_status       (CamelDiscoStore *,
-							  CamelDiscoStoreStatus,
-							  CamelException *);
-gboolean              camel_disco_store_can_work_offline (CamelDiscoStore *);
-
-
-/* Convenience functions */
-gboolean camel_disco_store_check_online (CamelDiscoStore *store, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DISCO_STORE_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 1bb6c22550..0000000000
--- a/camel/camel-exception.c
+++ /dev/null
@@ -1,313 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include "camel-exception.h"
-#include "e-util/e-memory.h"
-
-/* i dont know why gthread_mutex stuff even exists, this is easier */
-
-/* also, i'm not convinced mutexes are needed here.  But it
-   doesn't really hurt either */
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-static pthread_mutex_t exception_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define CAMEL_EXCEPTION_LOCK(e) (pthread_mutex_lock(&exception_mutex))
-#define CAMEL_EXCEPTION_UNLOCK(e) (pthread_mutex_unlock(&exception_mutex))
-#else
-#define CAMEL_EXCEPTION_LOCK(e) 
-#define CAMEL_EXCEPTION_UNLOCK(e) 
-#endif
-
-static EMemChunk *exception_chunks = NULL;
-
-/**
- * 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;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	if (exception_chunks == NULL)
-		exception_chunks = e_memchunk_new(16, sizeof(CamelException));
-
-	ex = e_memchunk_alloc(exception_chunks);
-	ex->desc = NULL;
-
-	/* set the Exception Id to NULL */
-	ex->id = CAMEL_EXCEPTION_NONE;
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-
-	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;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	if (exception->desc)
-		g_free (exception->desc);
-	exception->desc = NULL;
-	exception->id = CAMEL_EXCEPTION_NONE;
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * 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;
-	
-	if (exception->desc)
-		g_free (exception->desc);
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	e_memchunk_free(exception_chunks, exception);
-
-	CAMEL_EXCEPTION_UNLOCK(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 (!ex)
-		return;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	ex->id = id;
-
-	if (desc != ex->desc) {
-		g_free (ex->desc);
-		ex->desc = g_strdup (desc);
-	}
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * 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;
-	char *old;
-	
-	if (!ex)
-		return;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-	
-	old = ex->desc;
-	
-	va_start(args, format);
-	ex->desc = g_strdup_vprintf (format, args);
-	va_end (args);
-
-	g_free (old);
-	
-	ex->id = id;
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * 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_src == NULL) {
-		g_warning ("camel_exception_xfer: trying to transfer NULL exception to %p\n", ex_dst);
-		return;
-	}
-
-	if (ex_dst == NULL) {
-		/* must have same side-effects */
-		camel_exception_clear (ex_src);
-		return;
-	}
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	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_UNLOCK(exception);
-}
-
-/**
- * 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 {
-		g_warning ("camel_exception_get_id called with NULL parameter.");
-		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)
-{
-	char *ret = NULL;
-
-	if (ex)
-		ret = ex->desc;
-	else
-		g_warning ("camel_exception_get_description called with NULL parameter.");
-		
-	return ret;
-}
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
deleted file mode 100644
index 77c2c16066..0000000000
--- a/camel/camel-exception.h
+++ /dev/null
@@ -1,87 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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 char *             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-file-utils.c b/camel/camel-file-utils.c
deleted file mode 100644
index 0b909f3e82..0000000000
--- a/camel/camel-file-utils.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors:
- *   Michael Zucchi <notzed@ximian.com>
- *   Dan Winship <danw@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "camel-file-utils.h"
-#include "camel-url.h"
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <string.h>
-
-#include <netinet/in.h>
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-/**
- * camel_file_util_encode_uint32:
- * @out: file to output to
- * @value: value to output
- * 
- * Utility function to save an uint32 to a file.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_encode_uint32 (FILE *out, guint32 value)
-{
-	int i;
-
-	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);
-}
-
-/**
- * camel_file_util_decode_uint32:
- * @in: file to read from
- * @dest: pointer to a variable to store the value in
- * 
- * Retrieve an encoded uint32 from a file.
- * 
- * Return value: 0 on success, -1 on error.  @*dest will contain the
- * decoded value.
- **/
-int
-camel_file_util_decode_uint32 (FILE *in, guint32 *dest)
-{
-        guint32 value = 0;
-	int 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 -1;
-	}
-	*dest = value | (v & 0x7f);
-
-        return 0;
-}
-
-/**
- * camel_file_util_encode_fixed_int32:
- * @out: file to output to
- * @value: value to output
- * 
- * Encode a gint32, performing no compression, but converting
- * to network order.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_encode_fixed_int32 (FILE *out, gint32 value)
-{
-	guint32 save;
-
-	save = htonl (value);
-	if (fwrite (&save, sizeof (save), 1, out) != 1)
-		return -1;
-	return 0;
-}
-
-/**
- * camel_file_util_decode_fixed_int32:
- * @in: file to read from
- * @dest: pointer to a variable to store the value in
- * 
- * Retrieve a gint32.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_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;
-	}
-}
-
-/**
- * camel_file_util_encode_time_t:
- * @out: file to output to
- * @value: value to output
- * 
- * Encode a time_t value to the file.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_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;
-}
-
-/**
- * camel_file_util_decode_time_t:
- * @in: file to read from
- * @dest: pointer to a variable to store the value in
- * 
- * Decode a time_t value.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_decode_time_t (FILE *in, time_t *dest)
-{
-	time_t save = 0;
-	int i = sizeof (time_t) - 1;
-	int v = EOF;
-
-        while (i >= 0 && (v = fgetc (in)) != EOF) {
-		save |= ((time_t)v) << (i * 8);
-		i--;
-	}
-	*dest = save;
-	if (v == EOF)
-		return -1;
-	return 0;
-}
-
-/**
- * camel_file_util_encode_off_t:
- * @out: file to output to
- * @value: value to output
- * 
- * Encode an off_t type.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_encode_off_t (FILE *out, off_t value)
-{
-	int i;
-
-	for (i = sizeof (off_t) - 1; i >= 0; i--) {
-		if (fputc ((value >> (i * 8)) & 0xff, out) == -1)
-			return -1;
-	}
-	return 0;
-}
-
-/**
- * camel_file_util_decode_off_t:
- * @in: file to read from
- * @dest: pointer to a variable to put the value in
- * 
- * Decode an off_t type.
- * 
- * Return value: 0 on success, -1 on failure.
- **/
-int
-camel_file_util_decode_off_t (FILE *in, off_t *dest)
-{
-	off_t save = 0;
-	int i = sizeof(off_t) - 1;
-	int v = EOF;
-
-        while (i >= 0 && (v = fgetc (in)) != EOF) {
-		save |= ((off_t)v) << (i * 8);
-		i--;
-	}
-	*dest = save;
-	if (v == EOF)
-		return -1;
-	return 0;
-}
-
-/**
- * camel_file_util_encode_string:
- * @out: file to output to
- * @str: value to output
- * 
- * Encode a normal string and save it in the output file.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_encode_string (FILE *out, const char *str)
-{
-	register int len;
-
-	if (str == NULL)
-		return camel_file_util_encode_uint32 (out, 0);
-
-	len = strlen (str);
-	if (camel_file_util_encode_uint32 (out, len+1) == -1)
-		return -1;
-	if (len == 0 || fwrite (str, len, 1, out) == 1)
-		return 0;
-	return -1;
-}
-
-/**
- * camel_file_util_decode_string:
- * @in: file to read from
- * @str: pointer to a variable to store the value in
- * 
- * Decode a normal string from the input file.
- * 
- * Return value: 0 on success, -1 on error.
- **/
-int
-camel_file_util_decode_string (FILE *in, char **str)
-{
-	guint32 len;
-	register char *ret;
-
-	if (camel_file_util_decode_uint32 (in, &len) == -1) {
-		*str = NULL;
-		return -1;
-	}
-
-	len--;
-	if (len > 65536) {
-		*str = NULL;
-		return -1;
-	}
-
-	ret = g_malloc (len+1);
-	if (len > 0 && fread (ret, len, 1, in) != 1) {
-		g_free (ret);
-		*str = NULL;
-		return -1;
-	}
-
-	ret[len] = 0;
-	*str = ret;
-	return 0;
-}
-
-/* Make a directory heirarchy.
-   Always use full paths */
-int
-camel_file_util_mkdir(const char *path, mode_t mode)
-{
-	char *copy, *p;
-
-	g_assert(path && path[0] == '/');
-
-	p = copy = alloca(strlen(path)+1);
-	strcpy(copy, path);
-	do {
-		p = strchr(p + 1, '/');
-		if (p)
-			*p = '\0';
-		if (access(copy, F_OK) == -1) {
-			if (mkdir(copy, mode) == -1)
-				return -1;
-		}
-		if (p)
-			*p = '/';
-	} while (p);
-
-	return 0;
-}
-
-char *
-camel_file_util_safe_filename(const char *name)
-{
-	if (name == NULL)
-		return NULL;
-	
-	return camel_url_encode(name, TRUE, "/?()'*");
-}
diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h
deleted file mode 100644
index e261ead16b..0000000000
--- a/camel/camel-file-utils.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors:
- *   Michael Zucchi <notzed@ximian.com>
- *   Dan Winship <danw@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_FILE_UTILS_H
-#define CAMEL_FILE_UTILS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <time.h>
-
-int camel_file_util_encode_fixed_int32 (FILE *out, gint32);
-int camel_file_util_decode_fixed_int32 (FILE *in, gint32 *);
-int camel_file_util_encode_uint32 (FILE *out, guint32);
-int camel_file_util_decode_uint32 (FILE *in, guint32 *);
-int camel_file_util_encode_time_t (FILE *out, time_t);
-int camel_file_util_decode_time_t (FILE *in, time_t *);
-int camel_file_util_encode_off_t (FILE *out, off_t);
-int camel_file_util_decode_off_t (FILE *in, off_t *);
-int camel_file_util_encode_string (FILE *out, const char *);
-int camel_file_util_decode_string (FILE *in, char **);
-
-int camel_file_util_mkdir(const char *path, mode_t mode);
-char *camel_file_util_safe_filename(const char *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_FILE_UTILS_H */
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
deleted file mode 100644
index 8df6a0d1b4..0000000000
--- a/camel/camel-filter-driver.c
+++ /dev/null
@@ -1,1265 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <string.h>
-#include <time.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "camel-filter-driver.h"
-#include "camel-filter-search.h"
-
-#include "camel-exception.h"
-#include "camel-service.h"
-#include "camel-mime-message.h"
-
-#include "e-util/e-sexp.h"
-#include "e-util/e-memory.h"
-#include "e-util/e-msgport.h"	/* for edlist */
-
-#define d(x)
-
-/* an invalid pointer */
-#define FOLDER_INVALID ((void *)~0)
-
-/* 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 */
-};
-
-/* list of rule nodes */
-struct _filter_rule {
-	struct _filter_rule *next;
-	struct _filter_rule *prev;
-
-	char *match;
-	char *action;
-	char *name;
-};
-
-struct _CamelFilterDriverPrivate {
-	GHashTable *globals;       /* global variables */
-	
-	CamelFolder *defaultfolder;        /* defualt folder */
-	
-	CamelFilterStatusFunc *statusfunc; /* status callback */
-	void *statusdata;                  /* status callback data */
-	
-	CamelFilterShellExecFunc *execfunc; /* execute shell command callback */
-	void *execdata;                     /* execute shell command callback data */
-	
-	CamelFilterPlaySoundFunc *playfunc; /* play-sound command callback */
-	void *playdata;                     /* play-sound command callback data */
-	
-	CamelFilterSystemBeepFunc *beep;    /* system beep callback */
-	void *beepdata;                     /* system beep callback data */
-	
-	/* for callback */
-	CamelFilterGetFolderFunc get_folder;
-	void *data;
-	
-	/* run-time data */
-	GHashTable *folders;       /* folders that message has been copied to */
-	int closed;		   /* close count */
-	GHashTable *forwards;      /* addresses that have been forwarded the message */
-	GHashTable *only_once;     /* actions to run only-once */
-	
-	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 */
-	const char *uid;           /* message uid */
-	CamelFolder *source;       /* message source folder */
-	
-	FILE *logfile;             /* log file */
-	
-	EDList rules;		   /* list of _filter_rule structs */
-	
-	CamelException *ex;
-	
-	/* evaluator */
-	ESExp *eval;
-};
-
-#define _PRIVATE(o) (((CamelFilterDriver *)(o))->priv)
-
-static void camel_filter_driver_class_init (CamelFilterDriverClass *klass);
-static void camel_filter_driver_init       (CamelFilterDriver *obj);
-static void camel_filter_driver_finalise   (CamelObject *obj);
-
-static void camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const char *desc, ...);
-
-static CamelFolder *open_folder (CamelFilterDriver *d, const char *folder_url);
-static int close_folders (CamelFilterDriver *d);
-
-static ESExpResult *do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_beep (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *play_sound (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_only_once (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-
-/* 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-system-flag", (ESExpFunc *) do_flag,      0 },
-	{ "shell-exec",      (ESExpFunc *) shell_exec,   0 },
-	{ "beep",            (ESExpFunc *) do_beep,      0 },
-	{ "play-sound",      (ESExpFunc *) play_sound,   0 },
-	{ "only-once",       (ESExpFunc *) do_only_once, 0 }
-};
-
-static CamelObjectClass *camel_filter_driver_parent;
-
-CamelType
-camel_filter_driver_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE)	{
-		type = camel_type_register (CAMEL_OBJECT_TYPE,
-					    "CamelFilterDriver",
-					    sizeof (CamelFilterDriver),
-					    sizeof (CamelFilterDriverClass),
-					    (CamelObjectClassInitFunc) camel_filter_driver_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_filter_driver_init,
-					    (CamelObjectFinalizeFunc) camel_filter_driver_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_filter_driver_class_init (CamelFilterDriverClass *klass)
-{
-	/*CamelObjectClass *object_class = (CamelObjectClass *) klass;*/
-
-	camel_filter_driver_parent = camel_type_get_global_classfuncs(camel_object_get_type());
-}
-
-static void
-camel_filter_driver_init (CamelFilterDriver *obj)
-{
-	struct _CamelFilterDriverPrivate *p;
-	int i;
-	
-	p = _PRIVATE (obj) = g_malloc0 (sizeof (*p));
-
-	e_dlist_init(&p->rules);
-
-	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);
-	
-	p->only_once = 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
-camel_filter_driver_finalise (CamelObject *obj)
-{
-	CamelFilterDriver *driver = (CamelFilterDriver *) obj;
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);	
-	struct _filter_rule *node;
-
-	/* 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);
-	
-	g_hash_table_foreach (p->only_once, free_hash_strings, driver);
-	g_hash_table_destroy (p->only_once);
-	
-	e_sexp_unref(p->eval);
-	
-	if (p->defaultfolder) {
-		camel_folder_thaw (p->defaultfolder);
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	}
-
-	while ((node = (struct _filter_rule *)e_dlist_remhead(&p->rules))) {
-		g_free(node->match);
-		g_free(node->action);
-		g_free(node->name);
-		g_free(node);
-	}
-	
-	g_free (p);
-}
-
-/**
- * camel_filter_driver_new:
- *
- * Return value: A new CamelFilterDriver object
- **/
-CamelFilterDriver *
-camel_filter_driver_new (void)
-{
-	return CAMEL_FILTER_DRIVER (camel_object_new(camel_filter_driver_get_type ()));
-}
-
-void
-camel_filter_driver_set_folder_func (CamelFilterDriver *d, CamelFilterGetFolderFunc get_folder, void *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-
-	p->get_folder = get_folder;
-	p->data = data;
-}
-
-void
-camel_filter_driver_set_logfile (CamelFilterDriver *d, FILE *logfile)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->logfile = logfile;
-}
-
-void
-camel_filter_driver_set_status_func (CamelFilterDriver *d, CamelFilterStatusFunc *func, void *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->statusfunc = func;
-	p->statusdata = data;
-}
-
-void
-camel_filter_driver_set_shell_exec_func (CamelFilterDriver *d, CamelFilterShellExecFunc *func, void *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->execfunc = func;
-	p->execdata = data;
-}
-
-void
-camel_filter_driver_set_play_sound_func (CamelFilterDriver *d, CamelFilterPlaySoundFunc *func, void *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->playfunc = func;
-	p->playdata = data;
-}
-
-void
-camel_filter_driver_set_system_beep_func (CamelFilterDriver *d, CamelFilterSystemBeepFunc *func, void *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->beep = func;
-	p->beepdata = data;
-}
-
-void
-camel_filter_driver_set_default_folder (CamelFilterDriver *d, CamelFolder *def)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	if (p->defaultfolder) {
-		camel_folder_thaw (p->defaultfolder);
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	}
-	
-	p->defaultfolder = def;
-	
-	if (p->defaultfolder) {
-		camel_folder_freeze (p->defaultfolder);
-		camel_object_ref (CAMEL_OBJECT (p->defaultfolder));
-	}
-}
-
-void
-camel_filter_driver_add_rule(CamelFilterDriver *d, const char *name, const char *match, const char *action)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	struct _filter_rule *node;
-
-	node = g_malloc(sizeof(*node));
-	node->match = g_strdup(match);
-	node->action = g_strdup(action);
-	node->name = g_strdup(name);
-	e_dlist_addtail(&p->rules, (EDListNode *)node);
-}
-
-int
-camel_filter_driver_remove_rule_by_name (CamelFilterDriver *d, const char *name)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	struct _filter_rule *node;
-	
-	node = (struct _filter_rule *) p->rules.head;
-	while (node->next) {
-		if (!strcmp (node->name, name)) {
-			e_dlist_remove ((EDListNode *) node);
-			g_free (node->match);
-			g_free (node->action);
-			g_free (node->name);
-			g_free (node);
-			
-			return 0;
-		}
-		
-		node = node->next;
-	}
-	
-	return -1;
-}
-
-static void
-report_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, ...)
-{
-	/* call user-defined status report function */
-	struct _CamelFilterDriverPrivate *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, pc, str, p->statusdata);
-		g_free (str);
-	}
-}
-
-
-#if 0
-void
-camel_filter_driver_set_global (CamelFilterDriver *d, const char *name, const char *value)
-{
-	struct _CamelFilterDriverPrivate *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, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "doing delete\n"));
-	p->deleted = TRUE;
-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Delete");
-	
-	return NULL;
-}
-
-static ESExpResult *
-mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	/*struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);*/
-	
-	d(fprintf (stderr, "marking message for forwarding\n"));
-	/* FIXME: do stuff here */
-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Forward");
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "copying message...\n"));
-	
-	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;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				break;
-			
-			if (outbox == p->source)
-				break;
-			
-			if (p->uid && p->source && camel_folder_has_summary_capability (p->source)) {
-				GPtrArray *uids;
-				
-				uids = g_ptr_array_new ();
-				g_ptr_array_add (uids, (char *) p->uid);
-				camel_folder_transfer_messages_to (p->source, uids, outbox, NULL, FALSE, p->ex);
-				g_ptr_array_free (uids, TRUE);
-			} else {
-				if (p->message == NULL)
-					p->message = camel_folder_get_message (p->source, p->uid, p->ex);
-				
-				if (!p->message) {
-					/* FIXME: exception? */
-					continue;
-				}
-				
-				camel_folder_append_message (outbox, p->message, p->info, NULL, p->ex);
-			}
-			
-			if (!camel_exception_is_set (p->ex))
-					p->copied = TRUE;
-			
-			camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to folder %s",
-						 folder);
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "moving message...\n"));
-	
-	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;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				break;
-			
-			if (outbox == p->source)
-				break;
-			
-			if (p->uid && p->source && camel_folder_has_summary_capability (p->source)) {
-				GPtrArray *uids;
-				
-				uids = g_ptr_array_new ();
-				g_ptr_array_add (uids, (char *) p->uid);
-				camel_folder_transfer_messages_to (p->source, uids, outbox, NULL, FALSE, p->ex);
-				g_ptr_array_free (uids, TRUE);
-			} else {
-				if (p->message == NULL)
-					p->message = camel_folder_get_message (p->source, p->uid, p->ex);
-				
-				if (!p->message) {
-					/* FIXME: exception? */
-					continue;
-				}
-				
-				camel_folder_append_message (outbox, p->message, p->info, NULL, p->ex);
-			}
-			
-			if (!camel_exception_is_set (p->ex)) {
-				/* a 'move' is a copy & delete */
-				p->copied = TRUE;
-				p->deleted = TRUE;
-			}
-			
-			camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Move to folder %s",
-						 folder);
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	camel_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, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting colour tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_STRING) {
-		if (p->source && p->uid && camel_folder_has_summary_capability (p->source))
-			camel_folder_set_message_user_tag(p->source, p->uid, "colour", argv[0]->value.string);
-		else
-			camel_tag_set (&p->info->user_tags, "colour", argv[0]->value.string);
-		camel_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, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *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);
-		if (p->source && p->uid && camel_folder_has_summary_capability (p->source))
-			camel_folder_set_message_user_tag(p->source, p->uid, "score", value);
-		else
-			camel_tag_set (&p->info->user_tags, "score", value);
-		camel_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, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting flag\n"));
-	if (argc == 1 && argv[0]->type == ESEXP_RES_STRING) {
-		if (p->source && p->uid && camel_folder_has_summary_capability (p->source))
-			camel_folder_set_message_flags(p->source, p->uid, camel_system_flag(argv[0]->value.string), ~0);
-		else
-			p->info->flags |= camel_system_flag (argv[0]->value.string)|CAMEL_MESSAGE_FOLDER_FLAGGED;
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set %s flag", argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "executing shell command\n"));
-	
-	if (p->execfunc && argc == 1 && argv[0]->type == ESEXP_RES_STRING) {
-		p->execfunc (driver, argv[0]->value.string, p->execdata);
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Executing shell command: [%s]",
-					 argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_beep (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "beep\n"));
-	
-	if (p->beep) {
-		p->beep (driver, p->beepdata);
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Beep");
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-play_sound (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "play sound\n"));
-	
-	if (p->playfunc && argc == 1 && argv[0]->type == ESEXP_RES_STRING) {
-		p->playfunc (driver, argv[0]->value.string, p->playdata);
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Play sound");
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_only_once (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "only once\n"));
-	
-	if (argc == 2 && !g_hash_table_lookup (p->only_once, argv[0]->value.string))
-		g_hash_table_insert (p->only_once, g_strdup (argv[0]->value.string),
-				     g_strdup (argv[1]->value.string));
-	
-	return NULL;
-}
-
-static CamelFolder *
-open_folder (CamelFilterDriver *driver, const char *folder_url)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	CamelFolder *camelfolder;
-	CamelException ex;
-	
-	/* we have a lookup table of currently open folders */
-	camelfolder = g_hash_table_lookup (p->folders, folder_url);
-	if (camelfolder)
-		return camelfolder == FOLDER_INVALID?NULL:camelfolder;
-	
-	camel_exception_init (&ex);
-	camelfolder = p->get_folder (driver, folder_url, p->data, &ex);
-	camel_exception_clear (&ex);
-	
-	if (camelfolder) {
-		g_hash_table_insert (p->folders, g_strdup (folder_url), camelfolder);
-		camel_folder_freeze (camelfolder);
-	} else {
-		g_hash_table_insert (p->folders, g_strdup (folder_url), FOLDER_INVALID);
-	}
-	
-	return camelfolder;
-}
-
-static void
-close_folder (void *key, void *value, void *data)
-{	
-	CamelFolder *folder = value;
-	CamelFilterDriver *driver = data;
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-
-	p->closed++;
-	g_free (key);
-
-	if (folder != FOLDER_INVALID) {
-		camel_folder_sync (folder, FALSE, p->ex);
-		camel_folder_thaw (folder);
-		camel_object_unref (CAMEL_OBJECT (folder));
-	}
-
-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, g_hash_table_size(p->folders)* 100 / p->closed, _("Syncing folders"));
-}
-
-/* flush/close all folders */
-static int
-close_folders (CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-
-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 0, _("Syncing folders"));
-
-	p->closed = 0;
-	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
-camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const char *desc, ...)
-{
-	struct _CamelFilterDriverPrivate *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;
-			char *fromstr;
-			const CamelInternetAddress *from;
-			char date[50];
-			time_t t;
-			
-			/* FIXME: does this need locking?  Probably */
-			
-			/* FIXME: use info for these, not message since message may not be loaded */
-			from = camel_mime_message_get_from (p->message);
-			fromstr = camel_address_format((CamelAddress *)from);
-			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, fromstr ? fromstr : "unknown", subject ? subject : "", date);
-			g_free(fromstr);
-			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);
-	}
-}
-
-
-struct _run_only_once {
-	CamelFilterDriver *driver;
-	CamelException *ex;
-};
-
-static gboolean
-run_only_once (gpointer key, char *action, struct _run_only_once *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (data->driver);
-	CamelException *ex = data->ex;
-	ESExpResult *r;
-	
-	printf ("evaluating: %s\n\n", action);
-	
-	e_sexp_input_text (p->eval, action, strlen (action));
-	if (e_sexp_parse (p->eval) == -1) {
-		if (!camel_exception_is_set (ex))
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Error parsing filter: %s: %s"),
-					      e_sexp_error (p->eval), action);
-		goto done;
-	}
-	
-	r = e_sexp_eval (p->eval);
-	if (r == NULL) {
-		if (!camel_exception_is_set (ex))
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Error executing filter: %s: %s"),
-					      e_sexp_error (p->eval), action);
-		goto done;
-	}
-	
-	e_sexp_result_free (p->eval, r);
-	
- done:
-	
-	g_free (key);
-	g_free (action);
-	
-	return TRUE;
-}
-
-
-/**
- * camel_filter_driver_flush:
- * @driver:
- * @ex:
- *
- * Flush all of the only-once filter actions.
- **/
-void
-camel_filter_driver_flush (CamelFilterDriver *driver, CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	struct _run_only_once data;
-	
-	if (!p->only_once)
-		return;
-	
-	data.driver = driver;
-	data.ex = ex;
-	
-	g_hash_table_foreach_remove (p->only_once, (GHRFunc) run_only_once, &data);
-}
-
-/**
- * camel_filter_driver_filter_mbox:
- * @driver: CamelFilterDriver
- * @mbox: mbox filename to be filtered
- * @ex: exception
- *
- * Filters an mbox file based on rules defined in the FilterDriver
- * object. Is more efficient as it doesn't need to open the folder
- * through Camel directly.
- *
- * Returns -1 if errors were encountered during filtering,
- * otherwise returns 0.
- *
- **/
-int
-camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, const char *original_source_url, CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	CamelMimeParser *mp = NULL;
-	char *source_url = NULL;
-	int fd = -1;
-	int i = 0;
-	struct stat st;
-	int status;
-	off_t last = 0;
-	int ret = -1;
-	
-	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) {
-		CamelMessageInfo *info;
-		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, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d (%d%%)"), i, pc);
-		
-		msg = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
-			camel_exception_set (ex, (errno==EINTR)?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_SYSTEM, _("Cannot open message"));
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d"), i);
-			camel_object_unref (CAMEL_OBJECT (msg));
-			goto fail;
-		}
-		
-		info = camel_message_info_new_from_header(((CamelMimePart *)msg)->headers);
-		info->size = camel_mime_parser_tell(mp) - last;
-		last = camel_mime_parser_tell(mp);
-		status = camel_filter_driver_filter_message (driver, msg, info, NULL, NULL, source_url, 
-							     original_source_url ? original_source_url : source_url, ex);
-		camel_object_unref (CAMEL_OBJECT (msg));
-		if (camel_exception_is_set (ex) || status == -1) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d"), i);
-			camel_message_info_free (info);
-			goto fail;
-		}
-		
-		i++;
-		
-		/* skip over the FROM_END state */
-		camel_mime_parser_step (mp, 0, 0);
-
-		camel_message_info_free (info);
-	}
-	
-	if (p->defaultfolder) {
-		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, _("Syncing folder"));
-		camel_folder_sync(p->defaultfolder, FALSE, camel_exception_is_set (ex) ? NULL : ex);
-	}
-	
-	report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));
-
-	ret = 0;
-fail:
-	g_free (source_url);
-	if (fd != -1)
-		close (fd);
-	if (mp)
-		camel_object_unref (CAMEL_OBJECT (mp));
-	
-	return -1;
-}
-
-
-/**
- * camel_filter_driver_filter_folder:
- * @driver: CamelFilterDriver
- * @folder: CamelFolder to be filtered
- * @cache: UID cache (needed for POP folders)
- * @uids: message uids to be filtered or NULL (as a shortcut to filter all messages)
- * @remove: TRUE to mark filtered messages as deleted
- * @ex: exception
- *
- * Filters a folder based on rules defined in the FilterDriver
- * object.
- *
- * Returns -1 if errors were encountered during filtering,
- * otherwise returns 0.
- *
- **/
-int
-camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folder, CamelUIDCache *cache,
-				   GPtrArray *uids, gboolean remove, CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	gboolean freeuids = FALSE;
-	CamelMessageInfo *info;
-	char *source_url, *service_url;
-	const char *folder_name;
-	int status = 0;
-	CamelURL *url;
-	int i;
-	
-	service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (folder)));
-	url = camel_url_new (service_url, NULL);
-	g_free (service_url);
-	
-	folder_name = camel_folder_get_full_name (folder);
-	
-	if (folder_name && *folder_name != '/') {
-		char *path;
-		
-		path = g_strdup_printf ("/%s", folder_name);
-		camel_url_set_path (url, path);
-		g_free (path);
-	} else {
-		camel_url_set_path (url, folder_name);
-	}
-	
-	source_url = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-	camel_url_free (url);
-	
-	if (uids == NULL) {
-		uids = camel_folder_get_uids (folder);
-		freeuids = TRUE;
-	}
-	
-	for (i = 0; i < uids->len; i++) {
-		int pc = (100 * i)/uids->len;
-		
-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d of %d"), i+1,
-			       uids->len);
-		
-		if (camel_folder_has_summary_capability (folder))
-			info = camel_folder_get_message_info (folder, uids->pdata[i]);
-		else
-			info = NULL;
-		
-		status = camel_filter_driver_filter_message (driver, NULL, info, uids->pdata[i],
-							     folder, source_url, source_url, ex);
-		
-		if (camel_folder_has_summary_capability (folder))
-			camel_folder_free_message_info (folder, info);
-		
-		if (camel_exception_is_set (ex) || status == -1) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed at message %d of %d"),
-				       i+1, uids->len);
-			status = -1;
-			break;
-		}
-		
-		if (remove)
-			camel_folder_set_message_flags (folder, uids->pdata[i],
-							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN, ~0);
-		
-		if (cache)
-			camel_uid_cache_save_uid (cache, uids->pdata[i]);
-	}
-	
-	if (freeuids)
-		camel_folder_free_uids (folder, uids);
-	
-	if (p->defaultfolder) {
-		report_status (driver, CAMEL_FILTER_STATUS_PROGRESS, 100, _("Syncing folder"));
-		camel_folder_sync (p->defaultfolder, FALSE, camel_exception_is_set (ex) ? NULL : ex);
-	}
-	
-	if (i == uids->len)
-		report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));
-	
-	g_free (source_url);
-	
-	return status;
-}
-
-
-struct _get_message {
-	struct _CamelFilterDriverPrivate *p;
-	const char *source_url;
-};
-
-
-static CamelMimeMessage *
-get_message_cb (void *data, CamelException *ex)
-{
-	struct _get_message *msgdata = data;
-	struct _CamelFilterDriverPrivate *p = msgdata->p;
-	const char *source_url = msgdata->source_url;
-	CamelMimeMessage *message;
-	
-	if (p->message) {
-		message = p->message;
-		camel_object_ref (CAMEL_OBJECT (message));
-	} else {
-		const char *uid;
-		
-		if (p->uid)
-			uid = p->uid;
-		else
-			uid = camel_message_info_uid (p->info);
-		
-		message = camel_folder_get_message (p->source, uid, ex);
-	}
-	
-	if (source_url && camel_mime_message_get_source (message) == NULL)
-		camel_mime_message_set_source (message, source_url);
-	
-	return message;
-}
-
-/**
- * camel_filter_driver_filter_message:
- * @driver: CamelFilterDriver
- * @message: message to filter or NULL
- * @info: message info or NULL
- * @uid: message uid or NULL
- * @source: source folder or NULL
- * @source_url: url of source folder or NULL
- * @original_source_url: url of original source folder (pre-movemail) or NULL
- * @ex: exception
- *
- * Filters a message based on rules defined in the FilterDriver
- * object. If the source folder (@source) and the uid (@uid) are
- * provided, the filter will operate on the CamelFolder (which in
- * certain cases is more efficient than using the default
- * camel_folder_append_message() function).
- *
- * Returns -1 if errors were encountered during filtering,
- * otherwise returns 0.
- *
- **/
-int
-camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage *message,
-				    CamelMessageInfo *info, const char *uid,
-				    CamelFolder *source, const char *source_url,
-				    const char *original_source_url,
-				    CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	struct _filter_rule *node;
-	gboolean freeinfo = FALSE;
-	gboolean filtered = FALSE;
-	ESExpResult *r;
-	int result;
-	
-	/* FIXME: make me into a g_return_if_fail/g_assert or whatever... */
-	if (message == NULL && (source == NULL || uid == NULL)) {
-		g_warning ("there is no way to fetch the message using the information provided...");
-		return -1;
-	}
-	
-	if (info == NULL) {
-		struct _header_raw *h;
-		
-		if (message) {
-			camel_object_ref (CAMEL_OBJECT (message));
-		} else {
-			message = camel_folder_get_message (source, uid, ex);
-			if (!message)
-				return -1;
-		}
-		
-		h = CAMEL_MIME_PART (message)->headers;
-		info = camel_message_info_new_from_header (h);
-		freeinfo = TRUE;
-	} else {
-		if (info->flags & CAMEL_MESSAGE_DELETED)
-			return 0;
-		
-		uid = camel_message_info_uid (info);
-		
-		if (message)
-			camel_object_ref (CAMEL_OBJECT (message));
-	}
-	
-	p->ex = ex;
-	p->terminated = FALSE;
-	p->deleted = FALSE;
-	p->copied = FALSE;
-	p->message = message;
-	p->info = info;
-	p->uid = uid;
-	p->source = source;
-	
-	if (message && original_source_url && camel_mime_message_get_source (message) == NULL)
-		camel_mime_message_set_source (message, original_source_url);
-	
-	node = (struct _filter_rule *) p->rules.head;
-	result = CAMEL_SEARCH_NOMATCH;
-	while (node->next && !p->terminated) {
-		struct _get_message data;
-		
-		d(fprintf (stderr, "applying rule %s\naction %s\n", node->match, node->action));
-		
-		data.p = p;
-		data.source_url = original_source_url;
-		
-		result = camel_filter_search_match (get_message_cb, &data, p->info, 
-						    original_source_url ? original_source_url : source_url,
-						    node->match, p->ex);
-		
-		switch (result) {
-		case CAMEL_SEARCH_ERROR:
-			goto error;
-		case CAMEL_SEARCH_MATCHED:
-			filtered = TRUE;
-			camel_filter_driver_log (driver, FILTER_LOG_START, node->name);
-			
-			/* perform necessary filtering actions */
-			e_sexp_input_text (p->eval, node->action, strlen (node->action));
-			if (e_sexp_parse (p->eval) == -1) {
-				camel_exception_setv (ex, 1, _("Error parsing filter: %s: %s"),
-						      e_sexp_error (p->eval), node->action);
-				goto error;
-			}
-			r = e_sexp_eval (p->eval);
-			if (r == NULL) {
-				camel_exception_setv (ex, 1, _("Error executing filter: %s: %s"),
-						      e_sexp_error (p->eval), node->action);
-				goto error;
-			}
-			e_sexp_result_free (p->eval, r);
-		default:
-			break;
-		}
-		
-		node = node->next;
-	}
-	
-	/* *Now* we can set the DELETED flag... */
-	if (p->deleted) {
-		if (p->source && p->uid && camel_folder_has_summary_capability (p->source))
-			camel_folder_set_message_flags(p->source, p->uid, CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);
-		else
-			info->flags |= CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_FOLDER_FLAGGED;
-	}
-	
-	/* Logic: if !Moved and there exists a default folder... */
-	if (!(p->copied && p->deleted) && p->defaultfolder) {
-		/* copy it to the default inbox */
-		filtered = TRUE;
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder");
-		if (p->uid && p->source && camel_folder_has_summary_capability (p->source)) {
-			GPtrArray *uids;
-			
-			uids = g_ptr_array_new ();
-			g_ptr_array_add (uids, (char *) p->uid);
-			camel_folder_transfer_messages_to (p->source, uids, p->defaultfolder, NULL, FALSE, p->ex);
-			g_ptr_array_free (uids, TRUE);
-		} else {
-			if (p->message == NULL) {
-				p->message = camel_folder_get_message (source, uid, ex);
-				if (!p->message)
-					goto error;
-			}
-			
-			camel_folder_append_message (p->defaultfolder, p->message, p->info, NULL, p->ex);
-		}
-	}
-	
-	if (p->message)
-		camel_object_unref (CAMEL_OBJECT (p->message));
-	
-	if (freeinfo)
-		camel_message_info_free (info);
-	
-	return 0;
-	
- error:
-	if (filtered)
-		camel_filter_driver_log (driver, FILTER_LOG_END, NULL);
-	
-	if (p->message)
-		camel_object_unref (CAMEL_OBJECT (p->message));
-	
-	if (freeinfo)
-		camel_message_info_free (info);
-	
-	return -1;
-}
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
deleted file mode 100644
index 3f86a47a33..0000000000
--- a/camel/camel-filter-driver.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_FILTER_DRIVER_H
-#define _CAMEL_FILTER_DRIVER_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <camel/camel-object.h>
-#include <camel/camel-session.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-uid-cache.h>
-
-#define CAMEL_FILTER_DRIVER_TYPE   (camel_filter_driver_get_type())
-#define CAMEL_FILTER_DRIVER(obj)         CAMEL_CHECK_CAST (obj, camel_filter_driver_get_type (), CamelFilterDriver)
-#define CAMEL_FILTER_DRIVER_CLASS(klass) CAMEL__CHECK_CLASS_CAST (klass, camel_filter_driver_get_type (), CamelFilterDriverClass)
-#define CAMEL_IS_FILTER_DRIVER(obj)      CAMEL_CHECK_TYPE (obj, camel_filter_driver_get_type ())
-
-typedef struct _CamelFilterDriverClass CamelFilterDriverClass;
-
-struct _CamelFilterDriver {
-	CamelObject parent;
-
-	struct _CamelFilterDriverPrivate *priv;
-};
-
-struct _CamelFilterDriverClass {
-	CamelObjectClass parent_class;
-};
-
-/* FIXME: this maybe should change... */
-/* type of status for a status report */
-enum camel_filter_status_t {
-	CAMEL_FILTER_STATUS_NONE,
-	CAMEL_FILTER_STATUS_START,	/* start of new message processed */
-	CAMEL_FILTER_STATUS_ACTION,	/* an action performed */
-	CAMEL_FILTER_STATUS_PROGRESS,	/* (an) extra update(s), if its taking longer to process */
-	CAMEL_FILTER_STATUS_END,	/* end of message */
-};
-
-typedef CamelFolder * (*CamelFilterGetFolderFunc) (CamelFilterDriver *driver, const char *uri,
-						   void *data, CamelException *ex);
-/* report status */
-typedef void (CamelFilterStatusFunc) (CamelFilterDriver *driver, enum camel_filter_status_t status,
-				      int pc, const char *desc, void *data);
-
-typedef void (CamelFilterShellExecFunc)  (CamelFilterDriver *driver, const char *command, void *data);
-typedef void (CamelFilterPlaySoundFunc)  (CamelFilterDriver *driver, const char *filename, void *data);
-typedef void (CamelFilterSystemBeepFunc) (CamelFilterDriver *driver, void *data);
-
-CamelType          camel_filter_driver_get_type (void);
-CamelFilterDriver  *camel_filter_driver_new     (void);
-
-/* modifiers */
-void camel_filter_driver_set_logfile          (CamelFilterDriver *d, FILE *logfile);
-
-void camel_filter_driver_set_status_func      (CamelFilterDriver *d, CamelFilterStatusFunc *func, void *data);
-void camel_filter_driver_set_shell_exec_func  (CamelFilterDriver *d, CamelFilterShellExecFunc *func, void *data);
-void camel_filter_driver_set_play_sound_func  (CamelFilterDriver *d, CamelFilterPlaySoundFunc *func, void *data);
-void camel_filter_driver_set_system_beep_func (CamelFilterDriver *d, CamelFilterSystemBeepFunc *func, void *data);
-void camel_filter_driver_set_folder_func      (CamelFilterDriver *d, CamelFilterGetFolderFunc fetcher, void *data);
-
-void camel_filter_driver_set_default_folder   (CamelFilterDriver *d, CamelFolder *def);
-
-void camel_filter_driver_add_rule             (CamelFilterDriver *d, const char *name, const char *match,
-					       const char *action);
-int  camel_filter_driver_remove_rule_by_name  (CamelFilterDriver *d, const char *name);
-
-/*void camel_filter_driver_set_global(CamelFilterDriver *, const char *name, const char *value);*/
-
-void camel_filter_driver_flush                (CamelFilterDriver *driver, CamelException *ex);
-
-int  camel_filter_driver_filter_message       (CamelFilterDriver *driver, CamelMimeMessage *message,
-					       CamelMessageInfo *info, const char *uri,
-					       CamelFolder *source, const char *source_url,
-					       const char *original_source_url, CamelException *ex);
-
-int  camel_filter_driver_filter_mbox          (CamelFilterDriver *driver, const char *mbox,
-					       const char *original_source_url, CamelException *ex);
-
-int  camel_filter_driver_filter_folder        (CamelFilterDriver *driver, CamelFolder *folder, CamelUIDCache *cache,
-					       GPtrArray *uids, gboolean remove, CamelException *ex);
-
-#if 0
-/* generate the search query/action string for a filter option */
-void camel_filter_driver_expand_option (CamelFilterDriver *d, GString *s, GString *action, struct filter_option *op);
-
-/* get info about rules (options) */
-int camel_filter_driver_rule_count (CamelFilterDriver *d);
-struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, int n);
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_FILTER_DRIVER_H */
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
deleted file mode 100644
index 02362b7e2b..0000000000
--- a/camel/camel-filter-search.c
+++ /dev/null
@@ -1,699 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	     Michael Zucchi <NotZed@Ximian.com>
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *  Copyright 2001 Ximian Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-/* (from glibc headers:
-   POSIX says that <sys/types.h> must be included (by the caller) before <regex.h>.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <signal.h>
-#include <sys/wait.h>
-
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include <gal/util/e-iconv.h>
-
-#include "e-util/e-sexp.h"
-
-#include "camel-mime-message.h"
-#include "camel-filter-search.h"
-#include "camel-exception.h"
-#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-fs.h"
-#include "camel-search-private.h"
-
-#include "camel-url.h"
-
-#define d(x)
-
-typedef struct {
-	CamelFilterSearchGetMessageFunc get_message;
-	void *get_message_data;
-	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 *header_full_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 *system_flag (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);
-static ESExpResult *get_size (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *shell_exec (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,          1 },
-	{ "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 },
-	{ "header-full-regex",  (ESExpFunc *) header_full_regex,  0 },
-	{ "user-tag",           (ESExpFunc *) user_tag,           0 },
-	{ "user-flag",          (ESExpFunc *) user_flag,          0 },
-	{ "system-flag",        (ESExpFunc *) system_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 },
-	{ "get-size",           (ESExpFunc *) get_size,           0 },
-	{ "shell-exec",         (ESExpFunc *) shell_exec,         0 },
-};
-
-
-static CamelMimeMessage *
-camel_filter_search_get_message (FilterMessageSearch *fms, struct _ESExp *sexp)
-{
-	if (fms->message)
-		return fms->message;
-	
-	fms->message = fms->get_message (fms->get_message_data, fms->ex);
-	
-	if (fms->message == NULL)
-		e_sexp_fatal_error (sexp, _("Failed to retrieve message"));
-	
-	return fms->message;
-}
-
-static ESExpResult *
-check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms, camel_search_match_t how)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	int i;
-	
-	if (argc > 1 && argv[0]->type == ESEXP_RES_STRING) {
-		char *name = argv[0]->value.string;
-		const char *header;
-		camel_search_t type = CAMEL_SEARCH_TYPE_ENCODED;
-		CamelContentType *ct;
-		const char *charset = NULL;
-		
-		if (strcasecmp(name, "x-camel-mlist") == 0) {
-			header = camel_message_info_mlist(fms->info);
-			type = CAMEL_SEARCH_TYPE_MLIST;
-		} else {
-			CamelMimeMessage *message = camel_filter_search_get_message (fms, f);
-			
-			header = camel_medium_get_header (CAMEL_MEDIUM (message), argv[0]->value.string);
-			/* FIXME: what about Resent-To, Resent-Cc and Resent-From? */
-			if (strcasecmp("to", name) == 0 || strcasecmp("cc", name) == 0 || strcasecmp("from", name) == 0)
-				type = CAMEL_SEARCH_TYPE_ADDRESS_ENCODED;
-			else {
-				ct = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));
-				if (ct)
-					charset = e_iconv_charset_name(header_content_type_param(ct, "charset"));
-			}
-		}
-		
-		if (header) {
-			for (i=1; i<argc && !matched; i++) {
-				if (argv[i]->type == ESEXP_RES_STRING)
-					matched = camel_search_header_match(header, argv[i]->value.string, how, type, charset);
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_CONTAINS);
-}
-
-
-static ESExpResult *
-header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_EXACT);
-}
-
-static ESExpResult *
-header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_STARTS);
-}
-
-static ESExpResult *
-header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_ENDS);
-}
-
-static ESExpResult *
-header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_SOUNDEX);
-}
-
-static ESExpResult *
-header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	CamelMimeMessage *message;
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	int i;
-	
-	message = camel_filter_search_get_message (fms, f);
-	
-	for (i = 0; i < argc && !matched; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING)
-			matched = camel_medium_get_header (CAMEL_MEDIUM (message), argv[i]->value.string) != NULL;
-	}
-	
-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	CamelMimeMessage *message;
-	regex_t pattern;
-	const char *contents;
-	
-	message = camel_filter_search_get_message (fms, f);
-	
-	if (argc > 1 && argv[0]->type == ESEXP_RES_STRING
-	    && (contents = camel_medium_get_header (CAMEL_MEDIUM (message), argv[0]->value.string))
-	    && camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc-1, argv+1, fms->ex) == 0) {
-		r->value.bool = regexec (&pattern, contents, 0, NULL, 0) == 0;
-		regfree (&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static gchar *
-get_full_header (CamelMimeMessage *message)
-{
-	CamelMimePart *mp = CAMEL_MIME_PART (message);
-	GString *str = g_string_new ("");
-	char   *ret;
-	struct _header_raw *h;
-	
-	for (h = mp->headers; h; h = h->next) {
-		if (h->value != NULL) {
-			g_string_append (str, h->name);
-			if (isspace (h->value[0]))
-				g_string_append (str, ":");
-			else
-				g_string_append (str, ": ");
-			g_string_append (str, h->value);
-			g_string_append_c(str, '\n');
-		}
-	}
-	
-	ret = str->str;
-	g_string_free (str, FALSE);
-	
-	return ret;
-}
-
-static ESExpResult *
-header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	CamelMimeMessage *message;
-	regex_t pattern;
-	char *contents;
-	
-	if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_NEWLINE,
-					   argc, argv, fms->ex) == 0) {
-		message = camel_filter_search_get_message (fms, f);
-		contents = get_full_header (message);
-		r->value.bool = regexec (&pattern, contents, 0, NULL, 0) == 0;
-		g_free (contents);
-		regfree (&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	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;
-	
-	if (argc > 0)
-		return e_sexp_term_eval (f, argv[0]);
-	
-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	CamelMimeMessage *message;
-	regex_t pattern;
-	
-	if (camel_search_build_match_regex (&pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, fms->ex) == 0) {
-		message = camel_filter_search_get_message (fms, f);
-		r->value.bool = camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern);
-		regfree (&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	CamelMimeMessage *message;
-	regex_t pattern;
-	
-	if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_NEWLINE,
-					   argc, argv, fms->ex) == 0) {
-		message = camel_filter_search_get_message (fms, f);
-		r->value.bool = camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern);
-		regfree (&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	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 (f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-	
-	return r;
-}
-
-static ESExpResult *
-system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	gboolean truth = FALSE;
-	
-	if (argc == 1)
-		truth = camel_system_flag_get (fms->info->flags, argv[0]->value.string);
-	
-	r = e_sexp_result_new (f, 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 (f, 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)
-{
-	CamelMimeMessage *message;
-	ESExpResult *r;
-	
-	message = camel_filter_search_get_message (fms, f);
-	r = e_sexp_result_new (f, ESEXP_RES_INT);
-	r->value.number = camel_mime_message_get_date (message, NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	CamelMimeMessage *message;
-	ESExpResult *r;
-	
-	message = camel_filter_search_get_message (fms, f);
-	r = e_sexp_result_new (f, ESEXP_RES_INT);
-	r->value.number = camel_mime_message_get_date_received (message, NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (f, 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 (f, 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)
-{
-	CamelMimeMessage *message;
-	ESExpResult *r;
-	char *src = NULL;
-	char *tmp;
-	
-	if (fms->source) {
-		CamelURL *url;
-		
-		url = camel_url_new (fms->source, NULL);
-		if (url) {
-			src = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-			camel_url_free (url);
-		}
-	} else {
-		message = camel_filter_search_get_message (fms, f);
-		src = g_strdup (camel_mime_message_get_source (message));
-	}
-	
-	/* This is an abusive hack */
-	if (src && (tmp = strstr (src, "://"))) {
-		tmp += 3;
-		tmp = strchr (tmp, '/');
-		if (tmp)
-			*tmp = '\0';
-	}
-	
-	if (src) {
-		r = e_sexp_result_new (f, ESEXP_RES_STRING);
-		r->value.string = src;
-	} else {
-		r = e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
-	}
-	
-	return r;
-}
-
-/* remember, the size comparisons are done at Kbytes */
-static ESExpResult *
-get_size (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(f, ESEXP_RES_INT);
-	r->value.number = fms->info->size / 1024;
-
-	return r;
-}
-
-static int
-run_command (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	CamelMimeMessage *message;
-	CamelStream *stream;
-	int result, status;
-	int in_fds[2];
-	pid_t pid;
-	
-	if (pipe (in_fds) == -1) {
-		camel_exception_setv (fms->ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to create pipe to '%s': %s"),
-				      argv[0]->value.string, g_strerror (errno));
-		return -1;
-	}
-	
-	if (!(pid = fork ())) {
-		/* child process */
-		GPtrArray *args;
-		int maxfd, i;
-		
-		if (dup2 (in_fds[0], STDIN_FILENO) < 0)
-			_exit (255);
-		
-		setsid ();
-		
-		maxfd = sysconf (_SC_OPEN_MAX);
-		if (maxfd > 0) {
-			for (i = 0; i < maxfd; i++) {
-				if (i != STDIN_FILENO && i != STDOUT_FILENO && i != STDERR_FILENO)
-					close (i);
-			}
-		}
-		
-		args = g_ptr_array_new ();
-		g_ptr_array_add (args, g_basename (argv[0]->value.string));
-		for (i = 1; i < argc; i++) {
-			g_ptr_array_add (args, argv[i]->value.string);
-		}
-		g_ptr_array_add (args, NULL);
-		
-		execvp (argv[0]->value.string, (char **) args->pdata);
-		
-		g_ptr_array_free (args, TRUE);
-		
-		fprintf (stderr, "Could not execute %s: %s\n", argv[0]->value.string,
-			 g_strerror (errno));
-		_exit (255);
-	} else if (pid < 0) {
-		camel_exception_setv (fms->ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to create create child process '%s': %s"),
-				      argv[0]->value.string, g_strerror (errno));
-		return -1;
-	}
-	
-	/* parent process */
-	close (in_fds[0]);
-	fcntl (in_fds[1], F_SETFL, O_NONBLOCK);
-	
-	stream = camel_stream_fs_new_with_fd (in_fds[1]);
-	
-	message = camel_filter_search_get_message (fms, f);
-	
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-	camel_stream_flush (stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	result = waitpid (pid, &status, 0);
-	
-	if (result == -1 && errno == EINTR) {
-		/* child process is hanging... */
-		kill (pid, SIGTERM);
-		sleep (1);
-		result = waitpid (pid, &status, WNOHANG);
-		if (result == 0) {
-			/* ...still hanging, set phasers to KILL */
-			kill (pid, SIGKILL);
-			sleep (1);
-			result = waitpid (pid, &status, WNOHANG);
-		}
-	}
-	
-	if (result != -1 && WIFEXITED (status))
-		return WEXITSTATUS (status);
-	else
-		return -1;	
-}
-
-static ESExpResult *
-shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	int retval, i;
-	
-	/* make sure all args are strings */
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type != ESEXP_RES_STRING) {
-			retval = -1;
-			goto done;
-		}
-	}
-	
-	retval = run_command (f, argc, argv, fms);
-	
- done:
-	r = e_sexp_result_new (f, ESEXP_RES_INT);
-	r->value.number = retval;
-	
-	return r;
-}
-
-
-/**
- * camel_filter_search_match:
- * @message:
- * @info:
- * @source:
- * @expression:
- * @ex:
- *
- * Returns one of CAMEL_SEARCH_MATCHED, CAMEL_SEARCH_NOMATCH, or CAMEL_SEARCH_ERROR.
- **/
-int
-camel_filter_search_match (CamelFilterSearchGetMessageFunc get_message, void *data,
-			   CamelMessageInfo *info, const char *source,
-			   const char *expression, CamelException *ex)
-{
-	FilterMessageSearch fms;
-	ESExp *sexp;
-	ESExpResult *result;
-	gboolean retval;
-	int i;
-	
-	fms.get_message = get_message;
-	fms.get_message_data = data;
-	fms.message = NULL;
-	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));
-	if (e_sexp_parse (sexp) == -1) {
-		if (!camel_exception_is_set (ex))
-			camel_exception_setv (ex, 1, _("Error executing filter search: %s: %s"),
-					      e_sexp_error (sexp), expression);
-		goto error;
-	}
-	
-	result = e_sexp_eval (sexp);
-	if (result == NULL) {
-		if (!camel_exception_is_set (ex))
-			camel_exception_setv (ex, 1, _("Error executing filter search: %s: %s"),
-					      e_sexp_error (sexp), expression);
-		goto error;
-	}
-	
-	if (result->type == ESEXP_RES_BOOL)
-		retval = result->value.bool ? CAMEL_SEARCH_MATCHED : CAMEL_SEARCH_NOMATCH;
-	else
-		retval = CAMEL_SEARCH_NOMATCH;
-	
-	e_sexp_result_free (sexp, result);
-	e_sexp_unref (sexp);
-	
-	if (fms.message)
-		camel_object_unref (CAMEL_OBJECT (fms.message));
-	
-	return retval;
-	
- error:
-	if (fms.message)
-		camel_object_unref (CAMEL_OBJECT (fms.message));
-	
-	e_sexp_unref (sexp);
-	
-	return CAMEL_SEARCH_ERROR;
-}
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
deleted file mode 100644
index d54c3c03b7..0000000000
--- a/camel/camel-filter-search.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	     Michael Zucchi <NotZed@Ximian.com>
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *  Copyright 2001 Ximian Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_FILTER_SEARCH_H
-#define CAMEL_FILTER_SEARCH_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder-summary.h>
-
-enum {
-	CAMEL_SEARCH_ERROR    = -1,
-	CAMEL_SEARCH_NOMATCH  =  0,
-	CAMEL_SEARCH_MATCHED  =  1,
-};
-
-typedef CamelMimeMessage * (*CamelFilterSearchGetMessageFunc) (void *data, CamelException *ex);
-
-int camel_filter_search_match (CamelFilterSearchGetMessageFunc get_message, void *data,
-			       CamelMessageInfo *info, const char *source,
-			       const char *expression, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! CAMEL_FILTER_SEARCH_H */
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
deleted file mode 100644
index 92b73e6f59..0000000000
--- a/camel/camel-folder-search.c
+++ /dev/null
@@ -1,1159 +0,0 @@
-/*
- *  Copyright (C) 2000,2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <regex.h>
-
-#include <glib.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 "camel-stream-mem.h"
-#include "e-util/e-memory.h"
-#include "camel-search-private.h"
-
-#define d(x) 
-#define r(x) 
-
-struct _CamelFolderSearchPrivate {
-	GHashTable *mempool_hash;
-	CamelException *ex;
-};
-
-#define _PRIVATE(o) (((CamelFolderSearch *)(o))->priv)
-
-static ESExpResult *search_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-
-static ESExpResult *search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_matches(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_starts_with(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_ends_with(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_exists(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_system_flag(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_uid(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->not = search_not;
-
-	klass->match_all = search_match_all;
-	klass->body_contains = search_body_contains;
-	klass->header_contains = search_header_contains;
-	klass->header_matches = search_header_matches;
-	klass->header_starts_with = search_header_starts_with;
-	klass->header_ends_with = search_header_ends_with;
-	klass->header_exists = search_header_exists;
-	klass->user_tag = search_user_tag;
-	klass->user_flag = search_user_flag;
-	klass->system_flag = search_system_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;
-	klass->uid = search_uid;
-}
-
-static void
-camel_folder_search_init (CamelFolderSearch *obj)
-{
-	struct _CamelFolderSearchPrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	obj->sexp = e_sexp_new();
-
-	/* use a hash of mempools to associate the returned uid lists with
-	   the backing mempool.  yes pretty weird, but i didn't want to change
-	   the api just yet */
-
-	p->mempool_hash = g_hash_table_new(0, 0);
-}
-
-static void
-free_mempool(void *key, void *value, void *data)
-{
-	GPtrArray *uids = key;
-	EMemPool *pool = value;
-
-	g_warning("Search closed with outstanding result unfreed: %p", uids);
-
-	g_ptr_array_free(uids, TRUE);
-	e_mempool_destroy(pool);
-}
-
-static void
-camel_folder_search_finalize (CamelObject *obj)
-{
-	CamelFolderSearch *search = (CamelFolderSearch *)obj;
-	struct _CamelFolderSearchPrivate *p = _PRIVATE(obj);
-
-	if (search->sexp)
-		e_sexp_unref(search->sexp);
-
-	g_free(search->last_search);
-	g_hash_table_foreach(p->mempool_hash, free_mempool, obj);
-	g_hash_table_destroy(p->mempool_hash);
-	g_free(p);
-}
-
-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 },
-	/* we need to override this one though to implement an 'array not' */
-	{ "not", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, not), 0 },
-	{ "<", 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 parses, 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 },
-	{ "header-matches", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_matches), 1 },
-	{ "header-starts-with", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_starts_with), 1 },
-	{ "header-ends-with", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_ends_with), 1 },
-	{ "header-exists", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_exists), 1 },
-	{ "user-tag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_tag), 1 },
-	{ "user-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_flag), 1 },
-	{ "system-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, system_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 },
-	{ "uid", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, uid), 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)));
-			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)
-{
-	int i;
-
-	search->summary = summary;
-	if (search->summary_hash)
-		g_hash_table_destroy(search->summary_hash);
-	search->summary_hash = g_hash_table_new(g_str_hash, g_str_equal);
-	for (i=0;i<summary->len;i++)
-		g_hash_table_insert(search->summary_hash, (char *)camel_message_info_uid(summary->pdata[i]), summary->pdata[i]);
-}
-
-/**
- * camel_folder_search_set_body_index:
- * @search: 
- * @index: 
- * 
- * Set the index 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, CamelIndex *index)
-{
-	if (search->body_index)
-		camel_object_unref((CamelObject *)search->body_index);
-	search->body_index = index;
-	if (index)
-		camel_object_ref((CamelObject *)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;
-	int i;
-	GHashTable *results;
-	EMemPool *pool;
-	struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
-
-	p->ex = ex;
-
-	/* 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));
-		if (e_sexp_parse(search->sexp) == -1) {
-			camel_exception_setv(ex, 1, _("Cannot parse search expression: %s:\n%s"), e_sexp_error(search->sexp), expr);
-			return NULL;
-		}
-
-		g_free(search->last_search);
-		search->last_search = g_strdup(expr);
-	}
-	r = e_sexp_eval(search->sexp);
-	if (r == NULL) {
-		if (!camel_exception_is_set(ex))
-			camel_exception_setv(ex, 1, _("Error executing search expression: %s:\n%s"), e_sexp_error(search->sexp), expr);
-		return NULL;
-	}
-
-	matches = g_ptr_array_new();
-
-	/* now create a folder summary to return?? */
-	if (r
-	    && r->type == ESEXP_RES_ARRAY_PTR) {
-		d(printf("got result ...\n"));
-		/* we use a mempool to store the strings, packed in tight as possible, and freed together */
-		/* because the strings are often short (like <8 bytes long), we would be wasting appx 50%
-		   of memory just storing the size tag that malloc assigns us and alignment padding, so this
-		   gets around that (and is faster to allocate and free as a bonus) */
-		pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-		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);
-				char *uid = (char *)camel_message_info_uid(info);
-				if (g_hash_table_lookup(results, uid)) {
-					g_ptr_array_add(matches, e_mempool_strdup(pool, 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, e_mempool_strdup(pool, g_ptr_array_index(r->value.ptrarray, i)));
-			}
-		}
-		e_sexp_result_free(search->sexp, r);
-		/* instead of putting the mempool_hash in the structure, we keep the api clean by
-		   putting a reference to it in a hashtable.  Lets us do some debugging and catch
-		   unfree'd results as well. */
-		g_hash_table_insert(p->mempool_hash, matches, pool);
-	} else {
-		d(printf("no result!\n"));
-	}
-
-	search->folder = NULL;
-	search->summary = NULL;
-	search->current = NULL;
-	search->body_index = NULL;
-
-	return matches;
-}
-
-/**
- * camel_folder_search_match_expression:
- * @search: 
- * @expr: 
- * @info: 
- * @ex: 
- * 
- * Returns #TRUE if the expression matches the specific message info @info.
- * Note that the folder and index may need to be set for body searches to
- * operate as well.
- * 
- * Return value: 
- **/
-gboolean
-camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr, const CamelMessageInfo *info, CamelException *ex)
-{
-	GPtrArray *uids;
-	int ret = FALSE;
-
-	search->match1 = (CamelMessageInfo *)info;
-
-	uids = camel_folder_search_execute_expression(search, expr, ex);
-	if (uids) {
-		if (uids->len == 1)
-			ret = TRUE;
-		camel_folder_search_free_result(search, uids);
-	}
-	search->match1 = NULL;
-
-	return ret;
-}
-
-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *result)
-{
-	int i;
-	struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
-	EMemPool *pool;
-
-	pool = g_hash_table_lookup(p->mempool_hash, result);
-	if (pool) {
-		e_mempool_destroy(pool);
-		g_hash_table_remove(p->mempool_hash, result);
-	} else {
-		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(f, ESEXP_RES_BOOL);
-		r->value.bool = FALSE;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-/* impelemnt an 'array not', i.e. everything in the summary, not in the supplied array */
-static ESExpResult *
-search_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int i;
-
-	if (argc>0) {
-		if (argv[0]->type == ESEXP_RES_ARRAY_PTR) {
-			GPtrArray *v = argv[0]->value.ptrarray;
-			const char *uid;
-
-			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-			r->value.ptrarray = g_ptr_array_new();
-
-			/* not against a single message?*/
-			if (search->match1 || search->current) {
-				int found = FALSE;
-
-				if (search->match1)
-					uid = camel_message_info_uid(search->match1);
-				else
-					uid = camel_message_info_uid(search->current);
-
-				for (i=0;!found && i<v->len;i++) {
-					if (strcmp(uid, v->pdata[i]) == 0)
-						found = TRUE;
-				}
-
-				if (!found)
-					g_ptr_array_add(r->value.ptrarray, (char *)uid);
-			} else if (search->summary == NULL) {
-				g_warning("No summary set, 'not' against an array requires a summary");
-			} else {
-				/* 'not' against the whole summary */
-				GHashTable *have = g_hash_table_new(g_str_hash, g_str_equal);
-				char **s;
-				CamelMessageInfo **m;
-
-				s = (char **)v->pdata;
-				for (i=0;i<v->len;i++)
-					g_hash_table_insert(have, s[i], s[i]);
-
-				v = search->summary;
-				m = (CamelMessageInfo **)v->pdata;
-				for (i=0;i<v->len;i++) {
-					char *uid = (char *)camel_message_info_uid(m[i]);
-
-					if (g_hash_table_lookup(have, uid) == NULL)
-						g_ptr_array_add(r->value.ptrarray, uid);
-				}
-				g_hash_table_destroy(have);
-			}
-		} else {
-			int res = TRUE;
-
-			if (argv[0]->type == ESEXP_RES_BOOL)
-				res = ! argv[0]->value.bool;
-
-			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-			r->value.bool = res;
-		}
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = TRUE;
-	}
-
-	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(f, ESEXP_RES_ARRAY_PTR);
-	r->value.ptrarray = g_ptr_array_new();
-
-	/* we are only matching a single message? */
-	if (search->match1) {
-		search->current = search->match1;
-
-		d(printf("matching against 1 message: %s\n", camel_message_info_subject(search->current)));
-
-		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, (char *)camel_message_info_uid(search->current));
-			} else {
-				g_warning("invalid syntax, matches require a single bool result");
-				e_sexp_fatal_error(f, _("(match-all) requires a single bool result"));
-			}
-			e_sexp_result_free(f, r1);
-		} else {
-			g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(search->current));
-		}
-		search->current = NULL;
-
-		return r;
-	}
-
-	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");
-		g_assert(0);
-		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, (char *)camel_message_info_uid(search->current));
-			} else {
-				g_warning("invalid syntax, matches require a single bool result");
-				e_sexp_fatal_error(f, _("(match-all) requires a single bool result"));
-			}
-			e_sexp_result_free(f, r1);
-		} else {
-			g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(search->current));
-		}
-	}
-	search->current = NULL;
-
-	return r;
-}
-
-static ESExpResult *
-check_header(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search, camel_search_match_t how)
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	r(printf("executing check-header %d\n", how));
-
-	/* are we inside a match-all? */
-	if (search->current && argc>1
-	    && argv[0]->type == ESEXP_RES_STRING) {
-		char *headername;
-		const char *header = NULL;
-		char strbuf[32];
-		int i, j;
-		camel_search_t type = CAMEL_SEARCH_TYPE_ASIS;
-		struct _camel_search_words *words;
-
-		/* only a subset of headers are supported .. */
-		headername = argv[0]->value.string;
-		if (!strcasecmp(headername, "subject")) {
-			header = camel_message_info_subject(search->current);
-		} 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 = camel_message_info_from(search->current);
-			type = CAMEL_SEARCH_TYPE_ADDRESS;
-		} else if (!strcasecmp(headername, "to")) {
-			header = camel_message_info_to(search->current);
-			type = CAMEL_SEARCH_TYPE_ADDRESS;
-		} else if (!strcasecmp(headername, "cc")) {
-			header = camel_message_info_cc(search->current);
-			type = CAMEL_SEARCH_TYPE_ADDRESS;
-		} else if (!strcasecmp(headername, "x-camel-mlist")) {
-			header = camel_message_info_mlist(search->current);
-			type = CAMEL_SEARCH_TYPE_MLIST;
-		} else {
-			e_sexp_resultv_free(f, argc, argv);
-			e_sexp_fatal_error(f, _("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) {
-					if (argv[i]->value.string[0] == 0) {
-						truth = TRUE;
-					} else if (how == CAMEL_SEARCH_MATCH_CONTAINS) {
-						/* doesn't make sense to split words on anything but contains i.e. we can't have an ending match different words */
-						words = camel_search_words_split(argv[i]->value.string);
-						truth = TRUE;
-						for (j=0;j<words->len && truth;j++) {
-							truth = camel_search_header_match(header, words->words[j]->word, how, type, NULL);
-						}
-						camel_search_words_free(words);
-					} else {
-						truth = camel_search_header_match(header, argv[i]->value.string, how, type, NULL);
-					}
-				}
-			}
-		}
-	}
-	/* TODO: else, find all matches */
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_CONTAINS);
-}
-
-static ESExpResult *
-search_header_matches(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_EXACT);
-}
-
-static ESExpResult *
-search_header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_STARTS);
-}
-
-static ESExpResult *
-search_header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_ENDS);
-}
-
-static ESExpResult *
-search_header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	
-	r(printf ("executing header-exists\n"));
-	
-	if (search->current) {
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		if (argc == 1 && argv[0]->type == ESEXP_RES_STRING)
-			r->value.bool = camel_medium_get_header(CAMEL_MEDIUM(search->current), argv[0]->value.string) != NULL;
-		
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-	
-	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);
-}
-
-/* and, only store duplicates */
-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);
-}
-
-static int
-match_message_index(CamelIndex *idx, const char *uid, const char *match, CamelException *ex)
-{
-	CamelIndexCursor *wc, *nc;
-	const char *word, *name;
-	int truth = FALSE;
-
-	wc = camel_index_words(idx);
-	if (wc) {
-		while (!truth && (word = camel_index_cursor_next(wc))) {
-			if (camel_ustrstrcase(word,match) != NULL) {
-				/* perf: could have the wc cursor return the name cursor */
-				nc = camel_index_find(idx, word);
-				if (nc) {
-					while (!truth && (name = camel_index_cursor_next(nc)))
-						truth = strcmp(name, uid) == 0;
-					camel_object_unref((CamelObject *)nc);
-				}
-			}
-		}
-		camel_object_unref((CamelObject *)wc);
-	}
-
-	return truth;
-}
-
-/*
- "one two" "three" "four five"
-
-  one and two
-or
-  three
-or
-  four and five
-*/
-
-/* returns messages which contain all words listed in words */
-static GPtrArray *
-match_words_index(CamelFolderSearch *search, struct _camel_search_words *words, CamelException *ex)
-{
-	GPtrArray *result = g_ptr_array_new();
-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
-	CamelIndexCursor *wc, *nc;
-	const char *word, *name;
-	CamelMessageInfo *mi;
-	int i;
-
-	/* we can have a maximum of 32 words, as we use it as the AND mask */
-			
-	wc = camel_index_words(search->body_index);
-	if (wc) {
-		while ((word = camel_index_cursor_next(wc))) {
-			for (i=0;i<words->len;i++) {
-				if (camel_ustrstrcase(word, words->words[i]->word) != NULL) {
-					/* perf: could have the wc cursor return the name cursor */
-					nc = camel_index_find(search->body_index, word);
-					if (nc) {
-						while ((name = camel_index_cursor_next(nc))) {
-							mi = g_hash_table_lookup(search->summary_hash, name);
-							if (mi) {
-								int mask;
-								const char *uid = camel_message_info_uid(mi);
-
-								mask = ((int)g_hash_table_lookup(ht, uid)) | (1<<i);
-								g_hash_table_insert(ht, (char *)uid, (void *)mask);
-							}
-						}
-						camel_object_unref((CamelObject *)nc);
-					}
-				}
-			}
-		}
-		camel_object_unref((CamelObject *)wc);
-
-		lambdafoo.uids = result;
-		lambdafoo.count = (1<<words->len) - 1;
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &lambdafoo);
-		g_hash_table_destroy(ht);
-	}
-
-	return result;
-}
-
-static gboolean
-match_words_1message (CamelDataWrapper *object, struct _camel_search_words *words, guint32 *mask)
-{
-	CamelDataWrapper *containee;
-	int truth = FALSE;
-	int parts, i;
-	
-	containee = camel_medium_get_content_object (CAMEL_MEDIUM (object));
-	
-	if (containee == NULL)
-		return FALSE;
-	
-	/* 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 = match_words_1message(part, words, mask);
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
-		/* for messages we only look at its contents */
-		truth = match_words_1message((CamelDataWrapper *)containee, words, mask);
-	} else if (header_content_type_is(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 ();
-
-		/* FIXME: The match should be part of a stream op */
-		camel_data_wrapper_write_to_stream (containee, CAMEL_STREAM (mem));
-		camel_stream_write (CAMEL_STREAM (mem), "", 1);
-		for (i=0;i<words->len;i++) {
-			/* FIXME: This is horridly slow, and should use a real search algorithm */
-			if (camel_ustrstrcase(mem->buffer->data, words->words[i]->word) != NULL) {
-				*mask |= (1<<i);
-				/* shortcut a match */
-				if (*mask == (1<<(words->len))-1)
-					return TRUE;
-			}
-		}
-		camel_object_unref (CAMEL_OBJECT (mem));
-	}
-	
-	return truth;
-}
-
-static gboolean
-match_words_message(CamelFolder *folder, const char *uid, struct _camel_search_words *words, CamelException *ex)
-{
-	guint32 mask;
-	CamelMimeMessage *msg;
-	int truth;
-
-	msg = camel_folder_get_message(folder, uid, ex);
-	if (msg) {
-		mask = 0;
-		truth = match_words_1message((CamelDataWrapper *)msg, words, &mask);
-		camel_object_unref((CamelObject *)msg);
-	} else {
-		camel_exception_clear(ex);
-		truth = FALSE;
-	}
-
-	return truth;
-}
-
-static GPtrArray *
-match_words_messages(CamelFolderSearch *search, struct _camel_search_words *words, CamelException *ex)
-{
-	int i;
-	GPtrArray *matches = g_ptr_array_new();
-
-	if (search->body_index) {
-		GPtrArray *indexed;
-		struct _camel_search_words *simple;
-
-		simple = camel_search_words_simple(words);
-		indexed = match_words_index(search, simple, ex);
-		camel_search_words_free(simple);
-
-		for (i=0;i<indexed->len;i++) {
-			const char *uid = g_ptr_array_index(indexed, i);
-			
-			if (match_words_message(search->folder, uid, words, ex))
-				g_ptr_array_add(matches, (char *)uid);
-		}
-		
-		g_ptr_array_free(indexed, TRUE);
-	} else {
-		for (i=0;i<search->summary->len;i++) {
-			CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
-			const char *uid = camel_message_info_uid(info);
-			
-			if (match_words_message(search->folder, uid, words, ex))
-				g_ptr_array_add(matches, (char *)uid);
-		}
-	}
-
-	return matches;
-}
-
-static ESExpResult *
-search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	int i, j;
-	CamelException *ex = search->priv->ex;
-	struct _camel_search_words *words;
-	ESExpResult *r;
-	struct _glib_sux_donkeys lambdafoo;
-
-	if (search->current) {	
-		int truth = FALSE;
-
-		if (argc == 1 && argv[0]->value.string[0] == 0) {
-			truth = TRUE;
-		} else {
-			for (i=0;i<argc && !truth;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING) {
-					words = camel_search_words_split(argv[i]->value.string);
-					truth = TRUE;
-					if ((words->type & CAMEL_SEARCH_WORD_COMPLEX) == 0 && search->body_index) {
-						for (j=0;j<words->len && truth;j++)
-							truth = match_message_index(search->body_index, camel_message_info_uid(search->current), words->words[j]->word, ex);
-					} else {
-						/* TODO: cache current message incase of multiple body search terms */
-						truth = match_words_message(search->folder, camel_message_info_uid(search->current), words, ex);
-					}
-					camel_search_words_free(words);
-				}
-			}
-		}
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-
-		if (argc == 1 && argv[0]->value.string[0] == 0) {
-			for (i=0;i<search->summary->len;i++) {
-				CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
-
-				g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(info));
-			}
-		} else {
-			GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-			GPtrArray *matches;
-
-			for (i=0;i<argc;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING) {
-					words = camel_search_words_split(argv[i]->value.string);
-					if ((words->type & CAMEL_SEARCH_WORD_COMPLEX) == 0 && search->body_index) {
-						matches = match_words_index(search, words, ex);
-					} else {
-						matches = match_words_messages(search, words, ex);
-					}
-					for (j=0;j<matches->len;j++)
-						g_hash_table_insert(ht, matches->pdata[j], matches->pdata[j]);
-					g_ptr_array_free(matches, TRUE);
-					camel_search_words_free(words);
-				}
-			}
-			lambdafoo.uids = r->value.ptrarray;
-			g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
-			g_hash_table_destroy(ht);
-		}
-	}
-
-	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(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	
-	r(printf ("executing system-flag\n"));
-	
-	if (search->current) {
-		gboolean truth = FALSE;
-		
-		if (argc == 1)
-			truth = camel_system_flag_get (search->current->flags, argv[0]->value.string);
-		
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, 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(f, ESEXP_RES_STRING);
-		r->value.string = g_strdup(value?value:"");
-	} else {
-		r = e_sexp_result_new(f, 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(f, ESEXP_RES_INT);
-
-		r->value.number = s->current->date_sent;
-	} else {
-		r = e_sexp_result_new(f, 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(f, ESEXP_RES_INT);
-
-		r->value.number = s->current->date_received;
-	} else {
-		r = e_sexp_result_new(f, 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(f, ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	return r;
-}
-
-static ESExpResult *
-search_uid(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int i;
-
-	r(printf("executing uid\n"));
-
-	/* are we inside a match-all? */
-	if (search->current) {
-		int truth = FALSE;
-		const char *uid = camel_message_info_uid(search->current);
-
-		/* performs an OR of all words */
-		for (i=0;i<argc && !truth;i++) {
-			if (argv[i]->type == ESEXP_RES_STRING
-			    && !strcmp(uid, argv[i]->value.string)) {
-				truth = TRUE;
-				break;
-			}
-		}
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-		for (i=0;i<argc;i++) {
-			if (argv[i]->type == ESEXP_RES_STRING)
-				g_ptr_array_add(r->value.ptrarray, argv[i]->value.string);
-		}
-	}
-
-	return r;
-}
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
deleted file mode 100644
index 701178b0b4..0000000000
--- a/camel/camel-folder-search.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <e-util/e-sexp.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-object.h>
-#include <camel/camel-index.h>
-
-#define CAMEL_FOLDER_SEARCH_TYPE         (camel_folder_search_get_type ())
-#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 CAMEL_IS_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 */
-	GHashTable *summary_hash; /* hashtable of summary items */
-	CamelMessageInfo *current; /* current message info, when searching one by one */
-	CamelMessageInfo *match1; /* message info, when searching a single message only */
-	CamelMimeMessage *current_message; /* cache of current message, if required */
-	CamelIndex *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 _ESExpResult **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);
-	
-	/* (header-matches "headername" "string") */
-	ESExpResult * (*header_matches)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-starts-with "headername" "string") */
-	ESExpResult * (*header_starts_with)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-ends-with "headername" "string") */
-	ESExpResult * (*header_ends_with)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-exists "headername") */
-	ESExpResult * (*header_exists)(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);
-	
-	/* (system-flag "flagname") Returns the value of a system flag.  Can only be used in match-all */
-	ESExpResult * (*system_flag)(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);
-
-	/* (uid "uid" ...) True if the uid is in the list */
-	ESExpResult * (*uid)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-};
-
-CamelType		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, CamelIndex *index);
-GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);
-gboolean camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr,
-					      const CamelMessageInfo *info, CamelException *ex);
-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
deleted file mode 100644
index aa5156b9be..0000000000
--- a/camel/camel-folder-summary.c
+++ /dev/null
@@ -1,2748 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include <gal/util/e-iconv.h>
-
-#include "camel-folder-summary.h"
-
-#include <camel/camel-file-utils.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-basic.h>
-#include <camel/camel-mime-filter-html.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-filter.h>
-
-#include "hash-table-utils.h"
-#include "e-util/md5-utils.h"
-#include "e-util/e-memory.h"
-
-#include "camel-private.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* this lock is ONLY for the standalone messageinfo stuff */
-#define GLOBAL_INFO_LOCK(i) pthread_mutex_lock(&info_lock)
-#define GLOBAL_INFO_UNLOCK(i) pthread_mutex_unlock(&info_lock)
-#else
-#define GLOBAL_INFO_LOCK(i) 
-#define GLOBAL_INFO_UNLOCK(i) 
-#endif
-
-/* 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 (12)
-
-#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_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg);
-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_new_from_message(CamelFolderSummary *s, CamelMimePart *mp);
-static CamelMessageContentInfo * content_info_load(CamelFolderSummary *, FILE *);
-static int		         content_info_save(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);
-static void		         content_info_free(CamelFolderSummary *, CamelMessageContentInfo *);
-
-static char *next_uid_string(CamelFolderSummary *s);
-
-static CamelMessageContentInfo * summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimeParser *mp);
-static CamelMessageContentInfo * summary_build_content_info_message(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimePart *object);
-
-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_new_from_message = message_info_new_from_message;
-	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_new_from_message = content_info_new_from_message;
-	klass->content_info_load = content_info_load;
-	klass->content_info_save = content_info_save;
-	klass->content_info_free = content_info_free;
-
-	klass->next_uid_string = next_uid_string;
-}
-
-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->message_info_chunks = NULL;
-	s->content_info_chunks = NULL;
-
-#if defined (DOESTRV) || defined (DOEPOOLV)
-	s->message_info_strings = CAMEL_MESSAGE_INFO_LAST;
-#endif
-
-	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);
-
-#ifdef ENABLE_THREADS
-	p->summary_lock = g_mutex_new();
-	p->io_lock = g_mutex_new();
-	p->filter_lock = g_mutex_new();
-	p->alloc_lock = g_mutex_new();
-	p->ref_lock = g_mutex_new();
-#endif
-}
-
-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 (s->message_info_chunks)
-		e_memchunk_destroy(s->message_info_chunks);
-	if (s->content_info_chunks)
-		e_memchunk_destroy(s->content_info_chunks);
-
-	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_uu)
-		camel_object_unref((CamelObject *)p->filter_uu);
-	if (p->filter_save)
-		camel_object_unref((CamelObject *)p->filter_save);
-	if (p->filter_html)
-		camel_object_unref((CamelObject *)p->filter_html);
-
-	if (p->filter_stream)
-		camel_object_unref((CamelObject *)p->filter_stream);
-	if (p->index)
-		camel_object_unref((CamelObject *)p->index);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(p->summary_lock);
-	g_mutex_free(p->io_lock);
-	g_mutex_free(p->filter_lock);
-	g_mutex_free(p->alloc_lock);
-	g_mutex_free(p->ref_lock);
-#endif
-
-	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;
-}
-
-
-/**
- * camel_folder_summary_set_filename:
- * @s: 
- * @name: 
- * 
- * Set the filename where the summary will be loaded to/saved from.
- **/
-void camel_folder_summary_set_filename(CamelFolderSummary *s, const char *name)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	g_free(s->summary_path);
-	s->summary_path = g_strdup(name);
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_set_index:
- * @s: 
- * @index: 
- * 
- * Set the index used to index body content.  If the index is NULL, or
- * not set (the default), no indexing of body content will take place.
- *
- * Unlike earlier behaviour, build_content need not be set to perform indexing.
- **/
-void camel_folder_summary_set_index(CamelFolderSummary *s, CamelIndex *index)
-{
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-
-	if (p->index)
-		camel_object_unref((CamelObject *)p->index);
-
-	p->index = index;
-	if (index)
-		camel_object_ref((CamelObject *)index);
-}
-
-/**
- * camel_folder_summary_set_build_content:
- * @s: 
- * @state: 
- * 
- * Set a flag to tell the summary to build the content info summary
- * (CamelMessageInfo.content).  The default is not to build content info
- * summaries.
- **/
-void camel_folder_summary_set_build_content(CamelFolderSummary *s, gboolean state)
-{
-	s->build_content = state;
-}
-
-/**
- * camel_folder_summary_count:
- * @s: 
- * 
- * Get the number of summary items stored in this summary.
- * 
- * Return value: The number of items int he summary.
- **/
-int
-camel_folder_summary_count(CamelFolderSummary *s)
-{
-	return s->messages->len;
-}
-
-/**
- * camel_folder_summary_index:
- * @s: 
- * @i: 
- * 
- * Retrieve a summary item by index number.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- * 
- * Return value: The summary item, or NULL if the index @i is out
- * of range.
- * It must be freed using camel_folder_summary_info_free().
- **/
-CamelMessageInfo *
-camel_folder_summary_index(CamelFolderSummary *s, int i)
-{
-	CamelMessageInfo *info = NULL;
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-
-	if (i<s->messages->len)
-		info = g_ptr_array_index(s->messages, i);
-
-	if (info)
-		info->refcount++;
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_index:
- * @s: 
- * @i: 
- * 
- * Obtain a copy of the summary array.  This is done atomically,
- * so cannot contain empty entries.
- *
- * It must be freed using camel_folder_summary_array_free().
- **/
-GPtrArray *
-camel_folder_summary_array(CamelFolderSummary *s)
-{
-	CamelMessageInfo *info;
-	GPtrArray *res = g_ptr_array_new();
-	int i;
-	
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-
-	g_ptr_array_set_size(res, s->messages->len);
-	for (i=0;i<s->messages->len;i++) {
-		info = res->pdata[i] = g_ptr_array_index(s->messages, i);
-		info->refcount++;
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	return res;
-}
-
-/**
- * camel_folder_summary_array_free:
- * @s: 
- * @array: 
- * 
- * Free the folder summary array.
- **/
-void
-camel_folder_summary_array_free(CamelFolderSummary *s, GPtrArray *array)
-{
-	int i;
-
-	for (i=0;i<array->len;i++)
-		camel_folder_summary_info_free(s, array->pdata[i]);
-
-	g_ptr_array_free(array, TRUE);
-}
-
-/**
- * camel_folder_summary_uid:
- * @s: 
- * @uid: 
- * 
- * Retrieve a summary item by uid.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- * 
- * Return value: The summary item, or NULL if the uid @uid
- * is not available.
- * It must be freed using camel_folder_summary_info_free().
- **/
-CamelMessageInfo *
-camel_folder_summary_uid(CamelFolderSummary *s, const char *uid)
-{
-	CamelMessageInfo *info;
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-
-	info = g_hash_table_lookup(s->messages_uid, uid);
-
-	if (info)
-		info->refcount++;
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_next_uid:
- * @s: 
- * 
- * Generate a new unique uid value as an integer.  This
- * may be used to create a unique sequence of numbers.
- * 
- * Return value: The next unique uid value.
- **/
-guint32 camel_folder_summary_next_uid(CamelFolderSummary *s)
-{
-	guint32 uid;
-
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	uid = s->nextuid++;
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	/* FIXME: sync this to disk */
-/*	summary_header_save(s);*/
-	return uid;
-}
-
-/**
- * camel_folder_summary_set_uid:
- * @s: 
- * @uid: The next minimum uid to assign.  To avoid clashing
- * uid's, set this to the uid of a given messages + 1.
- * 
- * Set the next minimum uid available.  This can be used to
- * ensure new uid's do not clash with existing uid's.
- **/
-void camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 uid)
-{
-	/* TODO: sync to disk? */
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	s->nextuid = MAX(s->nextuid, uid);
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_next_uid_string:
- * @s: 
- * 
- * Retrieve the next uid, but as a formatted string.
- * 
- * Return value: The next uid as an unsigned integer string.
- * This string must be freed by the caller.
- **/
-char *
-camel_folder_summary_next_uid_string(CamelFolderSummary *s)
-{
-	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->next_uid_string(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);
-	if (ci == NULL)
-		return NULL;
-
-	if (camel_file_util_decode_uint32(in, &count) == -1 || count > 500) {
-		camel_folder_summary_content_info_free(s, ci);
-		return NULL;
-	}
-
-	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?");
-			camel_folder_summary_content_info_free(s, ci);
-			return NULL;
-		}
-	}
-	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;
-
-	CAMEL_SUMMARY_LOCK(s, io_lock);
-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_load(s, in) == -1)
-		goto error;
-
-	/* now read in each message ... */
-	for (i=0;i<s->saved_count;i++) {
-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, in);
-
-		if (mi == NULL)
-			goto error;
-
-		if (s->build_content) {
-			mi->content = perform_content_info_load(s, in);
-			if (mi->content == NULL) {
-				camel_folder_summary_info_free(s, mi);
-				goto error;
-			}
-		}
-
-		camel_folder_summary_add(s, mi);
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-	
-	if (fclose(in) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-
-	return 0;
-
-error:
-	g_warning("Cannot load summary file: %s", strerror(ferror(in)));
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-	fclose(in);
-	s->flags |= ~CAMEL_SUMMARY_DIRTY;
-
-	return -1;
-}
-
-/* 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_file_util_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;
-}
-
-/**
- * camel_folder_summary_save:
- * @s: 
- * 
- * Writes the summary to disk.  The summary is only written if changes
- * have occured.
- * 
- * Return value: Returns -1 on error.
- **/
-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"));
-
-	CAMEL_SUMMARY_LOCK(s, io_lock);
-
-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_save(s, out) == -1) {
-		fclose(out);
-		CAMEL_SUMMARY_UNLOCK(s, io_lock);
-		return -1;
-	}
-
-	/* now write out each message ... */
-	/* FIXME: check returns */
-
-	count = s->messages->len;
-	for (i=0;i<count;i++) {
-		mi = s->messages->pdata[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);
-		}
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-
-	if (fclose(out) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-	return 0;
-}
-
-/**
- * camel_folder_summary_header_load:
- * @s: Summary object.
- * 
- * Only load the header information from the summary,
- * keep the rest on disk.  This should only be done on
- * a fresh summary object.
- * 
- * Return value: -1 on error.
- **/
-int camel_folder_summary_header_load(CamelFolderSummary *s)
-{
-	FILE *in;
-	int ret;
-
-	g_assert(s->summary_path);
-
-	in = fopen(s->summary_path, "r");
-	if (in == NULL)
-		return -1;
-
-	CAMEL_SUMMARY_LOCK(s, io_lock);
-	ret = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_load(s, in);
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-	
-	fclose(in);
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-	return ret;
-}
-
-static void
-summary_assign_uid(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	const char *uid;
-
-	uid = camel_message_info_uid(info);
-	if (uid == NULL || uid[0] == 0) {
-		camel_message_info_set_uid(info, camel_folder_summary_next_uid_string(s));
-		uid = camel_message_info_uid(info);
-	}
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	while (g_hash_table_lookup(s->messages_uid, uid)) {
-		g_warning("Trying to insert message with clashing uid (%s).  new uid re-assigned", camel_message_info_uid(info));
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		camel_message_info_set_uid(info, camel_folder_summary_next_uid_string(s));
-		uid = camel_message_info_uid(info);
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		CAMEL_SUMMARY_LOCK(s, summary_lock);
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_add:
- * @s: 
- * @info: 
- * 
- * Adds a new @info record to the summary.  If @info->uid is NULL, then a new
- * uid is automatically re-assigned by calling :next_uid_string().
- *
- * The @info record should have been generated by calling one of the
- * info_new_*() functions, as it will be free'd based on the summary
- * class.  And MUST NOT be allocated directly using malloc.
- **/
-void camel_folder_summary_add(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	if (info == NULL)
-		return;
-
-	summary_assign_uid(s, info);
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-/* unnecessary for pooled vectors */
-#ifdef DOESTRV
-	/* this is vitally important, and also if this is ever modified, then
-	   the hash table needs to be resynced */
-	info->strings = e_strv_pack(info->strings);
-#endif
-
-	g_ptr_array_add(s->messages, info);
-	g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_add_from_header:
- * @s: 
- * @h: 
- * 
- * Build a new info record based on a set of headers, and add it to the
- * summary.
- *
- * Note that this function should not be used if build_content_info has
- * been specified for this summary.
- * 
- * Return value: The newly added record.
- **/
-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *info = camel_folder_summary_info_new_from_header(s, h);
-
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_add_from_parser:
- * @s: 
- * @mp: 
- * 
- * Build a new info record based on the current position of a CamelMimeParser.
- *
- * The parser should be positioned before the start of the message to summarise.
- * This function may be used if build_contnet_info or an index has been
- * specified for the summary.
- * 
- * Return value: The newly added record.
- **/
-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *info = camel_folder_summary_info_new_from_parser(s, mp);
-
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_add_from_message:
- * @s: 
- * @msg: 
- * 
- * Add a summary item from an existing message.
- * 
- * Return value: 
- **/
-CamelMessageInfo *camel_folder_summary_add_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)
-{
-	CamelMessageInfo *info = camel_folder_summary_info_new_from_message(s, msg);
-
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_info_new_from_header:
- * @s: 
- * @h: 
- * 
- * Create a new info record from a header.
- * 
- * Return value: Guess?  This info record MUST be freed using
- * camel_folder_summary_info_free(), camel_message_info_free() will not work.
- **/
-CamelMessageInfo *camel_folder_summary_info_new_from_header(CamelFolderSummary *s, struct _header_raw *h)
-{
-	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s))) -> message_info_new(s, h);
-}
-
-/**
- * camel_folder_summary_info_new_from_parser:
- * @s: 
- * @mp: 
- * 
- * Create a new info record from a parser.  If the parser cannot
- * determine a uid, then none will be assigned.
-
- * If indexing is enabled, and the parser cannot determine a new uid, then
- * one is automatically assigned.
- *
- * If indexing is enabled, then the content will be indexed based
- * on this new uid.  In this case, the message info MUST be
- * added using :add().
- *
- * Once complete, the parser will be positioned at the end of
- * the message.
- *
- * Return value: Guess?  This info record MUST be freed using
- * camel_folder_summary_info_free(), camel_message_info_free() will not work.
- **/
-CamelMessageInfo *camel_folder_summary_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *info = NULL;
-	char *buffer;
-	int len;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	off_t start;
-	CamelIndexName *name = NULL;
-
-	/* should this check the parser is in the right state, or assume it is?? */
-
-	start = camel_mime_parser_tell(mp);
-	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);
-
-		/* assign a unique uid, this is slightly 'wrong' as we do not really
-		 * know if we are going to store this in the summary, but no matter */
-		if (p->index)
-			summary_assign_uid(s, info);
-
-		CAMEL_SUMMARY_LOCK(s, filter_lock);
-
-		if (p->index) {
-			if (p->filter_index == NULL)
-				p->filter_index = camel_mime_filter_index_new_index(p->index);
-			camel_index_delete_name(p->index, camel_message_info_uid(info));
-			name = camel_index_add_name(p->index, camel_message_info_uid(info));
-			camel_mime_filter_index_set_name(p->filter_index, name);
-		}
-
-		/* always scan the content info, even if we dont save it */
-		info->content = summary_build_content_info(s, info, mp);
-
-		if (name) {
-			camel_index_write_name(p->index, name);
-			camel_object_unref((CamelObject *)name);
-			camel_mime_filter_index_set_name(p->filter_index, NULL);
-		}
-
-		CAMEL_SUMMARY_UNLOCK(s, filter_lock);
-
-		info->size = camel_mime_parser_tell(mp) - start;
-	}
-	return info;
-}
-
-/**
- * camel_folder_summary_info_new_from_message:
- * @: 
- * @: 
- * 
- * Create a summary item from a message.
- * 
- * Return value: 
- **/
-CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)
-{
-	CamelMessageInfo *info;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	CamelIndexName *name = NULL;
-
-	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new_from_message(s, msg);
-
-	/* assign a unique uid, this is slightly 'wrong' as we do not really
-	 * know if we are going to store this in the summary, but no matter */
-	summary_assign_uid(s, info);
-
-	CAMEL_SUMMARY_LOCK(s, filter_lock);
-
-	if (p->index) {
-		if (p->filter_index == NULL)
-			p->filter_index = camel_mime_filter_index_new_index(p->index);
-		camel_index_delete_name(p->index, camel_message_info_uid(info));
-		name = camel_index_add_name(p->index, camel_message_info_uid(info));
-		camel_mime_filter_index_set_name(p->filter_index, name);
-
-		if (p->filter_stream == NULL) {
-			CamelStream *null = camel_stream_null_new();
-
-			p->filter_stream = camel_stream_filter_new_with_stream(null);
-			camel_object_unref((CamelObject *)null);
-		}
-	}
-
-	info->content = summary_build_content_info_message(s, info, (CamelMimePart *)msg);
-
-	if (name) {
-		camel_index_write_name(p->index, name);
-		camel_object_unref((CamelObject *)name);
-		camel_mime_filter_index_set_name(p->filter_index, NULL);
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, filter_lock);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_content_info_free:
- * @s: 
- * @ci: 
- * 
- * Free the content info @ci, and all associated memory.
- **/
-void
-camel_folder_summary_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;
-		camel_folder_summary_content_info_free(s, pw);
-		pw = pn;
-	}
-}
-
-/**
- * camel_folder_summary_info_free:
- * @s: 
- * @mi: 
- * 
- * Unref and potentially free the message info @mi, and all associated memory.
- **/
-void camel_folder_summary_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-	CamelMessageContentInfo *ci;
-
-	g_assert(mi);
-	g_assert(s);
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-
-	g_assert(mi->refcount >= 1);
-
-	mi->refcount--;
-	if (mi->refcount > 0) {
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-		return;
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-
-	ci = mi->content;
-
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_free(s, mi);		
-	if (s->build_content && ci) {
-		camel_folder_summary_content_info_free(s, ci);
-	}
-}
-
-/**
- * camel_folder_summary_info_ref:
- * @s: 
- * @mi: 
- * 
- * Add an extra reference to @mi.
- **/
-void camel_folder_summary_info_ref(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-	g_assert(mi);
-	g_assert(s);
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	g_assert(mi->refcount >= 1);
-	mi->refcount++;
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-}
-
-/**
- * camel_folder_summary_touch:
- * @s: 
- * 
- * Mark the summary as changed, so that a save will save it.
- **/
-void
-camel_folder_summary_touch(CamelFolderSummary *s)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_clear:
- * @s: 
- * 
- * Empty the summary contents.
- **/
-void
-camel_folder_summary_clear(CamelFolderSummary *s)
-{
-	int i;
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	if (camel_folder_summary_count(s) == 0) {
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		return;
-	}
-
-	for (i=0;i<s->messages->len;i++)
-		camel_folder_summary_info_free(s, s->messages->pdata[i]);
-
-	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;
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_remove:
- * @s: 
- * @info: 
- * 
- * Remove a specific @info record from the summary.
- **/
-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	g_hash_table_remove(s->messages_uid, camel_message_info_uid(info));
-	g_ptr_array_remove(s->messages, info);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	camel_folder_summary_info_free(s, info);
-}
-
-/**
- * camel_folder_summary_remove_uid:
- * @s: 
- * @uid: 
- * 
- * Remove a specific info record from the summary, by @uid.
- **/
-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid)
-{
-        CamelMessageInfo *oldinfo;
-        char *olduid;
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-        if (g_hash_table_lookup_extended(s->messages_uid, uid, (void *)&olduid, (void *)&oldinfo)) {
-		/* make sure it doesn't vanish while we're removing it */
-		oldinfo->refcount++;
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		camel_folder_summary_remove(s, oldinfo);
-		camel_folder_summary_info_free(s, oldinfo);
-        } else {
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-	}
-}
-
-/**
- * camel_folder_summary_remove_index:
- * @s: 
- * @index: 
- * 
- * Remove a specific info record from the summary, by index.
- **/
-void camel_folder_summary_remove_index(CamelFolderSummary *s, int index)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	if (index < s->messages->len) {
-		CamelMessageInfo *info = s->messages->pdata[index];
-
-		g_hash_table_remove(s->messages_uid, camel_message_info_uid(info));
-		g_ptr_array_remove_index(s->messages, index);
-		s->flags |= CAMEL_SUMMARY_DIRTY;
-
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		camel_folder_summary_info_free(s, info);
-	} else {
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-	}
-}
-
-/* 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
-
-/**
- * camel_folder_summary_encode_token:
- * @out: 
- * @str: 
- * 
- * Encode a string value, but use tokenisation and compression
- * to reduce the size taken for common mailer words.  This
- * can still be used to encode normal strings as well.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_encode_token(FILE *out, const char *str)
-{
-	io(printf("Encoding token: '%s'\n", str));
-
-	if (str == NULL) {
-		return camel_file_util_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_file_util_encode_uint32(out, token+1);
-		} else {
-			if (camel_file_util_encode_uint32(out, len+32) == -1)
-				return -1;
-			if (fwrite(str, len, 1, out) != 1)
-				return -1;
-		}
-	}
-	return 0;
-}
-
-/**
- * camel_folder_summary_decode_token:
- * @in: 
- * @str: 
- * 
- * Decode a token value.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_decode_token(FILE *in, char **str)
-{
-	char *ret;
-	guint32 len;
-
-	io(printf("Decode token ...\n"));
-	
-	if (camel_file_util_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;
-}
-
-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;
-	time_t time;
-
-	fseek(in, 0, SEEK_SET);
-
-	io(printf("Loading header\n"));
-
-	if (camel_file_util_decode_fixed_int32(in, &version) == -1
-	    || camel_file_util_decode_fixed_int32(in, &flags) == -1
-	    || camel_file_util_decode_fixed_int32(in, &nextuid) == -1
-	    || camel_file_util_decode_time_t(in, &time) == -1
-	    || camel_file_util_decode_fixed_int32(in, &count) == -1) {
-		return -1;
-	}
-
-	s->nextuid = nextuid;
-	s->flags = flags;
-	s->time = time;
-	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_file_util_encode_fixed_int32(out, s->version);
-	camel_file_util_encode_fixed_int32(out, s->flags);
-	camel_file_util_encode_fixed_int32(out, s->nextuid);
-	camel_file_util_encode_time_t(out, s->time);
-	return camel_file_util_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;
-}
-
-static CamelMessageInfo * message_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)
-{
-	CamelMessageInfo *mi;
-
-	mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new(s, ((CamelMimePart *)msg)->headers);
-
-	return mi;
-}
-
-static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummary *s, CamelMimePart *mp)
-{
-	CamelMessageContentInfo *ci;
-
-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new(s, mp->headers);
-
-	return ci;
-}
-
-static char *
-summary_format_address(struct _header_raw *h, const char *name)
-{
-	struct _header_address *addr;
-	const char *text;
-	char *ret;
-
-	text = header_raw_find (&h, name, NULL);
-	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;
-}
-
-static char *
-summary_format_string (struct _header_raw *h, const char *name, const char *charset)
-{
-	const char *text;
-	
-	text = header_raw_find (&h, name, NULL);
-	if (text) {
-		while (isspace ((unsigned) *text))
-			text++;
-		return header_decode_string (text, charset);
-	} else {
-		return NULL;
-	}
-}
-
-/**
- * camel_folder_summary_info_new:
- * @s: 
- * 
- * Allocate a new camel message info, suitable for adding
- * to this summary.
- * 
- * Return value: 
- **/
-CamelMessageInfo *
-camel_folder_summary_info_new(CamelFolderSummary *s)
-{
-	CamelMessageInfo *mi;
-
-	CAMEL_SUMMARY_LOCK(s, alloc_lock);
-	if (s->message_info_chunks == NULL)
-		s->message_info_chunks = e_memchunk_new(32, s->message_info_size);
-	mi = e_memchunk_alloc(s->message_info_chunks);
-	CAMEL_SUMMARY_UNLOCK(s, alloc_lock);
-
-	memset(mi, 0, s->message_info_size);
-#ifdef DOEPOOLV
-	mi->strings = e_poolv_new (s->message_info_strings);
-#endif
-#ifdef DOESTRV
-	mi->strings = e_strv_new(s->message_info_strings);
-#endif
-	mi->refcount = 1;
-	return mi;
-}
-
-/**
- * camel_folder_summary_content_info_new:
- * @s: 
- * 
- * Allocate a new camel message content info, suitable for adding
- * to this summary.
- * 
- * Return value: 
- **/
-CamelMessageContentInfo *
-camel_folder_summary_content_info_new(CamelFolderSummary *s)
-{
-	CamelMessageContentInfo *ci;
-
-	CAMEL_SUMMARY_LOCK(s, alloc_lock);
-	if (s->content_info_chunks == NULL)
-		s->content_info_chunks = e_memchunk_new(32, s->content_info_size);
-	ci = e_memchunk_alloc(s->content_info_chunks);
-	CAMEL_SUMMARY_UNLOCK(s, alloc_lock);
-
-	memset(ci, 0, s->content_info_size);
-	return ci;
-}
-
-static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-	const char *received;
-	guchar digest[16];
-	struct _header_references *refs, *irt, *scan;
-	char *msgid;
-	int count;
-	char *subject, *from, *to, *cc, *mlist;
-	struct _header_content_type *ct = NULL;
-	const char *content, *charset = NULL;
-
-	mi = camel_folder_summary_info_new(s);
-
-	if ((content = header_raw_find(&h, "Content-Type", NULL))
-	     && (ct = header_content_type_decode(content))
-	     && (charset = header_content_type_param(ct, "charset"))
-	     && (strcasecmp(charset, "us-ascii") == 0))
-		charset = NULL;
-
-	charset = e_iconv_charset_name(charset);
-
-	subject = summary_format_string(h, "subject", charset);
-	from = summary_format_address(h, "from");
-	to = summary_format_address(h, "to");
-	cc = summary_format_address(h, "cc");
-	mlist = header_raw_check_mailing_list(&h);
-
-	if (ct)
-		header_content_type_unref(ct);
-
-#ifdef DOEPOOLV
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_SUBJECT, subject, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_FROM, from, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_TO, to, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_CC, cc, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_MLIST, mlist, TRUE);
-#elif defined (DOESTRV)
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_SUBJECT, subject);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_FROM, from);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_TO, to);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_CC, cc);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_MLIST, mlist);
-#else
-	mi->subject = subject;
-	mi->from = from;
-	mi->to = to;
-	mi->cc = cc;
-	mi->mlist = mlist;
-#endif
-
-	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;
-
-	msgid = header_msgid_decode(header_raw_find(&h, "message-id", NULL));
-	if (msgid) {
-		md5_get_digest(msgid, strlen(msgid), digest);
-		memcpy(mi->message_id.id.hash, digest, sizeof(mi->message_id.id.hash));
-		g_free(msgid);
-	}
-	
-	/* decode our references and in-reply-to headers */
-	refs = header_references_decode (header_raw_find (&h, "references", NULL));
-	irt = header_references_inreplyto_decode (header_raw_find (&h, "in-reply-to", NULL));
-	if (refs || irt) {
-		if (irt) {
-			/* The References field is populated from the ``References'' and/or ``In-Reply-To''
-			   headers. If both headers exist, take the first thing in the In-Reply-To header
-			   that looks like a Message-ID, and append it to the References header. */
-			
-			if (refs)
-				irt->next = refs;
-			
-			refs = irt;
-		}
-		
-		count = header_references_list_size(&refs);
-		mi->references = g_malloc(sizeof(*mi->references) + ((count-1) * sizeof(mi->references->references[0])));
-		count = 0;
-		scan = refs;
-		while (scan) {
-			md5_get_digest(scan->id, strlen(scan->id), digest);
-			memcpy(mi->references->references[count].id.hash, digest, sizeof(mi->message_id.id.hash));
-			count++;
-			scan = scan->next;
-		}
-		mi->references->size = count;
-		header_references_list_clear(&refs);
-	}
-
-	return mi;
-}
-
-
-static CamelMessageInfo *
-message_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *mi;
-	guint count;
-	int i;
-	char *subject, *from, *to, *cc, *mlist, *uid;;
-
-	mi = camel_folder_summary_info_new(s);
-
-	io(printf("Loading message info\n"));
-
-	camel_file_util_decode_string(in, &uid);
-	camel_file_util_decode_uint32(in, &mi->flags);
-	camel_file_util_decode_uint32(in, &mi->size);
-	camel_file_util_decode_time_t(in, &mi->date_sent);
-	camel_file_util_decode_time_t(in, &mi->date_received);
-	camel_file_util_decode_string(in, &subject);
-	camel_file_util_decode_string(in, &from);
-	camel_file_util_decode_string(in, &to);
-	camel_file_util_decode_string(in, &cc);
-	camel_file_util_decode_string(in, &mlist);
-
-#ifdef DOEPOOLV
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_UID, uid, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_SUBJECT, subject, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_FROM, from, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_TO, to, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_CC, cc, TRUE);
-	e_poolv_set(mi->strings, CAMEL_MESSAGE_INFO_MLIST, mlist, TRUE);
-#elif defined (DOESTRV)
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_UID, uid);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_SUBJECT, subject);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_FROM, from);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_TO, to);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_CC, cc);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_MLIST, mlist);
-#else
-	mi->uid = uid;
-	mi->subject = subject;
-	mi->from = from;
-	mi->to = to;
-	mi->cc = cc;
-	mi->mlist = mlist;
-#endif
-
-	mi->content = NULL;
-
-	camel_file_util_decode_fixed_int32(in, &mi->message_id.id.part.hi);
-	camel_file_util_decode_fixed_int32(in, &mi->message_id.id.part.lo);
-
-	if (camel_file_util_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-
-	if (count > 0) {
-		mi->references = g_malloc(sizeof(*mi->references) + ((count-1) * sizeof(mi->references->references[0])));
-		mi->references->size = count;
-		for (i=0;i<count;i++) {
-			camel_file_util_decode_fixed_int32(in, &mi->references->references[i].id.part.hi);
-			camel_file_util_decode_fixed_int32(in, &mi->references->references[i].id.part.lo);
-		}
-	}
-
-	if (camel_file_util_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-
-	for (i=0;i<count;i++) {
-		char *name;
-		camel_file_util_decode_string(in, &name);
-		camel_flag_set(&mi->user_flags, name, TRUE);
-		g_free(name);
-	}
-
-	if (camel_file_util_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-
-	for (i=0;i<count;i++) {
-		char *name, *value;
-		camel_file_util_decode_string(in, &name);
-		camel_file_util_decode_string(in, &value);
-		camel_tag_set(&mi->user_tags, name, value);
-		g_free(name);
-		g_free(value);
-	}
-
-	if (!ferror(in))
-		return mi;
-
-error:
-	camel_folder_summary_info_free(s, mi);
-
-	return NULL;
-}
-
-static int
-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
-{
-	guint32 count;
-	CamelFlag *flag;
-	CamelTag *tag;
-	int i;
-
-	io(printf("Saving message info\n"));
-
-	camel_file_util_encode_string(out, camel_message_info_uid(mi));
-	camel_file_util_encode_uint32(out, mi->flags);
-	camel_file_util_encode_uint32(out, mi->size);
-	camel_file_util_encode_time_t(out, mi->date_sent);
-	camel_file_util_encode_time_t(out, mi->date_received);
-	camel_file_util_encode_string(out, camel_message_info_subject(mi));
-	camel_file_util_encode_string(out, camel_message_info_from(mi));
-	camel_file_util_encode_string(out, camel_message_info_to(mi));
-	camel_file_util_encode_string(out, camel_message_info_cc(mi));
-	camel_file_util_encode_string(out, camel_message_info_mlist(mi));
-
-	camel_file_util_encode_fixed_int32(out, mi->message_id.id.part.hi);
-	camel_file_util_encode_fixed_int32(out, mi->message_id.id.part.lo);
-
-	if (mi->references) {
-		camel_file_util_encode_uint32(out, mi->references->size);
-		for (i=0;i<mi->references->size;i++) {
-			camel_file_util_encode_fixed_int32(out, mi->references->references[i].id.part.hi);
-			camel_file_util_encode_fixed_int32(out, mi->references->references[i].id.part.lo);
-		}
-	} else {
-		camel_file_util_encode_uint32(out, 0);
-	}
-
-	count = camel_flag_list_size(&mi->user_flags);
-	camel_file_util_encode_uint32(out, count);
-	flag = mi->user_flags;
-	while (flag) {
-		camel_file_util_encode_string(out, flag->name);
-		flag = flag->next;
-	}
-
-	count = camel_tag_list_size(&mi->user_tags);
-	camel_file_util_encode_uint32(out, count);
-	tag = mi->user_tags;
-	while (tag) {
-		camel_file_util_encode_string(out, tag->name);
-		camel_file_util_encode_string(out, tag->value);
-		tag = tag->next;
-	}
-
-	return ferror(out);
-}
-
-static void
-message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-#ifdef DOEPOOLV
-	e_poolv_destroy(mi->strings);
-#elif defined (DOESTRV)
-	e_strv_destroy(mi->strings);
-#else
-	g_free(mi->uid);
-	g_free(mi->subject);
-	g_free(mi->from);
-	g_free(mi->to);
-	g_free(mi->cc);
-	g_free(mi->mlist);
-#endif
-	g_free(mi->references);
-	camel_flag_list_free(&mi->user_flags);
-	camel_tag_list_free(&mi->user_tags);
-	e_memchunk_free(s->message_info_chunks, mi);
-}
-
-static CamelMessageContentInfo *
-content_info_new (CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageContentInfo *ci;
-	const char *charset;
-	
-	ci = camel_folder_summary_content_info_new (s);
-	
-	charset = e_iconv_locale_charset();
-	ci->id = header_msgid_decode (header_raw_find (&h, "content-id", NULL));
-	ci->description = header_decode_string (header_raw_find (&h, "content-description", NULL), NULL);
-	ci->encoding = header_content_encoding_decode (header_raw_find (&h, "content-transfer-encoding", NULL));
-	
-	return ci;
-}
-
-static CamelMessageContentInfo *
-content_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageContentInfo *ci;
-	char *type, *subtype;
-	guint32 count, i;
-	struct _header_content_type *ct;
-
-	io(printf("Loading content info\n"));
-
-	ci = camel_folder_summary_content_info_new(s);
-	
-	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);
-	if (camel_file_util_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-	
-	for (i=0;i<count;i++) {
-		char *name, *value;
-		camel_folder_summary_decode_token(in, &name);
-		camel_folder_summary_decode_token(in, &value);
-		if (!(name && value))
-			goto error;
-		
-		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);
-
-	camel_file_util_decode_uint32(in, &ci->size);
-
-	ci->childs = NULL;
-
-	if (!ferror(in))
-		return ci;
-
- error:
-	camel_folder_summary_content_info_free(s, ci);
-	return NULL;
-}
-
-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"));
-
-	ct = ci->type;
-	if (ct) {
-		camel_folder_summary_encode_token(out, ct->type);
-		camel_folder_summary_encode_token(out, ct->subtype);
-		camel_file_util_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_file_util_encode_uint32(out, 0);
-	}
-	camel_folder_summary_encode_token(out, ci->id);
-	camel_folder_summary_encode_token(out, ci->description);
-	camel_folder_summary_encode_token(out, ci->encoding);
-	return camel_file_util_encode_uint32(out, ci->size);
-}
-
-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);
-	e_memchunk_free(s->content_info_chunks, ci);
-}
-
-static char *
-next_uid_string(CamelFolderSummary *s)
-{
-	return g_strdup_printf("%u", camel_folder_summary_next_uid(s));
-}
-
-/*
-  OK
-  Now this is where all the "smarts" happen, where the content info is built,
-  and any indexing and what not is performed
-*/
-
-/* must have filter_lock before calling this function */
-static CamelMessageContentInfo *
-summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimeParser *mp)
-{
-	int state, len;
-	char *buffer;
-	CamelMessageContentInfo *info = NULL;
-	struct _header_content_type *ct;
-	int body;
-	int enc_id = -1, chr_id = -1, html_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);
-
-	if (s->build_content)
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_parser(s, mp);
-
-	switch(state) {
-	case HSCAN_HEADER:
-		/* check content type for indexing, then read body */
-		ct = camel_mime_parser_content_type(mp);
-		/* update attachments flag as we go */
-		if (!header_content_type_is(ct, "text", "*"))
-			msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-		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);
-					else
-						camel_mime_filter_reset((CamelMimeFilter *)p->filter_64);
-					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);
-					else
-						camel_mime_filter_reset((CamelMimeFilter *)p->filter_qp);
-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_qp);
-				} else if (!strcasecmp (encoding, "x-uuencode")) {
-					d(printf(" decoding x-uuencode\n"));
-					if (p->filter_uu == NULL)
-						p->filter_uu = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_UU_DEC);
-					else
-						camel_mime_filter_reset((CamelMimeFilter *)p->filter_uu);
-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_uu);
-				} 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);
-				} else {
-					camel_mime_filter_reset((CamelMimeFilter *)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);
-				}
-			}
-
-			/* we do charset conversions before this filter, which isn't strictly correct,
-			   but works in most cases */
-			if (header_content_type_is(ct, "text", "html")) {
-				if (p->filter_html == NULL)
-					p->filter_html = camel_mime_filter_html_new();
-				else
-					camel_mime_filter_reset((CamelMimeFilter *)p->filter_html);
-				html_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_html);
-			}
-			
-			/* 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, html_id);
-		camel_mime_parser_filter_remove(mp, idx_id);
-		break;
-	case HSCAN_MULTIPART:
-		d(printf("Summarising multipart\n"));
-		/* update attachments flag as we go */
-		ct = camel_mime_parser_content_type(mp);
-		if (header_content_type_is(ct, "multipart", "mixed"))
-			msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-		while (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_MULTIPART_END) {
-			camel_mime_parser_unstep(mp);
-			part = summary_build_content_info(s, msginfo, mp);
-			if (part) {
-				part->parent = info;
-				my_list_append((struct _node **)&info->childs, (struct _node *)part);
-			}
-		}
-		break;
-	case HSCAN_MESSAGE:
-		d(printf("Summarising message\n"));
-		/* update attachments flag as we go */
-		msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-		part = summary_build_content_info(s, msginfo, mp);
-		if (part) {
-			part->parent = info;
-			my_list_append((struct _node **)&info->childs, (struct _node *)part);
-		}
-		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;
-	}
-
-	d(printf("finished building content info\n"));
-
-	return info;
-}
-
-/* build the content-info, from a message */
-/* this needs the filter lock since it uses filters to perform indexing */
-static CamelMessageContentInfo *
-summary_build_content_info_message(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimePart *object)
-{
-	CamelDataWrapper *containee;
-	int parts, i;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	CamelMessageContentInfo *info = NULL, *child;
-
-	if (s->build_content)
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_message(s, object);
-	
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));
-
-	if (containee == NULL)
-		return info;
-
-	/* TODO: I find it odd that get_part and get_content_object do not
-	   add a reference, probably need fixing for multithreading */
-
-	/* check for attachments */
-	if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "multipart", "*")) {
-		if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "multipart", "mixed"))
-			msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-	} else if (!header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "*"))
-		msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-	/* 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;i++) {
-			CamelMimePart *part = camel_multipart_get_part(CAMEL_MULTIPART(containee), i);
-			g_assert(part);
-			child = summary_build_content_info_message(s, msginfo, part);
-			if (child) {
-				child->parent = info;
-				my_list_append((struct _node **)&info->childs, (struct _node *)child);
-			}
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-		/* for messages we only look at its contents */
-		child = summary_build_content_info_message(s, msginfo, (CamelMimePart *)containee);
-		if (child) {
-			child->parent = info;
-			my_list_append((struct _node **)&info->childs, (struct _node *)child);
-		}
-	} else if (p->filter_stream
-		   && header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "*")) {
-		int html_id = -1, idx_id = -1;
-
-		/* pre-attach html filter if required, otherwise just index filter */
-		if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "html")) {
-			if (p->filter_html == NULL)
-				p->filter_html = camel_mime_filter_html_new();
-			else
-				camel_mime_filter_reset((CamelMimeFilter *)p->filter_html);
-			html_id = camel_stream_filter_add(p->filter_stream, (CamelMimeFilter *)p->filter_html);
-		}
-		idx_id = camel_stream_filter_add(p->filter_stream, (CamelMimeFilter *)p->filter_index);
-
-		camel_data_wrapper_write_to_stream(containee, (CamelStream *)p->filter_stream);
-		camel_stream_flush((CamelStream *)p->filter_stream);
-
-		camel_stream_filter_remove(p->filter_stream, idx_id);
-		camel_stream_filter_remove(p->filter_stream, html_id);
-	}
-
-	return info;
-}
-
-/**
- * camel_flag_get:
- * @list: 
- * @name: 
- * 
- * Find the state of the flag @name in @list.
- * 
- * Return value: The state of the flag (TRUE or FALSE).
- **/
-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;
-}
-
-/**
- * camel_flag_set:
- * @list: 
- * @name: 
- * @value: 
- * 
- * Set the state of a flag @name in the list @list to @value.
- *
- * Return value: Whether or not it changed.
- **/
-gboolean
-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 !value;
-		}
-		flag = tmp;
-	}
-
-	if (value) {
-		tmp = g_malloc(sizeof(*tmp) + strlen(name));
-		strcpy(tmp->name, name);
-		tmp->next = 0;
-		flag->next = tmp;
-	}
-	return value;
-}
-
-/**
- * camel_flag_list_size:
- * @list: 
- * 
- * Get the length of the flag list.
- * 
- * Return value: The number of TRUE flags in the list.
- **/
-int
-camel_flag_list_size(CamelFlag **list)
-{
-	int count=0;
-	CamelFlag *flag;
-
-	flag = *list;
-	while (flag) {
-		count++;
-		flag = flag->next;
-	}
-	return count;
-}
-
-/**
- * camel_flag_list_free:
- * @list: 
- * 
- * Free the memory associated with the flag list @list.
- **/
-void
-camel_flag_list_free(CamelFlag **list)
-{
-	CamelFlag *flag, *tmp;
-	flag = *list;
-	while (flag) {
-		tmp = flag->next;
-		g_free(flag);
-		flag = tmp;
-	}
-	*list = NULL;
-}
-
-/**
- * camel_flag_list_copy:
- * @to: 
- * @from: 
- * 
- * Copy a flag list, return true if the destination list @to changed.
- * 
- * Return value: 
- **/
-gboolean
-camel_flag_list_copy(CamelFlag **to, CamelFlag **from)
-{
-	CamelFlag *flag, *tmp;
-	int changed = FALSE;
-
-	if (*to == NULL && from == NULL)
-		return FALSE;
-
-	/* Remove any now-missing flags */
-	flag = (CamelFlag *)to;
-	while (flag->next) {
-		tmp = flag->next;
-		if (!camel_flag_get(from, tmp->name)) {
-			flag->next = tmp->next;
-			g_free(tmp);
-			changed = TRUE;
-		} else {
-			flag = tmp;
-		}
-	}
-
-	/* Add any new flags */
-	flag = *from;
-	while (flag) {
-		changed |= camel_flag_set(to, flag->name, TRUE);
-		flag = flag->next;
-	}
-
-	return changed;
-}
-
-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;
-}
-
-/**
- * camel_tag_set:
- * @list: 
- * @name: 
- * @value: 
- * 
- * Set the tag @name in the tag list @list to @value.
- *
- * Return value: whether or not it changed
- **/
-gboolean
-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);
-				return TRUE;
-			} else if (strcmp(tmp->value, value)) { /* has it changed? */
-				g_free(tmp->value);
-				tmp->value = g_strdup(value);
-				return TRUE;
-			}
-			return FALSE;
-		}
-		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;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * camel_tag_list_size:
- * @list: 
- * 
- * Get the number of tags present in the tag list @list.
- * 
- * Return value: The number of tags.
- **/
-int		camel_tag_list_size(CamelTag **list)
-{
-	int count=0;
-	CamelTag *tag;
-
-	tag = *list;
-	while (tag) {
-		count++;
-		tag = tag->next;
-	}
-	return count;
-}
-
-static void
-rem_tag(char *key, char *value, CamelTag **to)
-{
-	camel_tag_set(to, key, NULL);
-}
-
-/**
- * camel_tag_list_copy:
- * @to: 
- * @from: 
- * 
- * Copy a list of tags.
- * 
- * Return value: 
- **/
-gboolean
-camel_tag_list_copy(CamelTag **to, CamelTag **from)
-{
-	int changed = FALSE;
-	CamelTag *tag;
-	GHashTable *left;
-
-	if (*to == NULL && from == NULL)
-		return FALSE;
-
-	left = g_hash_table_new(g_str_hash, g_str_equal);
-	tag = *to;
-	while (tag) {
-		g_hash_table_insert(left, tag->name, tag);
-		tag = tag->next;
-	}
-
-	tag = *from;
-	while (tag) {
-		changed |= camel_tag_set(to, tag->name, tag->value);
-		g_hash_table_remove(left, tag->name);
-		tag = tag->next;
-	}
-
-	if (g_hash_table_size(left)>0) {
-		g_hash_table_foreach(left, (GHFunc)rem_tag, to);
-		changed = TRUE;
-	}
-	g_hash_table_destroy(left);
-
-	return changed;
-}
-
-/**
- * camel_tag_list_free:
- * @list: 
- * 
- * Free the tag list @list.
- **/
-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;
-}
-
-struct flag_names_t {
-	char *name;
-	guint32 value;
-} flag_names[] = {
-	{ "answered", CAMEL_MESSAGE_ANSWERED },
-	{ "deleted", CAMEL_MESSAGE_DELETED },
-	{ "draft", CAMEL_MESSAGE_DELETED },
-	{ "flagged", CAMEL_MESSAGE_FLAGGED },
-	{ "seen", CAMEL_MESSAGE_SEEN },
-	{ "attachments", CAMEL_MESSAGE_ATTACHMENTS },
-	{ NULL, 0 }
-};
-
-/**
- * camel_system_flag:
- * @name: 
- * 
- * Returns the integer value of the flag string.
- **/
-guint32
-camel_system_flag (const char *name)
-{
-	struct flag_names_t *flag;
-	
-	g_return_val_if_fail (name != NULL, 0);
-	
-	for (flag = flag_names; *flag->name; flag++)
-		if (!g_strcasecmp (name, flag->name))
-			return flag->value;
-	
-	return 0;
-}
-
-/**
- * camel_system_flag_get:
- * @flags: 
- * @name: 
- * 
- * Find the state of the flag @name in @flags.
- * 
- * Return value: The state of the flag (TRUE or FALSE).
- **/
-gboolean
-camel_system_flag_get (guint32 flags, const char *name)
-{
-	g_return_val_if_fail (name != NULL, FALSE);
-	
-	return flags & camel_system_flag (name);
-}
-
-
-/**
- * camel_message_info_new:
- *
- * Returns a new CamelMessageInfo structure.
- **/
-CamelMessageInfo *
-camel_message_info_new (void)
-{
-	CamelMessageInfo *info;
-	
-	info = g_malloc0(sizeof(*info));
-#ifdef DOEPOOLV
-	info->strings = e_poolv_new(CAMEL_MESSAGE_INFO_LAST);
-#endif
-#ifdef DOESTRV
-	info->strings = e_strv_new (CAMEL_MESSAGE_INFO_LAST);
-#endif
-	info->refcount = 1;
-
-	return info;
-}
-
-/**
- * camel_message_info_ref:
- * @info: 
- * 
- * Reference an info.
- *
- * NOTE: This interface is not MT-SAFE, like the others.
- **/
-void camel_message_info_ref(CamelMessageInfo *info)
-{
-	GLOBAL_INFO_LOCK(info);
-	info->refcount++;
-	GLOBAL_INFO_UNLOCK(info);
-}
-
-/**
- * camel_message_info_new_from_header:
- * @header: raw header
- *
- * Returns a new CamelMessageInfo structure populated by the header.
- **/
-CamelMessageInfo *
-camel_message_info_new_from_header (struct _header_raw *header)
-{
-	CamelMessageInfo *info;
-	char *subject, *from, *to, *cc, *mlist;
-	struct _header_content_type *ct = NULL;
-	const char *content, *date, *charset = NULL;
-	
-	if ((content = header_raw_find(&header, "Content-Type", NULL))
-	    && (ct = header_content_type_decode(content))
-	    && (charset = header_content_type_param(ct, "charset"))
-	    && (strcasecmp(charset, "us-ascii") == 0))
-		charset = NULL;
-
-	charset = e_iconv_charset_name(charset);
-	
-	subject = summary_format_string(header, "subject", charset);
-	from = summary_format_address(header, "from");
-	to = summary_format_address(header, "to");
-	cc = summary_format_address(header, "cc");
-	date = header_raw_find(&header, "date", NULL);
-	mlist = header_raw_check_mailing_list(&header);
-
-	if (ct)
-		header_content_type_unref(ct);
-
-	info = camel_message_info_new();
-
-	camel_message_info_set_subject(info, subject);
-	camel_message_info_set_from(info, from);
-	camel_message_info_set_to(info, to);
-	camel_message_info_set_cc(info, cc);
-	camel_message_info_set_mlist(info, mlist);
-	
-	if (date)
-		info->date_sent = header_decode_date (date, NULL);
-	else
-		info->date_sent = time (NULL);
-	
-	date = header_raw_find (&header, "received", NULL);
-	if (date && (date = strrchr (date, ';')))
-		date++;
-	
-	if (date)
-		info->date_received = header_decode_date (date, NULL);
-	else
-		info->date_received = time (NULL);
-	
-	return info;
-}
-
-/**
- * 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;
-	to->refcount = 1;
-
-	/* Copy strings */
-#ifdef DOEPOOLV
-	to->strings = e_poolv_cpy (to->strings, from->strings);
-#elif defined (DOESTRV)
-	/* to->strings = e_strv_new(CAMEL_MESSAGE_INFO_LAST); */
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_SUBJECT, camel_message_info_subject(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_FROM, camel_message_info_from(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_TO, camel_message_info_to(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_CC, camel_message_info_cc(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_UID, camel_message_info_uid(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_UID, camel_message_info_mlist(from));
-#else
-	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->mlist = g_strdup(from->mlist);
-#endif
-	memcpy(&to->message_id, &from->message_id, sizeof(from->message_id));
-
-	/* Copy structures */
-	if (from->references) {
-		int len = sizeof(*from->references) + ((from->references->size-1) * sizeof(from->references->references[0]));
-
-		to->references = g_malloc(len);
-		memcpy(to->references, from->references, len);
-	} else {
-		to->references = NULL;
-	}
-
-	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;
-	}
-
-	/* No, this is impossible without knowing the class of summary we came from */
-	/* FIXME some day */
-	to->content = NULL;
-}
-
-/**
- * camel_message_info_free:
- * @mi: the message info
- *
- * Unref's and potentially frees a CamelMessageInfo and its contents.
- *
- * Can only be used to free CamelMessageInfo's created with
- * camel_message_info_dup_to.
- *
- * NOTE: This interface is not MT-SAFE, like the others.
- *
- **/
-void
-camel_message_info_free(CamelMessageInfo *mi)
-{
-	g_return_if_fail(mi != NULL);
-
-	GLOBAL_INFO_LOCK(info);
-	mi->refcount--;
-	if (mi->refcount > 0) {
-		GLOBAL_INFO_UNLOCK(info);
-		return;
-	}
-	GLOBAL_INFO_UNLOCK(info);
-
-#ifdef DOEPOOLV
-	e_poolv_destroy(mi->strings);
-#elif defined (DOESTRV)
-	e_strv_destroy(mi->strings);
-#else
-	g_free(mi->uid);
-	g_free(mi->subject);
-	g_free(mi->from);
-	g_free(mi->to);
-	g_free(mi->cc);
-	g_free(mi->mlist);
-#endif
-	g_free(mi->references);
-	camel_flag_list_free(&mi->user_flags);
-	camel_tag_list_free(&mi->user_tags);
-	/* FIXME: content info? */
-	g_free(mi);
-}
-
-#if defined (DOEPOOLV) || defined (DOESTRV)
-const char *
-camel_message_info_string (const CamelMessageInfo *mi, int type)
-{
-	g_assert (mi != NULL);
-	
-	if (mi->strings == NULL)
-		return "";
-#ifdef DOEPOOLV
-	return e_poolv_get (mi->strings, type);
-#else
-	return e_strv_get (mi->strings, type);
-#endif
-}
-
-void
-camel_message_info_set_string (CamelMessageInfo *mi, int type, char *str)
-{
-	g_assert (mi != NULL);
-	g_assert (mi->strings != NULL);
-#ifdef DOEPOOLV
-	e_poolv_set (mi->strings, type, str, TRUE);
-#else
-	mi->strings = e_strv_set_ref_free (mi->strings, type, str);
-#endif
-}
-#endif
-
-
-void
-camel_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 ("%scontent-type: %s/%s\n", p, ci->type->type ? ci->type->type : "(null)",
-	       ci->type->subtype ? ci->type->subtype : "(null)");
-	printf ("%scontent-transfer-encoding: %s\n", p, ci->encoding ? ci->encoding : "(null)");
-	printf ("%scontent-description: %s\n", p, ci->description ? ci->description : "(null)");
-	printf ("%ssize: %lu\n", p, (unsigned long) ci->size);
-	ci = ci->childs;
-	while (ci) {
-		camel_content_info_dump (ci, depth + 1);
-		ci = ci->next;
-	}
-}
-
-void
-camel_message_info_dump (CamelMessageInfo *mi)
-{
-	if (mi == NULL) {
-		printf("No message?\n");
-		return;
-	}
-
-	printf("Subject: %s\n", camel_message_info_subject(mi));
-	printf("To: %s\n", camel_message_info_to(mi));
-	printf("Cc: %s\n", camel_message_info_cc(mi));
-	printf("mailing list: %s\n", camel_message_info_mlist(mi));
-	printf("From: %s\n", camel_message_info_from(mi));
-	printf("UID: %s\n", camel_message_info_uid(mi));
-	printf("Flags: %04x\n", mi->flags & 0xffff);
-	camel_content_info_dump(mi->content, 0);
-}
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
deleted file mode 100644
index 7545f2af22..0000000000
--- a/camel/camel-folder-summary.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <stdio.h>
-#include <time.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-object.h>
-#include <camel/camel-index.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 CAMEL_IS_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) */
-struct _CamelMessageContentInfo {
-	struct _CamelMessageContentInfo *next;
-	
-	struct _CamelMessageContentInfo *childs;
-	struct _CamelMessageContentInfo *parent;
-	
-	struct _header_content_type *type;
-	char *id;
-	char *description;
-	char *encoding;
-	guint32 size;
-};
-
-/* 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,
-	CAMEL_MESSAGE_ATTACHMENTS = 1<<5,
-
-	/* 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;
-
-/* a summary messageid is a 64 bit identifier (partial md5 hash) */
-typedef struct _CamelSummaryMessageID {
-	union {
-		guint64 id;
-		unsigned char hash[8];
-		struct {
-			guint32 hi;
-			guint32 lo;
-		} part;
-	} id;
-} CamelSummaryMessageID;
-
-/* summary references is a fixed size array of references */
-typedef struct _CamelSummaryReferences {
-	int size;
-	CamelSummaryMessageID references[1];
-} CamelSummaryReferences;
-
-/* #define DOESTRV */
-#define DOEPOOLV
-
-#if defined (DOEPOOLV) || defined (DOESTRV)
-
-/* string array indices */
-enum {
-	CAMEL_MESSAGE_INFO_UID,
-	CAMEL_MESSAGE_INFO_SUBJECT,
-	CAMEL_MESSAGE_INFO_FROM,
-	CAMEL_MESSAGE_INFO_TO,
-	CAMEL_MESSAGE_INFO_CC,
-	CAMEL_MESSAGE_INFO_MLIST,
-	CAMEL_MESSAGE_INFO_LAST,
-};
-#endif
-
-/* information about a given object */
-struct _CamelMessageInfo {
-	/* public fields */
-#ifdef DOEPOOLV
-	struct _EPoolv *strings;
-#elif defined (DOESTRV)
-	struct _EStrv *strings;		/* all strings packed into a single compact array */
-#else
-	char *subject;
-	char *from;
-	char *to;
-	char *cc;
-	char *mlist;
-
-	char *uid;
-#endif /* DOEPOOLV */
-	guint32 flags;
-	guint32 size;
-	guint32 refcount;
-
-	time_t date_sent;
-	time_t date_received;
-
-	CamelSummaryMessageID message_id;/* for this message */
-	CamelSummaryReferences *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;
-};
-
-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;
-
-#if defined (DOEPOOLV) || defined (DOESTRV)
-	guint32 message_info_strings;
-#endif	
-	/* memory allocators (setup automatically) */
-	struct _EMemChunk *message_info_chunks;
-	struct _EMemChunk *content_info_chunks;
-
-	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_new_from_message)(CamelFolderSummary *, CamelMimeMessage *);
-	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_new_from_message)(CamelFolderSummary *, CamelMimePart *);
-	CamelMessageContentInfo * (*content_info_load)(CamelFolderSummary *, FILE *);
-	int		          (*content_info_save)(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);
-	void		          (*content_info_free)(CamelFolderSummary *, CamelMessageContentInfo *);
-
-	/* get the next uid */
-	char *(*next_uid_string)(CamelFolderSummary *);
-};
-
-CamelType			 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 *, CamelIndex *);
-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 *);
-
-/* only load the header */
-int camel_folder_summary_header_load(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 *);
-CamelMessageInfo *camel_folder_summary_add_from_message(CamelFolderSummary *, CamelMimeMessage *);
-
-/* Just build raw summary items */
-CamelMessageInfo *camel_folder_summary_info_new(CamelFolderSummary *s);
-CamelMessageInfo *camel_folder_summary_info_new_from_header(CamelFolderSummary *, struct _header_raw *);
-CamelMessageInfo *camel_folder_summary_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
-CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary *, CamelMimeMessage *);
-
-void camel_folder_summary_info_ref(CamelFolderSummary *, CamelMessageInfo *);
-void camel_folder_summary_info_free(CamelFolderSummary *, CamelMessageInfo *);
-
-CamelMessageContentInfo *camel_folder_summary_content_info_new(CamelFolderSummary *s);
-void camel_folder_summary_content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci);
-
-/* 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);
-GPtrArray *camel_folder_summary_array(CamelFolderSummary *s);
-void camel_folder_summary_array_free(CamelFolderSummary *s, GPtrArray *array);
-
-/* 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);
-
-/* basically like strings, but certain keywords can be compressed and de-cased */
-int camel_folder_summary_encode_token(FILE *, const char *);
-int camel_folder_summary_decode_token(FILE *, char **);
-
-/* message flag operations */
-gboolean	camel_flag_get(CamelFlag **list, const char *name);
-gboolean	camel_flag_set(CamelFlag **list, const char *name, gboolean state);
-gboolean	camel_flag_list_copy(CamelFlag **to, CamelFlag **from);
-int		camel_flag_list_size(CamelFlag **list);
-void		camel_flag_list_free(CamelFlag **list);
-
-guint32         camel_system_flag (const char *name);
-gboolean        camel_system_flag_get (guint32 flags, const char *name);
-
-/* message tag operations */
-const char	*camel_tag_get(CamelTag **list, const char *name);
-gboolean	camel_tag_set(CamelTag **list, const char *name, const char *value);
-gboolean	camel_tag_list_copy(CamelTag **to, CamelTag **from);
-int		camel_tag_list_size(CamelTag **list);
-void		camel_tag_list_free(CamelTag **list);
-
-/* message info utils for working with pseudo-messageinfo structures
-   NOTE: These cannot be added to a real summary object, but suffice for all
-   other external interfaces that use message info's */
-CamelMessageInfo *camel_message_info_new(void);
-void camel_message_info_ref(CamelMessageInfo *info);
-CamelMessageInfo *camel_message_info_new_from_header(struct _header_raw *header);
-void camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to);
-void camel_message_info_free(CamelMessageInfo *mi);
-
-/* accessors */
-#if defined (DOEPOOLV) || defined (DOESTRV)
-const char *camel_message_info_string(const CamelMessageInfo *mi, int type);
-#define camel_message_info_subject(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_SUBJECT)
-#define camel_message_info_from(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_FROM)
-#define camel_message_info_to(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_TO)
-#define camel_message_info_cc(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_CC)
-#define camel_message_info_uid(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_UID)
-#define camel_message_info_mlist(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_MLIST)
-
-void camel_message_info_set_string(CamelMessageInfo *mi, int type, char *str);
-#define camel_message_info_set_subject(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_SUBJECT, s)
-#define camel_message_info_set_from(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_FROM, s)
-#define camel_message_info_set_to(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_TO, s)
-#define camel_message_info_set_cc(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_CC, s)
-#define camel_message_info_set_uid(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_UID, s)
-#define camel_message_info_set_mlist(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_MLIST, s)
-
-#else
-
-#define camel_message_info_subject(x) (((CamelMessageInfo *)(x))->subject?((CamelMessageInfo *)(x))->subject:"")
-#define camel_message_info_from(x) (((CamelMessageInfo *)(x))->from?((CamelMessageInfo *)(x))->from:"")
-#define camel_message_info_to(x) (((CamelMessageInfo *)(x))->to?((CamelMessageInfo *)(x))->to:"")
-#define camel_message_info_cc(x) (((CamelMessageInfo *)(x))->cc?((CamelMessageInfo *)(x))->cc:"")
-#define camel_message_info_uid(x) (((CamelMessageInfo *)(x))->uid?((CamelMessageInfo *)(x))->uid:"")
-#define camel_message_info_mlist(x) (((CamelMessageInfo *)(x))->mlist?((CamelMessageInfo *)(x))->mlist:"")
-
-#define camel_message_info_set_subject(x, s) (g_free(((CamelMessageInfo *)(x))->subject),((CamelMessageInfo *)(x))->subject = (s))
-#define camel_message_info_set_from(x, s) (g_free(((CamelMessageInfo *)(x))->from),((CamelMessageInfo *)(x))->from = (s))
-#define camel_message_info_set_to(x, s) (g_free(((CamelMessageInfo *)(x))->to),((CamelMessageInfo *)(x))->to = (s))
-#define camel_message_info_set_cc(x, s) (g_free(((CamelMessageInfo *)(x))->cc),((CamelMessageInfo *)(x))->cc = (s))
-#define camel_message_info_set_uid(x, s) (g_free(((CamelMessageInfo *)(x))->uid),((CamelMessageInfo *)(x))->uid = (s))
-#define camel_message_info_set_mlist(x, s) (g_free(((CamelMessageInfo *)(x))->mlist),((CamelMessageInfo *)(x))->mlist = (s))
-#endif
-
-
-/* debugging functions */
-
-void camel_content_info_dump (CamelMessageContentInfo *ci, int depth);
-
-void camel_message_info_dump (CamelMessageInfo *mi);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c
deleted file mode 100644
index 2427047ed9..0000000000
--- a/camel/camel-folder-thread.c
+++ /dev/null
@@ -1,783 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* TODO: This could probably be made a camel object, but it isn't really required */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <glib.h>
-
-#include "camel-folder-thread.h"
-#include "e-util/e-memory.h"
-
-#define d(x)
-
-/*#define TIMEIT*/
-
-#ifdef TIMEIT
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-static void
-container_add_child(CamelFolderThreadNode *node, CamelFolderThreadNode *child)
-{
-	d(printf("\nAdding child %p to parent %p \n", child, node));
-	child->next = node->child;
-	node->child = child;
-	child->parent = node;
-}
-
-static void
-container_parent_child(CamelFolderThreadNode *parent, CamelFolderThreadNode *child)
-{
-	CamelFolderThreadNode *c, *node;
-
-	/* are we already the right parent? */
-	if (child->parent == parent)
-		return;
-
-	/* would this create a loop? */
-	node = parent->parent;
-	while (node) {
-		if (node == child)
-			return;
-		node = node->parent;
-	}
-
-	/* are we unparented? */
-	if (child->parent == NULL) {
-		container_add_child(parent, child);
-		return;
-	}
-
-	/* else remove child from its existing parent, and reparent */
-	node = child->parent;
-	c = (CamelFolderThreadNode *)&node->child;
-	d(printf("scanning children:\n"));
-	while (c->next) {
-		d(printf(" %p\n", c));
-	        if (c->next==child) {
-			d(printf("found node %p\n", child));
-			c->next = c->next->next;
-			child->parent = NULL;
-			container_add_child(parent, child);
-			return;
-		}
-		c = c->next;
-	}
-
-	printf("DAMN, we shouldn't  be here!\n");
-}
-
-static void
-prune_empty(CamelFolderThread *thread, CamelFolderThreadNode **cp)
-{
-	CamelFolderThreadNode *child, *next, *c, *lastc;
-
-	/* yes, this is intentional */
-	lastc = (CamelFolderThreadNode *)cp;
-	while (lastc->next) {
-		c = lastc->next;
-
-		d(printf("checking message %p %p (%08x%08x)\n", c,
-			 c->message, c->message?c->message->message_id.id.part.hi:0,
-			 c->message?c->message->message_id.id.part.lo:0));
-		if (c->message == NULL) {
-			if (c->child == NULL) {
-				d(printf("removing empty node\n"));
-				lastc->next = c->next;
-				e_memchunk_free(thread->node_chunks, c);
-				continue;
-			}
-			if (c->parent || c->child->next==0) {
-				d(printf("promoting child\n"));
-				lastc->next = c->next; /* remove us */
-				child = c->child;
-				while (child) {
-					next = child->next;
-
-					child->parent = c->parent;
-					child->next = lastc->next;
-					lastc->next = child;
-
-					child = next;
-				}
-				continue;
-			}
-		}
-		prune_empty(thread, &c->child);
-		lastc = c;
-	}
-}
-
-static void
-hashloop(void *key, void *value, void *data)
-{
-	CamelFolderThreadNode *c = value;
-	CamelFolderThreadNode *tail = data;
-
-	if (c->parent == NULL) {
-		c->next = tail->next;
-		tail->next = c;
-	}
-}
-
-static char *
-get_root_subject(CamelFolderThreadNode *c, int *re)
-{
-	char *s, *p;
-	CamelFolderThreadNode *scan;
-	
-	s = NULL;
-	*re = FALSE;
-	if (c->message)
-		s = (char *)camel_message_info_subject(c->message);
-	else {
-		/* one of the children will always have a message */
-		scan = c->child;
-		while (scan) {
-			if (scan->message) {
-				s = (char *)camel_message_info_subject(scan->message);
-				break;
-			}
-			scan = scan->next;
-		}
-	}
-	if (s != NULL) {
-		while (*s) {
-			while (isspace(*s))
-				s++;
-			if (s[0] == 0)
-				break;
-			if ((s[0] == 'r' || s[0]=='R')
-			    && (s[1] == 'e' || s[1]=='E')) {
-				p = s+2;
-				while (isdigit(*p) || (ispunct(*p) && (*p != ':')))
-					p++;
-				if (*p==':') {
-					*re = TRUE;
-					s = p+1;
-				} else
-					break;
-			} else
-				break;
-		}
-		if (*s)
-			return s;
-	}
-	return NULL;
-}
-
-/* this can be pretty slow, but not used often */
-/* clast cannot be null */
-static void
-remove_node(CamelFolderThreadNode **list, CamelFolderThreadNode *node, CamelFolderThreadNode **clast)
-{
-	CamelFolderThreadNode *c;
-
-	/* this is intentional, even if it looks funny */
-	/* if we have a parent, then we should remove it from the parent list,
-	   otherwise we remove it from the root list */
-	if (node->parent) {
-		c = (CamelFolderThreadNode *)&node->parent->child;
-	} else {
-		c = (CamelFolderThreadNode *)list;
-	}
-	while (c->next) {
-		if (c->next == node) {
-			if (*clast == c->next)
-				*clast = c;
-			c->next = c->next->next;
-			return;
-		}
-		c = c->next;
-	}
-
-	printf("ERROR: removing node %p failed\n", node);
-}
-
-static void
-group_root_set(CamelFolderThread *thread, CamelFolderThreadNode **cp)
-{
-	GHashTable *subject_table = g_hash_table_new(g_str_hash, g_str_equal);
-	CamelFolderThreadNode *c, *clast, *scan, *container;
-
-	/* gather subject lines */ 
-	d(printf("gathering subject lines\n"));
-	clast = (CamelFolderThreadNode *)cp;
-	c = clast->next;
-	while (c) {
-		c->root_subject = get_root_subject(c, &c->re);
-		if (c->root_subject) {
-			container = g_hash_table_lookup(subject_table, c->root_subject);
-			if (container == NULL
-			    || (container->message == NULL && c->message)
-			    || (container->re == TRUE && !c->re)) {
-				g_hash_table_insert(subject_table, c->root_subject, c);
-			}
-		}
-		c = c->next;
-	}
-
-	/* merge common subjects? */
-	clast = (CamelFolderThreadNode *)cp;
-	while (clast->next) {
-		c = clast->next;
-		d(printf("checking %p %s\n", c, c->root_subject));
-		if (c->root_subject
-		    && (container = g_hash_table_lookup(subject_table, c->root_subject))
-		    && (container != c)) {
-			d(printf(" matching %p %s\n", container, container->root_subject));
-			if (c->message == NULL && container->message == NULL) {
-				d(printf("merge containers children\n"));
-				/* steal the children from c onto container, and unlink c */
-				scan = (CamelFolderThreadNode *)&container->child;
-				while (scan->next)
-					scan = scan->next;
-				scan->next = c->child;
-				clast->next = c->next;
-				e_memchunk_free(thread->node_chunks, c);
-				continue;
-			} if (c->message == NULL && container->message != NULL) {
-				d(printf("container is non-empty parent\n"));
-				remove_node(cp, container, &clast);
-				container_add_child(c, container);
-			} else if (c->message != NULL && container->message == NULL) {
-				d(printf("container is empty child\n"));
-				clast->next = c->next;
-				container_add_child(container, c);
-				continue;
-			} else if (c->re && !container->re) {
-				d(printf("container is re\n"));
-				clast->next = c->next;
-				container_add_child(container, c);
-				continue;
-			} else if (!c->re && container->re) {
-				d(printf("container is not re\n"));
-				remove_node(cp, container, &clast);
-				container_add_child(c, container);
-			} else if (c->re && container->re) {
-				d(printf("subjects are common %p and %p\n", c, container));
-
-				/* build a phantom node */
-				remove_node(cp, container, &clast);
-				remove_node(cp, c, &clast);
-
-				scan = e_memchunk_alloc0(thread->node_chunks);
-
-				scan->root_subject = c->root_subject;
-				scan->re = c->re && container->re;
-				scan->next = c->next;
-				clast->next = scan;
-				container_add_child(scan, c);
-				container_add_child(scan, container);
-				clast = scan;
-				g_hash_table_insert(subject_table, scan->root_subject, scan);
-				continue;
-			}
-		}
-		clast = c;
-	}
-	g_hash_table_destroy(subject_table);
-}
-
-struct _tree_info {
-	GHashTable *visited;
-};
-
-static int
-dump_tree_rec(struct _tree_info *info, CamelFolderThreadNode *c, int depth)
-{
-	char *p;
-	int count=0;
-
-	p = alloca(depth*2+1);
-	memset(p, ' ', depth*2);
-	p[depth*2] = 0;
-
-	while (c) {
-		if (g_hash_table_lookup(info->visited, c)) {
-			printf("WARNING: NODE REVISITED: %p\n", c);
-		} else {
-			g_hash_table_insert(info->visited, c, c);
-		}
-		if (c->message) {
-			printf("%s %p Subject: %s <%.8s>\n", p, c, camel_message_info_subject(c->message), c->message->message_id.id.hash);
-			count += 1;
-		} else {
-			printf("%s %p <empty>\n", p, c);
-		}
-		if (c->child)
-			count += dump_tree_rec(info, c->child, depth+1);
-		c = c->next;
-	}
-	return count;
-}
-
-int
-camel_folder_threaded_messages_dump(CamelFolderThreadNode *c)
-{
-	int count;
-	struct _tree_info info;
-
-	info.visited = g_hash_table_new(g_direct_hash, g_direct_equal);
-	count = dump_tree_rec(&info, c, 0);
-	g_hash_table_destroy(info.visited);
-	return count;
-}
-
-static int
-sort_node(const void *a, const void *b)
-{
-	const CamelFolderThreadNode *a1 = ((CamelFolderThreadNode **)a)[0];
-	const CamelFolderThreadNode *b1 = ((CamelFolderThreadNode **)b)[0];
-
-	/* if we have no message, it must be a dummy node, which 
-	   also means it must have a child, just use that as the
-	   sort data (close enough?) */
-	if (a1->message == NULL)
-		a1 = a1->child;
-	if (b1->message == NULL)
-		b1 = b1->child;
-	if (a1->order == b1->order)
-		return 0;
-	if (a1->order < b1->order)
-		return -1;
-	else
-		return 1;
-}
-
-static void
-sort_thread(CamelFolderThreadNode **cp)
-{
-	CamelFolderThreadNode *c, *head, **carray;
-	int size=0;
-
-	c = *cp;
-	while (c) {
-		/* sort the children while we're at it */
-		if (c->child)
-			sort_thread(&c->child);
-		size++;
-		c = c->next;
-	}
-	if (size<2)
-		return;
-	carray = alloca(size*sizeof(CamelFolderThreadNode *));
-	c = *cp;
-	size=0;
-	while (c) {
-		carray[size] = c;
-		c = c->next;
-		size++;
-	}
-	qsort(carray, size, sizeof(CamelFolderThreadNode *), sort_node);
-	size--;
-	head = carray[size];
-	head->next = NULL;
-	size--;
-	do {
-		c = carray[size];
-		c->next = head;
-		head = c;
-		size--;
-	} while (size>=0);
-	*cp = head;
-}
-
-static guint id_hash(void *key)
-{
-	CamelSummaryMessageID *id = (CamelSummaryMessageID *)key;
-
-	return id->id.part.lo;
-}
-
-static gint id_equal(void *a, void *b)
-{
-	return ((CamelSummaryMessageID *)a)->id.id == ((CamelSummaryMessageID *)b)->id.id;
-}
-
-/**
- * camel_folder_thread_messages_new:
- * @folder: 
- * @uids: The subset of uid's to thread.  If NULL. then thread all
- * uid's in @folder.
- * 
- * Thread a (subset) of the messages in a folder.  And sort the result
- * in summary order.
- * 
- * This function is probably to be removed soon.
- *
- * Return value: A CamelFolderThread contianing a tree of CamelFolderThreadNode's
- * which represent the threaded structure of the messages.
- **/
-CamelFolderThread *
-camel_folder_thread_messages_new(CamelFolder *folder, GPtrArray *uids)
-{
-	GHashTable *id_table, *no_id_table;
-	int i;
-	CamelFolderThreadNode *c, *child, *head;
-	CamelFolderThread *thread;
-	GHashTable *wanted = NULL;
-	GPtrArray *summary;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	gettimeofday(&start, NULL);
-#endif
-
-	thread = g_malloc(sizeof(*thread));
-	thread->tree = NULL;
-	thread->node_chunks = e_memchunk_new(32, sizeof(CamelFolderThreadNode));
-	thread->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-
-	/* wanted is the list of what we want, we put it in a hash for quick lookup */
-	if (uids) {
-		wanted = g_hash_table_new(g_str_hash, g_str_equal);
-		for (i=0;i<uids->len;i++)
-			g_hash_table_insert(wanted, uids->pdata[i], uids->pdata[i]);
-	}
-
-	thread->summary = summary = camel_folder_get_summary(folder);
-	
-	id_table = g_hash_table_new((GHashFunc)id_hash, (GCompareFunc)id_equal);
-	no_id_table = g_hash_table_new(NULL, NULL);
-	for (i=0;i<summary->len;i++) {
-		CamelMessageInfo *mi = summary->pdata[i];
-		const char *uid = camel_message_info_uid(mi);
-
-		if (wanted && g_hash_table_lookup(wanted, uid) == 0)
-			continue;
-
-		if (mi->message_id.id.id) {
-			c = g_hash_table_lookup(id_table, &mi->message_id);
-			/* check for duplicate messages */
-			if (c && c->order) {
-				/* if duplicate, just make out it is a no-id message,  but try and insert it
-				   into the right spot in the tree */
-				d(printf("doing: (duplicate message id)\n"));
-				c = e_memchunk_alloc0(thread->node_chunks);
-				g_hash_table_insert(no_id_table, (void *)mi, c);
-			} else if (!c) {
-				d(printf("doing : %08x%08x (%s)\n", mi->message_id.id.part.hi, mi->message_id.id.part.lo, camel_message_info_subject(mi)));
-				c = e_memchunk_alloc0(thread->node_chunks);
-				g_hash_table_insert(id_table, (void *)&mi->message_id, c);
-			}
-		} else {
-			d(printf("doing : (no message id)\n"));
-			c = e_memchunk_alloc0(thread->node_chunks);
-			g_hash_table_insert(no_id_table, (void *)mi, c);
-		}
-
-		c->message = mi;
-		c->order = i+1;
-		child = c;
-		if (mi->references) {
-			int j;
-
-			d(printf("references:\n"));
-			for (j=0;j<mi->references->size;j++) {
-				/* should never be empty, but just incase */
-				if (mi->references->references[j].id.id == 0)
-					continue;
-
-				c = g_hash_table_lookup(id_table, &mi->references->references[j]);
-				if (c == NULL) {
-					d(printf("not found\n"));
-					c = e_memchunk_alloc0(thread->node_chunks);
-					g_hash_table_insert(id_table, &mi->references->references[j], c);
-				}
-				if (c!=child)
-					container_parent_child(c, child);
-				child = c;
-			}
-		}
-	}
-
-	d(printf("\n\n"));
-	/* build a list of root messages (no parent) */
-	head = NULL;
-	g_hash_table_foreach(id_table, hashloop, &head);
-	g_hash_table_foreach(no_id_table, hashloop, &head);
-
-	g_hash_table_destroy(id_table);
-	g_hash_table_destroy(no_id_table);
-
-	/* remove empty parent nodes */
-	prune_empty(thread, &head);
-
-	/* find any siblings which missed out */
-	group_root_set(thread, &head);
-
-#if 0
-	printf("finished\n");
-	i = camel_folder_thread_messages_dump(head);
-	printf("%d count, %d items in tree\n", uids->len, i);
-#endif
-
-	sort_thread(&head);
-
-	/* remove any phantom nodes, this could possibly be put in group_root_set()? */
-	c = (CamelFolderThreadNode *)&head;
-	while (c && c->next) {
-		CamelFolderThreadNode *scan, *newtop;
-
-		child = c->next;
-		if (child->message == NULL) {
-			newtop = child->child;
-			/* unlink pseudo node */
-			c->next = newtop;
-
-			/* link its siblings onto the end of its children */
-			scan = (CamelFolderThreadNode *)&newtop->child;
-			while (scan->next)
-				scan = scan->next;
-			scan->next = newtop->next;
-			/* and link the now 'real' node into the list */
-			newtop->next = child->next;
-			c = newtop;
-			e_memchunk_free(thread->node_chunks, child);
-		} else {
-			c = child;
-		}
-	}
-
-	/* this is only debug assertion stuff */
-	c = (CamelFolderThreadNode *)&head;
-	while (c->next) {
-		c = c->next;
-		if (c->message == NULL)
-			g_warning("threading missed removing a pseudo node: %s\n", c->root_subject);
-	}
-
-	thread->tree = head;
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Message threading %d messages took %ld.%03ld seconds\n",
-	       uids->len, diff / 1000, diff % 1000);
-#endif
-
-	return thread;
-}
-
-/**
- * camel_folder_thread_messages_new_summary:
- * @summary: Array of CamelMessageInfo's to thread.
- * 
- * Thread a list of MessageInfo's.  The summary must remain valid for the
- * life of the CamelFolderThread created by this function, and it is upto the
- * caller to ensure this.
- * 
- * Return value: A CamelFolderThread contianing a tree of CamelFolderThreadNode's
- * which represent the threaded structure of the messages.
- **/
-CamelFolderThread *
-camel_folder_thread_messages_new_summary(GPtrArray *summary)
-{
-	GHashTable *id_table, *no_id_table;
-	int i;
-	CamelFolderThreadNode *c, *child, *head;
-	CamelFolderThread *thread;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	gettimeofday(&start, NULL);
-#endif
-
-	thread = g_malloc(sizeof(*thread));
-	thread->tree = NULL;
-	thread->node_chunks = e_memchunk_new(32, sizeof(CamelFolderThreadNode));
-	thread->folder = NULL;
-	thread->summary = NULL;
-	
-	id_table = g_hash_table_new((GHashFunc)id_hash, (GCompareFunc)id_equal);
-	no_id_table = g_hash_table_new(NULL, NULL);
-	for (i=0;i<summary->len;i++) {
-		CamelMessageInfo *mi = summary->pdata[i];
-
-		if (mi->message_id.id.id) {
-			c = g_hash_table_lookup(id_table, &mi->message_id);
-			/* check for duplicate messages */
-			if (c && c->order) {
-				/* if duplicate, just make out it is a no-id message,  but try and insert it
-				   into the right spot in the tree */
-				d(printf("doing: (duplicate message id)\n"));
-				c = e_memchunk_alloc0(thread->node_chunks);
-				g_hash_table_insert(no_id_table, (void *)mi, c);
-			} else if (!c) {
-				d(printf("doing : %08x%08x (%s)\n", mi->message_id.id.part.hi, mi->message_id.id.part.lo, camel_message_info_subject(mi)));
-				c = e_memchunk_alloc0(thread->node_chunks);
-				g_hash_table_insert(id_table, (void *)&mi->message_id, c);
-			}
-		} else {
-			d(printf("doing : (no message id)\n"));
-			c = e_memchunk_alloc0(thread->node_chunks);
-			g_hash_table_insert(no_id_table, (void *)mi, c);
-		}
-
-		c->message = mi;
-		c->order = i+1;
-		child = c;
-		if (mi->references) {
-			int j;
-
-			d(printf("references:\n"));
-			for (j=0;j<mi->references->size;j++) {
-				/* should never be empty, but just incase */
-				if (mi->references->references[j].id.id == 0)
-					continue;
-
-				c = g_hash_table_lookup(id_table, &mi->references->references[j]);
-				if (c == NULL) {
-					d(printf("not found\n"));
-					c = e_memchunk_alloc0(thread->node_chunks);
-					g_hash_table_insert(id_table, &mi->references->references[j], c);
-				}
-				if (c!=child)
-					container_parent_child(c, child);
-				child = c;
-			}
-		}
-	}
-
-	d(printf("\n\n"));
-	/* build a list of root messages (no parent) */
-	head = NULL;
-	g_hash_table_foreach(id_table, hashloop, &head);
-	g_hash_table_foreach(no_id_table, hashloop, &head);
-
-	g_hash_table_destroy(id_table);
-	g_hash_table_destroy(no_id_table);
-
-	/* remove empty parent nodes */
-	prune_empty(thread, &head);
-
-	/* find any siblings which missed out */
-	group_root_set(thread, &head);
-
-#if 0
-	printf("finished\n");
-	i = camel_folder_thread_messages_dump(head);
-	printf("%d count, %d items in tree\n", uids->len, i);
-#endif
-
-	sort_thread(&head);
-
-	/* remove any phantom nodes, this could possibly be put in group_root_set()? */
-	c = (CamelFolderThreadNode *)&head;
-	while (c && c->next) {
-		CamelFolderThreadNode *scan, *newtop;
-
-		child = c->next;
-		if (child->message == NULL) {
-			newtop = child->child;
-			/* unlink pseudo node */
-			c->next = newtop;
-
-			/* link its siblings onto the end of its children */
-			scan = (CamelFolderThreadNode *)&newtop->child;
-			while (scan->next)
-				scan = scan->next;
-			scan->next = newtop->next;
-			/* and link the now 'real' node into the list */
-			newtop->next = child->next;
-			c = newtop;
-			e_memchunk_free(thread->node_chunks, child);
-		} else {
-			c = child;
-		}
-	}
-
-	/* this is only debug assertion stuff */
-	c = (CamelFolderThreadNode *)&head;
-	while (c->next) {
-		c = c->next;
-		if (c->message == NULL)
-			g_warning("threading missed removing a pseudo node: %s\n", c->root_subject);
-	}
-
-	thread->tree = head;
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Message threading %d messages took %ld.%03ld seconds\n",
-	       summary->len, diff / 1000, diff % 1000);
-#endif
-
-	return thread;
-}
-
-/**
- * camel_folder_thread_messages_destroy:
- * @thread: 
- * 
- * Free all memory associated with the thread descriptor @thread.
- **/
-void
-camel_folder_thread_messages_destroy(CamelFolderThread *thread)
-{
-	if (thread->folder) {
-		camel_folder_free_summary(thread->folder, thread->summary);
-		camel_object_unref((CamelObject *)thread->folder);
-	}
-	e_memchunk_destroy(thread->node_chunks);
-	g_free(thread);
-}
-
-#if 0
-/* intended for incremental update.  Not implemented yet as, well, its probbaly
-   not worth it (memory overhead vs speed, may as well just rethread the whole
-   lot?)
-
-   But it might be implemented at a later date.
-*/
-void
-camel_folder_thread_messages_add(CamelFolderThread *thread, CamelFolder *folder, GPtrArray *uids)
-{
-	
-}
-
-void
-thread_messages_remove(CamelFolderThread *thread, CamelFolder *folder, GPtrArray *uids)
-{
-	
-}
-#endif
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
deleted file mode 100644
index 5999b7bab8..0000000000
--- a/camel/camel-folder-thread.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_THREAD_H
-#define _CAMEL_FOLDER_THREAD_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-
-typedef struct _CamelFolderThreadNode {
-	struct _CamelFolderThreadNode *next,
-		*parent,
-		*child;
-	const CamelMessageInfo *message;
-	char *root_subject;	/* cached root equivalent subject */
-	int re;			/* re version of subject? */
-	int order;
-} CamelFolderThreadNode;
-
-typedef struct CamelFolderThread {
-	struct _CamelFolderThreadNode *tree;
-	struct _EMemChunk *node_chunks;
-	CamelFolder *folder;
-	GPtrArray *summary;
-} CamelFolderThread;
-
-CamelFolderThread *camel_folder_thread_messages_new(CamelFolder *folder, GPtrArray *uids);
-
-/* new improved interface (believe it or not!) */
-CamelFolderThread *camel_folder_thread_messages_new_summary(GPtrArray *summary);
-/*
-void camel_folder_thread_messages_add(CamelFolderThread *threads, CamelFolder *folder, GPtrArray *uids);
-void camel_folder_thread_messages_remove(CamelFolderThread *threads, CamelFolder *folder, GPtrArray *uids);
-*/
-void camel_folder_thread_messages_destroy(CamelFolderThread *threads);
-
-/* debugging function only */
-int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* !_CAMEL_FOLDER_THREAD_H */
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
deleted file mode 100644
index 05d765ce7a..0000000000
--- a/camel/camel-folder.c
+++ /dev/null
@@ -1,1993 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-store.h"
-#include "camel-mime-message.h"
-#include "string-utils.h"
-#include "e-util/e-memory.h"
-#include "camel-operation.h"
-
-#include "camel-session.h"
-#include "camel-filter-driver.h"
-#include "camel-private.h"
-#include "camel-vtrash-folder.h"
-
-#define d(x) 
-#define w(x)
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelFolder */
-#define CF_CLASS(so) ((CamelFolderClass *)((CamelObject *)(so))->klass)
-
-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, char **appended_uid,
-			    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 CamelMessageInfo *get_message_info    (CamelFolder *folder, const char *uid);
-static void		 free_message_info   (CamelFolder *folder, CamelMessageInfo *info);
-static void		 ref_message_info    (CamelFolder *folder, CamelMessageInfo *info);
-
-static GPtrArray      *search_by_expression  (CamelFolder *folder, const char *exp, CamelException *ex);
-static GPtrArray      *search_by_uids	     (CamelFolder *folder, const char *exp, GPtrArray *uids, CamelException *ex);
-static void            search_free           (CamelFolder * folder, GPtrArray *result);
-
-static void            transfer_messages_to  (CamelFolder *source, GPtrArray *uids, CamelFolder *dest,
-					      GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex);
-
-static void            delete                (CamelFolder *folder);
-static void            folder_rename         (CamelFolder *folder, const char *new);
-
-static void            freeze                (CamelFolder *folder);
-static void            thaw                  (CamelFolder *folder);
-static gboolean        is_frozen             (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_by_uids = search_by_uids;
-	camel_folder_class->search_free = search_free;
-	camel_folder_class->get_message_info = get_message_info;
-	camel_folder_class->ref_message_info = ref_message_info;
-	camel_folder_class->free_message_info = free_message_info;
-	camel_folder_class->transfer_messages_to = transfer_messages_to;
-	camel_folder_class->delete = delete;
-	camel_folder_class->rename = folder_rename;
-	camel_folder_class->freeze = freeze;
-	camel_folder_class->thaw = thaw;
-	camel_folder_class->is_frozen = is_frozen;
-
-	/* virtual method overload */
-	camel_object_class_add_event(camel_object_class, "folder_changed", folder_changed);
-	camel_object_class_add_event(camel_object_class, "message_changed", message_changed);
-	camel_object_class_add_event(camel_object_class, "deleted", NULL);
-	camel_object_class_add_event(camel_object_class, "renamed", NULL);
-}
-
-static void
-camel_folder_init (gpointer object, gpointer klass)
-{
-	CamelFolder *folder = object;
-
-	folder->priv = g_malloc0(sizeof(*folder->priv));
-	folder->priv->frozen = 0;
-	folder->priv->changed_frozen = camel_folder_change_info_new();
-#ifdef ENABLE_THREADS
-	folder->priv->lock = e_mutex_new(E_MUTEX_REC);
-	folder->priv->change_lock = e_mutex_new(E_MUTEX_SIMPLE);
-#endif
-}
-
-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));
-
-	if (camel_folder->summary)
-		camel_object_unref((CamelObject *)camel_folder->summary);
-
-	camel_folder_change_info_free(camel_folder->priv->changed_frozen);
-#ifdef ENABLE_THREADS
-	e_mutex_destroy(camel_folder->priv->lock);
-	e_mutex_destroy(camel_folder->priv->change_lock);
-#endif
-	g_free(camel_folder->priv);
-}
-
-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;
-	if (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)
-{
-	w(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));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-	
-	if (!(folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED))
-		CF_CLASS (folder)->sync (folder, expunge, ex);
-	
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-
-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));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	CF_CLASS (folder)->refresh_info (folder, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-
-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)
-{
-	w(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));
-	
-	CAMEL_FOLDER_LOCK(folder, lock);
-	
-	if (!(folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED))
-		CF_CLASS (folder)->expunge (folder, ex);
-	
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-static int
-get_message_count (CamelFolder *folder)
-{
-	g_return_val_if_fail(folder->summary != NULL, -1);
-
-	return camel_folder_summary_count(folder->summary);
-}
-
-/**
- * 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)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);
-
-	ret = CF_CLASS (folder)->get_message_count (folder);
-
-	return ret;
-}
-
-static int
-get_unread_message_count(CamelFolder *folder)
-{
-	int i, count, unread=0;
-
-	g_return_val_if_fail(folder->summary != NULL, -1);
-
-	count = camel_folder_summary_count(folder->summary);
-	for (i=0; i<count; i++) {
-		CamelMessageInfo *info = camel_folder_summary_index(folder->summary, i);
-
-		if (info) {
-			if (!(info->flags & CAMEL_MESSAGE_SEEN))
-				unread++;
-			camel_folder_summary_info_free(folder->summary, info);
-		}
-	}
-
-	return unread;
-}
-
-/**
- * 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)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);
-	
-	ret = CF_CLASS (folder)->get_unread_message_count (folder);
-
-	return ret;
-}
-
-static void
-append_message (CamelFolder *folder, CamelMimeMessage *message,
-		const CamelMessageInfo *info, char **appended_uid,
-		CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-			      _("Unsupported operation: append message: for %s"),
-			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	
-	w(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
- * @appended_uid: if non-%NULL, the UID of the appended message will
- * be returned here, if it is known.
- * @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, char **appended_uid,
-			     CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	CF_CLASS (folder)->append_message (folder, message, info, appended_uid, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-
-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)
-{
-	CamelMessageInfo *info;
-	guint32 flags;
-
-	g_return_val_if_fail(folder->summary != NULL, 0);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_val_if_fail(info != NULL, 0);
-
-	flags = info->flags;
-	camel_folder_summary_info_free(folder->summary, info);
-
-	return flags;
-}
-
-/**
- * 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)
-{
-	guint32 ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	ret = CF_CLASS (folder)->get_message_flags (folder, uid);
-
-	return ret;
-}
-
-static void
-set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelMessageInfo *info;
-	guint32 new;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	new = (info->flags & ~flags) | (set & flags);
-	if (new == info->flags) {
-		camel_folder_summary_info_free(folder->summary, info);
-		return;
-	}
-
-	info->flags = new | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(folder->summary);
-	camel_folder_summary_info_free(folder->summary, info);
-
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-/**
- * 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)
-{
-	CamelMessageInfo *info;
-	gboolean ret;
-
-	g_return_val_if_fail(folder->summary != NULL, FALSE);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-	ret = camel_flag_get(&info->user_flags, name);
-	camel_folder_summary_info_free(folder->summary, info);
-
-	return ret;
-}
-
-/**
- * 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)
-{
-	gboolean ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	ret = CF_CLASS (folder)->get_message_user_flag (folder, uid, name);
-
-	return ret;
-}
-
-static void
-set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	CamelMessageInfo *info;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	if (camel_flag_set(&info->user_flags, name, value)) {
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		camel_folder_summary_touch(folder->summary);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-	}
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-/**
- * 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)
-{
-	CamelMessageInfo *info;
-	const char *ret;
-
-	g_return_val_if_fail(folder->summary != NULL, NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-#warning "Need to duplicate tag string"
-
-	ret = camel_tag_get(&info->user_tags, name);
-	camel_folder_summary_info_free(folder->summary, info);
-
-	return ret;
-}
-
-/**
- * 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)
-{
-	const char *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-#warning "get_message_user_tag() needs to copy the tag contents"
-	ret = CF_CLASS (folder)->get_message_user_tag (folder, uid, name);
-
-	return ret;
-}
-
-static void
-set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	CamelMessageInfo *info;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	if (camel_tag_set(&info->user_tags, name, value)) {
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		camel_folder_summary_touch(folder->summary);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-	}
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-/**
- * 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 CamelMessageInfo *
-get_message_info (CamelFolder *folder, const char *uid)
-{
-	g_return_val_if_fail(folder->summary != NULL, NULL);
-
-	return camel_folder_summary_uid(folder->summary, uid);
-}
-
-/**
- * camel_folder_get_message_info:
- * @folder: a CamelFolder
- * @uid: the uid of a message
- *
- * Retrieve the CamelMessageInfo for the specified @uid.  This return
- * must be freed using free_message_info().
- *
- * Return value: the summary information for the indicated message, or NULL
- * if the uid does not exist.
- **/
-CamelMessageInfo *
-camel_folder_get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelMessageInfo *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	ret = CF_CLASS (folder)->get_message_info (folder, uid);
-
-	return ret;
-}
-
-static void
-free_message_info (CamelFolder *folder, CamelMessageInfo *info)
-{
-	g_return_if_fail(folder->summary != NULL);
-
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-/**
- * camel_folder_free_message_info:
- * @folder: 
- * @info: 
- * 
- * Free (unref) a CamelMessageInfo, previously obtained with get_message_info().
- **/
-void
-camel_folder_free_message_info(CamelFolder *folder, CamelMessageInfo *info)
-{
-	g_return_if_fail(CAMEL_IS_FOLDER (folder));
-	g_return_if_fail(info != NULL);
-
-	CF_CLASS (folder)->free_message_info(folder, info);
-}
-
-static void
-ref_message_info (CamelFolder *folder, CamelMessageInfo *info)
-{
-	g_return_if_fail(folder->summary != NULL);
-
-	camel_folder_summary_info_ref(folder->summary, info);
-}
-
-/**
- * camel_folder_ref_message_info:
- * @folder: 
- * @info: 
- * 
- * Ref a CamelMessageInfo, previously obtained with get_message_info().
- **/
-void
-camel_folder_ref_message_info(CamelFolder *folder, CamelMessageInfo *info)
-{
-	g_return_if_fail(CAMEL_IS_FOLDER (folder));
-	g_return_if_fail(info != NULL);
-
-	CF_CLASS (folder)->ref_message_info(folder, info);
-}
-
-/* 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->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;
-}
-
-
-/* UIDs stuff */
-
-static CamelMimeMessage *
-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	w(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)
-{
-	CamelMimeMessage *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	ret = CF_CLASS (folder)->get_message (folder, uid, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-
-	return ret;
-}
-
-static GPtrArray *
-get_uids(CamelFolder *folder)
-{
-	GPtrArray *array;
-	int i, count;
-
-	array = g_ptr_array_new();
-
-	g_return_val_if_fail(folder->summary != NULL, array);
-
-	count = camel_folder_summary_count(folder->summary);
-	g_ptr_array_set_size(array, count);
-	for (i=0; i<count; i++) {
-		CamelMessageInfo *info = camel_folder_summary_index(folder->summary, i);
-
-		if (info) {
-			array->pdata[i] = g_strdup(camel_message_info_uid(info));
-			camel_folder_summary_info_free(folder->summary, info);
-		} else {
-			array->pdata[i] = g_strdup("xx unknown uid xx");
-		}
-	}
-
-	return array;
-}
-
-/**
- * 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)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	ret = CF_CLASS (folder)->get_uids (folder);
-
-	return ret;
-}
-
-static void
-free_uids (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_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_assert(folder->summary != NULL);
-
-	return camel_folder_summary_array(folder->summary);
-}
-
-/**
- * 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)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	ret = CF_CLASS (folder)->get_summary (folder);
-
-	return ret;
-}
-
-static void
-free_summary(CamelFolder *folder, GPtrArray *summary)
-{
-	g_assert(folder->summary != NULL);
-
-	camel_folder_summary_array_free(folder->summary, summary);
-}
-
-/**
- * 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->folder_flags & CAMEL_FOLDER_HAS_SEARCH_CAPABILITY;
-}
-
-static GPtrArray *
-search_by_expression (CamelFolder *folder, const char *expression,
-		      CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-			      _("Unsupported operation: search by expression: for %s"),
-			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	
-	w(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)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (folder->folder_flags & CAMEL_FOLDER_HAS_SEARCH_CAPABILITY, NULL);
-
-	/* NOTE: that it is upto the callee to lock */
-
-	ret = CF_CLASS (folder)->search_by_expression (folder, expression, ex);
-
-	return ret;
-}
-
-static GPtrArray *
-search_by_uids(CamelFolder *folder, const char *exp, GPtrArray *uids, CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-			      _("Unsupported operation: search by uids: for %s"),
-			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	
-	w(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_uids:
- * @folder: 
- * @expr: 
- * @uids: array of uid's to match against.
- * @ex: 
- * 
- * Search a subset of uid's for an expression match.
- * 
- * Return value: 
- **/
-GPtrArray *
-camel_folder_search_by_uids(CamelFolder *folder, const char *expr, GPtrArray *uids, CamelException *ex)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail(CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail(folder->folder_flags & CAMEL_FOLDER_HAS_SEARCH_CAPABILITY, NULL);
-
-	/* NOTE: that it is upto the callee to lock */
-
-	ret = CF_CLASS(folder)->search_by_uids(folder, expr, uids, ex);
-
-	return ret;
-}
-
-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));
-
-	/* NOTE: upto the callee to lock */
-	CF_CLASS (folder)->search_free (folder, result);
-}
-
-
-static void
-transfer_message_to (CamelFolder *source, const char *uid, CamelFolder *dest,
-		     char **transferred_uid, gboolean delete_original,
-		     CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info = NULL;
-	
-	/* Default implementation. */
-	
-	/* we alredy have the lock, dont deadlock */
-	msg = CF_CLASS (source)->get_message (source, uid, ex);
-	if (!msg)
-		return;
-	
-	if (source->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY)
-		info = CF_CLASS (source)->get_message_info (source, uid);
-	else
-		info = camel_message_info_new_from_header (((CamelMimePart *)msg)->headers);
-	
-	/* we don't want to retain the deleted flag */
-	if (info && info->flags & CAMEL_MESSAGE_DELETED)
-		info->flags = info->flags & ~CAMEL_MESSAGE_DELETED;
-	
-	camel_folder_append_message (dest, msg, info, transferred_uid, ex);
-	camel_object_unref (CAMEL_OBJECT (msg));
-
-	if (delete_original && !camel_exception_is_set (ex))
-		camel_folder_set_message_flags (source, uid, CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);
-
-	if (info) {
-		if (source->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY)
-			CF_CLASS (source)->free_message_info (source, info);
-		else
-			camel_message_info_free (info);
-	}
-}
-
-static void
-transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex)
-{
-	CamelException local;
-	char **ret_uid = NULL;
-	int i;
-
-	if (transferred_uids) {
-		*transferred_uids = g_ptr_array_new ();
-		g_ptr_array_set_size (*transferred_uids, uids->len);
-	}
-
-	camel_exception_init(&local);
-	if (ex == NULL)
-		ex = &local;
-
-	camel_operation_start(NULL, delete_originals ? _("Moving messages") : _("Copying messages"));
-
-	if (uids->len > 1) {
-		camel_folder_freeze(dest);
-		if (delete_originals)
-			camel_folder_freeze(source);
-	}
-	for (i = 0; i < uids->len && !camel_exception_is_set (ex); i++) {
-		if (transferred_uids)
-			ret_uid = (char **)&((*transferred_uids)->pdata[i]);
-		transfer_message_to (source, uids->pdata[i], dest, ret_uid, delete_originals, ex);
-		camel_operation_progress(NULL, i * 100 / uids->len);
-	}
-	if (uids->len > 1) {
-		camel_folder_thaw(dest);
-		if (delete_originals)
-			camel_folder_thaw(source);
-	}
-
-	camel_operation_end(NULL);
-	camel_exception_clear(&local);
-}
-
-/**
- * camel_folder_transfer_messages_to:
- * @source: source folder
- * @uids: message UIDs in @source
- * @dest: destination folder
- * @transferred_uids: if non-%NULL, the UIDs of the resulting messages
- * in @dest will be stored here, if known.
- * @delete_originals: whether or not to delete the original messages
- * @ex: a CamelException
- *
- * This copies or moves messages from one folder to another. If the
- * @source and @dest folders have the same parent_store, this may be
- * more efficient than using camel_folder_append_message().
- **/
-void
-camel_folder_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
-				   CamelFolder *dest, GPtrArray **transferred_uids,
-				   gboolean delete_originals, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (source));
-	g_return_if_fail (CAMEL_IS_FOLDER (dest));
-	g_return_if_fail (uids != NULL);
-	
-	if (source == dest || uids->len == 0) {
-		/* source and destination folders are the same, or no work to do, do nothing. */
-		return;
-	}
-	
-	CAMEL_FOLDER_LOCK(source, lock);
-	
-	if (source->parent_store == dest->parent_store) {
-		/* If either folder is a vtrash, we need to use the
-		 * vtrash transfer method.
-		 */
-		if (CAMEL_IS_VTRASH_FOLDER (dest))
-			CF_CLASS (dest)->transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);
-		else
-			CF_CLASS (source)->transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);
-	} else
-		transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);
-	
-	CAMEL_FOLDER_UNLOCK(source, lock);
-}
-
-static void
-delete (CamelFolder *folder)
-{
-	if (folder->summary)
-		camel_folder_summary_clear (folder->summary);
-}
-
-/**
- * camel_folder_delete:
- * @folder: folder
- *
- * Marks a folder object as deleted and performs any required cleanup.
- **/
-void
-camel_folder_delete (CamelFolder *folder)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	
-	CAMEL_FOLDER_LOCK (folder, lock);
-	if (folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED) {
-		CAMEL_FOLDER_UNLOCK (folder, lock);
-		return;
-	}
-	
-	folder->folder_flags |= CAMEL_FOLDER_HAS_BEEN_DELETED;
-	
-	CF_CLASS (folder)->delete (folder);
-
-	CAMEL_FOLDER_UNLOCK (folder, lock);
-
-	camel_object_trigger_event (CAMEL_OBJECT (folder), "deleted", NULL);
-}
-
-static void
-folder_rename (CamelFolder *folder, const char *new)
-{
-	char *tmp;
-
-	printf("CamelFolder:rename('%s')\n", new);
-
-	g_free(folder->full_name);
-	folder->full_name = g_strdup(new);
-	g_free(folder->name);
-	tmp = strrchr(new, folder->parent_store->dir_sep);
-	folder->name = g_strdup(tmp?tmp+1:new);
-}
-
-/**
- * camel_folder_rename:
- * @folder: 
- * @new: 
- * 
- * Mark an active folder object as renamed.
- *
- * NOTE: This is an internal function used by camel stores, no locking
- * is performed on the folder.
- **/
-void
-camel_folder_rename(CamelFolder *folder, const char *new)
-{
-	char *old;
-
-	old = g_strdup(folder->full_name);
-
-	CF_CLASS (folder)->rename(folder, new);
-
-	camel_object_trigger_event (CAMEL_OBJECT (folder), "renamed", old);
-	g_free(old);
-}
-
-static void
-freeze (CamelFolder *folder)
-{
-	CAMEL_FOLDER_LOCK(folder, change_lock);
-
-	folder->priv->frozen++;
-
-	d(printf ("freeze(%p '%s') = %d\n", folder, folder->full_name, folder->priv->frozen));
-	CAMEL_FOLDER_UNLOCK(folder, change_lock);
-}
-
-/**
- * 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)
-{
-	CamelFolderChangeInfo *info = NULL;
-
-	CAMEL_FOLDER_LOCK(folder, change_lock);
-
-	folder->priv->frozen--;
-
-	d(printf ("thaw(%p '%s') = %d\n", folder, folder->full_name, folder->priv->frozen));
-
-	if (folder->priv->frozen == 0
-	    && camel_folder_change_info_changed(folder->priv->changed_frozen)) {
-		info = folder->priv->changed_frozen;
-		folder->priv->changed_frozen = camel_folder_change_info_new();
-	}
-	
-	CAMEL_FOLDER_UNLOCK(folder, change_lock);
-
-	if (info) {
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", info);
-		camel_folder_change_info_free(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->priv->frozen != 0);
-
-	CF_CLASS (folder)->thaw (folder);
-}
-
-static gboolean
-is_frozen (CamelFolder *folder)
-{
-	return folder->priv->frozen != 0;
-}
-
-/**
- * camel_folder_is_frozen:
- * @folder: a folder
- *
- * Return value: whether or not the folder is frozen.
- **/
-gboolean
-camel_folder_is_frozen (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
-
-	return CF_CLASS (folder)->is_frozen (folder);
-}
-
-#ifdef ENABLE_THREADS
-struct _folder_filter_msg {
-	CamelSessionThreadMsg msg;
-
-	GPtrArray *recents;
-	CamelFolder *folder;
-	CamelFilterDriver *driver;
-	CamelException ex;
-};
-
-static void
-filter_filter(CamelSession *session, CamelSessionThreadMsg *msg)
-{
-	struct _folder_filter_msg *m = (struct _folder_filter_msg *)msg;
-	
-	camel_filter_driver_filter_folder(m->driver, m->folder, NULL, m->recents, FALSE, &m->ex);
-	camel_filter_driver_flush (m->driver, &m->ex);
-}
-
-static void
-filter_free(CamelSession *session, CamelSessionThreadMsg *msg)
-{
-	struct _folder_filter_msg *m = (struct _folder_filter_msg *)msg;
-	int i;
-
-	camel_folder_thaw(m->folder);
-	camel_object_unref((CamelObject *)m->folder);
-	camel_object_unref((CamelObject *)m->driver);
-	for (i=0;i<m->recents->len;i++)
-		g_free(m->recents->pdata[i]);
-	g_ptr_array_free(m->recents, TRUE);
-}
-
-static CamelSessionThreadOps filter_ops = {
-	filter_filter,
-	filter_free,
-};
-#endif
-
-/* 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;
-	gboolean ret = TRUE;
-
-	d(printf ("folder_changed(%p, %p), frozen=%d\n", obj, event_data, folder->priv->frozen));
-	d(printf(" added %d remoded %d changed %d recent %d\n",
-		 changed->uid_added->len, changed->uid_removed->len,
-		 changed->uid_changed->len, changed->uid_recent->len));
-
-	if (changed != NULL) {
-		CamelSession *session = ((CamelService *)folder->parent_store)->session;
-		CamelFilterDriver *driver;
-
-		CAMEL_FOLDER_LOCK(folder, change_lock);
-		if ((folder->folder_flags & CAMEL_FOLDER_FILTER_RECENT)
-		    && changed->uid_recent->len>0
-		    && (driver = camel_session_get_filter_driver(session, "incoming", NULL))) {
-#ifdef ENABLE_THREADS
-			GPtrArray *recents = g_ptr_array_new();
-			int i;
-			struct _folder_filter_msg *msg;
-			
-			d(printf("** Have '%d' recent messages, launching thread to process them\n", changed->uid_recent->len));
-			
-			folder->priv->frozen++;
-			msg = camel_session_thread_msg_new(session, &filter_ops, sizeof(*msg));
-			for (i=0;i<changed->uid_recent->len;i++)
-				g_ptr_array_add(recents, g_strdup(changed->uid_recent->pdata[i]));
-			msg->recents = recents;
-			msg->folder = folder;
-			camel_object_ref((CamelObject *)folder);
-			msg->driver = driver;
-			camel_exception_init(&msg->ex);
-			camel_session_thread_queue(session, &msg->msg, 0);
-#else
-			d(printf("Have '%d' recent messages, filtering\n", changed->recent->len));
-			folder->priv->frozen++;
-			camel_filter_driver_filter_folder(driver, folder, NULL, changed->recent, FALSE, NULL);
-			camel_object_unref((CamelObject *)driver);
-			folder->priv->frozen--;
-#endif
-			/* zero out the recent list so we dont reprocess */
-			/* this pokes past abstraction, but changeinfo is our structure anyway */
-			/* the only other alternative is to recognise when trigger is called from	
-			   thaw(), but thats a pita */
-			g_ptr_array_set_size(changed->uid_recent, 0);
-		}
-		if (folder->priv->frozen) {
-			camel_folder_change_info_cat(folder->priv->changed_frozen, changed);
-			ret = FALSE;
-		}
-		CAMEL_FOLDER_UNLOCK(folder, change_lock);
-	} else {
-			w(g_warning ("Class %s is passing NULL to folder_changed event",
-				     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
-	}
-
-	return ret;
-}
-
-static gboolean
-message_changed (CamelObject *obj, /*const char *uid*/gpointer event_data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (obj);
-	gboolean ret = TRUE;
-
-	d(printf ("message_changed(%p, %p), frozen=%d\n", folder, event_data, folder->priv->frozen));
-
-	if (folder->priv->frozen) {
-		CAMEL_FOLDER_LOCK(folder, change_lock);
-	
-		camel_folder_change_info_change_uid(folder->priv->changed_frozen, (char *)event_data);
-		ret = FALSE;
-
-		CAMEL_FOLDER_UNLOCK(folder, change_lock);
-	}
-
-	return ret;
-}
-
-
-/**
- * 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);
-}
-
-struct _CamelFolderChangeInfoPrivate {
-	GHashTable *uid_stored;	/* what we have stored, which array they're in */
-	GHashTable *uid_source;	/* used to create unique lists */
-	struct _EMemPool *uid_pool;	/* pool used to store copies of uid strings */
-};
-
-/**
- * camel_folder_change_info_new:
- * @void: 
- * 
- * Create a new folder change info structure.
- *
- * Change info structures are not MT-SAFE and must be
- * locked for exclusive access externally.
- * 
- * 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_recent = g_ptr_array_new();
-	info->priv = g_malloc0(sizeof(*info->priv));
-	info->priv->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
-	info->priv->uid_source = NULL;
-	info->priv->uid_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-
-	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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (p->uid_source == NULL)
-		p->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
-
-	if (g_hash_table_lookup(p->uid_source, uid) == NULL)
-		g_hash_table_insert(p->uid_source, e_mempool_strdup(p->uid_pool, 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	int i;
-	
-	g_assert(info != NULL);
-	g_assert(list != NULL);
-	
-	p = info->priv;
-
-	if (p->uid_source == NULL)
-		p->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(p->uid_source, uid) == NULL)
-			g_hash_table_insert(p->uid_source, e_mempool_strdup(p->uid_pool, 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	char *key;
-	int value;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (p->uid_source == NULL) {
-		camel_folder_change_info_add_uid(info, uid);
-		return;
-	}
-
-	if (g_hash_table_lookup_extended(p->uid_source, uid, (void **)&key, (void **)&value)) {
-		g_hash_table_remove(p->uid_source, 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;
-	
-	g_assert(info != NULL);
-	g_assert(list != NULL);
-	
-	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)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-	GPtrArray *olduids;
-	char *olduid;
-
-	if (g_hash_table_lookup_extended(p->uid_stored, key, (void **)&olduid, (void **)&olduids)) {
-		/* if it was added/changed them removed, then remove it */
-		if (olduids != info->uid_removed) {
-			g_ptr_array_remove_fast(olduids, olduid);
-			g_ptr_array_add(info->uid_removed, olduid);
-			g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
-		}
-		return;
-	}
-
-	/* we dont need to copy this, as they've already been copied into our pool */
-	g_ptr_array_add(info->uid_removed, key);
-	g_hash_table_insert(p->uid_stored, key, info->uid_removed);
-}
-
-/**
- * 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (p->uid_source) {
-		g_hash_table_foreach(p->uid_source, (GHFunc)change_info_remove, info);
-		g_hash_table_destroy(p->uid_source);
-		p->uid_source = NULL;
-	}
-}
-
-static void
-change_info_cat(CamelFolderChangeInfo *info, GPtrArray *source, void (*add)(CamelFolderChangeInfo *info, const char *uid))
-{
-	int i;
-
-	for (i=0;i<source->len;i++)
-		add(info, 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)
-{
-	g_assert(info != NULL);
-	g_assert(source != NULL);
-	
-	change_info_cat(info, source->uid_added, camel_folder_change_info_add_uid);
-	change_info_cat(info, source->uid_removed, camel_folder_change_info_remove_uid);
-	change_info_cat(info, source->uid_changed, camel_folder_change_info_change_uid);
-	change_info_cat(info, source->uid_recent, camel_folder_change_info_recent_uid);
-}
-
-/**
- * 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	GPtrArray *olduids;
-	char *olduid;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		/* if it was removed then added, promote it to a changed */
-		/* if it was changed then added, leave as changed */
-		if (olduids == info->uid_removed) {
-			g_ptr_array_remove_fast(olduids, olduid);
-			g_ptr_array_add(info->uid_changed, olduid);
-			g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
-		}
-		return;
-	}
-
-	olduid = e_mempool_strdup(p->uid_pool, uid);
-	g_ptr_array_add(info->uid_added, olduid);
-	g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
-}
-
-/**
- * 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	GPtrArray *olduids;
-	char *olduid;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		/* if it was added/changed them removed, then remove it */
-		if (olduids != info->uid_removed) {
-			g_ptr_array_remove_fast(olduids, olduid);
-			g_ptr_array_add(info->uid_removed, olduid);
-			g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
-		}
-		return;
-	}
-
-	olduid = e_mempool_strdup(p->uid_pool, uid);
-	g_ptr_array_add(info->uid_removed, olduid);
-	g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
-}
-
-/**
- * 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	GPtrArray *olduids;
-	char *olduid;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		/* if we have it already, leave it as that */
-		return;
-	}
-
-	olduid = e_mempool_strdup(p->uid_pool, uid);
-	g_ptr_array_add(info->uid_changed, olduid);
-	g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
-}
-
-void
-camel_folder_change_info_recent_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	GPtrArray *olduids;
-	char *olduid;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-
-	/* always add to recent, but dont let anyone else know */	
-	if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		olduid = e_mempool_strdup(p->uid_pool, uid);
-	}
-	g_ptr_array_add(info->uid_recent, olduid);
-}
-
-/**
- * camel_folder_change_info_changed:
- * @info: 
- * 
- * Return true if the changeset contains any changes.
- *
- * Return Value:
- **/
-gboolean
-camel_folder_change_info_changed(CamelFolderChangeInfo *info)
-{
-	g_assert(info != NULL);
-	
-	return (info->uid_added->len || info->uid_removed->len || info->uid_changed->len || info->uid_recent->len);
-}
-
-/**
- * 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)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-	
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	g_ptr_array_set_size(info->uid_added, 0);
-	g_ptr_array_set_size(info->uid_removed, 0);
-	g_ptr_array_set_size(info->uid_changed, 0);
-	g_ptr_array_set_size(info->uid_recent, 0);
-	if (p->uid_source) {
-		g_hash_table_destroy(p->uid_source);
-		p->uid_source = NULL;
-	}
-	g_hash_table_destroy(p->uid_stored);
-	p->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
-	e_mempool_flush(p->uid_pool, TRUE);
-}
-
-/**
- * camel_folder_change_info_free:
- * @info: 
- * 
- * Free memory associated with the folder change info lists.
- **/
-void
-camel_folder_change_info_free(CamelFolderChangeInfo *info)
-{
-	struct _CamelFolderChangeInfoPrivate *p;
-
-	g_assert(info != NULL);
-	
-	p = info->priv;
-	
-	if (p->uid_source)
-		g_hash_table_destroy(p->uid_source);
-
-	g_hash_table_destroy(p->uid_stored);
-	e_mempool_destroy(p->uid_pool);
-	g_free(p);
-
-	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_ptr_array_free(info->uid_recent, TRUE);
-	g_free(info);
-}
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
deleted file mode 100644
index e437b1d87a..0000000000
--- a/camel/camel-folder.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * camel-folder.h: Abstract class for an email folder
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#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;
-	GPtrArray *uid_recent;
-
-	struct _CamelFolderChangeInfoPrivate *priv;
-};
-
-struct _CamelFolder
-{
-	CamelObject parent_object;
-
-	struct _CamelFolderPrivate *priv;
-
-	char *name;
-	char *full_name;
-	CamelStore *parent_store;
-	CamelFolderSummary *summary;
-
-	guint32 folder_flags;
-	guint32 permanent_flags;
-};
-
-#define CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY (1<<0)
-#define CAMEL_FOLDER_HAS_SEARCH_CAPABILITY  (1<<1)
-#define CAMEL_FOLDER_FILTER_RECENT          (1<<2)
-#define CAMEL_FOLDER_HAS_BEEN_DELETED       (1<<3)
-#define CAMEL_FOLDER_IS_TRASH               (1<<4)
-
-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,
-				 char **appended_uid,
-				 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 *, const char *, CamelException *);
-	GPtrArray * (*search_by_uids) (CamelFolder *, const char *, GPtrArray *uids, CamelException *);
-
-	void (*search_free) (CamelFolder *folder, GPtrArray *result);
-
-	CamelMessageInfo * (*get_message_info) (CamelFolder *, const char *uid);
-	void (*ref_message_info) (CamelFolder *, CamelMessageInfo *);
-	void (*free_message_info) (CamelFolder *, CamelMessageInfo *);
-
-	void (*transfer_messages_to) (CamelFolder *source,
-				      GPtrArray *uids,
-				      CamelFolder *destination,
-				      GPtrArray **transferred_uids,
-				      gboolean delete_originals,
-				      CamelException *ex);
-	
-	void (*delete)           (CamelFolder *folder);
-	void (*rename)           (CamelFolder *folder, const char *newname);
-	
-	void     (*freeze)    (CamelFolder *folder);
-	void     (*thaw)      (CamelFolder *folder);
-	gboolean (*is_frozen) (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,
-							char **appended_uid,
-							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 *expr, CamelException *ex);
-GPtrArray *	   camel_folder_search_by_uids	      (CamelFolder *folder, const char *expr, GPtrArray *uids, CamelException *ex);
-void		   camel_folder_search_free	      (CamelFolder *folder, GPtrArray *);
-
-/* summary info */
-CamelMessageInfo *camel_folder_get_message_info		(CamelFolder *folder, const char *uid);
-void		  camel_folder_free_message_info	(CamelFolder *folder, CamelMessageInfo *info);
-void		  camel_folder_ref_message_info		(CamelFolder *folder, CamelMessageInfo *info);
-
-void               camel_folder_transfer_messages_to   (CamelFolder *source,
-							GPtrArray *uids,
-							CamelFolder *dest,
-							GPtrArray **transferred_uids,
-							gboolean delete_originals,
-							CamelException *ex);
-
-void               camel_folder_delete                 (CamelFolder *folder);
-void               camel_folder_rename                 (CamelFolder *folder, const char *new);
-
-/* stop/restart getting events */
-void               camel_folder_freeze                (CamelFolder *folder);
-void               camel_folder_thaw                  (CamelFolder *folder);
-gboolean           camel_folder_is_frozen             (CamelFolder *folder);
-
-#if 0
-/* lock/unlock at the thread level, NOTE: only used internally */
-void		   camel_folder_lock		      (CamelFolder *folder);
-void		   camel_folder_unlock		      (CamelFolder *folder);
-#endif
-
-/* 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);
-gboolean		camel_folder_change_info_changed	(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);
-void			camel_folder_change_info_recent_uid	(CamelFolderChangeInfo *info, const char *uid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_FOLDER_H */
-
diff --git a/camel/camel-html-parser.c b/camel/camel-html-parser.c
deleted file mode 100644
index 2a59a136d4..0000000000
--- a/camel/camel-html-parser.c
+++ /dev/null
@@ -1,807 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/** WARNING
- **
- ** DO NOT USE THIS CODE OUTSIDE OF CAMEL
- **
- ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME
- **/
-
-#include "camel-html-parser.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include <gal/unicode/gunicode.h>
-#include <ctype.h>
-
-/* if defined, must also compile in dump_tag() below somewhere */
-#define d(x)
-
-static void camel_html_parser_class_init (CamelHTMLParserClass *klass);
-static void camel_html_parser_init       (CamelObject *o);
-static void camel_html_parser_finalize   (CamelObject *o);
-
-static CamelObjectClass *camel_html_parser_parent;
-
-/* Parser definitions, see below object code for details */
-
-typedef struct _CamelHTMLParserPrivate CamelHTMLParserPrivate;
-
-struct _CamelHTMLParserPrivate {
-	char *inbuf,
-		*inptr,
-		*inend,
-		*start;
-	enum _camel_html_parser_t state;
-	char *charset;
-	int eof;
-	GString *tag;
-	GString *ent;
-	char ent_utf8[8];
-	int attr;
-	GPtrArray *attrs;
-	GPtrArray *values;
-	int quote;
-};
-
-static void tokenise_setup(void);
-static CamelHTMLParserPrivate *tokenise_init(void);
-static void tokenise_free(CamelHTMLParserPrivate *p);
-static int tokenise_step(CamelHTMLParserPrivate *p, char **datap, int *lenp);
-
-/* ********************************************************************** */
-
-CamelType
-camel_html_parser_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelHTMLParser",
-					    sizeof (CamelHTMLParser),
-					    sizeof (CamelHTMLParserClass),
-					    (CamelObjectClassInitFunc) camel_html_parser_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_html_parser_init,
-					    (CamelObjectFinalizeFunc) camel_html_parser_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_html_parser_finalize(CamelObject *o)
-{
-	CamelHTMLParser *f = (CamelHTMLParser *)o;
-
-	tokenise_free(f->priv);
-}
-
-static void
-camel_html_parser_init       (CamelObject *o)
-{
-	CamelHTMLParser *f = (CamelHTMLParser *)o;
-
-	f->priv = tokenise_init();
-}
-
-static void
-camel_html_parser_class_init (CamelHTMLParserClass *klass)
-{
-	camel_html_parser_parent = CAMEL_OBJECT_CLASS (camel_type_get_global_classfuncs (camel_object_get_type ()));
-
-	tokenise_setup();
-}
-
-/**
- * camel_html_parser_new:
- *
- * Create a new CamelHTMLParser object.
- * 
- * Return value: A new CamelHTMLParser widget.
- **/
-CamelHTMLParser *
-camel_html_parser_new (void)
-{
-	CamelHTMLParser *new = CAMEL_HTML_PARSER ( camel_object_new (camel_html_parser_get_type ()));
-	return new;
-}
-
-
-void camel_html_parser_set_data(CamelHTMLParser *hp, const char *start, int len, int last)
-{
-	CamelHTMLParserPrivate *p = hp->priv;
-
-	p->inptr = p->inbuf = (char *)start;
-	p->inend = (char *)start+len;
-	p->eof = last;
-}
-
-camel_html_parser_t camel_html_parser_step(CamelHTMLParser *hp, const char **datap, int *lenp)
-{
-	return tokenise_step(hp->priv, (char **)datap, lenp);
-}
-
-const char *camel_html_parser_left(CamelHTMLParser *hp, int *lenp)
-{
-	CamelHTMLParserPrivate *p = hp->priv;
-
-	if (lenp)
-		*lenp = p->inend - p->inptr;
-
-	return p->inptr;
-}
-
-const char *camel_html_parser_tag(CamelHTMLParser *hp)
-{
-	return hp->priv->tag->str;
-}
-
-const char *camel_html_parser_attr(CamelHTMLParser *hp, const char *name)
-{
-	int i;
-	CamelHTMLParserPrivate *p = hp->priv;
-
-	for (i=0;i<p->attrs->len;i++) {
-		if (!strcasecmp(((GString *)p->attrs->pdata[i])->str, name)) {
-			return ((GString *)p->values->pdata[i])->str;
-		}
-	}
-
-	return NULL;
-}
-
-const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArray **values)
-{
-	if (values)
-		*values = hp->priv->values;
-
-	return hp->priv->attrs;
-}
-
-/* this map taken out of libxml */
-static struct {
-	unsigned int val;
-	const char *name;
-} entity_map[] = {
-/*
- * the 4 absolute ones,
- */
-	{ 34,	"quot",	/* quotation mark = APL quote, U+0022 ISOnum */ },
-	{ 38,	"amp",	/* ampersand, U+0026 ISOnum */ },
-	{ 60,	"lt",	/* less-than sign, U+003C ISOnum */ },
-	{ 62,	"gt",	/* greater-than sign, U+003E ISOnum */ },
-
-/*
- * A bunch still in the 128-255 range
- * Replacing them depend really on the charset used.
- */
-	{ 39,	"apos",	/* single quote */ },
-	{ 160,	"nbsp",	/* no-break space = non-breaking space, U+00A0 ISOnum */ },
-	{ 161,	"iexcl",/* inverted exclamation mark, U+00A1 ISOnum */ },
-	{ 162,	"cent",	/* cent sign, U+00A2 ISOnum */ },
-	{ 163,	"pound",/* pound sign, U+00A3 ISOnum */ },
-	{ 164,	"curren",/* currency sign, U+00A4 ISOnum */ },
-	{ 165,	"yen",	/* yen sign = yuan sign, U+00A5 ISOnum */ },
-	{ 166,	"brvbar",/* broken bar = broken vertical bar, U+00A6 ISOnum */ },
-	{ 167,	"sect",	/* section sign, U+00A7 ISOnum */ },
-	{ 168,	"uml",	/* diaeresis = spacing diaeresis, U+00A8 ISOdia */ },
-	{ 169,	"copy",	/* copyright sign, U+00A9 ISOnum */ },
-	{ 170,	"ordf",	/* feminine ordinal indicator, U+00AA ISOnum */ },
-	{ 171,	"laquo",/* left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum */ },
-	{ 172,	"not",	/* not sign, U+00AC ISOnum */ },
-	{ 173,	"shy",	/* soft hyphen = discretionary hyphen, U+00AD ISOnum */ },
-	{ 174,	"reg",	/* registered sign = registered trade mark sign, U+00AE ISOnum */ },
-	{ 175,	"macr",	/* macron = spacing macron = overline = APL overbar, U+00AF ISOdia */ },
-	{ 176,	"deg",	/* degree sign, U+00B0 ISOnum */ },
-	{ 177,	"plusmn",/* plus-minus sign = plus-or-minus sign, U+00B1 ISOnum */ },
-	{ 178,	"sup2",	/* superscript two = superscript digit two = squared, U+00B2 ISOnum */ },
-	{ 179,	"sup3",	/* superscript three = superscript digit three = cubed, U+00B3 ISOnum */ },
-	{ 180,	"acute",/* acute accent = spacing acute, U+00B4 ISOdia */ },
-	{ 181,	"micro",/* micro sign, U+00B5 ISOnum */ },
-	{ 182,	"para",	/* pilcrow sign = paragraph sign, U+00B6 ISOnum */ },
-	{ 183,	"middot",/* middle dot = Georgian comma Greek middle dot, U+00B7 ISOnum */ },
-	{ 184,	"cedil",/* cedilla = spacing cedilla, U+00B8 ISOdia */ },
-	{ 185,	"sup1",	/* superscript one = superscript digit one, U+00B9 ISOnum */ },
-	{ 186,	"ordm",	/* masculine ordinal indicator, U+00BA ISOnum */ },
-	{ 187,	"raquo",/* right-pointing double angle quotation mark right pointing guillemet, U+00BB ISOnum */ },
-	{ 188,	"frac14",/* vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum */ },
-	{ 189,	"frac12",/* vulgar fraction one half = fraction one half, U+00BD ISOnum */ },
-	{ 190,	"frac34",/* vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum */ },
-	{ 191,	"iquest",/* inverted question mark = turned question mark, U+00BF ISOnum */ },
-	{ 192,	"Agrave",/* latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1 */ },
-	{ 193,	"Aacute",/* latin capital letter A with acute, U+00C1 ISOlat1 */ },
-	{ 194,	"Acirc",/* latin capital letter A with circumflex, U+00C2 ISOlat1 */ },
-	{ 195,	"Atilde",/* latin capital letter A with tilde, U+00C3 ISOlat1 */ },
-	{ 196,	"Auml",	/* latin capital letter A with diaeresis, U+00C4 ISOlat1 */ },
-	{ 197,	"Aring",/* latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1 */ },
-	{ 198,	"AElig",/* latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1 */ },
-	{ 199,	"Ccedil",/* latin capital letter C with cedilla, U+00C7 ISOlat1 */ },
-	{ 200,	"Egrave",/* latin capital letter E with grave, U+00C8 ISOlat1 */ },
-	{ 201,	"Eacute",/* latin capital letter E with acute, U+00C9 ISOlat1 */ },
-	{ 202,	"Ecirc",/* latin capital letter E with circumflex, U+00CA ISOlat1 */ },
-	{ 203,	"Euml",	/* latin capital letter E with diaeresis, U+00CB ISOlat1 */ },
-	{ 204,	"Igrave",/* latin capital letter I with grave, U+00CC ISOlat1 */ },
-	{ 205,	"Iacute",/* latin capital letter I with acute, U+00CD ISOlat1 */ },
-	{ 206,	"Icirc",/* latin capital letter I with circumflex, U+00CE ISOlat1 */ },
-	{ 207,	"Iuml",	/* latin capital letter I with diaeresis, U+00CF ISOlat1 */ },
-	{ 208,	"ETH",	/* latin capital letter ETH, U+00D0 ISOlat1 */ },
-	{ 209,	"Ntilde",/* latin capital letter N with tilde, U+00D1 ISOlat1 */ },
-	{ 210,	"Ograve",/* latin capital letter O with grave, U+00D2 ISOlat1 */ },
-	{ 211,	"Oacute",/* latin capital letter O with acute, U+00D3 ISOlat1 */ },
-	{ 212,	"Ocirc",/* latin capital letter O with circumflex, U+00D4 ISOlat1 */ },
-	{ 213,	"Otilde",/* latin capital letter O with tilde, U+00D5 ISOlat1 */ },
-	{ 214,	"Ouml",	/* latin capital letter O with diaeresis, U+00D6 ISOlat1 */ },
-	{ 215,	"times",/* multiplication sign, U+00D7 ISOnum */ },
-	{ 216,	"Oslash",/* latin capital letter O with stroke latin capital letter O slash, U+00D8 ISOlat1 */ },
-	{ 217,	"Ugrave",/* latin capital letter U with grave, U+00D9 ISOlat1 */ },
-	{ 218,	"Uacute",/* latin capital letter U with acute, U+00DA ISOlat1 */ },
-	{ 219,	"Ucirc",/* latin capital letter U with circumflex, U+00DB ISOlat1 */ },
-	{ 220,	"Uuml",	/* latin capital letter U with diaeresis, U+00DC ISOlat1 */ },
-	{ 221,	"Yacute",/* latin capital letter Y with acute, U+00DD ISOlat1 */ },
-	{ 222,	"THORN",/* latin capital letter THORN, U+00DE ISOlat1 */ },
-	{ 223,	"szlig",/* latin small letter sharp s = ess-zed, U+00DF ISOlat1 */ },
-	{ 224,	"agrave",/* latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1 */ },
-	{ 225,	"aacute",/* latin small letter a with acute, U+00E1 ISOlat1 */ },
-	{ 226,	"acirc",/* latin small letter a with circumflex, U+00E2 ISOlat1 */ },
-	{ 227,	"atilde",/* latin small letter a with tilde, U+00E3 ISOlat1 */ },
-	{ 228,	"auml",	/* latin small letter a with diaeresis, U+00E4 ISOlat1 */ },
-	{ 229,	"aring",/* latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1 */ },
-	{ 230,	"aelig",/* latin small letter ae = latin small ligature ae, U+00E6 ISOlat1 */ },
-	{ 231,	"ccedil",/* latin small letter c with cedilla, U+00E7 ISOlat1 */ },
-	{ 232,	"egrave",/* latin small letter e with grave, U+00E8 ISOlat1 */ },
-	{ 233,	"eacute",/* latin small letter e with acute, U+00E9 ISOlat1 */ },
-	{ 234,	"ecirc",/* latin small letter e with circumflex, U+00EA ISOlat1 */ },
-	{ 235,	"euml",	/* latin small letter e with diaeresis, U+00EB ISOlat1 */ },
-	{ 236,	"igrave",/* latin small letter i with grave, U+00EC ISOlat1 */ },
-	{ 237,	"iacute",/* latin small letter i with acute, U+00ED ISOlat1 */ },
-	{ 238,	"icirc",/* latin small letter i with circumflex, U+00EE ISOlat1 */ },
-	{ 239,	"iuml",	/* latin small letter i with diaeresis, U+00EF ISOlat1 */ },
-	{ 240,	"eth",	/* latin small letter eth, U+00F0 ISOlat1 */ },
-	{ 241,	"ntilde",/* latin small letter n with tilde, U+00F1 ISOlat1 */ },
-	{ 242,	"ograve",/* latin small letter o with grave, U+00F2 ISOlat1 */ },
-	{ 243,	"oacute",/* latin small letter o with acute, U+00F3 ISOlat1 */ },
-	{ 244,	"ocirc",/* latin small letter o with circumflex, U+00F4 ISOlat1 */ },
-	{ 245,	"otilde",/* latin small letter o with tilde, U+00F5 ISOlat1 */ },
-	{ 246,	"ouml",	/* latin small letter o with diaeresis, U+00F6 ISOlat1 */ },
-	{ 247,	"divide",/* division sign, U+00F7 ISOnum */ },
-	{ 248,	"oslash",/* latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1 */ },
-	{ 249,	"ugrave",/* latin small letter u with grave, U+00F9 ISOlat1 */ },
-	{ 250,	"uacute",/* latin small letter u with acute, U+00FA ISOlat1 */ },
-	{ 251,	"ucirc",/* latin small letter u with circumflex, U+00FB ISOlat1 */ },
-	{ 252,	"uuml",	/* latin small letter u with diaeresis, U+00FC ISOlat1 */ },
-	{ 253,	"yacute",/* latin small letter y with acute, U+00FD ISOlat1 */ },
-	{ 254,	"thorn",/* latin small letter thorn with, U+00FE ISOlat1 */ },
-	{ 255,	"yuml",	/* latin small letter y with diaeresis, U+00FF ISOlat1 */ },
-
-/*
- * Anything below should really be kept as entities references
- */
-	{ 402,	"fnof",	/* latin small f with hook = function = florin, U+0192 ISOtech */ },
-
-	{ 913,	"Alpha",/* greek capital letter alpha, U+0391 */ },
-	{ 914,	"Beta",	/* greek capital letter beta, U+0392 */ },
-	{ 915,	"Gamma",/* greek capital letter gamma, U+0393 ISOgrk3 */ },
-	{ 916,	"Delta",/* greek capital letter delta, U+0394 ISOgrk3 */ },
-	{ 917,	"Epsilon",/* greek capital letter epsilon, U+0395 */ },
-	{ 918,	"Zeta",	/* greek capital letter zeta, U+0396 */ },
-	{ 919,	"Eta",	/* greek capital letter eta, U+0397 */ },
-	{ 920,	"Theta",/* greek capital letter theta, U+0398 ISOgrk3 */ },
-	{ 921,	"Iota",	/* greek capital letter iota, U+0399 */ },
-	{ 922,	"Kappa",/* greek capital letter kappa, U+039A */ },
-	{ 923,	"Lambda"/* greek capital letter lambda, U+039B ISOgrk3 */ },
-	{ 924,	"Mu",	/* greek capital letter mu, U+039C */ },
-	{ 925,	"Nu",	/* greek capital letter nu, U+039D */ },
-	{ 926,	"Xi",	/* greek capital letter xi, U+039E ISOgrk3 */ },
-	{ 927,	"Omicron",/* greek capital letter omicron, U+039F */ },
-	{ 928,	"Pi",	/* greek capital letter pi, U+03A0 ISOgrk3 */ },
-	{ 929,	"Rho",	/* greek capital letter rho, U+03A1 */ },
-	{ 931,	"Sigma",/* greek capital letter sigma, U+03A3 ISOgrk3 */ },
-	{ 932,	"Tau",	/* greek capital letter tau, U+03A4 */ },
-	{ 933,	"Upsilon",/* greek capital letter upsilon, U+03A5 ISOgrk3 */ },
-	{ 934,	"Phi",	/* greek capital letter phi, U+03A6 ISOgrk3 */ },
-	{ 935,	"Chi",	/* greek capital letter chi, U+03A7 */ },
-	{ 936,	"Psi",	/* greek capital letter psi, U+03A8 ISOgrk3 */ },
-	{ 937,	"Omega",/* greek capital letter omega, U+03A9 ISOgrk3 */ },
-
-	{ 945,	"alpha",/* greek small letter alpha, U+03B1 ISOgrk3 */ },
-	{ 946,	"beta",	/* greek small letter beta, U+03B2 ISOgrk3 */ },
-	{ 947,	"gamma",/* greek small letter gamma, U+03B3 ISOgrk3 */ },
-	{ 948,	"delta",/* greek small letter delta, U+03B4 ISOgrk3 */ },
-	{ 949,	"epsilon",/* greek small letter epsilon, U+03B5 ISOgrk3 */ },
-	{ 950,	"zeta",	/* greek small letter zeta, U+03B6 ISOgrk3 */ },
-	{ 951,	"eta",	/* greek small letter eta, U+03B7 ISOgrk3 */ },
-	{ 952,	"theta",/* greek small letter theta, U+03B8 ISOgrk3 */ },
-	{ 953,	"iota",	/* greek small letter iota, U+03B9 ISOgrk3 */ },
-	{ 954,	"kappa",/* greek small letter kappa, U+03BA ISOgrk3 */ },
-	{ 955,	"lambda",/* greek small letter lambda, U+03BB ISOgrk3 */ },
-	{ 956,	"mu",	/* greek small letter mu, U+03BC ISOgrk3 */ },
-	{ 957,	"nu",	/* greek small letter nu, U+03BD ISOgrk3 */ },
-	{ 958,	"xi",	/* greek small letter xi, U+03BE ISOgrk3 */ },
-	{ 959,	"omicron",/* greek small letter omicron, U+03BF NEW */ },
-	{ 960,	"pi",	/* greek small letter pi, U+03C0 ISOgrk3 */ },
-	{ 961,	"rho",	/* greek small letter rho, U+03C1 ISOgrk3 */ },
-	{ 962,	"sigmaf",/* greek small letter final sigma, U+03C2 ISOgrk3 */ },
-	{ 963,	"sigma",/* greek small letter sigma, U+03C3 ISOgrk3 */ },
-	{ 964,	"tau",	/* greek small letter tau, U+03C4 ISOgrk3 */ },
-	{ 965,	"upsilon",/* greek small letter upsilon, U+03C5 ISOgrk3 */ },
-	{ 966,	"phi",	/* greek small letter phi, U+03C6 ISOgrk3 */ },
-	{ 967,	"chi",	/* greek small letter chi, U+03C7 ISOgrk3 */ },
-	{ 968,	"psi",	/* greek small letter psi, U+03C8 ISOgrk3 */ },
-	{ 969,	"omega",/* greek small letter omega, U+03C9 ISOgrk3 */ },
-	{ 977,	"thetasym",/* greek small letter theta symbol, U+03D1 NEW */ },
-	{ 978,	"upsih",/* greek upsilon with hook symbol, U+03D2 NEW */ },
-	{ 982,	"piv",	/* greek pi symbol, U+03D6 ISOgrk3 */ },
-
-	{ 8226,	"bull",	/* bullet = black small circle, U+2022 ISOpub */ },
-	{ 8230,	"hellip",/* horizontal ellipsis = three dot leader, U+2026 ISOpub */ },
-	{ 8242,	"prime",/* prime = minutes = feet, U+2032 ISOtech */ },
-	{ 8243,	"Prime",/* double prime = seconds = inches, U+2033 ISOtech */ },
-	{ 8254,	"oline",/* overline = spacing overscore, U+203E NEW */ },
-	{ 8260,	"frasl",/* fraction slash, U+2044 NEW */ },
-
-	{ 8472,	"weierp",/* script capital P = power set = Weierstrass p, U+2118 ISOamso */ },
-	{ 8465,	"image",/* blackletter capital I = imaginary part, U+2111 ISOamso */ },
-	{ 8476,	"real",	/* blackletter capital R = real part symbol, U+211C ISOamso */ },
-	{ 8482,	"trade",/* trade mark sign, U+2122 ISOnum */ },
-	{ 8501,	"alefsym",/* alef symbol = first transfinite cardinal, U+2135 NEW */ },
-	{ 8592,	"larr",	/* leftwards arrow, U+2190 ISOnum */ },
-	{ 8593,	"uarr",	/* upwards arrow, U+2191 ISOnum */ },
-	{ 8594,	"rarr",	/* rightwards arrow, U+2192 ISOnum */ },
-	{ 8595,	"darr",	/* downwards arrow, U+2193 ISOnum */ },
-	{ 8596,	"harr",	/* left right arrow, U+2194 ISOamsa */ },
-	{ 8629,	"crarr",/* downwards arrow with corner leftwards = carriage return, U+21B5 NEW */ },
-	{ 8656,	"lArr",	/* leftwards double arrow, U+21D0 ISOtech */ },
-	{ 8657,	"uArr",	/* upwards double arrow, U+21D1 ISOamsa */ },
-	{ 8658,	"rArr",	/* rightwards double arrow, U+21D2 ISOtech */ },
-	{ 8659,	"dArr",	/* downwards double arrow, U+21D3 ISOamsa */ },
-	{ 8660,	"hArr",	/* left right double arrow, U+21D4 ISOamsa */ },
-
-
-	{ 8704,	"forall",/* for all, U+2200 ISOtech */ },
-	{ 8706,	"part",	/* partial differential, U+2202 ISOtech */ },
-	{ 8707,	"exist",/* there exists, U+2203 ISOtech */ },
-	{ 8709,	"empty",/* empty set = null set = diameter, U+2205 ISOamso */ },
-	{ 8711,	"nabla",/* nabla = backward difference, U+2207 ISOtech */ },
-	{ 8712,	"isin",	/* element of, U+2208 ISOtech */ },
-	{ 8713,	"notin",/* not an element of, U+2209 ISOtech */ },
-	{ 8715,	"ni",	/* contains as member, U+220B ISOtech */ },
-	{ 8719,	"prod",	/* n-ary product = product sign, U+220F ISOamsb */ },
-	{ 8721,	"sum",	/* n-ary sumation, U+2211 ISOamsb */ },
-	{ 8722,	"minus",/* minus sign, U+2212 ISOtech */ },
-	{ 8727,	"lowast",/* asterisk operator, U+2217 ISOtech */ },
-	{ 8730,	"radic",/* square root = radical sign, U+221A ISOtech */ },
-	{ 8733,	"prop",	/* proportional to, U+221D ISOtech */ },
-	{ 8734,	"infin",/* infinity, U+221E ISOtech */ },
-	{ 8736,	"ang",	/* angle, U+2220 ISOamso */ },
-	{ 8743,	"and",	/* logical and = wedge, U+2227 ISOtech */ },
-	{ 8744,	"or",	/* logical or = vee, U+2228 ISOtech */ },
-	{ 8745,	"cap",	/* intersection = cap, U+2229 ISOtech */ },
-	{ 8746,	"cup",	/* union = cup, U+222A ISOtech */ },
-	{ 8747,	"int",	/* integral, U+222B ISOtech */ },
-	{ 8756,	"there4",/* therefore, U+2234 ISOtech */ },
-	{ 8764,	"sim",	/* tilde operator = varies with = similar to, U+223C ISOtech */ },
-	{ 8773,	"cong",	/* approximately equal to, U+2245 ISOtech */ },
-	{ 8776,	"asymp",/* almost equal to = asymptotic to, U+2248 ISOamsr */ },
-	{ 8800,	"ne",	/* not equal to, U+2260 ISOtech */ },
-	{ 8801,	"equiv",/* identical to, U+2261 ISOtech */ },
-	{ 8804,	"le",	/* less-than or equal to, U+2264 ISOtech */ },
-	{ 8805,	"ge",	/* greater-than or equal to, U+2265 ISOtech */ },
-	{ 8834,	"sub",	/* subset of, U+2282 ISOtech */ },
-	{ 8835,	"sup",	/* superset of, U+2283 ISOtech */ },
-	{ 8836,	"nsub",	/* not a subset of, U+2284 ISOamsn */ },
-	{ 8838,	"sube",	/* subset of or equal to, U+2286 ISOtech */ },
-	{ 8839,	"supe",	/* superset of or equal to, U+2287 ISOtech */ },
-	{ 8853,	"oplus",/* circled plus = direct sum, U+2295 ISOamsb */ },
-	{ 8855,	"otimes",/* circled times = vector product, U+2297 ISOamsb */ },
-	{ 8869,	"perp",	/* up tack = orthogonal to = perpendicular, U+22A5 ISOtech */ },
-	{ 8901,	"sdot",	/* dot operator, U+22C5 ISOamsb */ },
-	{ 8968,	"lceil",/* left ceiling = apl upstile, U+2308 ISOamsc */ },
-	{ 8969,	"rceil",/* right ceiling, U+2309 ISOamsc */ },
-	{ 8970,	"lfloor",/* left floor = apl downstile, U+230A ISOamsc */ },
-	{ 8971,	"rfloor",/* right floor, U+230B ISOamsc */ },
-	{ 9001,	"lang",	/* left-pointing angle bracket = bra, U+2329 ISOtech */ },
-	{ 9002,	"rang",	/* right-pointing angle bracket = ket, U+232A ISOtech */ },
-	{ 9674,	"loz",	/* lozenge, U+25CA ISOpub */ },
-
-	{ 9824,	"spades",/* black spade suit, U+2660 ISOpub */ },
-	{ 9827,	"clubs",/* black club suit = shamrock, U+2663 ISOpub */ },
-	{ 9829,	"hearts",/* black heart suit = valentine, U+2665 ISOpub */ },
-	{ 9830,	"diams",/* black diamond suit, U+2666 ISOpub */ },
-
-	{ 338,	"OElig",/* latin capital ligature OE, U+0152 ISOlat2 */ },
-	{ 339,	"oelig",/* latin small ligature oe, U+0153 ISOlat2 */ },
-	{ 352,	"Scaron",/* latin capital letter S with caron, U+0160 ISOlat2 */ },
-	{ 353,	"scaron",/* latin small letter s with caron, U+0161 ISOlat2 */ },
-	{ 376,	"Yuml",	/* latin capital letter Y with diaeresis, U+0178 ISOlat2 */ },
-	{ 710,	"circ",	/* modifier letter circumflex accent, U+02C6 ISOpub */ },
-	{ 732,	"tilde",/* small tilde, U+02DC ISOdia */ },
-
-	{ 8194,	"ensp",	/* en space, U+2002 ISOpub */ },
-	{ 8195,	"emsp",	/* em space, U+2003 ISOpub */ },
-	{ 8201,	"thinsp",/* thin space, U+2009 ISOpub */ },
-	{ 8204,	"zwnj",	/* zero width non-joiner, U+200C NEW RFC 2070 */ },
-	{ 8205,	"zwj",	/* zero width joiner, U+200D NEW RFC 2070 */ },
-	{ 8206,	"lrm",	/* left-to-right mark, U+200E NEW RFC 2070 */ },
-	{ 8207,	"rlm",	/* right-to-left mark, U+200F NEW RFC 2070 */ },
-	{ 8211,	"ndash",/* en dash, U+2013 ISOpub */ },
-	{ 8212,	"mdash",/* em dash, U+2014 ISOpub */ },
-	{ 8216,	"lsquo",/* left single quotation mark, U+2018 ISOnum */ },
-	{ 8217,	"rsquo",/* right single quotation mark, U+2019 ISOnum */ },
-	{ 8218,	"sbquo",/* single low-9 quotation mark, U+201A NEW */ },
-	{ 8220,	"ldquo",/* left double quotation mark, U+201C ISOnum */ },
-	{ 8221,	"rdquo",/* right double quotation mark, U+201D ISOnum */ },
-	{ 8222,	"bdquo",/* double low-9 quotation mark, U+201E NEW */ },
-	{ 8224,	"dagger",/* dagger, U+2020 ISOpub */ },
-	{ 8225,	"Dagger",/* double dagger, U+2021 ISOpub */ },
-	{ 8240,	"permil",/* per mille sign, U+2030 ISOtech */ },
-	{ 8249,	"lsaquo",/* single left-pointing angle quotation mark, U+2039 ISO proposed */ },
-	{ 8250,	"rsaquo",/* single right-pointing angle quotation mark, U+203A ISO proposed */ },
-	{ 8364,	"euro",	/* euro sign, U+20AC NEW */ }
-};
-
-static GHashTable *entities;
-
-/* this cannot be called in a thread context */
-static void tokenise_setup(void)
-{
-	int i;
-
-	if (entities == NULL) {
-		entities = g_hash_table_new(g_str_hash, g_str_equal);
-		for (i=0;i<sizeof(entity_map)/sizeof(entity_map[0]);i++) {
-			g_hash_table_insert(entities, (char *)entity_map[i].name, (void *)entity_map[i].val);
-		}
-	}
-}
-
-static CamelHTMLParserPrivate *tokenise_init(void)
-{
-	CamelHTMLParserPrivate *p;
-
-	p = g_malloc(sizeof(*p));
-	p->state = CAMEL_HTML_PARSER_DATA;
-
-	p->attr = 0;
-	p->attrs = g_ptr_array_new();
-	p->values = g_ptr_array_new();
-	p->tag = g_string_new("");
-	p->ent = g_string_new("");
-	p->charset = NULL;
-	
-	if (entities == NULL)
-		tokenise_setup();
-
-	return p;
-}
-
-static void tokenise_free(CamelHTMLParserPrivate *p)
-{
-	int i;
-
-	g_string_free(p->tag, TRUE);
-	g_string_free(p->ent, TRUE);
-	g_free(p->charset);
-
-	for (i=0;i<p->attrs->len;i++)
-		g_string_free(p->attrs->pdata[i], TRUE);
-
-	for (i=0;i<p->values->len;i++)
-		g_string_free(p->values->pdata[i], TRUE);
-
-	g_free(p);
-}
-
-static int convert_entity(const char *e, char *ent)
-{
-	unsigned int val;
-
-	if (e[0] == '#')
-		return g_unichar_to_utf8(atoi(e+1), ent);
-
-	val = (unsigned int)g_hash_table_lookup(entities, e);
-	if (ent)
-		return g_unichar_to_utf8(val, ent);
-	else
-		return 0;
-}
-
-#if 0
-static void dump_tag(CamelHTMLParserPrivate *p)
-{
-	int i;
-
-	printf("got tag: %s\n", p->tag->str);
-	printf("%d attributes:\n", p->attr);
-	for (i=0;i<p->attr;i++) {
-		printf(" %s = '%s'\n", ((GString *)p->attrs->pdata[i])->str, ((GString *)p->values->pdata[i])->str);
-	}
-}
-#endif
-
-static int tokenise_step(CamelHTMLParserPrivate *p, char **datap, int *lenp)
-{
-	char *in = p->inptr;
-	char *inend = p->inend;
-	char c;
-	int state = p->state, ret, len;
-	char *start = p->inptr;
-
-	d(printf("Tokenise step\n"));
-
-	while (in < inend) {
-		c = *in++;
-		switch (state) {
-		case CAMEL_HTML_PARSER_DATA:
-			if (c == '<') {
-				ret = state;
-				state = CAMEL_HTML_PARSER_TAG;
-				p->attr = 0;
-				g_string_truncate(p->tag, 0);
-				d(printf("got data '%.*s'\n", in-start-1, start));
-				*datap = start;
-				*lenp = in-start-1;
-				goto done;
-			} else if (c=='&') {
-				ret = state;
-				state = CAMEL_HTML_PARSER_ENT;
-				g_string_truncate(p->ent, 0);
-				g_string_append_c(p->ent, c);
-				d(printf("got data '%.*s'\n", in-start-1, start));
-				*datap = start;
-				*lenp = in-start-1;
-				goto done;
-			}
-			break;
-		case CAMEL_HTML_PARSER_ENT:
-			if (c==';') {
-				len = convert_entity(p->ent->str+1, p->ent_utf8);
-				if (len == 0) {
-					/* handle broken entity */
-					g_string_append_c(p->ent, c);
-					ret = state = CAMEL_HTML_PARSER_DATA;
-					*datap = p->ent->str;
-					*lenp = p->ent->len;
-					goto done;
-				} else {
-					d(printf("got entity: %s = %s\n", p->ent->str, p->ent_utf8));
-					ret = state;
-					state = CAMEL_HTML_PARSER_DATA;
-					*datap = p->ent_utf8;
-					*lenp = len;
-					goto done;
-				}
-			} else if (isalnum(c) || c=='#') { /* FIXME: right type */
-				g_string_append_c(p->ent, c);
-			} else {
-				/* handle broken entity */
-				g_string_append_c(p->ent, c);
-				ret = state = CAMEL_HTML_PARSER_DATA;
-				*datap = p->ent->str;
-				*lenp = p->ent->len;
-				goto done;
-			}
-			break;
-		case CAMEL_HTML_PARSER_TAG:
-			if (c == '!') {
-				state = CAMEL_HTML_PARSER_COMMENT0;
-				g_string_append_c(p->tag, c);
-			} else if (c == '>') {
-				d(dump_tag(p));
-				ret = CAMEL_HTML_PARSER_ELEMENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				goto done;
-			} else if (c == ' ' || c=='\n' || c=='\t') {
-				state = CAMEL_HTML_PARSER_ATTR0;
-			} else {
-				g_string_append_c(p->tag, c);
-			}
-			break;
-			/* check for <!-- */
-		case CAMEL_HTML_PARSER_COMMENT0:
-			if (c == '-') {
-				g_string_append_c(p->tag, c);
-				if (p->tag->len == 3) {
-					g_string_truncate(p->tag, 0);
-					state = CAMEL_HTML_PARSER_COMMENT;
-				}
-			} else {
-				/* got something else, probbly dtd entity */
-				state = CAMEL_HTML_PARSER_DTDENT;
-			}
-			break;
-		case CAMEL_HTML_PARSER_DTDENT:
-			if (c == '>') {
-				ret = CAMEL_HTML_PARSER_DTDENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				*datap = start;
-				*lenp = in-start-1;
-				goto done;
-			}
-			break;
-		case CAMEL_HTML_PARSER_COMMENT:
-			if (c == '>' && p->tag->len == 2) {
-				ret = CAMEL_HTML_PARSER_COMMENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				*datap = start;
-				*lenp = in-start-1;
-				goto done;
-			} else if (c=='-') {
-				/* we dont care if we get 'n' --'s before the > */
-				if (p->tag->len < 2)
-					g_string_append_c(p->tag, c);
-			} else {
-				g_string_truncate(p->tag, 0);
-			}
-			break;
-		case CAMEL_HTML_PARSER_ATTR0:	/* pre-attribute whitespace */
-			if (c == '>') {
-				d(dump_tag(p));
-				ret = CAMEL_HTML_PARSER_ELEMENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				goto done;
-			} else if (c == ' ' || c=='\n' || c=='\t') {
-			} else {
-				if (p->attrs->len <= p->attr) {
-					g_ptr_array_add(p->attrs, g_string_new(""));
-					g_ptr_array_add(p->values, g_string_new(""));
-				} else {
-					g_string_truncate(p->attrs->pdata[p->attr], 0);
-					g_string_truncate(p->values->pdata[p->attr], 0);
-				}
-				g_string_append_c(p->attrs->pdata[p->attr], c);
-				state = CAMEL_HTML_PARSER_ATTR;
-			}
-			break;
-		case CAMEL_HTML_PARSER_ATTR:
-			if (c == '>') {
-				d(dump_tag(p));
-				ret = CAMEL_HTML_PARSER_ELEMENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				goto done;
-			} else if (c == '=') {
-				state = CAMEL_HTML_PARSER_VAL0;
-			} else if (c == ' ' || c=='\n' || c=='\t') {
-				state = CAMEL_HTML_PARSER_ATTR0;
-				p->attr++;
-			} else {
-				g_string_append_c(p->attrs->pdata[p->attr], c);
-			}
-			break;
-		case CAMEL_HTML_PARSER_VAL0:
-			if (c == '>') {
-				d(printf("value truncated\n"));
-				d(dump_tag(p));
-				ret = CAMEL_HTML_PARSER_ELEMENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				goto done;
-			} else if (c == '\'' || c == '\"') {
-				p->quote = c;
-				state = CAMEL_HTML_PARSER_VAL;
-			} else if (c == ' ' || c=='\n' || c=='\t') {
-			} else {
-				g_string_append_c(p->values->pdata[p->attr], c);
-				p->quote = 0;
-				state = CAMEL_HTML_PARSER_VAL;
-			}
-			break;
-		case CAMEL_HTML_PARSER_VAL:
-		do_val:
-			if (p->quote) {
-				if (c == '>') {
-					d(printf("value truncated\n"));
-					d(dump_tag(p));
-					ret = CAMEL_HTML_PARSER_ELEMENT;
-					state = CAMEL_HTML_PARSER_DATA;
-					p->attr++;
-					goto done;
-				} else if (c == p->quote) {
-					state = CAMEL_HTML_PARSER_ATTR0;
-					p->attr++;
-				} else if (c=='&') {
-					state = CAMEL_HTML_PARSER_VAL_ENT;
-					g_string_truncate(p->ent, 0);
-				} else {
-					g_string_append_c(p->values->pdata[p->attr], c);
-				}
-			} else if (c == '>') {
-				d(dump_tag(p));
-				ret = CAMEL_HTML_PARSER_ELEMENT;
-				state = CAMEL_HTML_PARSER_DATA;
-				p->attr++;
-				goto done;
-			} else if (c == ' ' || c=='\n' || c=='\t') {
-				state = CAMEL_HTML_PARSER_ATTR0;
-				p->attr++;
-			} else if (c=='&') {
-				state = CAMEL_HTML_PARSER_VAL_ENT;
-				g_string_truncate(p->ent, 0);
-			} else {
-				g_string_append_c(p->values->pdata[p->attr], c);
-			}
-			break;
-		case CAMEL_HTML_PARSER_VAL_ENT:
-			if (c==';') {
-				state = CAMEL_HTML_PARSER_VAL;
-				len = convert_entity(p->ent->str+1, p->ent_utf8);
-				if (len == 0) {
-					/* fallback; broken entity, just output it and see why we ended */
-					g_string_append(p->values->pdata[p->attr], p->ent->str);
-					g_string_append_c(p->values->pdata[p->attr], ';');
-				} else {
-					d(printf("got entity: %s = %s\n", p->ent->str, p->ent_utf8));
-					g_string_append(p->values->pdata[p->attr], p->ent_utf8);
-				}
-			} else if (isalnum(c) || c=='#') { /* FIXME: right type */
-				g_string_append_c(p->ent, c);
-			} else {
-				/* fallback; broken entity, just output it and see why we ended */
-				g_string_append(p->values->pdata[p->attr], p->ent->str);
-				goto do_val;
-			}
-			break;
-		}
-	}
-
-	if (p->eof) {
-		/* FIXME: what about other truncated states? */
-		switch (state) {
-		case CAMEL_HTML_PARSER_DATA:
-		case CAMEL_HTML_PARSER_COMMENT:
-			if (in > start) {
-				ret = state;
-				*datap = start;
-				*lenp = in-start-1;
-			} else {
-				ret = CAMEL_HTML_PARSER_EOF;
-				state = CAMEL_HTML_PARSER_EOF;
-			}
-			break;
-		default:
-			ret = CAMEL_HTML_PARSER_EOF;
-			state = CAMEL_HTML_PARSER_EOF;
-		}
-	} else {
-		/* we only care about remaining data for this buffer, everything else has its own copy */
-		switch (state) {
-		case CAMEL_HTML_PARSER_DATA:
-		case CAMEL_HTML_PARSER_COMMENT:
-			if (in > start) {
-				ret = state;
-				*datap = start;
-				*lenp = in-start-1;
-			} else {
-				ret = CAMEL_HTML_PARSER_EOD;
-			}
-			break;
-		default:
-			ret = CAMEL_HTML_PARSER_EOD;
-		}
-	}
-
-done:
-	p->start = start;
-	p->state = state;
-	p->inptr = in;
-
-	return ret;
-}
diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h
deleted file mode 100644
index 2e68e3bdff..0000000000
--- a/camel/camel-html-parser.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/** WARNING
- **
- ** DO NOT USE THIS CODE OUTSIDE OF CAMEL
- **
- ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME
- **/
-
-#ifndef _CAMEL_HTML_PARSER_H
-#define _CAMEL_HTML_PARSER_H
-
-#include <camel/camel-object.h>
-
-#define CAMEL_HTML_PARSER(obj)         CAMEL_CHECK_CAST (obj, camel_html_parser_get_type (), CamelHTMLParser)
-#define CAMEL_HTML_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_html_parser_get_type (), CamelHTMLParserClass)
-#define CAMEL_IS_HTML_PARSER(obj)      CAMEL_CHECK_TYPE (obj, camel_html_parser_get_type ())
-
-typedef struct _CamelHTMLParserClass CamelHTMLParserClass;
-typedef struct _CamelHTMLParser CamelHTMLParser;
-
-/* Parser/tokeniser states */
-typedef enum _camel_html_parser_t {
-	CAMEL_HTML_PARSER_DATA,			/* raw data */
-	CAMEL_HTML_PARSER_ENT,			/* entity in data */
-	CAMEL_HTML_PARSER_ELEMENT,		/* element (tag + attributes scanned) */
-	CAMEL_HTML_PARSER_TAG,			/* tag */
-	CAMEL_HTML_PARSER_DTDENT,		/* dtd entity? <! blah blah > */
-	CAMEL_HTML_PARSER_COMMENT0,		/* start of comment */
-	CAMEL_HTML_PARSER_COMMENT,		/* body of comment */
-	CAMEL_HTML_PARSER_ATTR0,		/* start of attribute */
-	CAMEL_HTML_PARSER_ATTR,			/* attribute */
-	CAMEL_HTML_PARSER_VAL0,			/* start of value */
-	CAMEL_HTML_PARSER_VAL,			/* value */
-	CAMEL_HTML_PARSER_VAL_ENT,		/* entity in value */
-	CAMEL_HTML_PARSER_EOD,			/* end of current data */
-	CAMEL_HTML_PARSER_EOF,			/* end of file */
-} camel_html_parser_t;
-
-struct _CamelHTMLParser {
-	CamelObject parent;
-
-	struct _CamelHTMLParserPrivate *priv;
-};
-
-struct _CamelHTMLParserClass {
-	CamelObjectClass parent_class;
-};
-
-CamelType		camel_html_parser_get_type	(void);
-CamelHTMLParser      *camel_html_parser_new	(void);
-
-void camel_html_parser_set_data(CamelHTMLParser *hp, const char *start, int len, int last);
-camel_html_parser_t camel_html_parser_step(CamelHTMLParser *hp, const char **datap, int *lenp);
-const char *camel_html_parser_left(CamelHTMLParser *hp, int *lenp);
-const char *camel_html_parser_tag(CamelHTMLParser *hp);
-const char *camel_html_parser_attr(CamelHTMLParser *hp, const char *name);
-const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArray **values);
-
-#endif /* ! _CAMEL_HTML_PARSER_H */
diff --git a/camel/camel-http-stream.c b/camel/camel-http-stream.c
deleted file mode 100644
index 44c7601e82..0000000000
--- a/camel/camel-http-stream.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.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.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include "camel-http-stream.h"
-
-#include "camel-mime-utils.h"
-#include "camel-stream-buffer.h"
-#include "camel-tcp-stream-raw.h"
-#ifdef HAVE_SSL
-#include "camel-tcp-stream-ssl.h"
-#endif
-#include "camel-exception.h"
-#include "camel-session.h"
-
-#define d(x) x
-
-
-static CamelStreamClass *parent_class = NULL;
-
-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 int stream_reset  (CamelStream *stream);
-
-static void
-camel_http_stream_class_init (CamelHttpStreamClass *camel_http_stream_class)
-{
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_http_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->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->reset = stream_reset;
-}
-
-static void
-camel_http_stream_init (gpointer object, gpointer klass)
-{
-	CamelHttpStream *http = CAMEL_HTTP_STREAM (object);
-	
-	http->parser = NULL;
-	http->content_type = NULL;
-	http->headers = NULL;
-	http->service = NULL;
-	http->url = NULL;
-	http->proxy = NULL;
-	http->authrealm = NULL;
-	http->authpass = NULL;
-	http->statuscode = 0;
-	http->raw = NULL;
-}
-
-static void
-camel_http_stream_finalize (CamelObject *object)
-{
-	CamelHttpStream *http = CAMEL_HTTP_STREAM (object);
-	
-	if (http->parser)
-		camel_object_unref (CAMEL_OBJECT (http->parser));
-	
-	if (http->content_type)
-		header_content_type_unref (http->content_type);
-	
-	if (http->headers)
-		header_raw_clear (&http->headers);
-	
-	if (http->service)
-		camel_object_unref (CAMEL_OBJECT (http->service));
-	
-	if (http->url)
-		camel_url_free (http->url);
-	
-	if (http->proxy)
-		camel_url_free (http->proxy);
-	
-	g_free (http->authrealm);
-	g_free (http->authpass);
-	
-	if (http->raw)
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-}
-
-
-CamelType
-camel_http_stream_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_stream_get_type (),
-					    "CamelHttpStream",
-					    sizeof (CamelHttpStream),
-					    sizeof (CamelHttpStreamClass),
-					    (CamelObjectClassInitFunc) camel_http_stream_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_http_stream_init,
-					    (CamelObjectFinalizeFunc) camel_http_stream_finalize);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_http_stream_new:
- * @method: HTTP method
- * @service: parent service (for SSL/TLS)
- * @url: URL to act upon
- *
- * Return value: a http stream
- **/
-CamelStream *
-camel_http_stream_new (CamelHttpMethod method, CamelService *service, CamelURL *url)
-{
-	CamelHttpStream *stream;
-	char *str;
-	
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-	g_return_val_if_fail (url != NULL, NULL);
-	
-	stream = CAMEL_HTTP_STREAM (camel_object_new (camel_http_stream_get_type ()));
-	
-	stream->method = method;
-	stream->service = service;
-	camel_object_ref (CAMEL_OBJECT (service));
-	
-	str = camel_url_to_string (url, 0);
-	stream->url = camel_url_new (str, NULL);
-	g_free (str);
-	
-	return CAMEL_STREAM (stream);
-}
-
-
-static CamelStream *
-http_connect (CamelService *service, CamelURL *url)
-{
-	CamelStream *buffered, *stream = NULL;
-	struct hostent *host;
-	int errsave;
-	
-	if (!strcasecmp (url->protocol, "https")) {
-#ifdef HAVE_SSL
-		stream = camel_tcp_stream_ssl_new (service, url->host);
-#endif
-	} else {
-		stream = camel_tcp_stream_raw_new ();
-	}
-	
-	if (stream == NULL) {
-		errno = EINVAL;
-		return NULL;
-	}
-	
-	host = camel_gethostbyname (url->host, NULL);
-	if (!host) {
-		errno = EHOSTUNREACH;
-		return NULL;
-	}
-	
-	if (camel_tcp_stream_connect (CAMEL_TCP_STREAM (stream), host, url->port ? url->port : 80) == -1) {
-		errsave = errno;
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_free_host (host);
-		errno = errsave;
-		return NULL;
-	}
-	
-	camel_free_host (host);
-	
-	buffered = camel_stream_buffer_new (stream, CAMEL_STREAM_BUFFER_READ);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return buffered;
-}
-
-
-static const char *
-http_next_token (const unsigned char *in)
-{
-	const unsigned char *inptr = in;
-	
-	while (*inptr && !isspace ((int) *inptr))
-		inptr++;
-	
-	while (*inptr && isspace ((int) *inptr))
-		inptr++;
-	
-	return (const char *) inptr;
-}
-
-static int
-http_get_statuscode (CamelHttpStream *http)
-{
-	const char *token;
-	char buffer[4096];
-	
-	if (camel_stream_buffer_gets (CAMEL_STREAM_BUFFER (http->raw), buffer, sizeof (buffer)) <= 0)
-		return -1;
-	
-	/* parse the HTTP status code */
-	if (!strncasecmp (buffer, "HTTP/", 5)) {
-		token = http_next_token (buffer);
-		http->statuscode = header_decode_int (&token);
-		return http->statuscode;
-	}
-	
-	camel_object_unref (CAMEL_OBJECT (http->raw));
-	http->raw = NULL;
-	
-	return -1;
-}
-
-static int
-http_get_headers (CamelHttpStream *http)
-{
-	struct _header_raw *headers, *node, *tail;
-	const char *type;
-	char *buf;
-	int len, err;
-	
-	if (http->parser)
-		camel_object_unref (CAMEL_OBJECT (http->parser));
-	
-	http->parser = camel_mime_parser_new ();
-	camel_mime_parser_init_with_stream (http->parser, http->raw);
-	
-	switch (camel_mime_parser_step (http->parser, &buf, &len)) {
-	case HSCAN_MESSAGE:
-	case HSCAN_HEADER:
-		/* we have the headers, build them into 'us' */
-		headers = camel_mime_parser_headers_raw (http->parser);
-		
-		/* if content-type exists, process it first, set for fallback charset in headers */
-		if (http->content_type)
-			header_content_type_unref (http->content_type);
-		type = header_raw_find (&headers, "Content-Type", NULL);
-		if (type)
-			http->content_type = header_content_type_decode (type);
-		else
-			http->content_type = NULL;
-		
-		if (http->headers)
-			header_raw_clear (&http->headers);
-		
-		http->headers = NULL;
-		tail = (struct _header_raw *) &http->headers;
-		
-		while (headers) {
-			node = g_new (struct _header_raw, 1);
-			node->next = NULL;
-			node->name = g_strdup (headers->name);
-			node->value = g_strdup (headers->value);
-			node->offset = headers->offset;
-			tail->next = node;
-			tail = node;
-			headers = headers->next;
-		}
-		
-		break;
-	default:
-		g_warning ("Invalid state encountered???: %d", camel_mime_parser_state (http->parser));
-	}
-	
-	err = camel_mime_parser_errno (http->parser);
-	
-	if (err != 0) {
-		camel_object_unref (CAMEL_OBJECT (http->parser));
-		http->parser = NULL;
-		goto exception;
-	}
-	
-	camel_mime_parser_drop_step (http->parser);
-	
-	return 0;
-	
- exception:
-	camel_object_unref (CAMEL_OBJECT (http->raw));
-	http->raw = NULL;
-	
-	return -1;
-}
-
-static int
-http_method_invoke (CamelHttpStream *http)
-{
-	const char *method = NULL;
-	char *url;
-	
-	switch (http->method) {
-	case CAMEL_HTTP_METHOD_GET:
-		method = "GET";
-		break;
-	case CAMEL_HTTP_METHOD_HEAD:
-		method = "HEAD";
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	url = camel_url_to_string (http->url, 0);
-	if (camel_stream_printf (http->raw, "%s %s HTTP/1.0\r\nUser-Agent: %s\r\nHost: %s\r\n",
-				 method, http->user_agent ? http->user_agent : "CamelHttpStream/1.0",
-				 http->proxy ? url : http->url->path,
-				 http->url->host) == -1) {
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-		http->raw = NULL;
-		g_free (url);
-		return -1;
-	}
-	g_free (url);
-	
-	if (http->authrealm && camel_stream_printf (http->raw, "WWW-Authenticate: %s\r\n", http->authrealm) == -1) {
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-		http->raw = NULL;
-		return -1;
-	}
-	
-	if (http->authpass && http->proxy && camel_stream_printf (http->raw, "Proxy-Authorization: Basic %s\r\n",
-								  http->authpass) == -1) {
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-		http->raw = NULL;
-		return -1;
-	}
-	
-	/* end the headers */
-	if (camel_stream_write (http->raw, "\r\n", 2) == -1 || camel_stream_flush (http->raw) == -1) {
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-		http->raw = NULL;
-		return -1;
-	}
-	
-	return 0;
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelHttpStream *http = CAMEL_HTTP_STREAM (stream);
-	const char *parser_buf;
-	ssize_t nread;
-	
-	if (http->method != CAMEL_HTTP_METHOD_GET && http->method != CAMEL_HTTP_METHOD_HEAD) {
-		errno = EIO;
-		return -1;
-	}
-	
- redirect:
-	
-	if (!http->raw) {
-		http->raw = http_connect (http->service, http->proxy ? http->proxy : http->url);
-		if (!http->raw)
-			return -1;
-		
-		if (http_method_invoke (http) == -1)
-			return -1;
-		
-		if (http_get_statuscode (http) == -1)
-			return -1;
-		
-		if (http_get_headers (http) == -1)
-			return -1;
-		
-		switch (http->statuscode) {
-		case 200:
-		case 206:
-			/* we are OK to go... */
-			break;
-		case 301:
-		case 302:
-			/* redirect... */
-			camel_url_free (http->url);
-			http->url = camel_url_new (header_raw_find (&http->headers, "Location", NULL), NULL);
-			
-			camel_object_unref (CAMEL_OBJECT (http->parser));
-			camel_object_unref (CAMEL_OBJECT (http->raw));
-			header_content_type_unref (http->content_type);
-			header_raw_clear (&http->headers);
-			http->parser = NULL;
-			http->raw = NULL;
-			
-			goto redirect;
-			break;
-		case 407:
-			/* failed proxy authentication? */
-		default:
-			/* unknown error */
-			camel_object_unref (CAMEL_OBJECT (http->parser));
-			camel_object_unref (CAMEL_OBJECT (http->raw));
-			http->parser = NULL;
-			http->raw = NULL;
-			return -1;
-		}
-	}
-	
-	nread = camel_mime_parser_read (http->parser, &parser_buf, n);
-	
-	if (nread > 0)
-		memcpy (buffer, parser_buf, nread);
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	return -1;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	CamelHttpStream *http = (CamelHttpStream *) stream;
-	
-	if (http->raw)
-		return camel_stream_flush (http->raw);
-	else
-		return 0;
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	CamelHttpStream *http = (CamelHttpStream *) stream;
-	
-	if (http->raw) {
-		if (camel_stream_close (http->raw) == -1)
-			return -1;
-		
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-		http->raw = NULL;
-	}
-	
-	return 0;
-}
-
-static int
-stream_reset (CamelStream *stream)
-{
-	CamelHttpStream *http = CAMEL_HTTP_STREAM (stream);
-	
-	if (http->raw) {
-		camel_stream_close (http->raw);
-		camel_object_unref (CAMEL_OBJECT (http->raw));
-		http->raw = NULL;
-	}
-	
-	return 0;
-};
-
-
-CamelContentType *
-camel_http_stream_get_content_type (CamelHttpStream *http_stream)
-{
-	g_return_val_if_fail (CAMEL_IS_HTTP_STREAM (http_stream), NULL);
-	
-	if (!http_stream->content_type && !http_stream->raw) {
-		http_stream->raw = http_connect (http_stream->service, http_stream->url);
-		if (!http_stream->raw)
-			return NULL;
-		
-		if (http_method_invoke (http_stream) == -1)
-			return NULL;
-		
-		if (http_get_headers (http_stream) == -1)
-			return NULL;
-	}
-	
-	if (http_stream->content_type)
-		header_content_type_ref (http_stream->content_type);
-	
-	return http_stream->content_type;
-}
-
-
-void
-camel_http_stream_set_user_agent (CamelHttpStream *http_stream, const char *user_agent)
-{
-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));
-	
-	g_free (http_stream->user_agent);
-	http_stream->user_agent = g_strdup (user_agent);
-}
-
-void
-camel_http_stream_set_proxy (CamelHttpStream *http_stream, const char *proxy_url)
-{
-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));
-	
-	if (http_stream->proxy)
-		camel_url_free (http_stream->proxy);
-	
-	http_stream->proxy = camel_url_new (proxy_url, NULL);
-}
-
-void
-camel_http_stream_set_proxy_authrealm (CamelHttpStream *http_stream, const char *proxy_authrealm)
-{
-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));
-	
-	g_free (http_stream->authrealm);
-	http_stream->authrealm = g_strdup (proxy_authrealm);
-}
-
-void
-camel_http_stream_set_proxy_authpass (CamelHttpStream *http_stream, const char *proxy_authpass)
-{
-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));
-	
-	g_free (http_stream->authpass);
-	http_stream->authpass = g_strdup (proxy_authpass);
-}
diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
deleted file mode 100644
index 40733662ef..0000000000
--- a/camel/camel-http-stream.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.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_HTTP_STREAM_H__
-#define __CAMEL_HTTP_STREAM_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-service.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-url.h>
-
-#define CAMEL_HTTP_STREAM_TYPE     (camel_http_stream_get_type ())
-#define CAMEL_HTTP_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_HTTP_STREAM_TYPE, CamelHttpStream))
-#define CAMEL_HTTP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_HTTP_STREAM_TYPE, CamelHttpStreamClass))
-#define CAMEL_IS_HTTP_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_HTTP_STREAM_TYPE))
-
-typedef enum {
-	/*CAMEL_HTTP_METHOD_OPTIONS,*/
-	CAMEL_HTTP_METHOD_GET,
-	CAMEL_HTTP_METHOD_HEAD,
-	/*CAMEL_HTTP_METHOD_POST,*/
-	/*CAMEL_HTTP_METHOD_PUT,*/
-	/*CAMEL_HTTP_METHOD_DELETE,*/
-	/*CAMEL_HTTP_METHOD_TRACE,*/
-	/*CAMEL_HTTP_METHOD_CONNECT*/
-} CamelHttpMethod;
-
-
-typedef struct _CamelHttpStreamClass CamelHttpStreamClass;
-
-struct _CamelHttpStream {
-	CamelStream parent_object;
-	
-	CamelMimeParser *parser;
-	
-	CamelContentType *content_type;
-	struct _header_raw *headers;
-	
-	CamelHttpMethod method;
-	CamelService *service;
-	CamelURL *url;
-	
-	char *user_agent;
-	
-	/* proxy info */
-	CamelURL *proxy;
-	char *authrealm;
-	char *authpass;
-	
-	int statuscode;
-	
-	CamelStream *raw;
-};
-
-struct _CamelHttpStreamClass {
-	CamelStreamClass parent_class;
-	
-	/* Virtual methods */
-};
-
-/* Standard Camel function */
-CamelType camel_http_stream_get_type (void);
-
-/* public methods */
-CamelStream *camel_http_stream_new (CamelHttpMethod method, CamelService *service, CamelURL *url);
-
-void camel_http_stream_set_user_agent (CamelHttpStream *http_stream, const char *user_agent);
-
-void camel_http_stream_set_proxy (CamelHttpStream *http_stream, const char *proxy_url);
-void camel_http_stream_set_proxy_authrealm (CamelHttpStream *http_stream, const char *proxy_authrealm);
-void camel_http_stream_set_proxy_authpass (CamelHttpStream *http_stream, const char *proxy_authpass);
-
-CamelContentType *camel_http_stream_get_content_type (CamelHttpStream *http_stream);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAMEL_HTTP_STREAM_H__ */
diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c
deleted file mode 100644
index f1f4dd234d..0000000000
--- a/camel/camel-index-control.c
+++ /dev/null
@@ -1,211 +0,0 @@
-
-/* Command to manually force a compression/dump of an index file */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <ctype.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 <sys/stat.h>
-#include <fcntl.h>
-
-#include "e-util/e-msgport.h"
-#include "e-util/e-memory.h"
-
-#include "camel/camel-object.h"
-
-#include "camel-text-index.h"
-
-#include <stdio.h>
-
-static void
-do_usage(char *argv0)
-{
-	fprintf(stderr, "Usage: %s [ compress | dump | info ] file(s) ...\n", argv0);
-	fprintf(stderr, " compress - compress (an) index file(s)\n");
-	fprintf(stderr, " dump - dump (an) index file's content to stdout\n");
-	fprintf(stderr, " info - dump summary info to stdout\n");
-	exit(1);
-}
-
-static int
-do_compress(int argc, char **argv)
-{
-	int i;
-	CamelIndex *idx;
-
-	for (i=2;i<argc;i++) {
-		printf("Opening index file: %s\n", argv[i]);
-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDWR);
-		if (idx) {
-			printf(" Compressing ...\n");
-			if (camel_index_compress(idx) == -1) {
-				camel_object_unref((CamelObject *)idx);
-				return 1;
-			}
-			camel_object_unref((CamelObject *)idx);
-		} else {
-			printf(" Failed: %s\n", strerror(errno));
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int
-do_dump(int argc, char **argv)
-{
-	int i;
-	CamelIndex *idx;
-
-	for (i=2;i<argc;i++) {
-		printf("Opening index file: %s\n", argv[i]);
-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);
-		if (idx) {
-			printf(" Dumping ...\n");
-			camel_text_index_dump(idx);
-			camel_object_unref((CamelObject *)idx);
-		} else {
-			printf(" Failed: %s\n", strerror(errno));
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int
-do_info(int argc, char **argv)
-{
-	int i;
-	CamelIndex *idx;
-
-	for (i=2;i<argc;i++) {
-		printf("Opening index file: %s\n", argv[i]);
-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);
-		if (idx) {
-			camel_text_index_info(idx);
-			camel_object_unref((CamelObject *)idx);
-		} else {
-			printf(" Failed: %s\n", strerror(errno));
-			return 0;
-		}
-	}
-	return 1;
-}
-
-static int
-do_check(int argc, char **argv)
-{
-	int i;
-	CamelIndex *idx;
-
-	for (i=2;i<argc;i++) {
-		printf("Opening index file: %s\n", argv[i]);
-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);
-		if (idx) {
-			camel_text_index_validate(idx);
-			camel_object_unref((CamelObject *)idx);
-		} else {
-			printf(" Failed: %s\n", strerror(errno));
-			return 0;
-		}
-	}
-	return 1;
-}
-
-static int do_perf(int argc, char **argv);
-
-int main(int argc, char **argv)
-{
-	if (argc<2)
-		do_usage(argv[0]);
-
-	g_thread_init(NULL);
-	camel_init(NULL, 0);
-
-	if (!strcmp(argv[1], "compress"))
-		return do_compress(argc, argv);
-	else if (!strcmp(argv[1], "dump"))
-		return do_dump(argc, argv);
-	else if (!strcmp(argv[1], "info"))
-		return do_info(argc, argv);
-	else if (!strcmp(argv[1], "check"))
-		return do_check(argc, argv);
-	else if (!strcmp(argv[1], "perf"))
-		return do_perf(argc, argv);
-
-	do_usage(argv[0]);
-	return 1;
-}
-
-#include <sys/types.h>
-#include <dirent.h>
-#include "camel-stream-null.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-index.h"
-#include "camel-stream-fs.h"
-
-static int
-do_perf(int argc, char **argv)
-{
-	CamelIndex *idx;
-	DIR *dir;
-	char *path = "/home/notzed/evolution/local/Inbox/mbox/cur";
-	struct dirent *d;
-	CamelStream *null, *filter, *stream;
-	CamelMimeFilterIndex *filter_index;
-	char *name;
-	CamelIndexName *idn;
-
-	dir = opendir(path);
-	if (dir == NULL) {
-		perror("open dir");
-		return 1;
-	}
-
-	idx = (CamelIndex *)camel_text_index_new("/tmp/index", O_TRUNC|O_CREAT|O_RDWR);
-	if (idx == NULL) {
-		perror("open index");
-		return 1;
-	}
-
-	null = camel_stream_null_new();
-	filter = (CamelStream *)camel_stream_filter_new_with_stream(null);
-	camel_object_unref((CamelObject *)null);
-	filter_index = camel_mime_filter_index_new_index(idx);
-	camel_stream_filter_add((CamelStreamFilter *)filter, (CamelMimeFilter *)filter_index);
-
-	while ((d = readdir(dir))) {
-		printf("indexing '%s'\n", d->d_name);
-
-		idn = camel_index_add_name(idx, d->d_name);
-		camel_mime_filter_index_set_name(filter_index, idn);
-		name = g_strdup_printf("%s/%s", path, d->d_name);
-		stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0);
-		camel_stream_write_to_stream(stream, filter);
-		camel_object_unref((CamelObject *)stream);
-		g_free(name);
-
-		camel_index_write_name(idx, idn);
-		camel_object_unref((CamelObject *)idn);
-		camel_mime_filter_index_set_name(filter_index, NULL);
-	}
-
-	closedir(dir);
-
-	camel_index_sync(idx);
-	camel_object_unref((CamelObject *)idx);
-
-	camel_object_unref((CamelObject *)filter);
-	camel_object_unref((CamelObject *)filter_index);
-
-	return 0;
-}
diff --git a/camel/camel-index.c b/camel/camel-index.c
deleted file mode 100644
index eb476b41fc..0000000000
--- a/camel/camel-index.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ctype.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "camel-index.h"
-#include "camel/camel-object.h"
-
-#define w(x)
-#define io(x)
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-#define CAMEL_INDEX_VERSION (0x01)
-
-struct _CamelIndexPrivate {
-	void *dummy;
-};
-
-#define _PRIVATE(o) (((CamelIndex *)(o))->priv)
-
-#define CI_CLASS(o) ((CamelIndexClass *)(((CamelObject *)o)->klass))
-
-/* ********************************************************************** */
-/* CamelIndex */
-/* ********************************************************************** */
-
-static CamelObjectClass *camel_index_parent;
-
-static void
-camel_index_class_init(CamelIndexClass *klass)
-{
-	camel_index_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));
-}
-
-static void
-camel_index_init(CamelIndex *idx)
-{
-	struct _CamelIndexPrivate *p;
-
-	p = _PRIVATE(idx) = g_malloc0(sizeof(*p));
-
-	idx->version = CAMEL_INDEX_VERSION;
-}
-
-static void
-camel_index_finalise(CamelIndex *idx)
-{
-	g_free(idx->path);
-	g_free(idx->priv);
-}
-
-CamelType
-camel_index_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelIndex",
-					   sizeof (CamelIndex),
-					   sizeof (CamelIndexClass),
-					   (CamelObjectClassInitFunc) camel_index_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_index_init,
-					   (CamelObjectFinalizeFunc) camel_index_finalise);
-	}
-	
-	return type;
-}
-
-CamelIndex *
-camel_index_new(const char *path, int flags)
-{
-	CamelIndex *idx = (CamelIndex *)camel_object_new(camel_index_get_type());
-
-	camel_index_construct(idx, path, flags);
-
-	return idx;
-}
-
-void
-camel_index_construct(CamelIndex *idx, const char *path, int flags)
-{
-	g_free(idx->path);
-	idx->path = g_strdup_printf("%s.index", path);
-	idx->flags = flags;
-}
-
-int
-camel_index_rename(CamelIndex *idx, const char *path)
-{
-	return CI_CLASS(idx)->rename(idx, path);
-}
-
-void
-camel_index_set_normalise(CamelIndex *idx, CamelIndexNorm func, void *data)
-{
-	idx->normalise = func;
-	idx->normalise_data = data;
-}
-
-int
-camel_index_sync(CamelIndex *idx)
-{
-	return CI_CLASS(idx)->sync(idx);
-}
-
-int
-camel_index_compress(CamelIndex *idx)
-{
-	return CI_CLASS(idx)->compress(idx);
-}
-
-int
-camel_index_has_name(CamelIndex *idx, const char *name)
-{
-	return CI_CLASS(idx)->has_name(idx, name);
-}
-
-CamelIndexName *
-camel_index_add_name(CamelIndex *idx, const char *name)
-{
-	return CI_CLASS(idx)->add_name(idx, name);
-}
-
-int
-camel_index_write_name(CamelIndex *idx, CamelIndexName *idn)
-{
-	return CI_CLASS(idx)->write_name(idx, idn);
-}
-
-CamelIndexCursor *
-camel_index_find_name(CamelIndex *idx, const char *name)
-{
-	return CI_CLASS(idx)->find_name(idx, name);
-}
-
-void
-camel_index_delete_name(CamelIndex *idx, const char *name)
-{
-	return CI_CLASS(idx)->delete_name(idx, name);
-}
-
-CamelIndexCursor *
-camel_index_find(CamelIndex *idx, const char *word)
-{
-	char *b = (char *)word;
-	CamelIndexCursor *ret;
-
-	if (idx->normalise)
-		b = idx->normalise(idx, word, idx->normalise_data);
-
-	ret = CI_CLASS(idx)->find(idx, b);
-
-	if (b != word)
-		g_free(b);
-
-	return ret;
-}
-
-CamelIndexCursor *
-camel_index_words(CamelIndex *idx)
-{
-	return CI_CLASS(idx)->words(idx);
-}
-
-CamelIndexCursor *
-camel_index_names(CamelIndex *idx)
-{
-	return CI_CLASS(idx)->names(idx);
-}
-
-/* ********************************************************************** */
-/* CamelIndexName */
-/* ********************************************************************** */
-
-static CamelObjectClass *camel_index_name_parent;
-
-#define CIN_CLASS(o) ((CamelIndexNameClass *)(((CamelObject *)o)->klass))
-
-static void
-camel_index_name_class_init(CamelIndexNameClass *klass)
-{
-	camel_index_name_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));
-}
-
-static void
-camel_index_name_init(CamelIndexName *idn)
-{
-}
-
-static void
-camel_index_name_finalise(CamelIndexName *idn)
-{
-	if (idn->index)
-		camel_object_unref((CamelObject *)idn->index);
-}
-
-CamelType
-camel_index_name_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelIndexName",
-					   sizeof (CamelIndexName),
-					   sizeof (CamelIndexNameClass),
-					   (CamelObjectClassInitFunc) camel_index_name_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_index_name_init,
-					   (CamelObjectFinalizeFunc) camel_index_name_finalise);
-	}
-	
-	return type;
-}
-
-CamelIndexName *
-camel_index_name_new(CamelIndex *idx, const char *name)
-{
-	CamelIndexName *idn = (CamelIndexName *)camel_object_new(camel_index_name_get_type());
-
-	idn->index = idx;
-	camel_object_ref((CamelObject *)idx);
-
-	return idn;
-}
-
-void
-camel_index_name_add_word(CamelIndexName *idn, const char *word)
-{
-	char *b = (char *)word;
-
-	if (idn->index->normalise)
-		b = idn->index->normalise(idn->index, word, idn->index->normalise_data);
-
-	CIN_CLASS(idn)->add_word(idn, b);
-
-	if (b != word)
-		g_free(b);
-}
-
-size_t
-camel_index_name_add_buffer(CamelIndexName *idn, const char *buffer, size_t len)
-{
-	return CIN_CLASS(idn)->add_buffer(idn, buffer, len);
-}
-
-/* ********************************************************************** */
-/* CamelIndexCursor */
-/* ********************************************************************** */
-
-static CamelObjectClass *camel_index_cursor_parent;
-
-#define CIC_CLASS(o) ((CamelIndexCursorClass *)(((CamelObject *)o)->klass))
-
-static void
-camel_index_cursor_class_init(CamelIndexCursorClass *klass)
-{
-	camel_index_cursor_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));
-}
-
-static void
-camel_index_cursor_init(CamelIndexCursor *idc)
-{
-}
-
-static void
-camel_index_cursor_finalise(CamelIndexCursor *idc)
-{
-	if (idc->index)
-		camel_object_unref((CamelObject *)idc->index);
-}
-
-CamelType
-camel_index_cursor_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelIndexCursor",
-					   sizeof (CamelIndexCursor),
-					   sizeof (CamelIndexCursorClass),
-					   (CamelObjectClassInitFunc) camel_index_cursor_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_index_cursor_init,
-					   (CamelObjectFinalizeFunc) camel_index_cursor_finalise);
-	}
-	
-	return type;
-}
-
-CamelIndexCursor *
-camel_index_cursor_new(CamelIndex *idx, const char *name)
-{
-	CamelIndexCursor *idc = (CamelIndexCursor *)camel_object_new(camel_index_cursor_get_type());
-
-	idc->index = idx;
-	camel_object_ref((CamelObject *)idx);
-
-	return idc;
-}
-
-const char *
-camel_index_cursor_next(CamelIndexCursor *idc)
-{
-	return CIC_CLASS(idc)->next(idc);
-}
-
-void
-camel_index_cursor_reset(CamelIndexCursor *idc)
-{
-	return CIC_CLASS(idc)->reset(idc);
-}
-
diff --git a/camel/camel-index.h b/camel/camel-index.h
deleted file mode 100644
index 81b84c3d38..0000000000
--- a/camel/camel-index.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_INDEX_H
-#define _CAMEL_INDEX_H
-
-#include <camel/camel-exception.h>
-#include <camel/camel-object.h>
-
-#define CAMEL_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_index_get_type (), CamelIndex)
-#define CAMEL_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_get_type (), CamelIndexClass)
-#define CAMEL_IS_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_index_get_type ())
-
-typedef struct _CamelIndex      CamelIndex;
-typedef struct _CamelIndexClass CamelIndexClass;
-
-#define CAMEL_INDEX_NAME(obj)         CAMEL_CHECK_CAST (obj, camel_index_name_get_type (), CamelIndexName)
-#define CAMEL_INDEX_NAME_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_name_get_type (), CamelIndexNameClass)
-#define CAMEL_IS_INDEX_NAME(obj)      CAMEL_CHECK_TYPE (obj, camel_index_name_get_type ())
-
-typedef struct _CamelIndexName      CamelIndexName;
-typedef struct _CamelIndexNameClass CamelIndexNameClass;
-
-#define CAMEL_INDEX_CURSOR(obj)         CAMEL_CHECK_CAST (obj, camel_index_cursor_get_type (), CamelIndexCursor)
-#define CAMEL_INDEX_CURSOR_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_cursor_get_type (), CamelIndexCursorClass)
-#define CAMEL_IS_INDEX_CURSOR(obj)      CAMEL_CHECK_TYPE (obj, camel_index_cursor_get_type ())
-
-typedef struct _CamelIndexCursor      CamelIndexCursor;
-typedef struct _CamelIndexCursorClass CamelIndexCursorClass;
-
-typedef char * (*CamelIndexNorm)(CamelIndex *idx, const char *word, void *data);
-
-/* ********************************************************************** */
-
-struct _CamelIndexCursor {
-	CamelObject parent;
-
-	struct _CamelIndexCursorPrivate *priv;
-
-	CamelIndex *index;
-};
-
-struct _CamelIndexCursorClass {
-	CamelObjectClass parent;
-
-	const char * (*next) (CamelIndexCursor *idc);
-	void         (*reset) (CamelIndexCursor *idc);
-};
-
-CamelType	           camel_index_cursor_get_type(void);
-
-CamelIndexCursor  *camel_index_cursor_new(CamelIndex *idx, const char *name);
-
-const char        *camel_index_cursor_next(CamelIndexCursor *idc);
-void               camel_index_cursor_reset(CamelIndexCursor *idc);
-
-/* ********************************************************************** */
-
-struct _CamelIndexName {
-	CamelObject parent;
-
-	struct _CamelIndexNamePrivate *priv;
-
-	CamelIndex *index;
-
-	char *name;		/* name being indexed */
-
-	GByteArray *buffer;	/* used for normalisation */
-	GHashTable *words;	/* unique list of words */
-};
-
-struct _CamelIndexNameClass {
-	CamelObjectClass parent;
-
-	int (*sync)(CamelIndexName *name);
-	void (*add_word)(CamelIndexName *name, const char *word);
-	size_t (*add_buffer)(CamelIndexName *name, const char *buffer, size_t len);
-};
-
-CamelType	           camel_index_name_get_type	(void);
-
-CamelIndexName    *camel_index_name_new(CamelIndex *idx, const char *name);
-
-void               camel_index_name_add_word(CamelIndexName *name, const char *word);
-size_t             camel_index_name_add_buffer(CamelIndexName *name, const char *buffer, size_t len);
-
-/* ********************************************************************** */
-
-struct _CamelIndex {
-	CamelObject parent;
-
-	struct _CamelIndexPrivate *priv;
-
-	char *path;
-	guint32 version;
-	guint32 flags;
-
-	CamelIndexNorm normalise;
-	void *normalise_data;
-};
-
-struct _CamelIndexClass {
-	CamelObjectClass parent_class;
-
-	int			(*sync)(CamelIndex *idx);
-	int			(*compress)(CamelIndex *idx);
-
-	int			(*rename)(CamelIndex *idx, const char *path);
-
-	int 			(*has_name)(CamelIndex *idx, const char *name);
-	CamelIndexName *	(*add_name)(CamelIndex *idx, const char *name);
-	int			(*write_name)(CamelIndex *idx, CamelIndexName *idn);
-	CamelIndexCursor *	(*find_name)(CamelIndex *idx, const char *name);
-	void 			(*delete_name)(CamelIndex *idx, const char *name);
-	CamelIndexCursor * 	(*find)(CamelIndex *idx, const char *word);
-
-	CamelIndexCursor *      (*words)(CamelIndex *idx);
-	CamelIndexCursor *      (*names)(CamelIndex *idx);
-};
-
-CamelType	           camel_index_get_type	(void);
-
-CamelIndex        *camel_index_new(const char *path, int flags);
-void               camel_index_construct(CamelIndex *, const char *path, int flags);
-int		   camel_index_rename(CamelIndex *, const char *path);
-
-void               camel_index_set_normalise(CamelIndex *idx, CamelIndexNorm func, void *data);
-
-int                camel_index_sync(CamelIndex *idx);
-int                camel_index_compress(CamelIndex *idx);
-
-int                camel_index_has_name(CamelIndex *idx, const char *name);
-CamelIndexName    *camel_index_add_name(CamelIndex *idx, const char *name);
-int                camel_index_write_name(CamelIndex *idx, CamelIndexName *idn);
-CamelIndexCursor  *camel_index_find_name(CamelIndex *idx, const char *name);
-void               camel_index_delete_name(CamelIndex *idx, const char *name);
-CamelIndexCursor  *camel_index_find(CamelIndex *idx, const char *word);
-
-CamelIndexCursor  *camel_index_words(CamelIndex *idx);
-CamelIndexCursor  *camel_index_names(CamelIndex *idx);
-
-#endif /* ! _CAMEL_INDEX_H */
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
deleted file mode 100644
index 5b741c61ca..0000000000
--- a/camel/camel-internet-address.c
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <stdio.h>
-#include <string.h>
-
-#include "camel-mime-utils.h"
-#include "camel-internet-address.h"
-
-#define d(x)
-
-static int    internet_decode		(CamelAddress *, const char *raw);
-static char * internet_encode		(CamelAddress *);
-static int    internet_unformat		(CamelAddress *, const char *raw);
-static char * internet_format		(CamelAddress *);
-static int    internet_cat		(CamelAddress *dest, const CamelAddress *source);
-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->unformat = internet_unformat;
-	address->format = internet_format;
-	address->remove = internet_remove;
-	address->cat = internet_cat;
-}
-
-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;
-	int count = a->addresses->len;
-
-	/* 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 a->addresses->len - count;
-}
-
-static char *
-internet_encode	(CamelAddress *a)
-{
-	int i;
-	GString *out;
-	char *ret;
-	int len = 6;		/* "From: ", assume longer of the address headers */
-
-	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 *enc;
-
-		if (i != 0)
-			g_string_append(out, ", ");
-
-		enc = camel_internet_address_encode_address(&len, addr->name, addr->address);
-		g_string_append(out, enc);
-		g_free(enc);
-	}
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-	
-	return ret;
-}
-
-static int
-internet_unformat(CamelAddress *a, const char *raw)
-{
-	char *buffer, *p, *name, *addr;
-	int c;
-	int count = a->addresses->len;
-
-	if (raw == NULL)
-		return 0;
-
-	d(printf("unformatting address: %s\n", raw));
-
-	/* we copy, so we can modify as we go */
-	buffer = g_strdup(raw);
-
-	/* this can be simpler than decode, since there are much fewer rules */
-	p = buffer;
-	name = NULL;
-	addr = p;
-	do {
-		c = (unsigned char)*p++;
-		switch (c) {
-			/* removes quotes, they should only be around the total name anyway */
-		case '"':
-			p[-1] = ' ';
-			while (*p)
-				if (*p == '"') {
-					*p++ = ' ';
-					break;
-				} else {
-					p++;
-				}
-			break;
-		case '<':
-			if (name == NULL)
-				name = addr;
-			addr = p;
-			addr[-1] = 0;
-			while (*p && *p != '>')
-				p++;
-			if (*p == 0)
-				break;
-			p++;
-			/* falls through */
-		case ',':
-			p[-1] = 0;
-			/* falls through */
-		case 0:
-			if (name)
-				name = g_strstrip(name);
-			addr = g_strstrip(addr);
-			if (addr[0]) {
-				d(printf("found address: '%s' <%s>\n", name, addr));
-				camel_internet_address_add((CamelInternetAddress *)a, name, addr);
-			}
-			name = NULL;
-			addr = p;
-			break;
-		}
-	} while (c);
-
-	g_free(buffer);
-
-	return a->addresses->len - count;
-}
-
-static char *
-internet_format	(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 *enc;
-
-		if (i != 0)
-			g_string_append(out, ", ");
-
-		enc = camel_internet_address_format_address(addr->name, addr->address);
-		g_string_append(out, enc);
-		g_free(enc);
-	}
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-	
-	return ret;
-}
-
-static int
-internet_cat (CamelAddress *dest, const CamelAddress *source)
-{
-	int i;
-
-	g_assert(CAMEL_IS_INTERNET_ADDRESS(source));
-
-	for (i=0;i<source->addresses->len;i++) {
-		struct _address *addr = g_ptr_array_index(source->addresses, i);
-		camel_internet_address_add((CamelInternetAddress *)dest, addr->name, addr->address);
-	}
-
-	return i;
-}
-
-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(CAMEL_IS_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(CAMEL_IS_INTERNET_ADDRESS(a));
-
-	if (index < 0 || 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(CAMEL_IS_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(CAMEL_IS_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;
-}
-
-/**
- * camel_internet_address_encode_address:
- * @len: The encoded length so far, of this line
- * @name: 
- * @addr: 
- * 
- * Encode a single address ready for internet usage.  Header folding
- * as per rfc 822 is also performed, based on the length in len.
- * 
- * Return value: The encoded address.
- **/
-char *
-camel_internet_address_encode_address(int *inlen, const char *real, const char *addr)
-{
-	char *name = header_encode_phrase(real);
-	char *ret = NULL, *addra = NULL;
-	int len = *inlen;
-	GString *out = g_string_new("");
-
-	g_assert(addr);
-
-	if (name && name[0]) {
-		if (strlen(name) + len > CAMEL_FOLD_SIZE) {
-			char *folded = header_address_fold(name, len);
-			char *last;
-			g_string_append(out, folded);
-			g_free(folded);
-			last = strrchr(out->str, '\n');
-			if (last)
-				len = last-(out->str+out->len);
-			else
-				len = out->len;
-		} else {
-			g_string_append(out, name);
-			len += strlen(name);
-		}
-		addr = addra = g_strdup_printf(" <%s>", addr);
-	}
-
-	/* NOTE: Strictly speaking, we could and should split the
-	 * internal address up if we need to, on atom or specials
-	 * boundaries - however, to aid interoperability with mailers
-	 * that will probably not handle this case, we will just move
-	 * the whole address to its own line */
-	if (strlen(addr) + len > CAMEL_FOLD_SIZE) {
-		g_string_append(out, "\n\t");
-		g_string_append(out, addr);
-		len = strlen(addr)+1;
-	} else {
-		g_string_append(out, addr);
-		len += strlen(addr);
-	}
-
-	*inlen = len;
-#if 0
-	if (name && name[0])
-		ret = g_strdup_printf("%s <%s>", name, addr);
-	else
-		ret = g_strdup_printf("%s", addr);
-#endif
-	g_free(name);
-	g_free(addra);
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-
-	return ret;
-}
-
-/**
- * camel_internet_address_format_address:
- * @name: A name, quotes may be stripped from it.
- * @addr: Assumes a valid rfc822 email address.
- * 
- * Function to format a single address, suitable for display.
- * 
- * Return value: 
- **/
-char *
-camel_internet_address_format_address(const char *name, const char *addr)
-{
-	char *ret = NULL;
-
-	g_assert(addr);
-
-	if (name && name[0]) {
-		const char *p = name;
-		char *o, c;
-
-		while ((c = *p++)) {
-			if (c == '\"' || c == ',') {
-				o = ret = g_malloc(strlen(name)+3+strlen(addr)+3 + 1);
-				p = name;
-				*o++ = '\"';
-				while ((c = *p++))
-					if (c != '\"')
-						*o++ = c;
-				*o++ = '\"';
-				sprintf(o, " <%s>", addr);
-				d(printf("encoded '%s' => '%s'\n", name, ret));
-				return ret;
-			}
-		}
-		ret = g_strdup_printf("%s <%s>", name, addr);
-	} else
-		ret = g_strdup(addr);
-
-	return ret;
-}
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
deleted file mode 100644
index 9bfa0f44c2..0000000000
--- a/camel/camel-internet-address.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_INTERNET_ADDRESS_H
-#define _CAMEL_INTERNET_ADDRESS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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 CAMEL_IS_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;
-};
-
-CamelType		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 **);
-
-/* utility functions, for network/display formatting */
-char *			camel_internet_address_encode_address(int *len, const char *name, const char *addr);
-char *			camel_internet_address_format_address(const char *real, const char *addr);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
deleted file mode 100644
index fbbed82192..0000000000
--- a/camel/camel-lock-client.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <stdlib.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#include "camel-exception.h"
-#include "camel-lock-helper.h"
-#include "camel-lock-client.h"
-
-#define d(x)
-
-/* dunno where this fucking thing is got from */
-/* see also camel-lock.c */
-#define _(x) (x)
-
-#ifdef ENABLE_THREADS
-static pthread_mutex_t lock_lock = PTHREAD_MUTEX_INITIALIZER;
-#define LOCK() pthread_mutex_lock(&lock_lock)
-#define UNLOCK() pthread_mutex_unlock(&lock_lock)
-#else
-#define LOCK()
-#define UNLOCK()
-#endif
-
-static int lock_sequence;
-static int lock_helper_pid = -1;
-static int lock_stdin_pipe[2], lock_stdout_pipe[2];
-
-static int read_n(int fd, void *buffer, int inlen)
-{
-	char *p = buffer;
-	int len, left = inlen;
-
-	do {
-		len = read(fd, p, left);
-		if (len == -1) {
-			if (errno != EINTR)
-				return -1;
-		} else {
-			left -= len;
-			p += len;
-		}
-	} while (left > 0 && len != 0);
-
-	return inlen - left;
-}
-
-static int write_n(int fd, void *buffer, int inlen)
-{
-	char *p = buffer;
-	int len, left = inlen;
-
-	do {
-		len = write(fd, p, left);
-		if (len == -1) {
-			if (errno != EINTR)
-				return -1;
-		} else {
-			left -= len;
-			p += len;
-		}
-	} while (left > 0);
-
-	return inlen;
-}
-
-static int camel_lock_helper_init(CamelException *ex)
-{
-	int i;
-
-	if (pipe(lock_stdin_pipe) == -1
-	    || pipe(lock_stdout_pipe) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot build locking helper pipe: %s"),
-				     strerror(errno));
-		return -1;
-	}
-
-	lock_helper_pid = fork();
-	switch(lock_helper_pid) {
-	case -1:
-		close(lock_stdin_pipe[0]);
-		close(lock_stdin_pipe[1]);
-		close(lock_stdout_pipe[0]);
-		close(lock_stdout_pipe[1]);
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot fork locking helper: %s"),
-				     strerror(errno));
-		return -1;
-	case 0:
-		close(STDIN_FILENO);
-		dup(lock_stdin_pipe[0]);
-		close(STDOUT_FILENO);
-		dup(lock_stdout_pipe[1]);
-		close(lock_stdin_pipe[0]);
-		close(lock_stdin_pipe[1]);
-		close(lock_stdout_pipe[0]);
-		close(lock_stdout_pipe[1]);
-		for (i=3;i<255;i++)
-			     close(i);
-		execl(CAMEL_SBINDIR "/camel-lock-helper", "camel-lock-helper", NULL);
-		d(fprintf(stderr, "shit, couldn't exec lock helper!\n"));
-		/* it'll pick this up when it tries to use us */
-		exit(255);
-	default:
-		close(lock_stdin_pipe[0]);
-		close(lock_stdout_pipe[1]);
-
-		/* so the child knows when we vanish */
-		fcntl(lock_stdin_pipe[1], F_SETFD, FD_CLOEXEC);
-		fcntl(lock_stdout_pipe[0], F_SETFD, FD_CLOEXEC);
-	}
-
-	return 0;
-}
-
-int camel_lock_helper_lock(const char *path, CamelException *ex)
-{
-	struct _CamelLockHelperMsg *msg;
-	int len = strlen(path);
-	int res = -1;
-	int retry = 3;
-
-	LOCK();
-
-	if (lock_helper_pid == -1) {
-		if (camel_lock_helper_init(ex) == -1) {
-			UNLOCK();
-			return -1;
-		}
-	}
-
-	msg = alloca(len + sizeof(*msg));
-again:
-	msg->magic = CAMEL_LOCK_HELPER_MAGIC;
-	msg->seq = lock_sequence;
-	msg->id = CAMEL_LOCK_HELPER_LOCK;
-	msg->data = len;
-	memcpy(msg+1, path, len);
-
-	write_n(lock_stdin_pipe[1], msg, len+sizeof(*msg));
-
-	do {
-		/* should also have a timeout here?  cancellation? */
-		len = read_n(lock_stdout_pipe[0], msg, sizeof(*msg));
-		if (len == 0) {
-			/* child quit, do we try ressurect it? */
-			res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-			/* if the child exited, this should get it, waidpid returns 0 if the child hasn't */
-			if (waitpid(lock_helper_pid, NULL, WNOHANG) > 0) {
-				lock_helper_pid = -1;
-				close(lock_stdout_pipe[0]);
-				close(lock_stdin_pipe[1]);
-				lock_stdout_pipe[0] = -1;
-				lock_stdin_pipe[1] = -1;
-			}
-			goto fail;
-		}
-
-		if (msg->magic != CAMEL_LOCK_HELPER_RETURN_MAGIC
-		    || msg->seq > lock_sequence) {
-			res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-			d(printf("lock child protocol error\n"));
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not lock '%s': protocol error with lock-helper"), path);
-			goto fail;
-		}
-	} while (msg->seq < lock_sequence);
-
-	if (msg->seq == lock_sequence) {
-		switch(msg->id) {
-		case CAMEL_LOCK_HELPER_STATUS_OK:
-			d(printf("lock child locked ok, id is %d\n", msg->data));
-			res = msg->data;
-			break;
-		default:
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not lock '%s'"), path);
-			d(printf("locking failed ! status = %d\n", msg->id));
-			break;
-		}
-	} else if (retry > 0) {
-		d(printf("sequence failure, lost message? retry?\n"));
-		retry--;
-		goto again;
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not lock '%s': protocol error with lock-helper"), path);
-	}
-
-fail:
-	lock_sequence++;
-
-	UNLOCK();
-
-	return res;
-}
-
-int camel_lock_helper_unlock(int lockid)
-{
-	struct _CamelLockHelperMsg *msg;
-	int res = -1;
-	int retry = 3;
-	int len;
-
-	d(printf("unlocking lock id %d\n", lockid));
-
-	LOCK();
-
-	/* impossible to unlock if we haven't locked yet */
-	if (lock_helper_pid == -1) {
-		UNLOCK();
-		return -1;
-	}
-
-	msg = alloca(sizeof(*msg));
-again:
-	msg->magic = CAMEL_LOCK_HELPER_MAGIC;
-	msg->seq = lock_sequence;
-	msg->id = CAMEL_LOCK_HELPER_UNLOCK;
-	msg->data = lockid;
-
-	write_n(lock_stdin_pipe[1], msg, sizeof(*msg));
-
-	do {
-		/* should also have a timeout here?  cancellation? */
-		len = read_n(lock_stdout_pipe[0], msg, sizeof(*msg));
-		if (len == 0) {
-			/* child quit, do we try ressurect it? */
-			res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-			if (waitpid(lock_helper_pid, NULL, WNOHANG) > 0) {
-				lock_helper_pid = -1;
-				close(lock_stdout_pipe[0]);
-				close(lock_stdin_pipe[1]);
-				lock_stdout_pipe[0] = -1;
-				lock_stdin_pipe[1] = -1;
-			}
-			goto fail;
-		}
-
-		if (msg->magic != CAMEL_LOCK_HELPER_RETURN_MAGIC
-		    || msg->seq > lock_sequence) {
-			goto fail;
-		}
-	} while (msg->seq < lock_sequence);
-
-	if (msg->seq == lock_sequence) {
-		switch(msg->id) {
-		case CAMEL_LOCK_HELPER_STATUS_OK:
-			d(printf("lock child unlocked ok\n"));
-			res = 0;
-			break;
-		default:
-			d(printf("locking failed ! \n"));
-			break;
-		}
-	} else if (retry > 0) {
-		d(printf("sequence failure, lost message? retry?\n"));
-		lock_sequence++;
-		retry--;
-		goto again;
-	}
-
-fail:
-	lock_sequence++;
-
-	UNLOCK();
-
-	return res;
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	int id1, id2;
-
-	d(printf("locking started\n"));
-	camel_lock_helper_init();
-
-	id1 = camel_lock_helper_lock("1 path 1");
-	if (id1 != -1) {
-		d(printf("lock ok, unlock\n"));
-		camel_lock_helper_unlock(id1);
-	}
-
-	id1 = camel_lock_helper_lock("2 path 1");
-	id2 = camel_lock_helper_lock("2 path 2");
-	camel_lock_helper_unlock(id2);
-	camel_lock_helper_unlock(id1);
-
-	id1 = camel_lock_helper_lock("3 path 1");
-	id2 = camel_lock_helper_lock("3 path 2");
-	camel_lock_helper_unlock(id1);
-}
-#endif
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
deleted file mode 100644
index fc45e1d127..0000000000
--- a/camel/camel-lock-client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 2001 Ximian Inc (www.ximian.com/)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/* defines protocol for lock helper process ipc */
-
-#ifndef _CAMEL_LOCK_CLIENT_H
-#define _CAMEL_LOCK_CLIENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-exception.h>
-
-int camel_lock_helper_lock(const char *path , CamelException *ex);
-int camel_lock_helper_unlock(int lockid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* !_CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c
deleted file mode 100644
index 9e5dc012a3..0000000000
--- a/camel/camel-lock-helper.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/* lock helper process */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <errno.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <signal.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <utime.h>
-
-#include <time.h>
-
-#include <string.h>
-
-#define SETEUID_SAVES (1)
-
-/* we try and include as little as possible */
-
-#include "camel-lock-helper.h"
-#include "camel-lock.h"
-
-#define d(x)
-
-/* keeps track of open locks */
-struct _lock_info {
-	struct _lock_info *next;
-	uid_t uid;
-	int id;
-	int depth;
-	time_t stamp;		/* when last updated */
-	char path[1];
-};
-
-static int lock_id = 0;
-static struct _lock_info *lock_info_list;
-static uid_t lock_root_uid = -1;
-static uid_t lock_real_uid = -1;
-
-/* utility functions */
-
-static int read_n(int fd, void *buffer, int inlen)
-{
-	char *p = buffer;
-	int len, left = inlen;
-
-	do {
-		len = read(fd, p, left);
-		if (len == -1) {
-			if (errno != EINTR)
-				return -1;
-		} else {
-			left -= len;
-			p += len;
-		}
-	} while (left > 0 && len != 0);
-
-	return inlen - left;
-}
-
-static int write_n(int fd, void *buffer, int inlen)
-{
-	char *p = buffer;
-	int len, left = inlen;
-
-	do {
-		len = write(fd, p, left);
-		if (len == -1) {
-			if (errno != EINTR)
-				return -1;
-		} else {
-			left -= len;
-			p += len;
-		}
-	} while (left > 0);
-
-	return inlen;
-}
-
-void
-camel_exception_setv (CamelException *ex, ExceptionId id, const char *format, ...)
-{
-	;
-}
-
-void
-camel_exception_clear (CamelException *exception)
-{
-	;
-}
-
-char *gettext (const char *msgid);
-
-char *
-gettext (const char *msgid)
-{
-	return NULL;
-}
-
-static int lock_path(const char *path, guint32 *lockid)
-{
-	struct _lock_info *info = NULL;
-	int res = CAMEL_LOCK_HELPER_STATUS_OK;
-	struct stat st;
-
-	d(fprintf(stderr, "locking path '%s' id = %d\n", path, lock_id));
-
-	/* check to see if we have it locked already, make the lock 'recursive' */
-	/* we could also error i suppose, but why bother */
-	info = lock_info_list;
-	while (info) {
-		if (!strcmp(info->path, path)) {
-			info->depth++;
-			return CAMEL_LOCK_HELPER_STATUS_OK;
-		}
-		info = info->next;
-	}
-
-	/* check we are allowed to lock it, we must own it, be able to write to it, and it has to exist */
-	if (stat(path, &st) == -1
-	    || st.st_uid != getuid()
-	    || !S_ISREG(st.st_mode)
-	    || (st.st_mode & 0400) == 0) {
-		return CAMEL_LOCK_HELPER_STATUS_INVALID;
-	}
-
-	info = malloc(sizeof(*info) + strlen(path));
-	if (info == NULL) {
-		res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
-		goto fail;
-	}
-
-	/* we try the real uid first, and if that fails, try the 'root id' */
-	if (camel_lock_dot(path, NULL) == -1) {
-#ifdef SETEUID_SAVES
-		if (lock_real_uid != lock_root_uid) {
-			if (seteuid(lock_root_uid) != -1) {
-				if (camel_lock_dot(path, NULL) == -1) {
-					seteuid(lock_real_uid);
-					res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;
-					goto fail;
-				}
-				seteuid(lock_real_uid);
-			} else {
-				res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;
-				goto fail;
-			}
-		} else {
-			res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;
-			goto fail;
-		}
-#else
-		res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;
-		goto fail;
-#endif
-	} else {
-		info->uid = lock_real_uid;
-	}
-
-	strcpy(info->path, path);
-	info->id = lock_id;
-	info->depth = 1;
-	info->next = lock_info_list;
-	info->stamp = time(0);
-	lock_info_list = info;
-
-	if (lockid)
-		*lockid = lock_id;
-
-	lock_id++;
-
-	d(fprintf(stderr, "lock ok\n"));
-
-	return res;
-fail:
-	d(fprintf(stderr, "lock failed\n"));
-
-	if (info)
-		free(info);
-
-	return res;
-}
-
-static int unlock_id(guint32 lockid)
-{
-	struct _lock_info *info, *p;
-
-	d(fprintf(stderr, "unlocking id '%d'\n", lockid));
-
-	p = (struct _lock_info *)&lock_info_list;
-	info = p->next;
-	while (info) {
-		if (info->id == lockid) {
-			d(fprintf(stderr, "found id %d path '%s'\n", lockid, info->path));
-			info->depth--;
-			if (info->depth <= 0) {
-#ifdef SETEUID_SAVES
-				if (info->uid != lock_real_uid) {
-					seteuid(lock_root_uid);
-					camel_unlock_dot(info->path);
-					seteuid(lock_real_uid);
-				} else
-#endif
-					camel_unlock_dot(info->path);
-
-				p->next = info->next;
-				free(info);
-			}
-
-			return CAMEL_LOCK_HELPER_STATUS_OK;
-		}
-		p = info;
-		info = info->next;
-	}
-
-	d(fprintf(stderr, "unknown id asked to be unlocked %d\n", lockid));
-	return CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-}
-
-static void lock_touch(const char *path)
-{
-	char *name;
-
-	/* we could also check that we haven't had our lock stolen from us here */
-
-	name = alloca(strlen(path) + 10);
-	sprintf(name, "%s.lock", path);
-
-	d(fprintf(stderr, "Updating lock %s\n", name));
-	utime(name, NULL);
-}
-
-static void setup_process(void)
-{
-	struct sigaction sa;
-	sigset_t sigset;
-	
-	/* ignore sigint/sigio */
-	sa.sa_handler = SIG_IGN;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = 0;
-	
-	sigemptyset(&sigset);
-	sigaddset(&sigset, SIGIO);
-	sigaddset(&sigset, SIGINT);
-	sigprocmask(SIG_UNBLOCK, &sigset, NULL);
-	
-	sigaction (SIGIO, &sa, NULL);
-	sigaction (SIGINT, &sa, NULL);
-	
-	/* FIXME: add more sanity checks/setup here */
-
-#ifdef SETEUID_SAVES
-	/* here we change to the real user id, this is probably not particularly
-	   portable so may need configure checks */
-	lock_real_uid = getuid();
-	lock_root_uid = geteuid();
-	if (lock_real_uid != lock_root_uid)
-		seteuid(lock_real_uid);
-#endif
-}
-
-int main(int argc, char **argv)
-{
-	struct _CamelLockHelperMsg msg;
-	int len;
-	int res;
-	char *path;
-	fd_set rset;
-	struct timeval tv;
-	struct _lock_info *info;
-
-	setup_process();
-
-	do {
-		/* do a poll/etc, so we can refresh the .locks as required ... */
-		FD_ZERO(&rset);
-		FD_SET(STDIN_FILENO, &rset);
-
-		/* check the minimum timeout we need to refresh the next oldest lock */
-		if (lock_info_list) {
-			time_t now = time(0);
-			time_t left;
-			time_t delay = CAMEL_DOT_LOCK_REFRESH;
-
-			info = lock_info_list;
-			while (info) {
-				left = CAMEL_DOT_LOCK_REFRESH - (now - info->stamp);
-				left = MAX(left, 0);
-				delay = MIN(left, delay);
-				info = info->next;
-			}
-
-			tv.tv_sec = delay;
-			tv.tv_usec = 0;
-		}
-		
-		d(fprintf(stderr, "lock helper waiting for input\n"));
-		if (select(STDIN_FILENO+1, &rset, NULL, NULL, lock_info_list?&tv:NULL) == -1) {
-			if (errno == EINTR)
-				break;
-
-			continue;
-		}
-
-		/* did we get a timeout?  scan for any locks that need updating */
-		if (!FD_ISSET(STDIN_FILENO, &rset)) {
-			time_t now = time(0);
-			time_t left;
-
-			d(fprintf(stderr, "Got a timeout, checking locks\n"));
-
-			info = lock_info_list;
-			while (info) {
-				left = (now - info->stamp);
-				if (left >= CAMEL_DOT_LOCK_REFRESH) {
-					lock_touch(info->path);
-					info->stamp = now;
-				}
-				info = info->next;
-			}
-			
-			continue;
-		}
-
-
-		len = read_n(STDIN_FILENO, &msg, sizeof(msg));
-		if (len == 0)
-			break;
-
-		res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-		if (len == sizeof(msg) && msg.magic == CAMEL_LOCK_HELPER_MAGIC) {
-			switch(msg.id) {
-			case CAMEL_LOCK_HELPER_LOCK:
-				res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
-				path = malloc(msg.data+1);
-				if (path != NULL) {
-					res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-					len = read_n(STDIN_FILENO, path, msg.data);
-					if (len == msg.data) {
-						path[len] = 0;
-						res = lock_path(path, &msg.data);
-					}
-					free(path);
-				}
-				break;
-			case CAMEL_LOCK_HELPER_UNLOCK:
-				res = unlock_id(msg.data);
-				break;
-			}
-		}
-		d(fprintf(stderr, "returning result %d\n", res));
-		msg.id = res;
-		msg.magic = CAMEL_LOCK_HELPER_RETURN_MAGIC;
-		write_n(STDOUT_FILENO, &msg, sizeof(msg));
-	} while (1);
-
-	d(fprintf(stderr, "parent exited, clsoing down remaining id's\n"));
-	while (lock_info_list)
-		unlock_id(lock_info_list->id);
-
-	return 0;
-}
diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
deleted file mode 100644
index c61a097642..0000000000
--- a/camel/camel-lock-helper.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999 Ximian (www.ximian.com/).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/* defines protocol for lock helper process ipc */
-
-#ifndef _CAMEL_LOCK_HELPER_H
-#define _CAMEL_LOCK_HELPER_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-struct _CamelLockHelperMsg {
-	guint32 magic;
-	guint32 seq;
-	guint32 id;
-	guint32 data;
-};
-
-/* magic values */
-enum {
-	CAMEL_LOCK_HELPER_MAGIC = 0xABADF00D,
-	CAMEL_LOCK_HELPER_RETURN_MAGIC = 0xDEADBEEF
-};
-
-/* return status */
-enum {
-	CAMEL_LOCK_HELPER_STATUS_OK = 0,
-	CAMEL_LOCK_HELPER_STATUS_PROTOCOL,
-	CAMEL_LOCK_HELPER_STATUS_NOMEM,
-	CAMEL_LOCK_HELPER_STATUS_SYSTEM,
-	CAMEL_LOCK_HELPER_STATUS_INVALID, /* not allowed to lock/doesn't exist etc */
-};
-
-/* commands */
-enum {
-	CAMEL_LOCK_HELPER_LOCK = 0xf0f,
-	CAMEL_LOCK_HELPER_UNLOCK = 0xf0f0,
-};
-
-/* seconds between lock refreshes */
-#define CAMEL_DOT_LOCK_REFRESH (30)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* !_CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
deleted file mode 100644
index 8faae9f2aa..0000000000
--- a/camel/camel-lock.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999 Ximian (www.ximian.com/).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <time.h>
-
-#ifdef USE_DOT
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
-#ifdef USE_FCNTL
-#include <unistd.h>
-#include <fcntl.h>
-#endif
-
-#ifdef USE_FLOCK
-#include <sys/file.h>
-#endif
-
-#include "camel-lock.h"
-
-/* dunno where this fucking thing is got from */
-#define _(x) (x)
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-/**
- * camel_lock_dot:
- * @path: 
- * @ex: 
- * 
- * Create an exclusive lock using .lock semantics.
- * All locks are equivalent to write locks (exclusive).
- * 
- * Return value: -1 on error, sets @ex appropriately.
- **/
-int
-camel_lock_dot(const char *path, CamelException *ex)
-{
-#ifdef USE_DOT
-	char *locktmp, *lock;
-	int retry = 0;
-	int fdtmp;
-	struct stat st;
-
-	/* TODO: Is there a reliable way to refresh the lock, if we're still busy with it?
-	   Does it matter?  We will normally also use fcntl too ... */
-
-	/* use alloca, save cleaning up afterwards */
-	lock = alloca(strlen(path) + strlen(".lock") + 1);
-	sprintf(lock, "%s.lock", path);
-	locktmp = alloca(strlen(path) + strlen("XXXXXX") + 1);
-
-#ifndef HAVE_MKSTEMP
-	sprintf(locktmp, "%sXXXXXX", path);
-	if (mktemp(locktmp) == NULL) {
-		/* well, this is really only a programatic error */
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create lock file for %s: %s"), path, strerror(errno));
-		return -1;
-	}
-#endif
-
-	while (retry < CAMEL_LOCK_DOT_RETRY) {
-
-		d(printf("trying to lock '%s', attempt %d\n", lock, retry));
-
-		if (retry > 0)
-			sleep(CAMEL_LOCK_DOT_DELAY);
-
-#ifdef HAVE_MKSTEMP
-		sprintf(locktmp, "%sXXXXXX", path);
-		fdtmp = mkstemp(locktmp);
-#else
-		fdtmp = open(locktmp, O_RDWR|O_CREAT|O_EXCL, 0600);
-#endif
-		if (fdtmp == -1) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create lock file for %s: %s"), path, strerror(errno));
-			return -1;
-		}
-		close(fdtmp);
-
-		/* apparently return code from link can be unreliable for nfs (see link(2)), so we ignore it */
-		link(locktmp, lock);
-
-		/* but we check stat instead (again, see link(2)) */
-		if (stat(locktmp, &st) == -1) {
-			d(printf("Out lock file %s vanished!?\n", locktmp));
-
-			/* well that was unexpected, try cleanup/retry */
-			unlink(locktmp);
-			unlink(lock);
-		} else {
-			d(printf("tmp lock created, link count is %d\n", st.st_nlink));
-
-			unlink(locktmp);
-
-			/* if we had 2 links, we have created the .lock, return ok, otherwise we need to keep trying */
-			if (st.st_nlink == 2)
-				return 0;
-		}
-
-		/* check for stale lock, kill it */
-		if (stat(lock, &st) == 0) {
-			time_t now = time(0);
-			(printf("There is an existing lock %ld seconds old\n", now-st.st_ctime));
-			if (st.st_ctime < now - CAMEL_LOCK_DOT_STALE) {
-				d(printf("Removing it now\n"));
-				unlink(lock);
-			}
-		}
-
-		retry++;
-	}
-
-	d(printf("failed to get lock after %d retries\n", retry));
-
-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Timed out trying to get lock file on %s. Try again later."), path);
-	return -1;
-#else /* ! USE_DOT */
-	return 0;
-#endif
-}
-
-/**
- * camel_unlock_dot:
- * @path: 
- * 
- * Attempt to unlock a .lock lock.
- **/
-void
-camel_unlock_dot(const char *path)
-{
-#ifdef USE_DOT
-	char *lock;
-
-	lock = alloca(strlen(path) + strlen(".lock") + 1);
-	sprintf(lock, "%s.lock", path);
-	d(printf("unlocking %s\n", lock));
-	(void)unlink(lock);
-#endif
-}
-
-/**
- * camel_lock_fcntl:
- * @fd: 
- * @type: 
- * @ex: 
- * 
- * Create a lock using fcntl(2).
- *
- * @type is CAMEL_LOCK_WRITE or CAMEL_LOCK_READ,
- * to create exclusive or shared read locks
- * 
- * Return value: -1 on error.
- **/
-int
-camel_lock_fcntl(int fd, CamelLockType type, CamelException *ex)
-{
-#ifdef USE_FCNTL
-	struct flock lock;
-
-	d(printf("fcntl locking %d\n", fd));
-
-	memset(&lock, 0, sizeof(lock));
-	lock.l_type = type==CAMEL_LOCK_READ?F_RDLCK:F_WRLCK;
-	if (fcntl(fd, F_SETLK, &lock) == -1) {
-		/* If we get a 'locking not vailable' type error,
-		   we assume the filesystem doesn't support fcntl() locking */
-		/* this is somewhat system-dependent */
-		if (errno != EINVAL && errno != ENOLCK) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to get lock using fcntl(2): %s"),
-					     strerror(errno));
-			return -1;
-		} else {
-			static int failed = 0;
-
-			if (failed == 0)
-				fprintf(stderr, "fcntl(2) locking appears not to work on this filesystem");
-			failed++;
-		}
-	}
-#endif
-	return 0;
-}
-
-/**
- * camel_unlock_fcntl:
- * @fd: 
- * 
- * Unlock an fcntl lock.
- **/
-void
-camel_unlock_fcntl(int fd)
-{
-#ifdef USE_FCNTL
-	struct flock lock;
-
-	d(printf("fcntl unlocking %d\n", fd));
-
-	memset(&lock, 0, sizeof(lock));
-	lock.l_type = F_UNLCK;
-	fcntl(fd, F_SETLK, &lock);
-#endif
-}
-
-/**
- * camel_lock_flock:
- * @fd: 
- * @type: 
- * @ex: 
- * 
- * Create a lock using flock(2).
- * 
- * @type is CAMEL_LOCK_WRITE or CAMEL_LOCK_READ,
- * to create exclusive or shared read locks
- *
- * Return value: -1 on error.
- **/
-int
-camel_lock_flock(int fd, CamelLockType type, CamelException *ex)
-{
-#ifdef USE_FLOCK
-	int op;
-
-	d(printf("flock locking %d\n", fd));
-
-	if (type == CAMEL_LOCK_READ)
-		op = LOCK_SH|LOCK_NB;
-	else
-		op = LOCK_EX|LOCK_NB;
-
-	if (flock(fd, op) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to get lock using flock(2): %s"), strerror(errno));
-		return -1;
-	}
-#endif
-	return 0;
-}
-
-/**
- * camel_unlock_flock:
- * @fd: 
- * 
- * Unlock an flock lock.
- **/
-void
-camel_unlock_flock(int fd)
-{
-#ifdef USE_FLOCK
-	d(printf("flock unlocking %d\n", fd));
-
-	(void)flock(fd, LOCK_UN);
-#endif
-}
-
-/**
- * camel_lock_folder:
- * @path: Path to the file to lock (used for .locking only).
- * @fd: Open file descriptor of the right type to lock.
- * @type: Type of lock, CAMEL_LOCK_READ or CAMEL_LOCK_WRITE.
- * @ex: 
- * 
- * Attempt to lock a folder, multiple attempts will be made using all
- * locking strategies available.
- * 
- * Return value: -1 on error, @ex will describe the locking system that failed.
- **/
-int
-camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex)
-{
-	int retry = 0;
-
-	while (retry < CAMEL_LOCK_RETRY) {
-		if (retry > 0)
-			sleep(CAMEL_LOCK_DELAY);
-
-		camel_exception_clear(ex);
-
-		if (camel_lock_fcntl(fd, type, ex) == 0) {
-			if (camel_lock_flock(fd, type, ex) == 0) {
-				if (camel_lock_dot(path, ex) == 0)
-					return 0;
-				camel_unlock_flock(fd);
-			}
-			camel_unlock_fcntl(fd);
-		}
-		retry++;
-	}
-
-	return -1;
-}
-
-/**
- * camel_unlock_folder:
- * @path: Filename of folder.
- * @fd: Open descrptor on which locks were placed.
- * 
- * Free a lock on a folder.
- **/
-void
-camel_unlock_folder(const char *path, int fd)
-{
-	camel_unlock_dot(path);
-	camel_unlock_flock(fd);
-	camel_unlock_fcntl(fd);
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	CamelException *ex;
-	int fd1, fd2;
-
-	ex = camel_exception_new();
-
-#if 0
-	if (camel_lock_dot("mylock", ex) == 0) {
-		if (camel_lock_dot("mylock", ex) == 0) {
-			printf("Got lock twice?\n");
-		} else {
-			printf("failed to get lock 2: %s\n", camel_exception_get_description(ex));
-		}
-		camel_unlock_dot("mylock");
-	} else {
-		printf("failed to get lock 1: %s\n", camel_exception_get_description(ex));
-	}
-
-	camel_exception_clear(ex);
-#endif
-
-	fd1 = open("mylock", O_RDWR);
-	fd2 = open("mylock", O_RDWR);
-
-	if (camel_lock_fcntl(fd1, CAMEL_LOCK_WRITE, ex) == 0) {
-		printf("got fcntl write lock once\n");
-		sleep(5);
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_WRITE, ex) == 0) {
-			printf("got fcntl write lock twice!\n");
-		} else {
-			printf("failed to get write lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_READ, ex) == 0) {
-			printf("got fcntl read lock as well?\n");
-			camel_unlock_fcntl(fd2);
-		} else {
-			printf("failed to get read lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-		camel_unlock_fcntl(fd1);
-	} else {
-		printf("failed to get write lock at all: %s\n", camel_exception_get_description(ex));
-	}
-
-	if (camel_lock_fcntl(fd1, CAMEL_LOCK_READ, ex) == 0) {
-		printf("got fcntl read lock once\n");
-		sleep(5);
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_WRITE, ex) == 0) {
-			printf("got fcntl write lock too?!\n");
-		} else {
-			printf("failed to get write lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_READ, ex) == 0) {
-			printf("got fcntl read lock twice\n");
-			camel_unlock_fcntl(fd2);
-		} else {
-			printf("failed to get read lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-		camel_unlock_fcntl(fd1);
-	}
-
-	close(fd1);
-	close(fd2);
-
-	return 0;
-}
-#endif
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
deleted file mode 100644
index d54f7ed071..0000000000
--- a/camel/camel-lock.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999 Ximian (www.ximian.com/).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_LOCK_H
-#define _CAMEL_LOCK_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-exception.h>
-
-/* for .lock locking, retry, delay and stale counts */
-#define CAMEL_LOCK_DOT_RETRY (5) /* number of times to retry lock */
-#define CAMEL_LOCK_DOT_DELAY (2) /* delay between locking retries */
-#define CAMEL_LOCK_DOT_STALE (60) /* seconds before a lock becomes stale */
-
-/* for locking folders, retry/interretry delay */
-#define CAMEL_LOCK_RETRY (5) /* number of times to retry lock */
-#define CAMEL_LOCK_DELAY (2) /* delay between locking retries */
-
-typedef enum {
-	CAMEL_LOCK_READ,
-	CAMEL_LOCK_WRITE,
-} CamelLockType;
-
-/* specific locking strategies */
-int camel_lock_dot(const char *path, CamelException *ex);
-int camel_lock_fcntl(int fd, CamelLockType type, CamelException *ex);
-int camel_lock_flock(int fd, CamelLockType type, CamelException *ex);
-
-void camel_unlock_dot(const char *path);
-void camel_unlock_fcntl(int fd);
-void camel_unlock_flock(int fd);
-
-/* lock a folder in a standard way */
-int camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex);
-void camel_unlock_folder(const char *path, int fd);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* !_CAMEL_LOCK_H */
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
deleted file mode 100644
index 2537989639..0000000000
--- a/camel/camel-medium.c
+++ /dev/null
@@ -1,335 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <ctype.h>
-#include "camel-medium.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 gboolean is_offline (CamelDataWrapper *data_wrapper);
-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 GArray *get_headers (CamelMedium *medium);
-static void free_headers (CamelMedium *medium, GArray *headers);
-
-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 overload */
-	camel_data_wrapper_class->is_offline = is_offline;
-
-	/* 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->get_headers = get_headers;
-	camel_medium_class->free_headers = free_headers;
-
-	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 gboolean
-is_offline (CamelDataWrapper *data_wrapper)
-{
-	return parent_class->is_offline (data_wrapper) ||
-		camel_data_wrapper_is_offline (CAMEL_MEDIUM (data_wrapper)->content);
-}
-
-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 char *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.  Setting a %NULL header can be used to remove
- * the header also.
- **/
-void
-camel_medium_set_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-
-	if (header_value == NULL)
-		CM_CLASS(medium)->remove_header(medium, header_name);
-	else
-		CM_CLASS(medium)->set_header(medium, header_name, header_value);
-}
-
-static void
-remove_header(CamelMedium *medium, const char *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 char *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 char *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 char *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 GArray *
-get_headers(CamelMedium *medium)
-{
-	g_warning("No %s::get_headers implemented", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)));
-	return NULL;
-}
-
-/**
- * camel_medium_get_headers:
- * @medium: a medium
- *
- * Returns an array of all header name/value pairs (as
- * CamelMediumHeader structures). The values will be decoded
- * to UTF-8 for any headers that are recognized by Camel. The
- * caller should not modify the returned data.
- *
- * Return value: the array of headers, which must be freed with
- * camel_medium_free_headers().
- **/
-GArray *
-camel_medium_get_headers(CamelMedium *medium)
-{
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);
-
-	return CM_CLASS (medium)->get_headers (medium);
-}
-
-static void
-free_headers (CamelMedium *medium, GArray *headers)
-{
-	g_warning("No %s::free_headers implemented", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)));
-}
-
-/**
- * camel_medium_free_headers:
- * @medium: a medium
- * @headers: an array of headers returned from camel_medium_get_headers()
- *
- * Frees @headers
- **/
-void
-camel_medium_free_headers (CamelMedium *medium, GArray *headers)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (headers != NULL);
-
-	CM_CLASS (medium)->free_headers (medium, headers);
-}
-
-
-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 26040b2a94..0000000000
--- a/camel/camel-medium.h
+++ /dev/null
@@ -1,100 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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))
-
-
-typedef struct {
-	const char *name;
-	const char *value;
-} CamelMediumHeader;
-
-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);
-
-	GArray * (*get_headers) (CamelMedium *medium);
-	void (*free_headers) (CamelMedium *medium, GArray *headers);
-
-	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);
-
-GArray *camel_medium_get_headers (CamelMedium *medium);
-void camel_medium_free_headers (CamelMedium *medium, GArray *headers);
-
-/* 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 efb9b9818e..0000000000
--- a/camel/camel-mime-filter-basic.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-basic.h"
-
-#include "camel-mime-utils.h"
-#include <string.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;
-	size_t 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+6, FALSE);
-		newlen = base64_encode_close(in, len, TRUE, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*2+6);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		/* *4 is definetly more than needed ... */
-		camel_mime_filter_set_size(mf, len*4+4, FALSE);
-		newlen = quoted_encode_close(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*4+4);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_UU_ENC:
-		/* won't go to more than 2 * (x + 2) + 62 */
-		camel_mime_filter_set_size (mf, (len + 2) * 2 + 62, FALSE);
-		newlen = uuencode_close (in, len, mf->outbuf, f->uubuf, &f->state, &f->save);
-		g_assert (newlen <= (len + 2) * 2 + 62);
-		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);
-		g_assert(newlen <= len);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		/* output can't possibly exceed the input size, well unless its not really qp, then +2 max */
-		camel_mime_filter_set_size(mf, len+2, FALSE);
-		newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len+2);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_UU_DEC:
-		if ((f->state & CAMEL_UUDECODE_STATE_BEGIN) && !(f->state & CAMEL_UUDECODE_STATE_END)) {
-			/* "begin <mode> <filename>\n" has been found, so we can now start decoding */
-			camel_mime_filter_set_size (mf, len + 3, FALSE);
-			newlen = uudecode_step (in, len, mf->outbuf, &f->state, &f->save);
-		} else {
-			newlen = 0;
-		}
-		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;
-	size_t 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+6, FALSE);
-		newlen = base64_encode_step(in, len, TRUE, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*2+6);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		/* *4 is overly conservative, but will do */
-		camel_mime_filter_set_size(mf, len*4+4, FALSE);
-		newlen = quoted_encode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*4+4);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_UU_ENC:
-		/* won't go to more than 2 * (x + 2) + 62 */
-		camel_mime_filter_set_size (mf, (len + 2) * 2 + 62, FALSE);
-		newlen = uuencode_step (in, len, mf->outbuf, f->uubuf, &f->state, &f->save);
-		g_assert (newlen <= (len + 2) * 2 + 62);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len+3, FALSE);
-		newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len+3);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len + 2, FALSE);
-		newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len + 2);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_UU_DEC:
-		if (!(f->state & CAMEL_UUDECODE_STATE_BEGIN)) {
-			register char *inptr, *inend;
-			size_t left;
-			
-			inptr = in;
-			inend = inptr + len;
-			
-			while (inptr < inend) {
-				left = inend - inptr;
-				if (left < 6) {
-					if (!strncmp (inptr, "begin ", left))
-						camel_mime_filter_backup (mf, inptr, left);
-					break;
-				} else if (!strncmp (inptr, "begin ", 6)) {
-					for (in = inptr; inptr < inend && *inptr != '\n'; inptr++);
-					if (inptr < inend) {
-						inptr++;
-						f->state |= CAMEL_UUDECODE_STATE_BEGIN;
-						/* we can start uudecoding... */
-						in = inptr;
-						len = inend - in;
-					} else {
-						camel_mime_filter_backup (mf, in, left);
-					}
-					break;
-				}
-				
-				/* go to the next line */
-				for ( ; inptr < inend && *inptr != '\n'; inptr++);
-				
-				if (inptr < inend)
-					inptr++;
-			}
-		}
-		
-		if ((f->state & CAMEL_UUDECODE_STATE_BEGIN) && !(f->state & CAMEL_UUDECODE_STATE_END)) {
-			/* "begin <mode> <filename>\n" has been found, so we can now start decoding */
-			camel_mime_filter_set_size (mf, len + 3, FALSE);
-			newlen = uudecode_step (in, len, mf->outbuf, &f->state, &f->save);
-		} else {
-			newlen = 0;
-		}
-		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:
-	case CAMEL_MIME_FILTER_BASIC_UU_ENC:
-	case CAMEL_MIME_FILTER_BASIC_UU_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 d07edee107..0000000000
--- a/camel/camel-mime-filter-basic.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_BASIC_H
-#define _CAMEL_MIME_FILTER_BASIC_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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 CAMEL_IS_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,
-	CAMEL_MIME_FILTER_BASIC_UU_ENC,
-	CAMEL_MIME_FILTER_BASIC_UU_DEC,
-} CamelMimeFilterBasicType;
-
-struct _CamelMimeFilterBasic {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterBasicPrivate *priv;
-
-	CamelMimeFilterBasicType type;
-	
-	unsigned char uubuf[60];
-	int state;
-	int save;
-};
-
-struct _CamelMimeFilterBasicClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType		camel_mime_filter_basic_get_type	(void);
-CamelMimeFilterBasic      *camel_mime_filter_basic_new	(void);
-CamelMimeFilterBasic      *camel_mime_filter_basic_new_type	(CamelMimeFilterBasicType type);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
deleted file mode 100644
index e53923344b..0000000000
--- a/camel/camel-mime-filter-bestenc.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-
-#include "camel-mime-filter-bestenc.h"
-
-static void camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *klass);
-static void camel_mime_filter_bestenc_init       (CamelMimeFilter *obj);
-
-static CamelMimeFilterClass *camel_mime_filter_bestenc_parent;
-
-CamelType
-camel_mime_filter_bestenc_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBestenc",
-					    sizeof (CamelMimeFilterBestenc),
-					    sizeof (CamelMimeFilterBestencClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_bestenc_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_bestenc_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;
-
-	f->count0 = 0;
-	f->count8 = 0;
-	f->countline = 0;
-	f->total = 0;
-	f->lastc = ~0;
-	f->crlfnoorder = FALSE;
-	f->fromcount = 0;
-	f->hadfrom = FALSE;
-	f->startofline = TRUE;
-
-	camel_charset_init(&f->charset);
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;
-	register unsigned char *p, *pend;
-
-	if (len == 0)
-		goto donothing;
-
-	if (f->flags & CAMEL_BESTENC_GET_ENCODING) {
-		register unsigned int /* hopefully reg's are assinged in the order they appear? */
-			c,
-			lastc=f->lastc, 
-			countline=f->countline,
-			count0=f->count0,
-			count8 = f->count8;
-
-		/* Check ^From  lines first call, or have the start of a new line waiting? */
-		if ((f->flags & CAMEL_BESTENC_NO_FROM) && !f->hadfrom
-		    && (f->fromcount > 0 || f->startofline)) {
-			if (f->fromcount + len >=5) {
-				memcpy(&f->fromsave[f->fromcount], in, 5-f->fromcount);
-				f->hadfrom = strncmp(f->fromsave, "From ", 5) == 0;
-				f->fromcount = 0;
-			} else {
-				memcpy(&f->fromsave[f->fromcount], in, len);
-				f->fromcount += len;
-			}
-		}
-
-		f->startofline = FALSE;
-
-		/* See rfc2045 section 2 for definitions of 7bit/8bit/binary */
-		p = in;
-		pend = p + len;
-		while (p<pend) {
-			c = *p++;
-			/* check for 8 bit characters */
-			if (c & 0x80)
-				count8++;
-
-			/* check for nul's */
-			if (c == 0)
-				count0++;
-
-			/* check for wild '\r's in a unix format stream */
-			if (c == '\r' && (f->flags & CAMEL_BESTENC_LF_IS_CRLF)) {
-				f->crlfnoorder = TRUE;
-			}
-
-			/* check for end of line */
-			if (c == '\n') {
-				/* check for wild '\n's in canonical format stream */
-				if (lastc == '\r' || (f->flags & CAMEL_BESTENC_LF_IS_CRLF)) {
-					if (countline > f->maxline)
-						f->maxline = countline;
-					countline = 0;
-
-					/* Check for "^From " lines */
-					if ((f->flags & CAMEL_BESTENC_NO_FROM) && !f->hadfrom) {
-						if (pend-p >= 5) {
-							f->hadfrom = strncmp(p, "From ", 5) == 0;
-						} else if (pend-p == 0) {
-							f->startofline = TRUE;
-						} else {
-							f->fromcount = pend-p;
-							memcpy(f->fromsave, p, pend-p);
-						}
-					}
-				} else {
-					f->crlfnoorder = TRUE;
-				}
-			} else {
-				countline++;
-			}
-			lastc = c;
-		}
-		f->count8 = count8;
-		f->count0 = count0;
-		f->countline = countline;
-		f->lastc = lastc;
-	}
-
-	f->total += len;
-
-	if (f->flags & CAMEL_BESTENC_GET_CHARSET)
-		camel_charset_step(&f->charset, in, len);
-
-donothing:
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;
-
-	filter(mf, in, len, prespace, out, outlen, outprespace);
-
-	if (f->countline > f->maxline)
-		f->maxline = f->countline;
-	f->countline = 0;
-}
-
-static void
-camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-
-	camel_mime_filter_bestenc_parent = (CamelMimeFilterClass *)(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_bestenc_init (CamelMimeFilter *f)
-{
-	reset(f);
-}
-
-/**
- * camel_mime_filter_bestenc_new:
- * @flags: A bitmask of data required.
- *
- * Create a new CamelMimeFilterBestenc object. 
- * 
- * Return value:
- **/
-CamelMimeFilterBestenc *
-camel_mime_filter_bestenc_new (unsigned int flags)
-{
-	CamelMimeFilterBestenc *new = (CamelMimeFilterBestenc *)camel_object_new(camel_mime_filter_bestenc_get_type());
-	new->flags = flags;
-	return new;
-}
-
-/**
- * camel_mime_filter_bestenc_get_best_encoding:
- * @f: 
- * @required: maximum level of output encoding allowed.
- * 
- * Return the best encoding, given specific constraints, that can be used to
- * encode a stream of bytes.
- * 
- * Return value: 
- **/
-CamelMimePartEncodingType
-camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *f, CamelBestencEncoding required)
-{
-	CamelMimePartEncodingType bestenc;
-
-#if 0
-	printf("count0 = %d, count8 = %d, total = %d\n", f->count0, f->count8, f->total);
-	printf("maxline = %d, crlfnoorder = %s\n", f->maxline, f->crlfnoorder?"TRUE":"FALSE");
-	printf(" %d%% require encoding?\n", (f->count0+f->count8)*100 / f->total);
-#endif
-
-	/* if we're not allowed to have From lines and we had one, use an encoding
-	   that will never let it show.  Unfortunately only base64 can at present,
-	   although qp could be modified to allow it too */
-	if ((f->flags & CAMEL_BESTENC_NO_FROM) && f->hadfrom)
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-
-	/* if we need to encode, see how we do it */
-	if (required == CAMEL_BESTENC_BINARY)
-		bestenc = CAMEL_MIME_PART_ENCODING_BINARY;
-	else if (f->count8 + f->count0 >= (f->total*17/100))
-		bestenc = CAMEL_MIME_PART_ENCODING_BASE64;
-	else
-		bestenc = CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	
-	/* if we have nocrlf order, or long lines, we need to encode always */
-	if (f->crlfnoorder || f->maxline >= 998)
-		return bestenc;
-
-	/* if we have no 8 bit chars or nul's, we can just use 7 bit */
-	if (f->count8 + f->count0 == 0)
-		return CAMEL_MIME_PART_ENCODING_7BIT;
-
-	/* otherwise, we see if we can use 8 bit, or not */
-	switch(required) {
-	case CAMEL_BESTENC_7BIT:
-		return bestenc;
-	case CAMEL_BESTENC_8BIT:
-	case CAMEL_BESTENC_BINARY:
-		if (f->count0 == 0)
-			return CAMEL_MIME_PART_ENCODING_8BIT;
-		else
-			return bestenc;
-	}
-
-	return CAMEL_MIME_PART_ENCODING_DEFAULT;
-}
-
-/**
- * camel_mime_filter_bestenc_get_best_charset:
- * @f: 
- * 
- * Gets the best charset that can be used to contain this content.
- * 
- * Return value: 
- **/
-const char *
-camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f)
-{
-	return camel_charset_best_name(&f->charset);
-}
-
-/**
- * camel_mime_filter_bestenc_set_flags:
- * @f: 
- * @flags: 
- * 
- * Set the flags for subsequent operations.
- **/
-void
-camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags)
-{
-	f->flags = flags;
-}
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
deleted file mode 100644
index 3d2e79fa55..0000000000
--- a/camel/camel-mime-filter-bestenc.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_BESTENC_H
-#define _CAMEL_MIME_FILTER_BESTENC_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-charset-map.h>
-
-#define CAMEL_MIME_FILTER_BESTENC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestenc)
-#define CAMEL_MIME_FILTER_BESTENC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestencClass)
-#define CAMEL_IS_MIME_FILTER_BESTENC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_bestenc_get_type ())
-
-typedef struct _CamelMimeFilterBestencClass CamelMimeFilterBestencClass;
-
-enum _CamelBestencRequired {
-	CAMEL_BESTENC_GET_ENCODING = 1<<0,
-	CAMEL_BESTENC_GET_CHARSET = 1<<1,
-
-	/* do we treat 'lf' as if it were crlf? */
-	CAMEL_BESTENC_LF_IS_CRLF = 1<<8,
-	/* do we not allow "From " to appear at the start of a line in any part? */
-	CAMEL_BESTENC_NO_FROM = 1<<9,
-};
-typedef enum _CamelBestencRequired CamelBestencRequired;
-
-enum _CamelBestencEncoding {
-	CAMEL_BESTENC_7BIT,
-	CAMEL_BESTENC_8BIT,
-	CAMEL_BESTENC_BINARY,
-};
-typedef enum _CamelBestencEncoding CamelBestencEncoding;
-
-struct _CamelMimeFilterBestenc {
-	CamelMimeFilter parent;
-
-	unsigned int flags;	/* our creation flags, see above */
-
-	unsigned int count0;	/* count of NUL characters */
-	unsigned int count8;	/* count of 8 bit characters */
-	unsigned int total;	/* total characters read */
-
-	unsigned int lastc;	/* the last character read */
-	int crlfnoorder;	/* if crlf's occured where they shouldn't have */
-
-	int startofline;	/* are we at the start of a new line? */
-
-	int fromcount;
-	char fromsave[6];	/* save a few characters if we found an \nF near the end of the buffer */
-	int hadfrom;		/* did we encounter a "\nFrom " in the data? */
-
-	unsigned int countline;	/* current count of characters on a given line */
-	unsigned int maxline;	/* max length of any line */
-
-	CamelCharset charset;	/* used to determine the best charset to use */
-};
-
-struct _CamelMimeFilterBestencClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType		camel_mime_filter_bestenc_get_type	(void);
-CamelMimeFilterBestenc      *camel_mime_filter_bestenc_new	(unsigned int flags);
-
-
-CamelMimePartEncodingType	camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *f, CamelBestencEncoding required);
-const char *		camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f);
-void 			camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
deleted file mode 100644
index f30047c96a..0000000000
--- a/camel/camel-mime-filter-charset.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <iconv.h>
-
-#include <string.h>
-#include <errno.h>
-
-#include <gal/util/e-iconv.h>
-
-#include "camel-mime-filter-charset.h"
-#include "camel-charset-map.h"
-
-#define d(x)
-
-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 != (iconv_t)-1) {
-		e_iconv_close(f->ic);
-		f->ic = (iconv_t) -1;
-	}
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	char buf[16];
-	char *buffer;
-	size_t outlen = 16;
-
-	/* what happens with the output bytes if this resets the state? */
-	if (f->ic != (iconv_t) -1) {
-		buffer = buf;
-		e_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;
-	size_t converted, inlen, outlen;
-	const char *inbuf;
-	char *outbuf;
-	
-	if (f->ic == (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+16, FALSE);
-	inbuf = in;
-	inlen = len;
-	outbuf = mf->outbuf;
-	outlen = mf->outsize;
-
-	/* temporary fix to find another bug somewhere */
-	d(memset(outbuf, 0, outlen));
-
-	if (inlen>0) {
-		converted = e_iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
-		if (converted == (size_t) -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 = e_iconv(f->ic, NULL, 0, &outbuf, &outlen);
-	if (converted == (size_t) -1) {
-		g_warning("Conversion failed to complete: %s", strerror(errno));
-	}
-
-	/* debugging assertion - check for NUL's in output */
-	d({
-		int i;
-		
-		for (i=0;i<(mf->outsize - outlen);i++) {
-			g_assert(mf->outbuf[i]);
-		}
-	});
-
-	*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;
-	size_t converted, inlen, outlen;
-	const char *inbuf;
-	char *outbuf;
-
-	if (f->ic == (iconv_t) -1) {
-		goto donothing;
-	}
-
-	/* FIXME: there's probably a safer way to size this ...? */
-	camel_mime_filter_set_size(mf, len*5+16, FALSE);
-	inbuf = in;
-	inlen = len;
-	outbuf = mf->outbuf;
-	outlen = mf->outsize;
-	converted = e_iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
-	if (converted == (size_t) -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.
-	*/
-
-	/* This is to fix a bug in at least 1 version of glibc iconv: we get EINVAL and
-	   it reads past the input and returns a converted length of -1 ... so discard
-	   any overruns as failed */
-	if (((int)inlen) < 0)
-		inlen = 0;
-
-	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 = (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 = e_iconv_open (to_charset, from_charset);
-	if (new->ic == (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 ddc3025eb0..0000000000
--- a/camel/camel-mime-filter-charset.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CHARSET_H
-#define _CAMEL_MIME_FILTER_CHARSET_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.h>
-#include <iconv.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 CAMEL_IS_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;
-
-	iconv_t ic;
-	char *from;
-	char *to;
-};
-
-struct _CamelMimeFilterCharsetClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType		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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-chomp.c b/camel/camel-mime-filter-chomp.c
deleted file mode 100644
index 6083b6dfe7..0000000000
--- a/camel/camel-mime-filter-chomp.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2002 Ximian, Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ctype.h>
-
-#include "camel-mime-filter-chomp.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_chomp_class_init (CamelMimeFilterChompClass *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_chomp_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterChomp",
-					    sizeof (CamelMimeFilterChomp),
-					    sizeof (CamelMimeFilterChompClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_chomp_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)
-{
-	register unsigned char *inptr, *s;
-	const unsigned char *inend;
-	register char *outptr;
-	
-	camel_mime_filter_set_size (f, len + prespace, FALSE);
-	
-	inend = in + len;
-	inptr = in;
-	
-	outptr = f->outbuf;
-	
-	while (inptr < inend) {
-		s = inptr;
-		while (inptr < inend && isspace ((int) *inptr))
-			inptr++;
-		
-		if (inptr < inend) {
-			while (s < inptr)
-				*outptr++ = (char) *s++;
-			
-			while (inptr < inend && !isspace ((int) *inptr))
-				*outptr++ = (char) *inptr++;
-		} else {
-#if 0
-			if ((inend - s) >= 2 && *s == '\r' && *(s + 1) == '\n')
-				*outptr++ = *s++;
-			if (*s == '\n')
-				*outptr++ = *s++;
-#endif		
-			if (s < inend)
-				camel_mime_filter_backup (f, s, inend - s);
-			break;
-		}
-	}
-	
-	*out = f->outbuf;
-	*outlen = outptr - 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)
-{
-	unsigned char *inptr;
-	char *outptr;
-	
-	if (len)
-		filter (f, in, len, prespace, out, outlen, outprespace);
-	
-	if (f->backlen) {
-		inptr = (unsigned char *) f->backbuf;
-		outptr = f->outbuf + *outlen;
-		
-		/* in the case of a canonical eoln */
-		if (*inptr == '\r' && *(inptr + 1) == '\n') {
-			*outptr++ = (char) *inptr++;
-			(*outlen)++;
-		}
-		
-		if (*inptr == '\n') {
-			*outptr++ = (char) *inptr++;
-			(*outlen)++;
-		}
-		
-		/* to protect against further complete calls */
-		camel_mime_filter_backup (f, "", 0);
-	}
-}
-
-static void
-reset (CamelMimeFilter *f)
-{
-	/* no-op */
-}
-
-CamelMimeFilter *
-camel_mime_filter_chomp_new (void)
-{
-	CamelMimeFilterChomp *chomp = CAMEL_MIME_FILTER_CHOMP (camel_object_new (CAMEL_MIME_FILTER_CHOMP_TYPE));
-	
-	return (CamelMimeFilter *) chomp;
-}
diff --git a/camel/camel-mime-filter-chomp.h b/camel/camel-mime-filter-chomp.h
deleted file mode 100644
index 6e0081a475..0000000000
--- a/camel/camel-mime-filter-chomp.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2002 Ximian Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CHOMP_H
-#define _CAMEL_MIME_FILTER_CHOMP_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_CHOMP_TYPE         (camel_mime_filter_chomp_get_type ())
-#define CAMEL_MIME_FILTER_CHOMP(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_CHOMP_TYPE, CamelMimeFilterChomp)
-#define CAMEL_MIME_FILTER_CHOMP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CHOMP_TYPE, CamelMimeFilterChompClass)
-#define CAMEL_IS_MIME_FILTER_CHOMP(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CHOMP_TYPE)
-
-typedef struct _CamelMimeFilterChompClass CamelMimeFilterChompClass;
-
-struct _CamelMimeFilterChomp {
-	CamelMimeFilter parent;
-	
-};
-
-struct _CamelMimeFilterChompClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType camel_mime_filter_chomp_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_chomp_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_CHOMP_H */
diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c
deleted file mode 100644
index 57378bbc24..0000000000
--- a/camel/camel-mime-filter-crlf.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian, Inc.
- *
- *  Authors: Dan Winship <danw@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-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') {
-				crlf->saw_lf = TRUE;
-				*q++ = '\r';
-			} else {
-				if (do_dots && *p == '.' && crlf->saw_lf)
-					*q++ = '.';
-				
-				crlf->saw_lf = FALSE;
-			}
-			
-			*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) {
-					crlf->saw_cr = FALSE;
-					
-					if (*p == '\n') {
-						crlf->saw_lf = TRUE;
-						*q++ = *p++;
-						continue;
-					} else
-						*q++ = '\r';
-				}
-				
-				*q++ = *p;
-			}
-			
-			if (do_dots && *p == '.') {
-				if (crlf->saw_lf) {
-					crlf->saw_dot = TRUE;
-					crlf->saw_lf = FALSE;
-					p++;
-				} else if (crlf->saw_dot) {
-					crlf->saw_dot = FALSE;
-				}
-			}
-			
-			crlf->saw_lf = FALSE;
-			
-			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;
-	crlf->saw_lf = TRUE;
-	crlf->saw_dot = 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;
-	crlf->saw_lf = TRUE;
-	crlf->saw_dot = 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 1e3526d600..0000000000
--- a/camel/camel-mime-filter-crlf.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Dan Winship <danw@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CRLF_H
-#define _CAMEL_MIME_FILTER_CRLF_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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_lf;
-	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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#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 fb2029f909..0000000000
--- a/camel/camel-mime-filter-from.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#include "camel-mime-filter-from.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 cbc2e70a94..0000000000
--- a/camel/camel-mime-filter-from.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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 CAMEL_IS_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;
-};
-
-CamelType		camel_mime_filter_from_get_type	(void);
-CamelMimeFilterFrom      *camel_mime_filter_from_new	(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c
deleted file mode 100644
index 3a9bdaba75..0000000000
--- a/camel/camel-mime-filter-html.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "camel-mime-filter-html.h"
-#include "camel-html-parser.h"
-
-#define d(x)
-
-static void camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *klass);
-static void camel_mime_filter_html_init       (CamelObject *o);
-static void camel_mime_filter_html_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_html_parent;
-
-struct _CamelMimeFilterHTMLPrivate {
-	CamelHTMLParser *ctxt;
-};
-
-/* ********************************************************************** */
-
-#if 0
-
-/* well we odnt use this stuff yet */
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))
-
-static struct {
-	char *element;
-	char *remap;
-} map_start[] = {
-	{ "p", "\n\n" },
-	{ "br", "\n" },
-	{ "h1", "\n" }, { "h2", "\n" }, { "h3", "\n" }, { "h4", "\n" }, { "h5", "\n" }, { "h6", "\n" },
-};
-
-
-static struct {
-	char *element;
-	char *remap;
-} map_end[] = {
-	{ "h1", "\n" }, { "h2", "\n" }, { "h3", "\n" }, { "h4", "\n" }, { "h5", "\n" }, { "h6", "\n" },
-};
-#endif
-
-
-/* ********************************************************************** */
-
-
-CamelType
-camel_mime_filter_html_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterHTML",
-					    sizeof (CamelMimeFilterHTML),
-					    sizeof (CamelMimeFilterHTMLClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_html_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_html_init,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_html_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_html_finalize(CamelObject *o)
-{
-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)o;
-
-	camel_object_unref((CamelObject *)f->priv->ctxt);
-	g_free(f->priv);
-}
-
-static void
-camel_mime_filter_html_init       (CamelObject *o)
-{
-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)o;
-
-	f->priv = g_malloc0(sizeof(*f->priv));
-	f->priv->ctxt = camel_html_parser_new();
-}
-
-static void
-run(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace, int last)
-{
-	camel_html_parser_t state;
-	char *outp;
-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)mf;
-
-	d(printf("converting html:\n%.*s\n", (int)len, in));
-	
-	/* We should generally shrink the data, but this'll do */
-	camel_mime_filter_set_size(mf, len*2+256, FALSE);
-	outp = mf->outbuf;
-
-	camel_html_parser_set_data(f->priv->ctxt, in, len, last);
-	do {
-		const char *data;
-		int len;
-		
-		state = camel_html_parser_step(f->priv->ctxt, &data, &len);
-		
-		switch(state) {
-		case CAMEL_HTML_PARSER_DATA:
-		case CAMEL_HTML_PARSER_ENT:
-			memcpy(outp, data, len);
-			outp += len;
-			break;
-		case CAMEL_HTML_PARSER_ELEMENT:
-			/* FIXME: do some whitespace processing here */
-			break;
-		default:
-			/* ignore everything else */
-			break;
-		}
-	} while (state != CAMEL_HTML_PARSER_EOF && state != CAMEL_HTML_PARSER_EOD);
-
-	*out = mf->outbuf;
-	*outlenptr = outp - mf->outbuf;
-	*outprespace = mf->outbuf - mf->outreal;
-
-	d(printf("converted html end:\n%.*s\n", (int)*outlenptr, *out));
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	run(mf, in, len, prespace, out, outlenptr, outprespace, TRUE);
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	run(mf, in, len, prespace, out, outlenptr, outprespace, FALSE);
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)mf;
-
-	camel_object_unref((CamelObject *)f->priv->ctxt);
-	f->priv->ctxt = camel_html_parser_new();
-}
-
-static void
-camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_html_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_html_new:
- *
- * Create a new CamelMimeFilterHTML object.
- * 
- * Return value: A new CamelMimeFilterHTML widget.
- **/
-CamelMimeFilterHTML *
-camel_mime_filter_html_new (void)
-{
-	CamelMimeFilterHTML *new = CAMEL_MIME_FILTER_HTML ( camel_object_new (camel_mime_filter_html_get_type ()));
-	return new;
-}
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
deleted file mode 100644
index bb9b6aaa4e..0000000000
--- a/camel/camel-mime-filter-html.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_HTML_H
-#define _CAMEL_MIME_FILTER_HTML_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_HTML(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_html_get_type (), CamelMimeFilterHTML)
-#define CAMEL_MIME_FILTER_HTML_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_html_get_type (), CamelMimeFilterHTMLClass)
-#define CAMEL_IS_MIME_FILTER_HTML(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_html_get_type ())
-
-typedef struct _CamelMimeFilterHTMLClass CamelMimeFilterHTMLClass;
-typedef struct _CamelMimeFilterHTML CamelMimeFilterHTML;
-
-struct _CamelMimeFilterHTML {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterHTMLPrivate *priv;
-};
-
-struct _CamelMimeFilterHTMLClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType		camel_mime_filter_html_get_type	(void);
-CamelMimeFilterHTML      *camel_mime_filter_html_new	(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_HTML_H */
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
deleted file mode 100644
index e9df08072b..0000000000
--- a/camel/camel-mime-filter-index.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-index.h"
-
-#include "camel-text-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;
-
-	if (f->name)
-		camel_object_unref((CamelObject *)f->name);
-	camel_object_unref((CamelObject *)f->index);
-}
-
-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;
-	}
-
-	camel_index_name_add_buffer(f->name, in, len);
-	camel_index_name_add_buffer(f->name, NULL, 0);
-
-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;
-
-	if (f->index == NULL || f->name==NULL) {
-		goto donothing;
-	}
-
-	camel_index_name_add_buffer(f->name, in, len);
-
-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_index (struct _CamelIndex *index)
-{
-	CamelMimeFilterIndex *new = camel_mime_filter_index_new();
-
-	if (new) {
-		new->index = index;
-		if (index)
-			camel_object_ref((CamelObject *)index);
-	}
-	return new;
-}
-
-/* Set the match name for any indexed words */
-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *mf, struct _CamelIndexName *name)
-{
-	if (mf->name)
-		camel_object_unref((CamelObject *)mf->name);
-	mf->name = name;
-	if (name)
-		camel_object_ref((CamelObject *)name);
-}
-
-void camel_mime_filter_index_set_index (CamelMimeFilterIndex *mf, CamelIndex *index)
-{
-	if (mf->index) {
-		char *out;
-		size_t outlen, outspace;
-
-		camel_mime_filter_complete((CamelMimeFilter *)mf, "", 0, 0, &out, &outlen, &outspace);
-	}
-
-	mf->index = index;
-	if (index)
-		camel_object_ref((CamelObject *)index);
-}
-
-
-
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
deleted file mode 100644
index 3bb1bd532c..0000000000
--- a/camel/camel-mime-filter-index.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_INDEX_H
-#define _CAMEL_MIME_FILTER_INDEX_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.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 CAMEL_IS_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;
-
-	struct _CamelIndex *index;
-	struct _CamelIndexName *name;
-};
-
-struct _CamelMimeFilterIndexClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType		camel_mime_filter_index_get_type	(void);
-CamelMimeFilterIndex      *camel_mime_filter_index_new	(void);
-
-CamelMimeFilterIndex      *camel_mime_filter_index_new_index(struct _CamelIndex *);
-
-/* Set the match name for any indexed words */
-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *, struct _CamelIndexName *name);
-void camel_mime_filter_index_set_index (CamelMimeFilterIndex *mf, struct _CamelIndex *index);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#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 44d4755efb..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 Ximian, Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-mime-filter-linewrap.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 1d6f444da4..0000000000
--- a/camel/camel-mime-filter-linewrap.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_LINEWRAP_H
-#define _CAMEL_MIME_FILTER_LINEWRAP_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#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 1516527ded..0000000000
--- a/camel/camel-mime-filter-save.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.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 HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "camel-mime-filter-save.h"
-#include "camel-stream-mem.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_save_class_init (CamelMimeFilterSaveClass *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_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,
-					    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)
-{
-	CamelMimeFilterSave *save = (CamelMimeFilterSave *) f;
-	
-	if (save->stream)
-		camel_stream_write (save->stream, in, len);
-	
-	*out = in;
-	*outlen = len;
-	*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)
-{
-	/* no-op */
-}
-
-CamelMimeFilter *
-camel_mime_filter_save_new (void)
-{
-	CamelMimeFilterSave *save = CAMEL_MIME_FILTER_SAVE (camel_object_new (CAMEL_MIME_FILTER_SAVE_TYPE));
-	
-	save->stream = camel_stream_mem_new ();
-	
-	return (CamelMimeFilter *) save;
-}
-
-CamelMimeFilter *
-camel_mime_filter_save_new_with_stream (CamelStream *stream)
-{
-	CamelMimeFilterSave *save = CAMEL_MIME_FILTER_SAVE (camel_object_new (CAMEL_MIME_FILTER_SAVE_TYPE));
-	
-	save->stream = stream;
-	camel_object_ref (CAMEL_OBJECT (stream));
-	
-	return (CamelMimeFilter *) save;
-}
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
deleted file mode 100644
index 20ebbea6f4..0000000000
--- a/camel/camel-mime-filter-save.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.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_MIME_FILTER_SAVE_H__
-#define __CAMEL_MIME_FILTER_SAVE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-seekable-stream.h>
-
-#define CAMEL_MIME_FILTER_SAVE_TYPE         (camel_mime_filter_save_get_type ())
-#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 CAMEL_IS_MIME_FILTER_SAVE(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_save_get_type ())
-
-typedef struct _CamelMimeFilterSaveClass CamelMimeFilterSaveClass;
-
-struct _CamelMimeFilterSave {
-	CamelMimeFilter parent;
-	
-	CamelStream *stream;
-};
-
-struct _CamelMimeFilterSaveClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType camel_mime_filter_save_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_save_new (void);
-CamelMimeFilter *camel_mime_filter_save_new_with_stream (CamelStream *stream);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAMEL_MIME_FILTER_SAVE_H__ */
diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c
deleted file mode 100644
index 22dc3ff737..0000000000
--- a/camel/camel-mime-filter-tohtml.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.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.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "camel-mime-filter-tohtml.h"
-
-#define d(x)
-
-static void camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *klass);
-static void camel_mime_filter_tohtml_init       (CamelObject *o);
-static void camel_mime_filter_tohtml_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_tohtml_parent;
-
-
-CamelType
-camel_mime_filter_tohtml_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (),
-					    "CamelMimeFilterToHTML",
-					    sizeof (CamelMimeFilterToHTML),
-					    sizeof (CamelMimeFilterToHTMLClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_tohtml_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_tohtml_init,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_tohtml_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_tohtml_finalize (CamelObject *o)
-{
-	;
-}
-
-static void
-camel_mime_filter_tohtml_init (CamelObject *o)
-{
-	;
-}
-
-
-static char *
-check_size (CamelMimeFilter *filter, char *outptr, char **outend, size_t len)
-{
-	size_t offset;
-	
-	if (*outend - outptr >= len)
-		return outptr;
-	
-	offset = outptr - filter->outbuf;
-	
-	camel_mime_filter_set_size (filter, filter->outsize + len, TRUE);
-	
-	*outend = filter->outbuf + filter->outsize;
-	
-	return filter->outbuf + offset;
-}
-
-/* 1 = non-email-address chars: "()<>@,;:\\\"/[]`'|\n\t "  */
-/* 2 = non-url chars:           "()<>,;\\\"[]`'|\n\t "   */
-/* 3 = trailing url garbage:    ",.!?;:>)]}\\`'-_|\n\t "  */
-static unsigned short special_chars[256] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 4, 3, 0, 0, 0, 0, 7, 3, 7, 0, 0, 7, 4, 4, 1,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 3, 0, 7, 4,
-	 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 7, 3, 0, 4,
-	 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 4, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-
-#define IS_NON_ADDR   (1 << 0)
-#define IS_NON_URL    (1 << 1)
-#define IS_GARBAGE    (1 << 2)
-
-#define NON_EMAIL_CHARS         "()<>@,;:\\\"/[]`'|\n\t "
-#define NON_URL_CHARS           "()<>,;\\\"[]`'|\n\t "
-#define TRAILING_URL_GARBAGE    ",.!?;:>)}\\`'-_|\n\t "
-
-#define is_addr_char(c) (isprint (c) && !(special_chars[(unsigned char) c] & IS_NON_ADDR))
-#define is_url_char(c)  (isprint (c) && !(special_chars[(unsigned char) c] & IS_NON_URL))
-#define is_trailing_garbage(c) (!isprint (c) || (special_chars[(unsigned char) c] & IS_GARBAGE))
-
-#if 0
-static void
-table_init (void)
-{
-	char *c;
-	
-	memset (special_chars, 0, sizeof (special_chars));
-	for (c = NON_EMAIL_CHARS; *c; c++)
-		special_chars[(int) *c] |= IS_NON_ADDR;
-	for (c = NON_URL_CHARS; *c; c++)
-		special_chars[(int) *c] |= IS_NON_URL;
-	for (c = TRAILING_URL_GARBAGE; *c; c++)
-		special_chars[(int) *c] |= IS_GARBAGE;
-}
-#endif
-
-static char *
-url_extract (char **in, int inlen, gboolean check, gboolean *backup)
-{
-	unsigned char *inptr, *inend, *p;
-	char *url;
-	
-	inptr = (unsigned char *) *in;
-	inend = inptr + inlen;
-	
-	while (inptr < inend && is_url_char (*inptr))
-		inptr++;
-	
-	if ((char *) inptr == *in)
-		return NULL;
-	
-	/* back up if we probably went too far. */
-	while (inptr > (unsigned char *) *in && is_trailing_garbage (*(inptr - 1)))
-		inptr--;
-	
-	if (check) {
-		/* make sure we weren't fooled. */
-		p = memchr (*in, ':', (char *) inptr - *in);
-		if (!p)
-			return NULL;
-	}
-	
-	if (inptr == inend && backup) {
-		*backup = TRUE;
-		return NULL;
-	}
-	
-	url = g_strndup (*in, (char *) inptr - *in);
-	*in = inptr;
-	
-	return url;
-}
-
-static char *
-email_address_extract (char **in, char *inend, char *start, char **outptr, gboolean *backup)
-{
-	char *addr, *pre, *end, *dot;
-	
-	/* *in points to the '@'. Look backward for a valid local-part */
-	for (pre = *in; pre - 1 >= start && is_addr_char (*(pre - 1)); pre--);
-	
-	if (pre == *in)
-		return NULL;
-	
-	/* Now look forward for a valid domain part */
-	for (end = *in + 1, dot = NULL; end < inend && is_addr_char (*end); end++) {
-		if (*end == '.' && !dot)
-			dot = end;
-	}
-	
-	if (end >= inend && backup) {
-		*backup = TRUE;
-		*outptr -= (*in - pre);
-		*in = pre;
-		return NULL;
-	}
-	
-	if (!dot)
-		return NULL;
-	
-	/* Remove trailing garbage */
-	while (end > *in && is_trailing_garbage (*(end - 1)))
-		end--;
-	if (dot > end)
-		return NULL;
-	
-	addr = g_strndup (pre, end - pre);
-	*outptr -= (*in - pre);
-	*in = end;
-	
-	return addr;
-}
-
-static gboolean
-is_citation (char *inptr, char *inend, gboolean saw_citation, gboolean *backup)
-{
-	if (*inptr != '>')
-		return FALSE;
-	
-	if (inend - inptr >= 6) {
-		/* make sure this isn't just mbox From-magling... */
-		if (strncmp (inptr, ">From ", 6) != 0)
-			return TRUE;
-	} else if (backup) {
-		/* we don't have enough data to tell, so return */
-		*backup = TRUE;
-		return saw_citation;
-	}
-	
-	/* if the previous line was a citation, then say this one is too */
-	if (saw_citation)
-		return TRUE;
-	
-	/* otherwise it was just an isolated ">From " line */
-	return FALSE;
-}
-
-static gboolean
-is_protocol (char *inptr, char *inend, gboolean *backup)
-{
-	if (inend - inptr >= 8) {
-		if (!strncasecmp (inptr, "http://", 7) ||
-		    !strncasecmp (inptr, "https://", 8) ||
-		    !strncasecmp (inptr, "ftp://", 6) ||
-		    !strncasecmp (inptr, "nntp://", 7) ||
-		    !strncasecmp (inptr, "mailto:", 7) ||
-		    !strncasecmp (inptr, "news:", 5))
-			return TRUE;
-	} else if (backup) {
-		*backup = TRUE;
-		return FALSE;
-	}
-	
-	return FALSE;
-}
-
-static void
-html_convert (CamelMimeFilter *filter, char *in, size_t inlen, size_t prespace,
-	      char **out, size_t *outlen, size_t *outprespace, gboolean flush)
-{
-	CamelMimeFilterToHTML *html = (CamelMimeFilterToHTML *) filter;
-	char *inptr, *inend, *outptr, *outend, *start;
-	gboolean backup = FALSE;
-	
-	camel_mime_filter_set_size (filter, inlen * 2 + 6, FALSE);
-	
-	inptr = start = in;
-	inend = in + inlen;
-	outptr = filter->outbuf;
-	outend = filter->outbuf + filter->outsize;
-	
-	if (html->flags & CAMEL_MIME_FILTER_TOHTML_PRE && !html->pre_open) {
-		outptr += sprintf (outptr, "%s", "<pre>");
-		html->pre_open = TRUE;
-	}
-	
-	while (inptr < inend) {
-		unsigned char u;
-		
-		if (html->flags & CAMEL_MIME_FILTER_TOHTML_MARK_CITATION && html->column == 0) {
-			html->saw_citation = is_citation (inptr, inend, html->saw_citation,
-							  flush ? &backup : NULL);
-			if (backup)
-				break;
-			
-			if (html->saw_citation) {
-				if (!html->coloured) {
-					char font[25];
-					
-					g_snprintf (font, 25, "<font color=\"#%06x\">", html->colour);
-					
-					outptr = check_size (filter, outptr, &outend, 25);
-					outptr += sprintf (outptr, "%s", font);
-					html->coloured = TRUE;
-				}
-			} else if (html->coloured) {
-				outptr = check_size (filter, outptr, &outend, 10);
-				outptr += sprintf (outptr, "%s", "</font>");
-				html->coloured = FALSE;
-			}
-			
-			/* display mbox-mangled ">From " as "From " */
-			if (*inptr == '>' && !html->saw_citation)
-				inptr++;
-		} else if (html->flags & CAMEL_MIME_FILTER_TOHTML_CITE && html->column == 0) {
-			outptr = check_size (filter, outptr, &outend, 6);
-			outptr += sprintf (outptr, "%s", "&gt; ");
-		}
-		
-		if (html->flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS && isalpha ((int) *inptr)) {
-			char *refurl = NULL, *dispurl = NULL;
-			
-			if (is_protocol (inptr, inend, flush ? &backup : NULL)) {
-				dispurl = url_extract (&inptr, inend - inptr, TRUE,
-						       flush ? &backup : NULL);
-				if (backup)
-					break;
-				
-				if (dispurl)
-					refurl = g_strdup (dispurl);
-			} else {
-				if (backup)
-					break;
-				
-				if (!strncasecmp (inptr, "www.", 4) && ((unsigned char) inptr[4]) < 0x80
-				    && isalnum ((int) inptr[4])) {
-					dispurl = url_extract (&inptr, inend - inptr, FALSE,
-							      flush ? &backup : NULL);
-					if (backup)
-						break;
-					
-					if (dispurl)
-						refurl = g_strdup_printf ("http://%s", dispurl);
-				}
-			}
-			
-			if (dispurl) {
-				outptr = check_size (filter, outptr, &outend,
-						     strlen (refurl) +
-						     strlen (dispurl) + 15);
-				outptr += sprintf (outptr, "<a href=\"%s\">%s</a>",
-						   refurl, dispurl);
-				html->column += strlen (dispurl);
-				g_free (refurl);
-				g_free (dispurl);
-			}
-			
-			if (inptr >= inend)
-				break;
-		}
-		
-		if (*inptr == '@' && (html->flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES)) {
-			char *addr, *outaddr;
-			
-			addr = email_address_extract (&inptr, inend, start, &outptr,
-						      flush ? &backup : NULL);
-			if (backup)
-				break;
-			
-			if (addr) {
-				outaddr = g_strdup_printf ("<a href=\"mailto:%s\">%s</a>",
-							   addr, addr);
-				outptr = check_size (filter, outptr, &outend, strlen (outaddr));
-				outptr += sprintf (outptr, "%s", outaddr);
-				html->column += strlen (addr);
-				g_free (addr);
-				g_free (outaddr);
-			}
-		}
-		
-		outptr = check_size (filter, outptr, &outend, 32);
-		
-		switch ((u = (unsigned char) *inptr++)) {
-		case '<':
-			outptr += sprintf (outptr, "%s", "&lt;");
-			html->column++;
-			break;
-			
-		case '>':
-			outptr += sprintf (outptr, "%s", "&gt;");
-			html->column++;
-			break;
-			
-		case '&':
-			outptr += sprintf (outptr, "%s", "&amp;");
-			html->column++;
-			break;
-			
-		case '"':
-			outptr += sprintf (outptr, "%s", "&quot;");
-			html->column++;
-			break;
-			
-		case '\n':
-			if (html->flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_NL)
-				outptr += sprintf (outptr, "%s", "<br>");
-			
-			*outptr++ = '\n';
-			start = inptr;
-			html->column = 0;
-			break;
-			
-		case '\t':
-			if (html->flags & (CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES)) {
-				do {
-					outptr = check_size (filter, outptr, &outend, 7);
-					outptr += sprintf (outptr, "%s", "&nbsp;");
-					html->column++;
-				} while (html->column % 8);
-				break;
-			}
-			/* otherwise, FALL THROUGH */
-			
-		case ' ':
-			if (html->flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES) {
-				if (inptr == in || (inptr < inend && (*(inptr + 1) == ' ' ||
-								      *(inptr + 1) == '\t' ||
-								      *(inptr - 1) == '\n'))) {
-					outptr += sprintf (outptr, "%s", "&nbsp;");
-					html->column++;
-					break;
-				}
-			}
-			/* otherwise, FALL THROUGH */
-			
-		default:
-			if ((u >= 0x20 && u < 0x80) ||
-			    (u == '\r' || u == '\t')) {
-				/* Default case, just copy. */
-				*outptr++ = (char) u;
-			} else {
-				if (html->flags & CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT)
-					*outptr++ = '?';
-				else
-					outptr += g_snprintf (outptr, 9, "&#%d;", (int) u);
-			}
-			html->column++;
-			break;
-		}
-	}
-	
-	if (inptr < inend)
-		camel_mime_filter_backup (filter, inptr, inend - inptr);
-	
-	if (flush && html->pre_open) {
-		outptr = check_size (filter, outptr, &outend, 10);
-		outptr += sprintf (outptr, "%s", "</pre>");
-		html->pre_open = FALSE;
-	}
-	
-	*out = filter->outbuf;
-	*outlen = outptr - filter->outbuf;
-	*outprespace = filter->outpre;
-}
-
-static void
-filter_filter (CamelMimeFilter *filter, char *in, size_t len, size_t prespace,
-	       char **out, size_t *outlen, size_t *outprespace)
-{
-	html_convert (filter, in, len, prespace, out, outlen, outprespace, FALSE);
-}
-
-static void 
-filter_complete (CamelMimeFilter *filter, char *in, size_t len, size_t prespace,
-		 char **out, size_t *outlen, size_t *outprespace)
-{
-	html_convert (filter, in, len, prespace, out, outlen, outprespace, TRUE);
-}
-
-static void
-filter_reset (CamelMimeFilter *filter)
-{
-	CamelMimeFilterToHTML *html = (CamelMimeFilterToHTML *) filter;
-	
-	html->column = 0;
-	html->pre_open = FALSE;
-	html->saw_citation = FALSE;
-	html->coloured = FALSE;
-}
-
-static void
-camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_tohtml_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-	
-	filter_class->reset = filter_reset;
-	filter_class->filter = filter_filter;
-	filter_class->complete = filter_complete;
-}
-
-
-/**
- * camel_mime_filter_tohtml_new:
- * @flags:
- * @colour:
- *
- * Creates a new CamelMimeFilterToHTML object.
- *
- * Returns a new CamelMimeFilter object.
- **/
-CamelMimeFilter *
-camel_mime_filter_tohtml_new (guint32 flags, guint32 colour)
-{
-	CamelMimeFilterToHTML *new;
-	
-	new = CAMEL_MIME_FILTER_TOHTML (camel_object_new (camel_mime_filter_tohtml_get_type ()));
-	
-	new->flags = flags;
-	new->colour = colour;
-	
-	return CAMEL_MIME_FILTER (new);
-}
diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h
deleted file mode 100644
index 46c4051b87..0000000000
--- a/camel/camel-mime-filter-tohtml.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.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_MIME_FILTER_TOHTML_H__
-#define __CAMEL_MIME_FILTER_TOHTML_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_TOHTML(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTML)
-#define CAMEL_MIME_FILTER_TOHTML_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTMLClass)
-#define CAMEL_IS_MIME_FILTER_TOHTML(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_tohtml_get_type ())
-
-#define CAMEL_MIME_FILTER_TOHTML_PRE               (1 << 0)
-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_NL        (1 << 1)
-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES    (1 << 2)
-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS      (1 << 3)
-#define CAMEL_MIME_FILTER_TOHTML_MARK_CITATION     (1 << 4)
-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES (1 << 5)
-#define CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT       (1 << 6)
-#define CAMEL_MIME_FILTER_TOHTML_CITE              (1 << 7)
-
-typedef struct _CamelMimeFilterToHTMLClass CamelMimeFilterToHTMLClass;
-typedef struct _CamelMimeFilterToHTML CamelMimeFilterToHTML;
-
-struct _CamelMimeFilterToHTML {
-	CamelMimeFilter parent;
-	
-	guint32 flags;
-	guint32 colour;
-	
-	guint32 column       : 29;
-	guint32 pre_open     : 1;
-	guint32 saw_citation : 1;
-	guint32 coloured     : 1;
-};
-
-struct _CamelMimeFilterToHTMLClass {
-	CamelMimeFilterClass parent_class;
-};
-
-
-CamelType        camel_mime_filter_tohtml_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_tohtml_new (guint32 flags, guint32 colour);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAMEL_MIME_FILTER_TOHTML_H__ */
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
deleted file mode 100644
index 6e94b3cde4..0000000000
--- a/camel/camel-mime-filter.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#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 3cd65fe8d1..0000000000
--- a/camel/camel-mime-filter.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* Abstract class for non-copying filters */
-
-#ifndef _CAMEL_MIME_FILTER_H
-#define _CAMEL_MIME_FILTER_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <sys/types.h>
-#include <camel/camel-object.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 CAMEL_IS_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;
-	size_t outsize;
-	size_t outpre;		/* prespace of this buffer */
-
-	char *backbuf;
-	size_t backsize;
-	size_t 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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
deleted file mode 100644
index fe62c84ed5..0000000000
--- a/camel/camel-mime-message.c
+++ /dev/null
@@ -1,908 +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@ximian.com>
- *          Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <gal/util/e-iconv.h>
-
-#include <errno.h>
-
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "string-utils.h"
-#include "hash-table-utils.h"
-#include "camel-url.h"
-
-#include "camel-stream-filter.h"
-#include "camel-stream-null.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-bestenc.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_RESENT_TO,
-	HEADER_CC,
-	HEADER_RESENT_CC,
-	HEADER_BCC,
-	HEADER_RESENT_BCC,
-	HEADER_DATE,
-	HEADER_MESSAGE_ID
-} CamelHeaderType;
-
-static char *header_names[] = {
-	/* dont include HEADER_UNKNOWN string */
-	"From", "Reply-To", "Subject", "To", "Resent-To", "Cc", "Resent-Cc",
-	"Bcc", "Resent-Bcc", "Date", "Message-Id", NULL
-};
-
-static GHashTable *header_name_table;
-
-static CamelMimePartClass *parent_class = NULL;
-
-static char *recipient_names[] = {
-	"To", "Cc", "Bcc", "Resent-To", "Resent-Cc", "Resent-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_received = CAMEL_MESSAGE_DATE_CURRENT;
-	mime_message->date_received_offset = 0;
-	mime_message->message_id = NULL;
-}
-
-static void           
-camel_mime_message_finalize (CamelObject *object)
-{
-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (object);
-	
-	g_free (message->subject);
-	
-	g_free (message->message_id);
-	
-	if (message->reply_to)
-		camel_object_unref ((CamelObject *)message->reply_to);
-	
-	if (message->from)
-		camel_object_unref ((CamelObject *)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)
-{
-	char *datestr;
-	
-	g_assert(message);
-	
-	if (date == CAMEL_MESSAGE_DATE_CURRENT) {
-		struct tm *local;
-		int tz;
-		
-		date = time(0);
-		local = localtime(&date);
-#if defined(HAVE_TIMEZONE)
-		tz = timezone;
-#elif defined(HAVE_TM_GMTOFF)
-		tz = -local->tm_gmtoff;
-#endif
-		offset = -(((tz/60/60) * 100) + (tz/60 % 60));
-#ifdef HAVE_TIMEZONE
-		/* tm.tm_gmtoff is already adjusted for DST */
-		if (local->tm_isdst>0)
-			offset += 100;
-#endif
-	}
-	message->date = date;
-	message->date_offset = offset;
-	
-	datestr = header_format_date (date, offset);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header ((CamelMedium *)message, "Date", datestr);
-	g_free (datestr);
-}
-
-time_t
-camel_mime_message_get_date (CamelMimeMessage *msg, int *offset)
-{
-	if (offset)
-		*offset = msg->date_offset;
-	
-	return msg->date;
-}
-
-time_t
-camel_mime_message_get_date_received (CamelMimeMessage *msg, int *offset)
-{
-	if (msg->date_received == CAMEL_MESSAGE_DATE_CURRENT) {
-		const char *received;
-		
-		received = camel_medium_get_header ((CamelMedium *)msg, "received");
-		if (received)
-			received = strrchr (received, ';');
-		if (received)
-			msg->date_received = header_decode_date (received + 1, &msg->date_received_offset);
-	}
-	
-	if (offset)
-		*offset = msg->date_received_offset;
-	
-	return msg->date_received;
-}
-
-/* **** Message-Id: */
-
-void
-camel_mime_message_set_message_id (CamelMimeMessage *mime_message, const char *message_id)
-{
-	char *id;
-	
-	g_assert (mime_message);
-	
-	g_free (mime_message->message_id);
-	
-	if (message_id) {
-		id = g_strstrip (g_strdup (message_id));
-	} else {
-		id = header_msgid_generate ();
-	}
-	
-	mime_message->message_id = id;
-	id = g_strdup_printf ("<%s>", mime_message->message_id);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "Message-Id", id);
-	g_free (id);
-}
-
-const char *
-camel_mime_message_get_message_id (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-	
-	return mime_message->message_id;
-}
-
-/* **** Reply-To: */
-
-void
-camel_mime_message_set_reply_to (CamelMimeMessage *msg, const CamelInternetAddress *reply_to)
-{
-	char *addr;
-	
-	g_assert(msg);
-	
-	if (msg->reply_to) {
-		camel_object_unref ((CamelObject *)msg->reply_to);
-		msg->reply_to = NULL;
-	}
-	
-	if (reply_to == NULL) {
-		CAMEL_MEDIUM_CLASS (parent_class)->remove_header (CAMEL_MEDIUM (msg), "Reply-To");
-		return;
-	}
-	
-	msg->reply_to = (CamelInternetAddress *)camel_address_new_clone ((CamelAddress *)reply_to);
-	addr = camel_address_encode ((CamelAddress *)msg->reply_to);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (msg), "Reply-To", addr);
-	g_free (addr);
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_reply_to (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-	
-	/* TODO: ref for threading? */
-	
-	return mime_message->reply_to;
-}
-
-/* **** Subject: */
-
-void
-camel_mime_message_set_subject (CamelMimeMessage *mime_message, const char *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 char *
-camel_mime_message_get_subject (CamelMimeMessage *mime_message)
-{
-	g_assert(mime_message);
-	
-	return mime_message->subject;
-}
-
-/* *** From: */
-
-/* Thought: Since get_from/set_from are so rarely called, it is probably not useful
-   to cache the from (and reply_to) addresses as InternetAddresses internally, we
-   could just get it from the headers and reprocess every time. */
-void
-camel_mime_message_set_from (CamelMimeMessage *msg, const CamelInternetAddress *from)
-{
-	char *addr;
-	
-	g_assert(msg);
-	
-	if (msg->from) {
-		camel_object_unref((CamelObject *)msg->from);
-		msg->from = NULL;
-	}
-	
-	if (from == NULL || camel_address_length((CamelAddress *)from) == 0) {
-		CAMEL_MEDIUM_CLASS(parent_class)->remove_header(CAMEL_MEDIUM(msg), "From");
-		return;
-	}
-	
-	msg->from = (CamelInternetAddress *)camel_address_new_clone((CamelAddress *)from);
-	addr = camel_address_encode((CamelAddress *)msg->from);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header(CAMEL_MEDIUM(msg), "From", addr);
-	g_free(addr);
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_from (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-	
-	/* TODO: we should really ref this for multi-threading to work */
-	
-	return mime_message->from;
-}
-
-/*  **** To: Cc: Bcc: */
-
-void
-camel_mime_message_set_recipients(CamelMimeMessage *mime_message, const char *type, const CamelInternetAddress *r)
-{
-	char *text;
-	CamelInternetAddress *addr;
-	
-	g_assert(mime_message);
-	
-	addr = g_hash_table_lookup (mime_message->recipients, type);
-	if (addr == NULL) {
-		g_warning ("trying to set a non-valid receipient type: %s", type);
-		return;
-	}
-	
-	if (r == NULL || camel_address_length ((CamelAddress *)r) == 0) {
-		camel_address_remove ((CamelAddress *)addr, -1);
-		CAMEL_MEDIUM_CLASS (parent_class)->remove_header (CAMEL_MEDIUM (mime_message), type);
-		return;
-	}
-	
-	/* note this does copy, and not append (cat) */
-	camel_address_copy ((CamelAddress *)addr, (const CamelAddress *)r);
-	
-	/* and sync our headers */
-	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_set_source (CamelMimeMessage *mime_message, const char *src)
-{
-	CamelURL *url;
-	char *uri;
-	
-	g_assert (mime_message);
-	
-	url = camel_url_new (src, NULL);
-	if (url) {
-		uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-		camel_medium_add_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source", uri);
-		g_free (uri);
-		camel_url_free (url);
-	}
-}
-
-const char *
-camel_mime_message_get_source (CamelMimeMessage *mime_message)
-{
-	const char *src;
-	
-	g_assert(mime_message);
-	
-	src = camel_medium_get_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source");
-	if (src) {
-		while (*src && isspace ((unsigned) *src))
-			++src;
-	}
-	return src;
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_recipients (CamelMimeMessage *mime_message, const char *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;
-	int err;
-
-	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
-	err = camel_mime_parser_errno(mp);
-	if (err != 0) {
-		errno = err;
-		ret = -1;
-	}
-
-	return ret;
-}
-
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMimeMessage *mm = CAMEL_MIME_MESSAGE (data_wrapper);
-	
-	/* force mandatory headers ... */
-	if (mm->from == NULL) {
-		/* FIXME: should we just abort?  Should we make one up? */
-		g_warning ("No from set for message");
-		camel_medium_set_header ((CamelMedium *)mm, "From", "");
-	}
-	if (!camel_medium_get_header ((CamelMedium *)mm, "Date"))
-		camel_mime_message_set_date (mm, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	
-	if (mm->subject == NULL)
-		camel_mime_message_set_subject (mm, "No Subject");
-	
-	if (mm->message_id == NULL)
-		camel_mime_message_set_message_id (mm, NULL);
-	
-	/* 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);
-}
-
-/* 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;
-	const char *charset;
-	
-	header_type = (CamelHeaderType)g_hash_table_lookup (header_name_table, header_name);
-	switch (header_type) {
-	case HEADER_FROM:
-		if (message->from)
-			camel_object_unref (CAMEL_OBJECT (message->from));
-		message->from = camel_internet_address_new ();
-		camel_address_decode (CAMEL_ADDRESS (message->from), header_value);
-		break;
-	case HEADER_REPLY_TO:
-		if (message->reply_to)
-			camel_object_unref (CAMEL_OBJECT (message->reply_to));
-		message->reply_to = camel_internet_address_new ();
-		camel_address_decode (CAMEL_ADDRESS (message->reply_to), header_value);
-		break;
-	case HEADER_SUBJECT:
-		g_free (message->subject);
-		if (((CamelMimePart *)message)->content_type)
-			charset = e_iconv_charset_name(header_content_type_param(((CamelMimePart *)message)->content_type, "charset"));
-		else
-			charset = NULL;
-		message->subject = g_strstrip (header_decode_string (header_value, charset));
-		break;
-	case HEADER_TO:
-	case HEADER_CC:
-	case HEADER_BCC:
-	case HEADER_RESENT_TO:
-	case HEADER_RESENT_CC:
-	case HEADER_RESENT_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:
-		if (header_value) {
-			message->date = header_decode_date (header_value, &message->date_offset);
-		} else {
-			message->date = CAMEL_MESSAGE_DATE_CURRENT;
-			message->date_offset = 0;
-		}
-		break;
-	case HEADER_MESSAGE_ID:
-		g_free (message->message_id);
-		if (header_value)
-			message->message_id = header_msgid_decode (header_value);
-		else
-			message->message_id = NULL;
-		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);
-}
-
-typedef gboolean (*CamelPartFunc)(CamelMimeMessage *, CamelMimePart *, void *data);
-
-static gboolean
-message_foreach_part_rec (CamelMimeMessage *msg, CamelMimePart *part, CamelPartFunc callback, void *data)
-{
-	CamelDataWrapper *containee;
-	int parts, i;
-	int go = TRUE;
-	
-	if (callback (msg, part, data) == FALSE)
-		return FALSE;
-	
-	containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	if (containee == NULL)
-		return go;
-	
-	/* 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; go && i < parts; i++) {
-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
-			
-			go = message_foreach_part_rec (msg, part, callback, data);
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
-		go = message_foreach_part_rec (msg, (CamelMimePart *)containee, callback, data);
-	}
-	
-	return go;
-}
-
-/* dont make this public yet, it might need some more thinking ... */
-/* MPZ */
-static void
-camel_mime_message_foreach_part (CamelMimeMessage *msg, CamelPartFunc callback, void *data)
-{
-	message_foreach_part_rec (msg, (CamelMimePart *)msg, callback, data);
-}
-
-static gboolean
-check_8bit (CamelMimeMessage *msg, CamelMimePart *part, void *data)
-{
-	int *has8bit = data;
-	
-	/* check this part, and stop as soon as we are done */
-	*has8bit = camel_mime_part_get_encoding (part) == CAMEL_MIME_PART_ENCODING_8BIT;
-	return !(*has8bit);
-}
-
-gboolean
-camel_mime_message_has_8bit_parts (CamelMimeMessage *msg)
-{
-	int has8bit = FALSE;
-	
-	camel_mime_message_foreach_part (msg, check_8bit, &has8bit);
-	
-	return has8bit;
-}
-
-/* finds the best charset and transfer encoding for a given part */
-static CamelMimePartEncodingType
-find_best_encoding (CamelMimePart *part, CamelBestencRequired required, CamelBestencEncoding enctype, char **charsetp)
-{
-	const char *charsetin = NULL;
-	char *charset = NULL;
-	CamelStream *null;
-	CamelStreamFilter *filter;
-	CamelMimeFilterCharset *charenc = NULL;
-	CamelMimeFilterBestenc *bestenc;
-	int idb, idc = -1;
-	gboolean istext;
-	unsigned int flags, callerflags;
-	CamelMimePartEncodingType encoding;
-	CamelDataWrapper *content;
-	
-	/* we use all these weird stream things so we can do it with streams, and
-	   not have to read the whole lot into memory - although i have a feeling
-	   it would make things a fair bit simpler to do so ... */
-	
-	d(printf("starting to check part\n"));
-	
-	content = camel_medium_get_content_object ((CamelMedium *)part);
-	if (content == NULL) {
-		/* charset might not be right here, but it'll get the right stuff
-		   if it is ever set */
-		*charsetp = NULL;
-		return CAMEL_MIME_PART_ENCODING_DEFAULT;
-	}
-	
-	istext = header_content_type_is (part->content_type, "text", "*");
-	if (istext) {
-		flags = CAMEL_BESTENC_GET_CHARSET | CAMEL_BESTENC_GET_ENCODING;
-	} else {
-		flags = CAMEL_BESTENC_GET_ENCODING;
-	}
-	
-	/* when building the message, any encoded parts are translated already */
-	flags |= CAMEL_BESTENC_LF_IS_CRLF;
-	/* and get any flags the caller passed in */
-	callerflags = (required & CAMEL_BESTENC_NO_FROM);
-	flags |= callerflags;
-	
-	/* first a null stream, so any filtering is thrown away; we only want the sideeffects */
-	null = (CamelStream *)camel_stream_null_new ();
-	filter = camel_stream_filter_new_with_stream (null);
-	
-	/* if we're not looking for the best charset, then use the one we have */
-	if (istext && (required & CAMEL_BESTENC_GET_CHARSET) == 0
-	    && (charsetin = header_content_type_param (part->content_type, "charset"))) {
-		/* if libunicode doesn't support it, we dont really have utf8 anyway, so
-		   we dont need a converter */
-		charenc = camel_mime_filter_charset_new_convert ("UTF-8", charsetin);
-		if (charenc != NULL)
-			idc = camel_stream_filter_add (filter, (CamelMimeFilter *)charenc);
-		charsetin = NULL;
-	}
-	
-	bestenc = camel_mime_filter_bestenc_new (flags);
-	idb = camel_stream_filter_add (filter, (CamelMimeFilter *)bestenc);
-	d(printf("writing to checking stream\n"));
-	camel_data_wrapper_write_to_stream (content, (CamelStream *)filter);
-	camel_stream_filter_remove (filter, idb);
-	if (idc != -1) {
-		camel_stream_filter_remove (filter, idc);
-		camel_object_unref ((CamelObject *)charenc);
-		charenc = NULL;
-	}
-	
-	if (istext)
-		charsetin = camel_mime_filter_bestenc_get_best_charset (bestenc);
-	
-	d(printf("charsetin = %s\n", charsetin ? charsetin : "(null)"));
-	
-	/* if we have US-ASCII, or we're not doing text, we dont need to bother with the rest */
-	if (charsetin != NULL && (required & CAMEL_BESTENC_GET_CHARSET) != 0) {
-		charset = g_strdup (charsetin);
-		
-		d(printf("have charset, trying conversion/etc\n"));
-		
-		/* now the 'bestenc' can has told us what the best encoding is, we can use that to create
-		   a charset conversion filter as well, and then re-add the bestenc to filter the
-		   result to find the best encoding to use as well */
-		
-		charenc = camel_mime_filter_charset_new_convert ("UTF-8", charset);
-		
-		/* eek, libunicode doesn't undertand this charset anyway, then the 'utf8' we
-		   thought we had is really the native format, in which case, we just treat
-		   it as binary data (and take the result we have so far) */
-		
-		if (charenc != NULL) {
-			/* otherwise, try another pass, converting to the real charset */
-			
-			camel_mime_filter_reset ((CamelMimeFilter *)bestenc);
-			camel_mime_filter_bestenc_set_flags (bestenc, CAMEL_BESTENC_GET_ENCODING |
-							     CAMEL_BESTENC_LF_IS_CRLF | callerflags);
-			
-			camel_stream_filter_add (filter, (CamelMimeFilter *)charenc);
-			camel_stream_filter_add (filter, (CamelMimeFilter *)bestenc);
-			
-			/* and write it to the new stream */
-			camel_data_wrapper_write_to_stream (content, (CamelStream *)filter);
-			
-			camel_object_unref ((CamelObject *)charenc);
-		}
-	}
-	
-	encoding = camel_mime_filter_bestenc_get_best_encoding (bestenc, enctype);
-	
-	camel_object_unref ((CamelObject *)filter);
-	camel_object_unref ((CamelObject *)bestenc);
-	camel_object_unref ((CamelObject *)null);
-	
-	d(printf("done, best encoding = %d\n", encoding));
-	
-	if (charsetp)
-		*charsetp = charset;
-	else
-		g_free (charset);
-	
-	return encoding;
-}
-
-struct _enc_data {
-	CamelBestencRequired required;
-	CamelBestencEncoding enctype;
-};
-
-static gboolean
-best_encoding (CamelMimeMessage *msg, CamelMimePart *part, void *datap)
-{
-	struct _enc_data *data = datap;
-	CamelMimePartEncodingType encoding;
-	CamelDataWrapper *wrapper;
-	char *charset;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	if (!wrapper)
-		return FALSE;
-	
-	/* we only care about actual content objects */
-	if (!CAMEL_IS_MULTIPART (wrapper) && !CAMEL_IS_MIME_MESSAGE (wrapper)) {
-		encoding = find_best_encoding (part, data->required, data->enctype, &charset);
-		/* we always set the encoding, if we got this far.  GET_CHARSET implies
-		   also GET_ENCODING */
-		camel_mime_part_set_encoding (part, encoding);
-		
-		if ((data->required & CAMEL_BESTENC_GET_CHARSET) != 0) {
-			if (header_content_type_is (part->content_type, "text", "*")) {
-				char *newct;
-				
-				/* FIXME: ick, the part content_type interface needs fixing bigtime */
-				header_content_type_set_param (part->content_type, "charset",
-							       charset ? charset : "us-ascii");
-				newct = header_content_type_format (part->content_type);
-				if (newct) {
-					d(printf("Setting content-type to %s\n", newct));
-					
-					camel_mime_part_set_content_type (part, newct);
-					g_free (newct);
-				}
-			}
-		}
-	}
-	
-	return TRUE;
-}
-
-void
-camel_mime_message_set_best_encoding (CamelMimeMessage *msg, CamelBestencRequired required, CamelBestencEncoding enctype)
-{
-	struct _enc_data data;
-	
-	if ((required & (CAMEL_BESTENC_GET_ENCODING|CAMEL_BESTENC_GET_CHARSET)) == 0)
-		return;
-	
-	data.required = required;
-	data.enctype = enctype;
-	
-	camel_mime_message_foreach_part (msg, best_encoding, &data);
-}
-
-void
-camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message)
-{
-	camel_mime_message_set_best_encoding (mime_message, CAMEL_BESTENC_GET_ENCODING, CAMEL_BESTENC_7BIT);
-}
-
-
-struct _check_content_id {
-	CamelMimePart *part;
-	const char *content_id;
-};
-
-static gboolean
-check_content_id (CamelMimeMessage *message, CamelMimePart *part, void *data)
-{
-	struct _check_content_id *check = (struct _check_content_id *) data;
-	const char *content_id;
-	gboolean found;
-	
-	content_id = camel_mime_part_get_content_id (part);
-	
-	found = content_id && !strcmp (content_id, check->content_id) ? TRUE : FALSE;
-	if (found) {
-		check->part = part;
-		camel_object_ref (CAMEL_OBJECT (part));
-	}
-	
-	return !found;
-}
-
-CamelMimePart *
-camel_mime_message_get_part_by_content_id (CamelMimeMessage *message, const char *id)
-{
-	struct _check_content_id check;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-	
-	if (id == NULL)
-		return NULL;
-	
-	check.content_id = id;
-	check.part = NULL;
-	
-	camel_mime_message_foreach_part (message, check_content_id, &check);
-	
-	return check.part;
-}
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
deleted file mode 100644
index 7735cc1775..0000000000
--- a/camel/camel-mime-message.h
+++ /dev/null
@@ -1,138 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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>
-#include <camel/camel-mime-filter-bestenc.h>
-
-#define CAMEL_RECIPIENT_TYPE_TO "To"
-#define CAMEL_RECIPIENT_TYPE_CC "Cc"
-#define CAMEL_RECIPIENT_TYPE_BCC "Bcc"
-
-#define CAMEL_RECIPIENT_TYPE_RESENT_TO "Resent-To"
-#define CAMEL_RECIPIENT_TYPE_RESENT_CC "Resent-Cc"
-#define CAMEL_RECIPIENT_TYPE_RESENT_BCC "Resent-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 */
-
-	/* cached internal copy */
-	time_t date_received;
-	int date_received_offset;	/* GMT offset */
-
-	char *subject;
-
-	char *message_id;
-
-	CamelInternetAddress *reply_to;
-	CamelInternetAddress *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);
-time_t                      camel_mime_message_get_date           (CamelMimeMessage           *mime_message,
-								   int                        *offset);
-time_t                      camel_mime_message_get_date_received  (CamelMimeMessage           *mime_message,
-								   int                        *offset);
-void                        camel_mime_message_set_message_id     (CamelMimeMessage           *mime_message,
-								   const char                 *message_id);
-const char                 *camel_mime_message_get_message_id     (CamelMimeMessage           *mime_message);
-void                        camel_mime_message_set_reply_to       (CamelMimeMessage           *mime_message,
-								   const CamelInternetAddress *reply_to);
-const CamelInternetAddress *camel_mime_message_get_reply_to       (CamelMimeMessage           *mime_message);
-
-void                        camel_mime_message_set_subject        (CamelMimeMessage           *mime_message,
-								   const char                 *subject);
-const char                 *camel_mime_message_get_subject        (CamelMimeMessage           *mime_message);
-void                        camel_mime_message_set_from           (CamelMimeMessage           *mime_message,
-								   const CamelInternetAddress *from);
-const CamelInternetAddress *camel_mime_message_get_from           (CamelMimeMessage           *mime_message);
-
-const CamelInternetAddress *camel_mime_message_get_recipients     (CamelMimeMessage           *mime_message,
-								   const char                 *type);
-void                        camel_mime_message_set_recipients     (CamelMimeMessage           *mime_message,
-								   const char                 *type,
-								   const CamelInternetAddress *r);
-
-void                        camel_mime_message_set_source         (CamelMimeMessage           *mime_message,
-								   const char                 *identity);
-const char                 *camel_mime_message_get_source         (CamelMimeMessage           *mime_message);
-								   
-
-/* utility functions */
-gboolean                    camel_mime_message_has_8bit_parts     (CamelMimeMessage           *mime_message);
-void                        camel_mime_message_set_best_encoding  (CamelMimeMessage           *msg,
-								   CamelBestencRequired        required,
-								   CamelBestencEncoding        enctype);
-void                        camel_mime_message_encode_8bit_parts  (CamelMimeMessage           *mime_message);
-
-CamelMimePart              *camel_mime_message_get_part_by_content_id (CamelMimeMessage *message, const char *content_id);
-
-#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 f57583135d..0000000000
--- a/camel/camel-mime-parser.c
+++ /dev/null
@@ -1,1986 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, 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 <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 */
-
-	int ioerrno;		/* io error state */
-
-	/* 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;
-
-	off_t seek;		/* current offset to start of buffer */
-	int unstep;		/* how many states to 'unstep' (repeat the current state) */
-
-	unsigned int midline:1;		/* are we mid-line interrupted? */
-	unsigned int scan_from:1;	/* do we care about From lines? */
-	unsigned int scan_pre_from:1;	/* do we return pre-from data? */
-
-	off_t start_of_from;	/* where from started */
-	off_t start_of_headers;	/* where headers started from the last scan */
-
-	off_t 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 */
-
-	GByteArray *from_line;	/* the from line */
-
-	char *boundary;		/* for multipart/ * boundaries, including leading -- and trailing -- for the final part */
-	int boundarylen;	/* actual length of boundary, including leading -- if there is one */
-	int boundarylenfinal;	/* length of boundary, including trailing -- if there is one */
-	int atleast;		/* the biggest boundary from here to the parent */
-};
-
-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, GByteArray *save);
-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);
-static int folder_read(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);
-
-#if d(!)0
-static char *states[] = {
-	"HSCAN_INITIAL",
-	"HSCAN_PRE_FROM",	/* pre-from data */
-	"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 */
-
-	"HSCAN_EOF",		/* end of file */
-	"HSCAN_PRE_FROM_END",
-	"HSCAN_FROM_END",
-	"HSCAN_HEAER_END",
-	"HSCAN_BODY_END",
-	"HSCAN_MULTIPART_END",
-	"HSCAN_MESSAGE_END",
-};
-#endif
-
-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_from_line:
- * @m: 
- * 
- * Get the last scanned "From " line, from a recently scanned from.
- * This should only be called in the HSCAN_FROM state.  The
- * from line will include the closing \n found (if there was one).
- *
- * The return value will remain valid while in the HSCAN_FROM
- * state, or any deeper state.
- * 
- * Return value: The From line, or NULL if called out of context.
- **/
-const char *
-camel_mime_parser_from_line(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return byte_array_to_string(s->parts->from_line);
-
-	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.
- *
- * This may also be preceeded by an optional
- * HSCAN_PRE_FROM state which contains the scanned data
- * found before the From line is encountered.  See also
- * scan_pre_from().
- **/
-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_scan_pre_from:
- * @: 
- * @scan_pre_from: #TRUE if we want to get pre-from data.
- * 
- * Tell the scanner whether we want to know abou the pre-from
- * data during a scan.  If we do, then we may get an additional
- * state HSCAN_PRE_FROM which returns the specified data.
- **/
-void
-camel_mime_parser_scan_pre_from(CamelMimeParser *m, int scan_pre_from)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	s->scan_pre_from = scan_pre_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_read:
- * @m: 
- * @databuffer: 
- * @len: 
- * 
- * Read at most @len bytes from the internal mime parser buffer.
- *
- * Returns the address of the internal buffer in @databuffer,
- * and the length of useful data.
- *
- * @len may be specified as INT_MAX, in which case you will
- * get the full remainder of the buffer at each call.
- *
- * Note that no parsing of the data read through this function
- * occurs, so no state changes occur, but the seek position
- * is updated appropriately.
- *
- * Return value: The number of bytes available, or -1 on error.
- **/
-int
-camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	int there;
-
-	if (len == 0)
-		return 0;
-
-	d(printf("parser::read() reading %d bytes\n", len));
-
-	there = MIN(s->inend - s->inptr, len);
-	d(printf("parser::read() there = %d bytes\n", there));
-	if (there > 0) {
-		*databuffer = s->inptr;
-		s->inptr += there;
-		return there;
-	}
-
-	if (folder_read(s) == -1)
-		return -1;
-
-	there = MIN(s->inend - s->inptr, len);
-	d(printf("parser::read() had to re-read, now there = %d bytes\n", there));
-
-	*databuffer = s->inptr;
-	s->inptr += there;
-
-	return there;
-}
-
-/**
- * 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;
-}
-
-/* Return errno of the parser, incase any error occured during processing */
-int camel_mime_parser_errno(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return s->ioerrno;
-}
-
-/* ********************************************************************** */
-/*    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));
-	} else {
-		s->ioerrno = errno?errno:EIO;
-	}
-
-	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;
-			s->ioerrno = errno?errno:EIO;
-		}
-	} else {
-		s->ioerrno = errno?errno:EIO;
-	}
-#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)
-{
-	if (s->parts && s->parts->atleast > h->boundarylenfinal)
-		h->atleast = s->parts->atleast;
-	else
-		h->atleast = MAX(h->boundarylenfinal, 1);
-
-	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);
-		if (h->from_line)
-			g_byte_array_free(h->from_line, TRUE);
-		g_free(h);
-	} else {
-		g_warning("Header stack underflow!\n");
-	}
-}
-
-static int
-folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save)
-{
-	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')
-			;
-
-		if (save)
-			g_byte_array_append(save, s->inptr, inptr-s->inptr);
-
-		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;	/* 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", s->atleast, 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->boundarylenfinal <= len) {
-				int extra = part->boundarylenfinal - part->boundarylen;
-				
-				/* check the extra stuff on an final boundary, normally -- for mime parts */
-				if (extra>0) {
-					*lastone = memcmp(&boundary[part->boundarylen],
-							  &part->boundary[part->boundarylen],
-							  extra) == 0;
-				} else {
-					*lastone = TRUE;
-				}
-				h(printf("checking lastone = %s\n", *lastone?"TRUE":"FALSE"));
-			} 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
-   remove trailing \r chars (\n's assumed already removed)
-   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 > 0) {									\
-		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;						\
-		}										\
-		if (start[headerlen-1] == '\r')							\
-			headerlen--;								\
-		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, newatleast;
-	char *start = NULL;
-	int len;
-	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
-
-	if (s->parts)
-		newatleast = s->parts->atleast;
-	else
-		newatleast = 1;
-	*lastone = FALSE;
-
-	do {
-		s->atleast = newatleast;
-
-		h(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+1;
-			
-			while (inptr<inend) {
-				if (!s->midline) {
-					if (folder_boundary_check(s, inptr, lastone)) {
-						if ((s->outptr>s->outbuf))
-							goto header_truncated; /* may not actually be truncated */
-						
-						goto header_done;
-					}
-				}
-				
-				start = inptr;
-
-				/* goto next line/sentinal */
-				while ((*inptr++)!='\n')
-					;
-			
-				g_assert(inptr<=s->inend+1);
-				
-				/* check for sentinal or real end of line */
-				if (inptr > inend) {
-					h(printf("not at end of line yet, going further\n"));
-					/* didn't find end of line within our allowed area */
-					inptr = inend;
-					s->midline = TRUE;
-					header_append(s, start, inptr);
-				} else {
-					h(printf("got line part: '%.*s'\n", inptr-1-start, start));
-					/* got a line, strip and add it, process it */
-					s->midline = FALSE;
-					header_append(s, start, inptr-1);
-
-					/* check for end of headers */
-					if (s->outbuf == s->outptr)
-						goto header_done;
-
-					/* check for continuation/compress headers, we have atleast 1 char here to work with */
-					if (inptr[0] ==  ' ' || inptr[0] == '\t') {
-						h(printf("continuation\n"));
-						/* TODO: this wont catch multiple space continuation across a read boundary, but
-						   that is assumed rare, and not fatal anyway */
-						do
-							inptr++;
-						while (*inptr == ' ' || *inptr == '\t');
-						inptr--;
-						*inptr = ' ';
-					} else {
-						/* otherwise, complete header, add it */
-						s->outptr[0] = 0;
-				
-						h(printf("header '%.20s' at %d\n", s->outbuf, s->header_start));
-						
-						header_raw_append_parse(&h->headers, s->outbuf, s->header_start);
-						s->outptr = s->outbuf;
-						s->header_start = -1;
-					}
-				}
-			}
-			s->inptr = inptr;
-		}
-		h(printf("end of file?  read %d bytes\n", len));
-		newatleast = 1;
-	} while (s->atleast > 1);
-
-	if ((s->outptr > s->outbuf) || s->inend > s->inptr) {
-		start = s->inptr;
-		inptr = s->inend;
-		if (inptr > start) {
-			if (inptr[-1] == '\n')
-				inptr--;
-		}
-		goto header_truncated;
-	}
-	
-	s->atleast = atleast;
-	
-	return h;
-	
-header_truncated:
-	header_append(s, start, inptr);
-	
-	s->outptr[0] = 0;
-	if (s->outbuf == s->outptr)
-		goto header_done;
-	
-	header_raw_append_parse(&h->headers, s->outbuf, s->header_start);
-	
-	s->outptr = s->outbuf;
-header_done:
-	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, newatleast;
-	register char *inptr;
-	char *inend;
-	char *start;
-	int len;
-	struct _header_scan_stack *part;
-	int onboundary = FALSE;
-
-	c(printf("scanning content\n"));
-
-	part = s->parts;
-	if (part)
-		newatleast = part->atleast;
-	else
-		newatleast = 1;
-	*lastone = FALSE;
-
-	c(printf("atleast = %d\n", s->atleast));
-
-	do {
-		s->atleast = newatleast;
-
-		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+1;
-			start = inptr;
-
-			c(printf("inptr = %p, inend = %p\n", inptr, inend));
-
-			while (inptr<inend) {
-				if (!s->midline
-				    && (part = folder_boundary_check(s, inptr, lastone))) {
-					onboundary = TRUE;
-
-					/* since we truncate the boundary data, we need at least 1 char here spare,
-					   to remain in the same state */
-					if ( (inptr-start) > 1)
-						goto content;
-
-					/* otherwise, jump to the state of the boundary we actually found */
-					goto normal_exit;
-				}
-				
-				/* goto the next line */
-				while ((*inptr++)!='\n')
-					;
-
-				/* check the sentinal, if we went past the atleast limit, and reset it to there */
-				if (inptr > inend) {
-					s->midline = TRUE;
-					inptr = inend;
-				} else {
-					s->midline = FALSE;
-				}
-			}
-
-			c(printf("ran out of input, dumping what i have (%d) bytes midline = %s\n",
-				 inptr-start, s->midline?"TRUE":"FALSE"));
-			goto content;
-		}
-		newatleast = 1;
-	} while (s->atleast > 1);
-
-	c(printf("length read = %d\n", len));
-
-	if (s->inend > s->inptr) {
-		start = s->inptr;
-		inptr = s->inend;
-		goto content;
-	}
-
-	*length = 0;
-	s->atleast = atleast;
-	return NULL;
-
-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 && (inptr-start)>0)
-		*length = inptr-start-1;
-	else
-		*length = inptr-start;
-
-	/*printf("got %scontent: '%.*s'\n", 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->ioerrno = 0;
-
-	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->scan_pre_from = FALSE;
-
-	s->filters = NULL;
-	s->filterid = 1;
-
-	s->parts = NULL;
-
-	s->state = HSCAN_INITIAL;
-	return s;
-}
-
-static void
-drop_states(struct _header_scan_state *s)
-{
-	while (s->parts) {
-		folder_scan_drop_step(s);
-	}
-	s->unstep = 0;
-	s->state = HSCAN_INITIAL;
-}
-
-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) {
-		drop_states(s);
-		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;
-		}
-		s->ioerrno = 0;
-		return 0;
-	} else {
-		s->ioerrno = errno?errno:EIO;
-		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) {
-		drop_states(s);
-		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;
-		}
-		s->ioerrno = 0;
-		return 0;
-	} else {
-		s->ioerrno = errno?errno:EIO;
-		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) {
-
-#ifdef USE_FROM
-	case HSCAN_INITIAL:
-		if (s->scan_from) {
-			h = g_malloc0(sizeof(*h));
-			h->boundary = g_strdup("From ");
-			h->boundarylen = strlen(h->boundary);
-			h->boundarylenfinal = h->boundarylen;
-			h->from_line = g_byte_array_new();
-			folder_push_part(s, h);
-			s->state = HSCAN_PRE_FROM;
-		} else {
-			s->start_of_from = -1;
-			goto scan_header;
-		}
-
-	case HSCAN_PRE_FROM:
-
-		h = s->parts;
-		do {
-			hb = folder_scan_content(s, &state, databuffer, datalength);
-			if (s->scan_pre_from && *datalength > 0) {
-				d(printf("got pre-from content %d bytes\n", *datalength));
-				return;
-			}
-		} 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->from_line);
-			h->savestate = HSCAN_INITIAL;
-			s->state = HSCAN_FROM;
-		} else {
-			folder_pull_part(s);
-			s->state = HSCAN_EOF;
-		}
-		return;
-#else
-	case HSCAN_INITIAL:
-	case HSCAN_PRE_FROM:
-#endif /* !USE_FROM */
-
-	scan_header:
-	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->boundarylenfinal = h->boundarylen+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 */
-		while (f) {
-			camel_mime_filter_complete(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, NULL);
-				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:
-	case HSCAN_PRE_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 7f784a1065..0000000000
--- a/camel/camel-mime-parser.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_PARSER_H
-#define _CAMEL_MIME_PARSER_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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 CAMEL_IS_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_PRE_FROM,		/* data before a 'From' line */
-	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_PRE_FROM_END,	/* pre from end */
-	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 *);
-};
-
-CamelType		camel_mime_parser_get_type	(void);
-CamelMimeParser      *camel_mime_parser_new	(void);
-
-/* quick-fix for parser not erroring, we can find out if it had an error afterwards */
-int		camel_mime_parser_errno		(CamelMimeParser *);
-
-/* 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);
-/* Do we want to know about the pre-from data? */
-void camel_mime_parser_scan_pre_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 *);
-
-/* read through the parser */
-int camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len);
-
-/* 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);
-
-/* return the from line content */
-const char *camel_mime_parser_from_line(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 *);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#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 987e5e77d7..0000000000
--- a/camel/camel-mime-part-utils.c
+++ /dev/null
@@ -1,390 +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@ximian.com>
- *          Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <gal/util/e-iconv.h>
-#include <gal/unicode/gunicode.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-fs.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"
-#include "camel-mime-filter-save.h"
-#include "camel-html-parser.h"
-#include "camel-charset-map.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-/* example: <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> */
-
-static const char *
-check_html_charset(char *buffer, int length)
-{
-	CamelHTMLParser *hp;
-	const char *charset = NULL;
-	camel_html_parser_t state;
-	struct _header_content_type *ct;
-
-	/* if we need to first base64/qp decode, do this here, sigh */
-	hp = camel_html_parser_new();
-	camel_html_parser_set_data(hp, buffer, length, TRUE);
-	
-	do {
-		const char *data;
-		int len;
-		const char *val;
-		
-		state = camel_html_parser_step(hp, &data, &len);
-		
-		/* example: <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> */
-		
-		switch(state) {
-		case CAMEL_HTML_PARSER_ELEMENT:
-			val = camel_html_parser_tag(hp);
-			d(printf("Got tag: %s\n", val));
-			if (g_strcasecmp(val, "meta") == 0
-			    && (val = camel_html_parser_attr(hp, "http-equiv"))
-			    && g_strcasecmp(val, "content-type") == 0
-			    && (val = camel_html_parser_attr(hp, "content"))
-			    && (ct = header_content_type_decode(val))) {
-				charset = header_content_type_param(ct, "charset");
-				charset = e_iconv_charset_name (charset);
-				header_content_type_unref(ct);
-			}
-			break;
-		default:
-			/* ignore everything else */
-			break;
-		}
-	} while (charset == NULL && state != CAMEL_HTML_PARSER_EOF);
-
-	camel_object_unref((CamelObject *)hp);
-
-	return charset;
-}
-
-static GByteArray *
-convert_buffer (GByteArray *in, const char *to, const char *from)
-{
-	size_t inleft, outleft, outlen, converted = 0;
-	GByteArray *out = NULL;
-	const char *inbuf;
-	char *outbuf;
-	iconv_t cd;
-	
-	if (in->len == 0)
-		return g_byte_array_new();
-
-	d(printf("converting buffer from %s to %s: '%.*s'\n", from, to, (int)in->len, in->data));
-	
-	cd = e_iconv_open(to, from);
-	if (cd == (iconv_t) -1) {
-		g_warning ("Cannot convert from '%s' to '%s': %s", from, to, g_strerror (errno));
-		return NULL;
-	}
-	
-	outlen = in->len * 2 + 16;
-	out = g_byte_array_new ();
-	g_byte_array_set_size (out, outlen);
-	
-	inbuf = in->data;
-	inleft = in->len;
-	
-	do {
-		outbuf = out->data + converted;
-		outleft = outlen - converted;
-		
-		converted = e_iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
-		if (converted == (size_t) -1) {
-			if (errno != E2BIG && errno != EINVAL)
-				goto fail;
-		}
-		
-		/*
-		 * E2BIG   There is not sufficient room at *outbuf.
-		 *
-		 * We just need to grow our outbuffer and try again.
-		 */
-		
-		converted = outlen - outleft;
-		if (errno == E2BIG) {
-			outlen += inleft * 2 + 16;
-			out = g_byte_array_set_size (out, outlen);
-			outbuf = out->data + converted;
-		}
-		
-	} while (errno == E2BIG && inleft > 0);
-	
-	/*
-	 * EINVAL  An  incomplete  multibyte sequence has been encoun�
-	 *         tered in the input.
-	 *
-	 * We'll just have to ignore it...
-	 */
-	
-	/* flush the iconv conversion */
-	e_iconv (cd, NULL, NULL, &outbuf, &outleft);
-	
-	/* now set the true length on the GByteArray */
-	converted = outlen - outleft;
-	g_byte_array_set_size (out, converted);
-	
-	e_iconv_close (cd);
-	
-	return out;
-	
- fail:
-	g_warning ("Cannot convert from '%s' to '%s': %s", from, to, g_strerror (errno));
-	
-	g_byte_array_free (out, TRUE);
-	
-	e_iconv_close (cd);
-	
-	return NULL;
-}
-
-/* We don't really use the charset argument except for debugging... */
-static gboolean
-broken_windows_charset (GByteArray *buffer, const char *charset)
-{
-	register unsigned char *inptr;
-	unsigned char *inend;
-	
-	inptr = buffer->data;
-	inend = inptr + buffer->len;
-	
-	while (inptr < inend) {
-		register unsigned char c = *inptr++;
-		
-		if (c >= 128 && c <= 159) {
-			g_warning ("Encountered Windows charset parading as %s", charset);
-			return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
-
-static gboolean
-is_7bit (GByteArray *buffer)
-{
-	register unsigned int i;
-	
-	for (i = 0; i < buffer->len; i++)
-		if (buffer->data[i] > 127)
-			return FALSE;
-	
-	return TRUE;
-}
-
-/* simple data wrapper */
-static void
-simple_data_wrapper_construct_from_parser (CamelDataWrapper *dw, CamelMimeParser *mp)
-{
-	CamelMimeFilter *fdec = NULL, *fcrlf = NULL;
-	CamelMimeFilterBasicType enctype = 0;
-	int len, decid = -1, crlfid = -1;
-	struct _header_content_type *ct;
-	const char *charset = NULL;
-	GByteArray *buffer;
-	char *encoding, *buf;
-	CamelStream *mem;
-	
-	d(printf ("simple_data_wrapper_construct_from_parser()\n"));
-	
-	/* 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"));
-			enctype = CAMEL_MIME_FILTER_BASIC_BASE64_DEC;
-		} else if (!strcasecmp (encoding, "quoted-printable")) {
-			d(printf("Adding quoted-printable decoder ...\n"));
-			enctype = CAMEL_MIME_FILTER_BASIC_QP_DEC;
-		} else if (!strcasecmp (encoding, "x-uuencode")) {
-			d(printf("Adding uudecoder ...\n"));
-			enctype = CAMEL_MIME_FILTER_BASIC_UU_DEC;
-		}
-		g_free (encoding);
-		
-		if (enctype != 0) {
-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(enctype);
-			decid = camel_mime_parser_filter_add (mp, fdec);
-		}
-	}
-	
-	/* 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", "*")) {
-		charset = header_content_type_param(ct, "charset");
-		charset = e_iconv_charset_name(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);
-		}
-	}
-	
-	/* read in the entire content */
-	buffer = g_byte_array_new();
-	while (camel_mime_parser_step(mp, &buf, &len) != HSCAN_BODY_END) {
-		d(printf("appending o/p data: %d: %.*s\n", len, len, buf));
-		g_byte_array_append(buffer, buf, len);
-	}
-
-	/* Possible Lame Mailer Alert... check the META tags for a charset */
-	if (!charset && header_content_type_is (ct, "text", "html"))
-		charset = check_html_charset(buffer->data, buffer->len);
-	
-	/* if we need to do charset conversion, see if we can/it works/etc */
-	if (charset && !(strcasecmp (charset, "us-ascii") == 0
-			 || strcasecmp (charset, "utf-8") == 0
-			 || strncasecmp (charset, "x-", 2) == 0)) {
-		GByteArray *out;
-		
-		/* You often see Microsoft Windows users announcing their texts
-		 * as being in ISO-8859-1 even when in fact they contain funny
-		 * characters from the Windows-CP1252 superset.
-		 */
-		if (!strncasecmp (charset, "iso-8859", 8)) {
-			/* check for Windows-specific chars... */
-			if (broken_windows_charset (buffer, charset)) {
-				charset = camel_charset_iso_to_windows (charset);
-				charset = e_iconv_charset_name (charset);
-			}
-		}
-		
-		out = convert_buffer (buffer, "UTF-8", charset);
-		if (out) {
-			/* converted ok, use this data instead */
-			g_byte_array_free(buffer, TRUE);
-			buffer = out;
-		} else {
-			/* else failed to convert, leave as raw? */
-			g_warning("Storing text as raw, unknown charset '%s' or invalid format", charset);
-			dw->rawtext = TRUE;
-		}
-	} else if (header_content_type_is (ct, "text", "*")) {
-		if (charset == NULL) {
-			/* check that it's 7bit */
-			dw->rawtext = !is_7bit (buffer);
-		} else if (!strncasecmp (charset, "x-", 2)) {
-			/* we're not even going to bother trying to convert, so set the
-			   rawtext bit to TRUE and let the mailer deal with it. */
-			dw->rawtext = TRUE;
-		} else if (!strcasecmp (charset, "utf-8")) {
-			/* check that it is valid utf8 */
-			dw->rawtext = !g_utf8_validate (buffer->data, buffer->len, NULL);
-		}
-	}
-	
-	d(printf("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);
-
-	camel_mime_parser_filter_remove(mp, decid);
-	camel_mime_parser_filter_remove(mp, crlfid);
-	
-	if (fdec)
-		camel_object_unref((CamelObject *)fdec);
-	if (fcrlf)
-		camel_object_unref((CamelObject *)fcrlf);
-}
-
-/* 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: {
-		struct _header_content_type *content_type;
-		CamelDataWrapper *bodypart;
-		
-		/* FIXME: we should use a came-mime-mutlipart, not jsut a camel-multipart, but who cares */
-		d(printf("Creating multi-part\n"));
-		
-		content = (CamelDataWrapper *)camel_multipart_new ();
-		
-		content_type = camel_mime_parser_content_type (mp);
-		camel_multipart_set_boundary ((CamelMultipart *)content,
-					      header_content_type_param (content_type, "boundary"));
-		
-		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) {
-		/* 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 576f7bd3e4..0000000000
--- a/camel/camel-mime-part-utils.h
+++ /dev/null
@@ -1,44 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 e64fc94927..0000000000
--- a/camel/camel-mime-part.c
+++ /dev/null
@@ -1,935 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <errno.h>
-
-#include <gal/util/e-iconv.h>
-
-#include "hash-table-utils.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-mime-part.h"
-#include "camel-mime-part-utils.h"
-#include "camel-exception.h"
-#include "camel-charset-map.h"
-#include "string-utils.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-typedef enum {
-	HEADER_UNKNOWN,
-	HEADER_DESCRIPTION,
-	HEADER_DISPOSITION,
-	HEADER_CONTENT_ID,
-	HEADER_ENCODING,
-	HEADER_CONTENT_MD5,
-	HEADER_CONTENT_LOCATION,
-	HEADER_CONTENT_LANGUAGES,
-	HEADER_CONTENT_TYPE
-} CamelHeaderType;
-
-
-static GHashTable *header_name_table;
-static GHashTable *header_formatted_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 GArray         *get_headers                     (CamelMedium *medium);
-static void            free_headers                    (CamelMedium *medium, GArray *headers);
-
-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);
-
-/* format output of headers */
-static int write_references(CamelStream *stream, struct _header_raw *h);
-static int write_fold(CamelStream *stream, struct _header_raw *h);
-static int write_raw(CamelStream *stream, struct _header_raw *h);
-
-
-/* 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-Location", (gpointer)HEADER_CONTENT_LOCATION);
-	g_hash_table_insert (header_name_table, "Content-Type", (gpointer)HEADER_CONTENT_TYPE);
-
-	header_formatted_table = g_hash_table_new(g_strcase_hash, g_strcase_equal);
-	g_hash_table_insert(header_formatted_table, "Content-Type", write_raw);
-	g_hash_table_insert(header_formatted_table, "Content-Disposition", write_raw);
-	g_hash_table_insert(header_formatted_table, "To", write_raw);
-	g_hash_table_insert(header_formatted_table, "From", write_raw);
-	g_hash_table_insert(header_formatted_table, "Reply-To", write_raw);
-	g_hash_table_insert(header_formatted_table, "Cc", write_raw);
-	g_hash_table_insert(header_formatted_table, "Bcc", write_raw);
-	g_hash_table_insert(header_formatted_table, "Message-ID", write_raw);
-	g_hash_table_insert(header_formatted_table, "In-Reply-To", write_raw);
-	g_hash_table_insert(header_formatted_table, "References", write_references);
-}
-
-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->get_headers               = get_headers;
-	camel_medium_class->free_headers              = free_headers;
-	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         = header_content_type_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_location     = 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);
-	g_free (mime_part->content_location);
-	string_list_free (mime_part->content_languages);
-	header_disposition_unref(mime_part->disposition);
-	
-	if (mime_part->content_type)
-		header_content_type_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;
-	const char *charset;
-	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 */
-		g_free (mime_part->description);
-		if (mime_part->content_type)
-			charset = e_iconv_charset_name(header_content_type_param(mime_part->content_type, "charset"));
-		else
-			charset = NULL;
-		mime_part->description = g_strstrip (header_decode_string (header_value, charset));
-		break;
-	case HEADER_DISPOSITION:
-		set_disposition (mime_part, header_value);
-		break;
-	case HEADER_CONTENT_ID:
-		g_free (mime_part->content_id);
-		mime_part->content_id = header_msgid_decode (header_value);
-		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_LOCATION:
-		g_free (mime_part->content_location);
-		mime_part->content_location = header_location_decode (header_value);
-		break;
-	case HEADER_CONTENT_TYPE:
-		if (mime_part->content_type)
-			header_content_type_unref (mime_part->content_type);
-		mime_part->content_type = header_content_type_decode (header_value);
-		break;
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-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);
-}
-
-static GArray *
-get_headers (CamelMedium *medium)
-{
-	CamelMimePart *part = (CamelMimePart *)medium;
-	GArray *headers;
-	CamelMediumHeader header;
-	struct _header_raw *h;
-
-	headers = g_array_new (FALSE, FALSE, sizeof (CamelMediumHeader));
-	for (h = part->headers; h; h = h->next) {
-		header.name = h->name;
-		header.value = h->value;
-		g_array_append_val (headers, header);
-	}
-
-	return headers;
-}
-
-static void
-free_headers (CamelMedium *medium, GArray *gheaders)
-{
-	g_array_free (gheaders, TRUE);
-}
-
-/* **** 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);
-	
-	header_content_type_set_param (mime_part->content_type, "name", filename);
-	str = header_content_type_format (mime_part->content_type);
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Type", 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 header_content_type_param (mime_part->content_type, "name");
-}
-
-
-/* **** Content-ID: */
-
-void
-camel_mime_part_set_content_id (CamelMimePart *mime_part, const char *contentid)
-{
-	char *cid, *id;
-	
-	if (contentid)
-		id = g_strstrip (g_strdup (contentid));
-	else
-		id = header_msgid_generate ();
-	
-	cid = g_strdup_printf ("<%s>", id);
-	g_free (id);
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID", cid);
-	g_free (cid);
-}
-
-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-MD5: */
-
-void
-camel_mime_part_set_content_location (CamelMimePart *mime_part, const char *location)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Location", location);
-}
-
-const gchar *
-camel_mime_part_get_content_location (CamelMimePart *mime_part)
-{
-	return mime_part->content_location;
-}
-
-/* **** 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);
-}
-
-CamelContentType *
-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);
-	CamelContentType *object_content_type;
-
-	parent_class->set_content_object (medium, content);
-
-	object_content_type = camel_data_wrapper_get_mime_type_field (content);
-	if (mime_part->content_type != object_content_type) {
-		char *txt;
-
-		txt = header_content_type_format (object_content_type);
-		camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Type", txt);
-		g_free(txt);
-	}
-}
-
-/**********************************************************************/
-
-static int
-write_references(CamelStream *stream, struct _header_raw *h)
-{
-	int len, out, total;
-	char *v, *ids, *ide;
-
-	/* this is only approximate, based on the next >, this way it retains any content
-	   from the original which may not be properly formatted, etc.  It also doesn't handle
-	   the case where an individual messageid is too long, however thats a bad mail to
-	   start with ... */
-
-	v = h->value;
-	len = strlen(h->name)+1;
-	total = camel_stream_printf(stream, "%s%s", h->name, isspace(v[0])?":":": ");
-	if (total == -1)
-		return -1;
-	while (*v) {
-		ids = v;
-		ide = strchr(ids+1, '>');
-		if (ide)
-			v = ++ide;
-		else
-			ide = v = strlen(ids)+ids;
-
-		if (len>0 && len + (ide - ids) >= CAMEL_FOLD_SIZE) {
-			out = camel_stream_printf(stream, "\n\t");
-			if (out == -1)
-				return -1;
-			total += out;
-			len = 0;
-		}
-		out = camel_stream_write(stream, ids, ide-ids);
-		if (out == -1)
-			return -1;
-		len += out;
-		total += out;
-	}
-	camel_stream_write(stream, "\n", 1);
-
-	return total;
-}
-
-#if 0
-/* not needed - yet - handled by default case */
-static int
-write_fold(CamelStream *stream, struct _header_raw *h)
-{
-	char *val;
-	int count;
-
-	val = header_fold(h->value, strlen(h->name));
-	count = camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(val[0]) ? ":" : ": ", val);
-	g_free(val);
-
-	return count;
-}
-#endif
-
-static int
-write_raw(CamelStream *stream, struct _header_raw *h)
-{
-	char *val = h->value;
-
-	return camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(val[0]) ? ":" : ": ", val);
-}
-
-static int
-write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMimePart *mp = CAMEL_MIME_PART(data_wrapper);
-	CamelMedium *medium = CAMEL_MEDIUM(data_wrapper);
-	CamelStream *ostream = stream;
-	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;
-		char *val;
-		int (*writefn)(CamelStream *stream, struct _header_raw *);
-		
-		/* fold/write the headers.   But dont fold headers that are already formatted
-		   (e.g. ones with parameter-lists, that we know about, and have created) */
-		while (h) {
-			val = h->value;
-			if (val == NULL) {
-				g_warning("h->value is NULL here for %s", h->name);
-				count = 0;
-			} else if ((writefn = g_hash_table_lookup(header_formatted_table, h->name)) == NULL) {
-				val = header_fold(val, strlen(h->name));
-				count = camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(val[0]) ? ":" : ": ", val);
-				g_free(val);
-			} else {
-				count = writefn(stream, h);
-			}
-			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 *filename;
-		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;
-		case CAMEL_MIME_PART_ENCODING_UUENCODE:
-			filename = camel_mime_part_get_filename (mp);
-			count = camel_stream_printf (ostream, "begin 644 %s\n", filename ? filename : "untitled");
-			if (count == -1)
-				return -1;
-			total += count;
-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_UU_ENC);
-			break;
-		default:
-			break;
-		}
-		
-		if (!data_wrapper->rawtext && header_content_type_is(mp->content_type, "text", "*")) {
-			charset = header_content_type_param(mp->content_type, "charset");
-			if (charset && !(!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 && header_content_type_is(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;
-		
-		if (mp->encoding == CAMEL_MIME_PART_ENCODING_UUENCODE) {
-			count = camel_stream_write (ostream, "end\n", 4);
-			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;
-	const char *content;
-	char *buf;
-	int len;
-	int err;
-
-	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 */
-		if (dw->content_type)
-			header_content_type_unref (dw->content_type);
-		dw->content_type = header_content_type_decode ("message/rfc822");
-	case HSCAN_HEADER:
-	case HSCAN_MULTIPART:
-		/* we have the headers, build them into 'us' */
-		headers = camel_mime_parser_headers_raw(mp);
-
-		/* if content-type exists, process it first, set for fallback charset in headers */
-		content = header_raw_find(&headers, "content-type", NULL);
-		if (content)
-			process_header((CamelMedium *)dw, "content-type", content);
-
-		while (headers) {
-			if (strcasecmp(headers->name, "content-type") == 0
-			    && headers->value != content)
-				camel_medium_add_header((CamelMedium *)dw, "X-Invalid-Content-Type", headers->value);
-			else
-				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
-
-	err = camel_mime_parser_errno(mp);
-	if (err != 0) {
-		errno = err;
-		return -1;
-	}
-
-	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;
-}
-
-/* this must be kept in sync with the header */
-static const char *encodings[] = {
-	"",
-	"7bit",
-	"8bit",
-	"base64",
-	"quoted-printable",
-	"binary",
-	"x-uuencode",
-};
-
-const char *
-camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding)
-{
-	if (encoding >= sizeof(encodings)/sizeof(encodings[0]))
-		encoding = 0;
-
-	return encodings[encoding];
-}
-
-/* FIXME I am not sure this is the correct way to do this.  */
-CamelMimePartEncodingType
-camel_mime_part_encoding_from_string (const gchar *string)
-{
-	int i;
-
-	if (string != NULL) {
-		for (i=0;i<sizeof(encodings)/sizeof(encodings[0]);i++)
-			if (!strcasecmp(string, encodings[i]))
-				return i;
-	}
-
-	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 4f05ecb71b..0000000000
--- a/camel/camel-mime-part.h
+++ /dev/null
@@ -1,133 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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))
-
-/* note, if you change this, make sure you change the 'encodings' array in camel-mime-part.c */
-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_ENCODING_BINARY,
-	CAMEL_MIME_PART_ENCODING_UUENCODE,
-        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;
-
-	CamelContentType *content_type;
-	struct _header_raw *headers; /* mime headers */
-	
-	/* All fields here are -** PRIVATE **- */
-	char *description;
-	CamelMimeDisposition *disposition;
-	char *content_id;
-	char *content_MD5;
-	char *content_location;
-	GList *content_languages;
-	CamelMimePartEncodingType encoding;
-};
-
-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_content_location	(CamelMimePart *mime_part, const char *);
-const	  gchar *camel_mime_part_get_content_location	(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);
-CamelContentType  *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 d32558096e..0000000000
--- a/camel/camel-mime-utils.c
+++ /dev/null
@@ -1,4224 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* dont touch this file without my permission - Michael */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>  /* for MAXHOSTNAMELEN */
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 1024
-#endif
-
-#include <iconv.h>
-
-#include <time.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <regex.h>
-
-#include <glib.h>
-#include <gal/unicode/gunicode.h>
-#include <gal/util/e-iconv.h>
-
-#include "camel-mime-utils.h"
-#include "camel-charset-map.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#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 non-essential warnings ... */
-#define w(x)
-
-#define d(x)
-#define d2(x)
-
-#define CAMEL_UUENCODE_CHAR(c)  ((c) ? (c) + ' ' : '`')
-#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];
-static unsigned char camel_mime_base64_rank[256];
-
-/* Flags bits set in the mime_special table, use the is_*() mactos to access them normally */
-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)
-
-/* Used by table initialisation code for special characters */
-#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);
-}
-
-static 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;
-}
-
-/* call this when finished encoding everything, to
-   flush off the last little bit */
-size_t
-base64_encode_close(unsigned char *in, size_t 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];
-	
-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",
-		 (int)((char *)save)[0],
-		 (int)((char *)save)[1],
-		 (int)((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).
-*/
-size_t
-base64_encode_step(unsigned char *in, size_t 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
- **/
-size_t
-base64_decode_step(unsigned char *in, size_t 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>out)
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-out;
-}
-
-char *
-base64_encode_simple (const char *data, size_t 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;
-}
-
-size_t
-base64_decode_simple (char *data, size_t len)
-{
-	int state = 0;
-	unsigned int save = 0;
-
-	return base64_decode_step ((unsigned char *)data, len,
-				   (unsigned char *)data, &state, &save);
-}
-
-/**
- * uuencode_close: uuencode a chunk of data
- * @in: input stream
- * @len: input stream length
- * @out: output stream
- * @uubuf: temporary buffer of 60 bytes
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been encoded
- *
- * Returns the number of bytes encoded. Call this when finished
- * encoding data with uuencode_step to flush off the last little
- * bit.
- **/
-size_t
-uuencode_close (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state, guint32 *save)
-{
-	register unsigned char *outptr, *bufptr;
-	register guint32 saved;
-	int uulen, uufill, i;
-	
-	outptr = out;
-	
-	if (len > 0)
-		outptr += uuencode_step (in, len, out, uubuf, state, save);
-	
-	uufill = 0;
-	
-	saved = *save;
-	i = *state & 0xff;
-	uulen = (*state >> 8) & 0xff;
-	
-	bufptr = uubuf + ((uulen / 3) * 4);
-	
-	if (i > 0) {
-		while (i < 3) {
-			saved <<= 8 | 0;
-			uufill++;
-			i++;
-		}
-		
-		if (i == 3) {
-			/* convert 3 normal bytes into 4 uuencoded bytes */
-			unsigned char b0, b1, b2;
-			
-			b0 = saved >> 16;
-			b1 = saved >> 8 & 0xff;
-			b2 = saved & 0xff;
-			
-			*bufptr++ = CAMEL_UUENCODE_CHAR ((b0 >> 2) & 0x3f);
-			*bufptr++ = CAMEL_UUENCODE_CHAR (((b0 << 4) | ((b1 >> 4) & 0xf)) & 0x3f);
-			*bufptr++ = CAMEL_UUENCODE_CHAR (((b1 << 2) | ((b2 >> 6) & 0x3)) & 0x3f);
-			*bufptr++ = CAMEL_UUENCODE_CHAR (b2 & 0x3f);
-			
-			i = 0;
-			saved = 0;
-			uulen += 3;
-		}
-	}
-	
-	if (uulen > 0) {
-		int cplen = ((uulen / 3) * 4);
-		
-		*outptr++ = CAMEL_UUENCODE_CHAR ((uulen - uufill) & 0xff);
-		memcpy (outptr, uubuf, cplen);
-		outptr += cplen;
-		*outptr++ = '\n';
-		uulen = 0;
-	}
-	
-	*outptr++ = CAMEL_UUENCODE_CHAR (uulen & 0xff);
-	*outptr++ = '\n';
-	
-	*save = 0;
-	*state = 0;
-	
-	return outptr - out;
-}
-
-
-/**
- * uuencode_step: uuencode a chunk of data
- * @in: input stream
- * @len: input stream length
- * @out: output stream
- * @uubuf: temporary buffer of 60 bytes
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been encoded
- *
- * Returns the number of bytes encoded. Performs an 'encode step',
- * only encodes blocks of 45 characters to the output at a time, saves
- * left-over state in @uubuf, @state and @save (initialize to 0 on first
- * invocation).
- **/
-size_t
-uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state, guint32 *save)
-{
-	register unsigned char *inptr, *outptr, *bufptr;
-	unsigned char *inend;
-	register guint32 saved;
-	int uulen, i;
-	
-	saved = *save;
-	i = *state & 0xff;
-	uulen = (*state >> 8) & 0xff;
-	
-	inptr = in;
-	inend = in + len;
-	
-	outptr = out;
-	
-	bufptr = uubuf + ((uulen / 3) * 4);
-	
-	while (inptr < inend) {
-		while (uulen < 45 && inptr < inend) {
-			while (i < 3 && inptr < inend) {
-				saved = (saved << 8) | *inptr++;
-				i++;
-			}
-			
-			if (i == 3) {
-				/* convert 3 normal bytes into 4 uuencoded bytes */
-				unsigned char b0, b1, b2;
-				
-				b0 = saved >> 16;
-				b1 = saved >> 8 & 0xff;
-				b2 = saved & 0xff;
-				
-				*bufptr++ = CAMEL_UUENCODE_CHAR ((b0 >> 2) & 0x3f);
-				*bufptr++ = CAMEL_UUENCODE_CHAR (((b0 << 4) | ((b1 >> 4) & 0xf)) & 0x3f);
-				*bufptr++ = CAMEL_UUENCODE_CHAR (((b1 << 2) | ((b2 >> 6) & 0x3)) & 0x3f);
-				*bufptr++ = CAMEL_UUENCODE_CHAR (b2 & 0x3f);
-				
-				i = 0;
-				saved = 0;
-				uulen += 3;
-			}
-		}
-		
-		if (uulen >= 45) {
-			*outptr++ = CAMEL_UUENCODE_CHAR (uulen & 0xff);
-			memcpy (outptr, uubuf, ((uulen / 3) * 4));
-			outptr += ((uulen / 3) * 4);
-			*outptr++ = '\n';
-			uulen = 0;
-			bufptr = uubuf;
-		}
-	}
-	
-	*save = saved;
-	*state = ((uulen & 0xff) << 8) | (i & 0xff);
-	
-	return outptr - out;
-}
-
-
-/**
- * uudecode_step: uudecode a chunk of data
- * @in: input stream
- * @inlen: 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
- *
- * Returns the number of bytes decoded. Performs a 'decode step' on
- * a chunk of uuencoded data. Assumes the "begin <mode> <file name>"
- * line has been stripped off.
- **/
-size_t
-uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, ch;
-	register guint32 saved;
-	gboolean last_was_eoln;
-	int uulen, i;
-	
-	if (*state & CAMEL_UUDECODE_STATE_END)
-		return 0;
-	
-	saved = *save;
-	i = *state & 0xff;
-	uulen = (*state >> 8) & 0xff;
-	if (uulen == 0)
-		last_was_eoln = TRUE;
-	else
-		last_was_eoln = FALSE;
-	
-	inend = in + len;
-	outptr = out;
-	
-	inptr = in;
-	while (inptr < inend) {
-		if (*inptr == '\n' || last_was_eoln) {
-			if (last_was_eoln && *inptr != '\n') {
-				uulen = CAMEL_UUDECODE_CHAR (*inptr);
-				last_was_eoln = FALSE;
-				if (uulen == 0) {
-					*state |= CAMEL_UUDECODE_STATE_END;
-					break;
-				}
-			} 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 = (*state & CAMEL_UUDECODE_STATE_MASK) | ((uulen & 0xff) << 8) | (i & 0xff);
-	
-	return outptr - out;
-}
-
-
-/* complete qp encoding */
-size_t
-quoted_encode_close(unsigned char *in, size_t 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];
-		}
-	}
-
-	*save = 0;
-	*state = -1;
-
-	return outptr-out;
-}
-
-/* perform qp encoding, initialise state to -1 and save to 0 on first invocation */
-size_t
-quoted_encode_step (unsigned char *in, size_t len, unsigned char *out, int *statep, int *save)
-{
-	register guchar *inptr, *outptr, *inend;
-	unsigned char 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.
-*/ 
-
-size_t
-quoted_decode_step(unsigned char *in, size_t 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++;
-				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 size_t
-quoted_decode(const unsigned char *in, size_t 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 0;
-}
-
-/* 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 size_t
-quoted_encode (const unsigned char *in, size_t 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 (c==' ') {
-			*outptr++ = '_';
-		} else if (camel_mime_special_table[c] & safemask) {
-			*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, size_t len)
-{
-	const char *inptr = in+2;
-	const char *inend = in+len-2;
-	const char *inbuf;
-	const char *charset;
-	char *encname, *p;
-	int tmplen;
-	size_t ret;
-	char *decword = NULL;
-	char *decoded = NULL;
-	char *outbase = NULL;
-	char *outbuf;
-	size_t inlen, outlen;
-	gboolean retried = FALSE;
-	iconv_t ic;
-	
-	d(printf("rfc2047: decoding '%.*s'\n", len, in));
-
-	/* quick check to see if this could possibly be a real encoded word */
-	if (len < 8 || !(in[0] == '=' && in[1] == '?' && in[len-1] == '=' && in[len-2] == '?')) {
-		d(printf("invalid\n"));
-		return NULL;
-	}
-	
-	/* skip past the charset to the encoding type */
-	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;
-		}
-		default:
-			/* uhhh, unknown encoding type - probably an invalid encoded word string */
-			return NULL;
-		}
-		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);
-			memcpy (encname, in + 2, tmplen);
-			encname[tmplen] = '\0';
-			
-			/* rfc2231 updates rfc2047 encoded words...
-			 * The ABNF given in RFC 2047 for encoded-words is:
-			 *   encoded-word := "=?" charset "?" encoding "?" encoded-text "?="
-			 * This specification changes this ABNF to:
-			 *   encoded-word := "=?" charset ["*" language] "?" encoding "?" encoded-text "?="
-			 */
-			
-			/* trim off the 'language' part if it's there... */
-			p = strchr (encname, '*');
-			if (p)
-				*p = '\0';
-			
-			charset = e_iconv_charset_name (encname);
-			
-			inbuf = decword;
-			
-			outlen = inlen * 6 + 16;
-			outbase = alloca (outlen);
-			outbuf = outbase;
-			
-		retry:
-			ic = e_iconv_open ("UTF-8", charset);
-			if (ic != (iconv_t) -1) {
-				ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen);
-				if (ret != (size_t) -1) {
-					e_iconv (ic, NULL, 0, &outbuf, &outlen);
-					*outbuf = 0;
-					decoded = g_strdup (outbase);
-				}
-				e_iconv_close (ic);
-			} else {
-				w(g_warning ("Cannot decode charset, header display may be corrupt: %s: %s",
-					     charset, g_strerror (errno)));
-				
-				if (!retried) {
-					charset = e_iconv_locale_charset ();
-					if (!charset)
-						charset = "iso-8859-1";
-					
-					retried = TRUE;
-					goto retry;
-				}
-				
-				/* we return the encoded word here because we've got to return valid utf8 */
-				decoded = g_strndup (in, inlen);
-			}
-		}
-	}
-	
-	d(printf("decoded '%s'\n", decoded));
-	
-	return decoded;
-}
-
-/* grrr, glib should have this ! */
-static GString *
-g_string_append_len(GString *st, const char *s, size_t 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, size_t 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;
-}
-
-static int
-append_8bit (GString *out, const char *inbuf, size_t inlen, const char *charset)
-{
-	char *outbase, *outbuf;
-	size_t outlen;
-	iconv_t ic;
-	
-	ic = e_iconv_open ("UTF-8", charset);
-	if (ic == (iconv_t) -1)
-		return FALSE;
-
-	outlen = inlen * 6 + 16;
-	outbuf = outbase = g_malloc(outlen);
-	
-	if (e_iconv(ic, &inbuf, &inlen, &outbuf, &outlen) == (size_t) -1) {
-		w(g_warning("Conversion to '%s' failed: %s", charset, strerror(errno)));
-		g_free(outbase);
-		e_iconv_close(ic);
-		return FALSE;
-	}
-
-	*outbuf = 0;
-	g_string_append(out, outbase);
-	g_free(outbase);
-	e_iconv_close(ic);
-
-	return TRUE;
-	
-}
-
-/* decodes a simple text, rfc822 + rfc2047 */
-static char *
-header_decode_text (const char *in, size_t inlen, const char *default_charset)
-{
-	GString *out;
-	const char *inptr, *inend, *start, *chunk, *locale_charset;
-	char *dword = NULL;
-
-	locale_charset = e_iconv_locale_charset();
-
-	out = g_string_new("");
-	inptr = in;
-	inend = inptr + inlen;
-	chunk = NULL;
-
-	while (inptr < inend) {
-		start = inptr;
-		while (inptr < inend && is_lwsp(*inptr))
-			inptr++;
-
-		if (inptr == inend) {
-			g_string_append_len(out, start, inptr-start);
-			break;
-		} else if (dword == NULL) {
-			g_string_append_len(out, start, inptr-start);
-		} else {
-			chunk = start;
-		}
-
-		start = inptr;
-		while (inptr < inend && !is_lwsp(*inptr))
-			inptr++;
-
-		dword = rfc2047_decode_word(start, inptr-start);
-		if (dword) {
-			g_string_append(out, dword);
-			g_free(dword);
-		} else {
-			if (!chunk)
-				chunk = start;
-			
-			if ((default_charset == NULL || !append_8bit (out, chunk, inptr-chunk, default_charset))
-			    && (locale_charset == NULL || !append_8bit(out, chunk, inptr-chunk, locale_charset)))
-				append_latin1(out, chunk, inptr-chunk);
-		}
-		
-		chunk = NULL;
-	}
-
-	dword = out->str;
-	g_string_free (out, FALSE);
-	
-	return dword;
-}
-
-char *
-header_decode_string (const char *in, const char *default_charset)
-{
-	if (in == NULL)
-		return NULL;
-	return header_decode_text (in, strlen (in), default_charset);
-}
-
-/* how long a sequence of pre-encoded words should be less than, to attempt to 
-   fit into a properly folded word.  Only a guide. */
-#define CAMEL_FOLD_PREENCODED (24)
-
-/* FIXME: needs a way to cache iconv opens for different charsets? */
-static void
-rfc2047_encode_word(GString *outstring, const char *in, size_t len, const char *type, unsigned short safemask)
-{
-	iconv_t ic = (iconv_t) -1;
-	char *buffer, *out, *ascii;
-	size_t inlen, outlen, enclen, bufflen;
-	const char *inptr, *p;
-	int first = 1;
-
-	d(printf("Converting [%d] '%.*s' to %s\n", len, len, in, type));
-
-	/* convert utf8->encoding */
-	bufflen = len * 6 + 16;
-	buffer = alloca (bufflen);
-	inlen = len;
-	inptr = in;
-	
-	ascii = alloca (bufflen);
-	
-	if (strcasecmp (type, "UTF-8") != 0)
-		ic = e_iconv_open (type, "UTF-8");
-	
-	while (inlen) {
-		size_t convlen, proclen;
-		int i;
-		
-		/* break up words into smaller bits, what we really want is encoded + overhead < 75,
-		   but we'll just guess what that means in terms of input chars, and assume its good enough */
-
-		out = buffer;
-		outlen = bufflen;
-
-		if (ic == (iconv_t) -1) {
-			/* native encoding case, the easy one (?) */
-			/* we work out how much we can convert, and still be in length */
-			/* proclen will be the result of input characters that we can convert, to the nearest
-			   (approximated) valid utf8 char */
-			convlen = 0;
-			proclen = 0;
-			p = inptr;
-			i = 0;
-			while (p < (in+len) && convlen < (75 - strlen("=?utf-8?q\?\?="))) {
-				unsigned char c = *p++;
-
-				if (c >= 0xc0)
-					proclen = i;
-				i++;
-				if (c < 0x80)
-					proclen = i;
-				if (camel_mime_special_table[c] & safemask)
-					convlen += 1;
-				else
-					convlen += 3;
-			}
-			/* well, we probably have broken utf8, just copy it anyway what the heck */
-			if (proclen == 0) {
-				w(g_warning("Appear to have truncated utf8 sequence"));
-				proclen = inlen;
-			}
-			memcpy(out, inptr, proclen);
-			inptr += proclen;
-			inlen -= proclen;
-			out += proclen;
-		} else {
-			/* well we could do similar, but we can't (without undue effort), we'll just break it up into
-			   hopefully-small-enough chunks, and leave it at that */
-			convlen = MIN(inlen, CAMEL_FOLD_PREENCODED);
-			p = inptr;
-			if (e_iconv (ic, &inptr, &convlen, &out, &outlen) == (size_t) -1) {
-				w(g_warning("Conversion problem: conversion truncated: %s", strerror(errno)));
-				/* blah, we include it anyway, better than infinite loop ... */
-				inptr = p + convlen;
-			} else {
-				/* make sure we flush out any shift state */
-				e_iconv(ic, NULL, 0, &out, &outlen);
-			}
-			inlen -= (inptr - p);
-		}
-		
-		enclen = out-buffer;
-		
-		if (enclen) {
-			/* create token */
-			out = ascii;
-			if (first)
-				first = 0;
-			else
-				*out++ = ' ';
-			out += sprintf (out, "=?%s?Q?", type);
-			out += quoted_encode (buffer, enclen, out, safemask);
-			sprintf (out, "?=");
-			
-			d(printf("converted part = %s\n", ascii));
-			
-			g_string_append (outstring, ascii);
-		}
-	}
-
-	if (ic != (iconv_t) -1)
-		e_iconv_close(ic);
-}
-
-
-/* TODO: Should this worry about quotes?? */
-char *
-header_encode_string (const unsigned char *in)
-{
-	const unsigned char *inptr = in, *start, *word;
-	gboolean last_was_encoded = FALSE;
-	gboolean last_was_space = FALSE;
-	int encoding;
-	GString *out;
-	char *outstr;
-
-	g_return_val_if_fail (g_utf8_validate (in, -1, NULL), NULL);
-	
-	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 */
-	out = g_string_new ("");
-	inptr = in;
-	encoding = 0;
-	word = NULL;
-	start = inptr;
-	while (inptr && *inptr) {
-		gunichar c;
-		const char *newinptr;
-		
-		newinptr = g_utf8_next_char (inptr);
-		c = g_utf8_get_char (inptr);
-		if (newinptr == NULL || !g_unichar_validate (c)) {
-			w(g_warning ("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s",
-				     (inptr-in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		
-		if (g_unichar_isspace (c) && !last_was_space) {
-			/* we've reached the end of a 'word' */
-			if (word && !(last_was_encoded && encoding)) {
-				g_string_append_len (out, start, word - start);
-				start = word;
-			}
-			
-			switch (encoding) {
-			case 0:
-				out = g_string_append_len (out, word, inptr - start);
-				last_was_encoded = FALSE;
-				break;
-			case 1:
-				if (last_was_encoded)
-					g_string_append_c (out, ' ');
-				
-				rfc2047_encode_word (out, start, inptr - start, "ISO-8859-1", IS_ESAFE);
-				last_was_encoded = TRUE;
-				break;
-			case 2:
-				if (last_was_encoded)
-					g_string_append_c (out, ' ');
-				
-				rfc2047_encode_word (out, start, inptr - start,
-						     camel_charset_best (start, inptr - start), IS_ESAFE);
-				last_was_encoded = TRUE;
-				break;
-			}
-			
-			last_was_space = TRUE;
-			start = inptr;
-			word = NULL;
-			encoding = 0;
-		} else if (c > 127 && c < 256) {
-			encoding = MAX (encoding, 1);
-			last_was_space = FALSE;
-		} else if (c >= 256) {
-			encoding = MAX (encoding, 2);
-			last_was_space = FALSE;
-		} else if (!g_unichar_isspace (c)) {
-			last_was_space = FALSE;
-		}
-		
-		if (!g_unichar_isspace (c) && !word)
-			word = inptr;
-		
-		inptr = newinptr;
-	}
-	
-	if (inptr - start) {
-		if (word && !(last_was_encoded && encoding)) {
-			g_string_append_len (out, start, word - start);
-			start = word;
-		}
-		
-		switch (encoding) {
-		case 0:
-			out = g_string_append_len (out, start, inptr - start);
-			break;
-		case 1:
-			if (last_was_encoded)
-				g_string_append_c (out, ' ');
-			
-			rfc2047_encode_word (out, start, inptr - start, "ISO-8859-1", IS_ESAFE);
-			break;
-		case 2:
-			if (last_was_encoded)
-				g_string_append_c (out, ' ');
-			
-			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, size_t 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;
-};
-
-static gboolean
-word_types_compatable (enum _phrase_word_t type1, enum _phrase_word_t type2)
-{
-	switch (type1) {
-	case WORD_ATOM:
-		return type2 == WORD_QSTRING;
-	case WORD_QSTRING:
-		return type2 != WORD_2047;
-	case WORD_2047:
-		return type2 == WORD_2047;
-	default:
-		return FALSE;
-	}
-}
-
-/* split the input into words with info about each word
- * merge common word types clean up */
-static GList *
-header_encode_phrase_get_words (const unsigned char *in)
-{
-	const unsigned char *inptr = in, *start, *last;
-	struct _phrase_word *word;
-	enum _phrase_word_t type;
-	int encoding, count = 0;
-	GList *words = NULL;
-	
-	/* break the input into words */
-	type = WORD_ATOM;
-	last = inptr;
-	start = inptr;
-	encoding = 0;
-	while (inptr && *inptr) {
-		gunichar c;
-		const char *newinptr;
-		
-		newinptr = g_utf8_next_char (inptr);
-		c = g_utf8_get_char (inptr);
-		
-		if (!g_unichar_validate (c)) {
-			w(g_warning ("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s",
-				     (inptr - in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		
-		inptr = newinptr;
-		if (g_unichar_isspace (c)) {
-			if (count > 0) {
-				word = g_new0 (struct _phrase_word, 1);
-				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_new0 (struct _phrase_word, 1);
-		word->start = start;
-		word->end = last;
-		word->type = type;
-		word->encoding = encoding;
-		words = g_list_append (words, word);
-	}
-	
-	return words;
-}
-
-static gboolean
-header_encode_phrase_merge_words (GList **wordsp)
-{
-	GList *wordl, *nextl, *words = *wordsp;
-	struct _phrase_word *word, *next;
-	gboolean merged = FALSE;
-	
-	/* scan the list, checking for words of similar types that can be merged */
-	wordl = words;
-	while (wordl) {
-		word = wordl->data;
-		nextl = g_list_next (wordl);
-		
-		while (nextl) {
-			next = nextl->data;
-			/* merge nodes of the same type AND we are not creating too long a string */
-			if (word_types_compatable (word->type, next->type)) {
-				if (next->end - word->start < CAMEL_FOLD_PREENCODED) {
-					/* the resulting word type is the MAX of the 2 types */
-					word->type = MAX(word->type, next->type);
-					
-					word->end = next->end;
-					words = g_list_remove_link (words, nextl);
-					g_free (next);
-					nextl = g_list_next (wordl);
-					
-					merged = TRUE;
-				} else {
-					/* if it is going to be too long, make sure we include the
-					   separating whitespace */
-					word->end = next->start;
-					break;
-				}
-			} else {
-				break;
-			}
-		}
-		
-		wordl = g_list_next (wordl);
-	}
-	
-	*wordsp = words;
-	
-	return merged;
-}
-
-/* encodes a phrase sequence (different quoting/encoding rules to strings) */
-char *
-header_encode_phrase (const unsigned char *in)
-{
-	struct _phrase_word *word = NULL, *last_word = NULL;
-	GList *words, *wordl;
-	GString *out;
-	char *outstr;
-	
-	if (in == NULL)
-		return NULL;
-	
-	words = header_encode_phrase_get_words (in);
-	if (!words)
-		return NULL;
-	
-	while (header_encode_phrase_merge_words (&words));
-	
-	out = g_string_new ("");
-	
-	/* output words now with spaces between them */
-	wordl = words;
-	while (wordl) {
-		const char *start;
-		size_t len;
-		
-		word = wordl->data;
-		
-		/* append correct number of spaces between words */
-		if (last_word && !(last_word->type == WORD_2047 && word->type == WORD_2047)) {
-			/* one or both of the words are not encoded so we write the spaces out untouched */
-			len = word->start - last_word->end;
-			out = g_string_append_len (out, last_word->end, len);
-		}
-		
-		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 (last_word && last_word->type == WORD_2047) {
-				/* include the whitespace chars between these 2 words in the
-                                   resulting rfc2047 encoded word. */
-				len = word->end - last_word->end;
-				start = last_word->end;
-				
-				/* encoded words need to be separated by linear whitespace */
-				g_string_append_c (out, ' ');
-			} else {
-				len = word->end - word->start;
-				start = word->start;
-			}
-			
-			if (word->encoding == 1)
-				rfc2047_encode_word (out, start, len, "ISO-8859-1", IS_PSAFE);
-			else
-				rfc2047_encode_word (out, start, len,
-						     camel_charset_best (start, len), IS_PSAFE);
-			break;
-		}
-		
-		g_free (last_word);
-		wordl = g_list_next (wordl);
-		
-		last_word = word;
-	}
-	
-	/* and we no longer need the list */
-	g_free (word);
-	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;
-	size_t 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!= '"') {
-			if (c=='\\' && *intmp) {
-				intmp++;
-				skip++;
-			}
-		}
-		outlen = intmp-inptr-skip;
-		out = outptr = g_malloc(outlen+1);
-		while ( (c = *inptr++) && c!= '"') {
-			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;
-}
-
-/* should this return -1 for no int? */
-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;
-}
-
-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)
-
-static char *
-hex_decode (const char *in, size_t len)
-{
-	const unsigned char *inend = in + len;
-	unsigned char *inptr, *outptr;
-	char *outbuf;
-	
-	outptr = outbuf = g_malloc (len + 1);
-	
-	inptr = (unsigned char *) in;
-	while (inptr < inend) {
-		if (*inptr == '%') {
-			if (isxdigit (inptr[1]) && isxdigit (inptr[2])) {
-				*outptr++ = HEXVAL (inptr[1]) * 16 + HEXVAL (inptr[2]);
-				inptr += 3;
-			} else
-				*outptr++ = *inptr++;
-		} else
-			*outptr++ = *inptr++;
-	}
-	
-	*outptr = '\0';
-	
-	return outbuf;
-}
-
-/* an rfc2184 encoded string looks something like:
- * us-ascii'en'This%20is%20even%20more%20
- */
-
-static char *
-rfc2184_decode (const char *in, size_t len)
-{
-	const char *inptr = in;
-	const char *inend = in + len;
-	const char *charset;
-	char *decoded = NULL;
-	char *encoding;
-	
-	inptr = memchr (inptr, '\'', len);
-	if (!inptr)
-		return NULL;
-	
-	encoding = g_strndup (in, inptr - in);
-	charset = e_iconv_charset_name (encoding);
-	g_free (encoding);
-	
-	inptr = memchr (inptr + 1, '\'', inend - inptr - 1);
-	if (!inptr)
-		return NULL;
-	
-	inptr++;
-	if (inptr < inend) {
-		char *decword, *outbase, *outbuf;
-		const char *inbuf;
-		size_t inlen, outlen;
-		iconv_t ic;
-		
-		inbuf = decword = hex_decode (inptr, inend - inptr);
-		inlen = strlen (inbuf);
-		
-		ic = e_iconv_open ("UTF-8", charset);
-		if (ic != (iconv_t) -1) {
-			size_t ret;
-			
-			outlen = inlen * 6 + 16;
-			outbuf = outbase = g_malloc (outlen);
-			
-			ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen);
-			if (ret != (size_t) -1) {
-				e_iconv (ic, NULL, 0, &outbuf, &outlen);
-				*outbuf = '\0';
-				g_free (decoded);
-				decoded = outbase;
-			}
-			
-			e_iconv_close (ic);
-		} else {
-			decoded = decword;
-		}
-	}
-	
-	return decoded;
-}
-
-/* This function is basically the same as decode_token()
- * except that it will not accept *'s which have a special
- * meaning for rfc2184 params */
-static char *
-decode_param_token (const char **in)
-{
-	const char *inptr = *in;
-	const char *start;
-	
-	header_decode_lwsp (&inptr);
-	start = inptr;
-	while (is_ttoken (*inptr) && *inptr != '*')
-		inptr++;
-	if (inptr > start) {
-		*in = inptr;
-		return g_strndup (start, inptr - start);
-	} else {
-		return NULL;
-	}
-}
-
-static gboolean
-header_decode_rfc2184_param (const char **in, char **paramp, gboolean *value_is_encoded, int *part)
-{
-	gboolean is_rfc2184 = FALSE;
-	const char *inptr = *in;
-	char *param;
-	
-	*value_is_encoded = FALSE;
-	*part = -1;
-	
-	param = decode_param_token (&inptr);
-	header_decode_lwsp (&inptr);
-	
-	if (*inptr == '*') {
-		is_rfc2184 = TRUE;
-		inptr++;
-		header_decode_lwsp (&inptr);
-		if (*inptr == '=') {
-			/* form := param*=value */
-			if (value_is_encoded)
-				*value_is_encoded = TRUE;
-		} else {
-			/* form := param*#=value or param*#*=value */
-			*part = header_decode_int (&inptr);
-			header_decode_lwsp (&inptr);
-			if (*inptr == '*') {
-				/* form := param*#*=value */
-				if (value_is_encoded)
-					*value_is_encoded = TRUE;
-				inptr++;
-				header_decode_lwsp (&inptr);
-			}
-		}
-	}
-	
-	if (paramp)
-		*paramp = param;
-	
-	if (param)
-		*in = inptr;
-	
-	return is_rfc2184;
-}
-
-static int
-header_decode_param (const char **in, char **paramp, char **valuep, int *is_rfc2184_param, int *rfc2184_part)
-{
-	gboolean is_rfc2184_encoded = FALSE;
-	gboolean is_rfc2184 = FALSE;
-	const char *inptr = *in;
-	char *param, *value = NULL;
-	
-	*is_rfc2184_param = FALSE;
-	*rfc2184_part = -1;
-	
-	is_rfc2184 = header_decode_rfc2184_param (&inptr, &param, &is_rfc2184_encoded, rfc2184_part);
-	
-	if (*inptr == '=') {
-		inptr++;
-		value = header_decode_value (&inptr);
-		
-		if (is_rfc2184) {
-			/* We have ourselves an rfc2184 parameter */
-			
-			if (*rfc2184_part == -1) {
-				/* rfc2184 allows the value to be broken into
-				 * multiple parts - this isn't one of them so
-				 * it is safe to decode it.
-				 */
-				char *val;
-				
-				val = rfc2184_decode (value, strlen (value));
-				if (val) {
-					g_free (value);
-					value = val;
-				}
-			} else {
-				/* Since we are expecting to find the rest of
-				 * this paramter value later, let our caller know.
-				 */
-				*is_rfc2184_param = TRUE;
-			}
-		} else if (value && !strncmp (value, "=?", 2)) {
-			/* We have a broken param value that is rfc2047 encoded.
-			 * Since both Outlook and Netscape/Mozilla do this, we
-			 * should handle this case.
-			 */
-			char *val;
-			
-			val = rfc2047_decode_word (value, strlen (value));
-			if (val) {
-				g_free (value);
-				value = val;
-			}
-		}
-	}
-	
-	if (value && !g_utf8_validate (value, -1, NULL)) {
-		/* The (broken) mailer sent us an unencoded 8bit value
-		 * attempt to save it by assuming it's in the user's
-		 * locale and converting to utf8 */
-		char *outbase, *outbuf, *p;
-		const char *charset, *inbuf;
-		size_t inlen, outlen;
-		iconv_t ic;
-		
-		inbuf = value;
-		inlen = strlen (inbuf);
-		
-		charset = e_iconv_locale_charset ();
-		ic = e_iconv_open ("UTF-8", charset ? charset : "ISO-8859-1");
-		if (ic != (iconv_t) -1) {
-			size_t ret;
-			
-			outlen = inlen * 6 + 16;
-			outbuf = outbase = g_malloc (outlen);
-			
-			ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen);
-			if (ret != (size_t) -1) {
-				e_iconv (ic, NULL, 0, &outbuf, &outlen);
-				*outbuf = '\0';
-			}
-			
-			e_iconv_close (ic);
-			
-			g_free (value);
-			value = outbase;
-		} else {
-			/* Okay, so now what? I guess we convert invalid chars to _'s? */
-			for (p = value; *p; p++)
-				if (!isascii ((unsigned) *p))
-					*p = '_';
-		}
-	}
-	
-	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;
-	
-	if (name == NULL)
-		return NULL;
-	
-	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->name);
-				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_c(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_c(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;
-	const char *comment = 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, *last;
-
-			/* perform internationalised decoding, and append */
-			text = header_decode_string (pre, NULL);
-			g_string_append (name, text);
-			last = pre;
-			g_free(text);
-
-			pre = header_decode_word(&inptr);
-			if (pre) {
-				size_t l = strlen (last);
-				size_t p = strlen (pre);
-				
-				/* dont append ' ' between sucsessive encoded words */
-				if ((l>6 && last[l-2] == '?' && last[l-1] == '=')
-				    && (p>6 && pre[0] == '=' && pre[1] == '?')) {
-					/* dont append ' ' */
-				} else {
-					name = g_string_append_c(name, ' ');
-				}
-			} else {
-				/* Fix for stupidly-broken-mailers that like to put '.''s in names unquoted */
-				/* see bug #8147 */
-				while (!pre && *inptr && *inptr != '<') {
-					w(g_warning("Working around stupid mailer bug #5: unescaped characters in names"));
-					name = g_string_append_c(name, *inptr++);
-					pre = header_decode_word(&inptr);
-				}
-			}
-			g_free(last);
-		}
-		header_decode_lwsp(&inptr);
-		if (*inptr == '<') {
-			closeme = TRUE;
-		try_address_again:
-			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);
-		addr = g_string_append_c(addr, '.');
-		if (pre)
-			addr = g_string_append(addr, pre);
-		comment = inptr;
-		header_decode_lwsp(&inptr);
-	}
-	g_free(pre);
-
-	/* now at '@' domain part */
-	if (*inptr == '@') {
-		char *dom;
-
-		inptr++;
-		addr = g_string_append_c(addr, '@');
-		comment = inptr;
-		dom = header_decode_domain(&inptr);
-		addr = g_string_append(addr, dom);
-		g_free(dom);
-	} else {
-		/* If we get a <, the address was probably a name part, lets try again shall we? */
-		/* Another fix for seriously-broken-mailers */
-		if (*inptr && *inptr != ',') {
-			char *text;
-
-			w(g_warning("We didn't get an '@' where we expected in '%s', trying again", *in));
-			w(g_warning("Name is '%s', Addr is '%s' we're at '%s'\n", name?name->str:"<UNSET>", addr->str, inptr));
-
-			/* need to keep *inptr, as try_address_again will drop the current character */
-			if (*inptr == '<')
-				closeme = TRUE;
-			else
-				g_string_append_c(addr, *inptr);
-
-			/* check for address is encoded word ... */
-			text = header_decode_string(addr->str, NULL);
-			if (name == NULL) {
-				name = addr;
-				addr = g_string_new("");
-				if (text) {
-					g_string_truncate(name, 0);
-					g_string_append(name, text);
-				}
-			} else {
-				g_string_append(name, text?text:addr->str);
-				g_string_truncate(addr, 0);
-			}
-			g_free(text);
-
-			/* or maybe that we've added up a bunch of broken bits to make an encoded word */
-			text = header_decode_string(name->str, NULL);
-			if (text) {
-				g_string_truncate(name, 0);
-				g_string_append(name, text);
-				g_free(text);
-			}
-
-			goto try_address_again;
-		}
-		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 && comment != NULL && inptr>comment) { /* check for comment after address */
-		char *text, *tmp;
-		const char *comstart, *comend;
-
-		/* this is a bit messy, we go from the last known position, because
-		   decode_domain/etc skip over any comments on the way */
-		/* FIXME: This wont detect comments inside the domain itself,
-		   but nobody seems to use that feature anyway ... */
-
-		d(printf("checking for comment from '%s'\n", comment));
-
-		comstart = strchr(comment, '(');
-		if (comstart) {
-			comstart++;
-			header_decode_lwsp(&inptr);
-			comend = inptr-1;
-			while (comend > comstart && comend[0] != ')')
-				comend--;
-			
-			if (comend > comstart) {
-				d(printf("  looking at subset '%.*s'\n", comend-comstart, comstart));
-				tmp = g_strndup (comstart, comend-comstart);
-				text = header_decode_string (tmp, NULL);
-				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;
-}
-
-static void
-header_references_decode_single (const char **in, struct _header_references **head)
-{
-	struct _header_references *ref;
-	const char *inptr = *in;
-	char *id, *word;
-	
-	while (*inptr) {
-		header_decode_lwsp (&inptr);
-		if (*inptr == '<') {
-			id = header_msgid_decode_internal (&inptr);
-			if (id) {
-				ref = g_malloc (sizeof (struct _header_references));
-				ref->next = *head;
-				ref->id = id;
-				*head = ref;
-				break;
-			}
-		} else {
-			word = header_decode_word (&inptr);
-			if (word)
-				g_free (word);
-			else if (*inptr != '\0')
-				inptr++; /* Stupid mailer tricks */
-		}
-	}
-	
-	*in = inptr;
-}
-
-struct _header_references *
-header_references_inreplyto_decode (const char *in)
-{
-	struct _header_references *ref = NULL;
-	
-	if (in == NULL || in[0] == '\0')
-		return NULL;
-	
-	header_references_decode_single (&in, &ref);
-	
-	return ref;
-}
-
-/* generate a list of references, from most recent up */
-struct _header_references *
-header_references_decode (const char *in)
-{
-	struct _header_references *refs = NULL;
-	
-	if (in == NULL || in[0] == '\0')
-		return NULL;
-	
-	while (*in)
-		header_references_decode_single (&in, &refs);
-	
-	return refs;
-}
-
-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;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == 0)
-		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_decode_param_list (const char **in)
-{
-	const char *inptr = *in;
-	struct _header_param *head = NULL, *tail = NULL;
-	gboolean last_was_rfc2184 = FALSE;
-	gboolean is_rfc2184 = FALSE;
-	
-	header_decode_lwsp (&inptr);
-	
-	while (*inptr == ';') {
-		struct _header_param *param;
-		char *name, *value;
-		int rfc2184_part;
-		
-		inptr++;
-		/* invalid format? */
-		if (header_decode_param (&inptr, &name, &value, &is_rfc2184, &rfc2184_part) != 0)
-			break;
-		
-		if (is_rfc2184 && tail && !strcasecmp (name, tail->name)) {
-			/* rfc2184 allows a parameter to be broken into multiple parts
-			 * and it looks like we've found one. Append this value to the
-			 * last value.
-			 */
-			/* FIXME: we should be ordering these based on rfc2184_part id */
-			GString *gvalue;
-			
-			gvalue = g_string_new (tail->value);
-			g_string_append (gvalue, value);
-			g_free (tail->value);
-			g_free (value);
-			g_free (name);
-			
-			tail->value = gvalue->str;
-			g_string_free (gvalue, FALSE);
-		} else {
-			if (last_was_rfc2184) {
-				/* We've finished gathering the values for the last param
-				 * so it is now safe to decode it.
-				 */
-				char *val;
-				
-				val = rfc2184_decode (tail->value, strlen (tail->value));
-				if (val) {
-					g_free (tail->value);
-					tail->value = val;
-				}
-			}
-			
-			param = g_malloc (sizeof (struct _header_param));
-			param->name = name;
-			param->value = value;
-			param->next = NULL;
-			if (head == NULL)
-				head = param;
-			if (tail)
-				tail->next = param;
-			tail = param;
-		}
-		
-		last_was_rfc2184 = is_rfc2184;
-		
-		header_decode_lwsp (&inptr);
-	}
-	
-	if (last_was_rfc2184) {
-		/* We've finished gathering the values for the last param
-		 * so it is now safe to decode it.
-		 */
-		char *val;
-		
-		val = rfc2184_decode (tail->value, strlen (tail->value));
-		if (val) {
-			g_free (tail->value);
-			tail->value = val;
-		}
-	}
-	
-	*in = inptr;
-	
-	return head;
-}
-
-struct _header_param *
-header_param_list_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return header_decode_param_list(&in);
-}
-
-
-static char *
-header_encode_param (const unsigned char *in, gboolean *encoded)
-{
-	register const unsigned char *inptr = in;
-	unsigned char *outbuf = NULL;
-	iconv_t cd = (iconv_t) -1;
-	const char *charset;
-	char *outstr;
-	int encoding;
-	GString *out;
-	
-	*encoded = FALSE;
-	
-	g_return_val_if_fail (in != NULL, NULL);
-	g_return_val_if_fail (g_utf8_validate (in, -1, NULL), NULL);
-	
-	/* do a quick us-ascii check (the common case?) */
-	while (*inptr) {
-		if (*inptr > 127)
-			break;
-		inptr++;
-	}
-	
-	if (*inptr == '\0')
-		return g_strdup (in);
-	
-	inptr = in;
-	encoding = 0;
-	while (inptr && *inptr) {
-		const char *newinptr;
-		gunichar c;
-		
-		newinptr = g_utf8_next_char (inptr);
-		c = g_utf8_get_char (inptr);
-		if (newinptr == NULL || !g_unichar_validate (c)) {
-			w(g_warning ("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s",
-				     (inptr-in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		
-		if (c > 127 && c < 256) {
-			encoding = MAX (encoding, 1);
-		} else if (c >= 256) {
-			encoding = MAX (encoding, 2);
-		}
-		
-		inptr = newinptr;
-	}
-	
-	if (encoding == 2)
-		charset = camel_charset_best (in, inptr - in);
-	else
-		charset = "iso-8859-1";
-	
-	if (strcasecmp (charset, "UTF-8") != 0)
-		cd = e_iconv_open (charset, "UTF-8");
-	
-	if (cd == (iconv_t) -1) {
-		charset = "UTF-8";
-		inptr = in;
-	} else {
-		size_t inleft, outleft;
-		const char *inbuf;
-		char *outptr;
-		
-		inleft = (inptr - in);
-		outleft = inleft * 6 + 16 + 1;
-		outptr = outbuf = alloca (outleft);
-		inbuf = in;
-		
-		if (e_iconv (cd, &inbuf, &inleft, &outptr, &outleft) == (size_t) -1) {
-			w(g_warning ("Conversion problem: conversion truncated: %s", g_strerror (errno)));
-		} else {
-			e_iconv (cd, NULL, 0, &outptr, &outleft);
-		}
-		
-		e_iconv_close (cd);
-		
-		*outptr = '\0';
-		
-		inptr = outbuf;
-	}
-	
-	/* FIXME: set the 'language' as well, assuming we can get that info...? */
-	out = g_string_new ("");
-	g_string_sprintfa (out, "%s''", charset);
-	
-	while (inptr && *inptr) {
-		unsigned char c = *inptr++;
-		
-		/* FIXME: make sure that '\'', '*', and ';' are also encoded */
-		
-		if (c > 127) {
-			g_string_sprintfa (out, "%%%c%c", tohex[(c >> 4) & 0xf], tohex[c & 0xf]);
-		} else if (is_lwsp (c) || !(camel_mime_special_table[c] & IS_ESAFE)) {
-			g_string_sprintfa (out, "%%%c%c", tohex[(c >> 4) & 0xf], tohex[c & 0xf]);
-		} else {
-			g_string_append_c (out, c);
-		}
-	}
-	
-	g_free (outbuf);
-	
-	outstr = out->str;
-	g_string_free (out, FALSE);
-	*encoded = TRUE;
-	
-	return outstr;
-}
-
-void
-header_param_list_format_append (GString *out, struct _header_param *p)
-{
-	int used = out->len;
-	
-	while (p) {
-		gboolean encoded = FALSE;
-		gboolean quote = FALSE;
-		int here = out->len;
-		size_t nlen, vlen;
-		char *value;
-		
-		if (!p->value) {
-			p = p->next;
-			continue;
-		}
-		
-		value = header_encode_param (p->value, &encoded);
-		if (!value) {
-			w(g_warning ("appending parameter %s=%s violates rfc2184", p->name, p->value));
-			value = g_strdup (p->value);
-		}
-		
-		if (!encoded) {
-			char *ch;
-			
-			for (ch = value; *ch; ch++) {
-				if (is_tspecial (*ch) || is_lwsp (*ch))
-					break;
-			}
-			
-			quote = ch && *ch;
-		}
-		
-		nlen = strlen (p->name);
-		vlen = strlen (value);
-		
-		if (used + nlen + vlen > CAMEL_FOLD_SIZE - 8) {
-			out = g_string_append (out, ";\n\t");
-			here = out->len;
-			used = 0;
-		} else
-			out = g_string_append (out, "; ");
-		
-		if (nlen + vlen > CAMEL_FOLD_SIZE - 8) {
-			/* we need to do special rfc2184 parameter wrapping */
-			int maxlen = CAMEL_FOLD_SIZE - (nlen + 8);
-			char *inptr, *inend;
-			int i = 0;
-			
-			inptr = value;
-			inend = value + vlen;
-			
-			while (inptr < inend) {
-				char *ptr = inptr + MIN (inend - inptr, maxlen);
-				
-				if (encoded && ptr < inend) {
-					/* be careful not to break an encoded char (ie %20) */
-					char *q = ptr;
-					int j = 2;
-					
-					for ( ; j > 0 && q > inptr && *q != '%'; j--, q--);
-					if (*q == '%')
-						ptr = q;
-				}
-				
-				if (i != 0) {
-					g_string_append (out, ";\n\t");
-					here = out->len;
-					used = 0;
-				}
-				
-				g_string_sprintfa (out, "%s*%d%s=", p->name, i++, encoded ? "*" : "");
-				if (encoded || !quote)
-					g_string_append_len (out, inptr, ptr - inptr);
-				else
-					quote_word (out, TRUE, inptr, ptr - inptr);
-				
-				d(printf ("wrote: %s\n", out->str + here));
-				
-				used += (out->len - here);
-				
-				inptr = ptr;
-			}
-		} else {
-			g_string_sprintfa (out, "%s%s=", p->name, encoded ? "*" : "");
-			
-			if (encoded || !quote)
-				g_string_append (out, value);
-			else
-				quote_word (out, TRUE, value, vlen);
-			
-			used += (out->len - here);
-		}
-		
-		g_free (value);
-		
-		p = p->next;
-	}
-}
-
-char *
-header_param_list_format(struct _header_param *p)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	header_param_list_format_append(out, p);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-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_decode_param_list(&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_type_simple (struct _header_content_type *ct)
-{
-	if (ct->type == NULL) {
-		w(g_warning ("Content-Type with no main type"));
-		return g_strdup ("text/plain");
-	} else if (ct->subtype == NULL) {
-		w(g_warning ("Content-Type with no sub type: %s", ct->type));
-		if (!strcasecmp (ct->type, "multipart"))
-			return g_strdup_printf ("%s/mixed", ct->type);
-		else
-			return g_strdup (ct->type);
-	} else
-		return g_strdup_printf ("%s/%s", ct->type, ct->subtype);
-}
-
-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_decode_param_list(&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
-				return parse_broken_date (in, saveoffset);
-#else
-				if (saveoffset)
-					*saveoffset = 0;
-				return 0;
-#endif /* ! CLEAN_DATE */
-			}
-		}
-	}
-	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 < 69) {
-		tm.tm_year = 100 + year;
-	} else if (year < 100) {
-		tm.tm_year = year;
-	} else if (year >= 100 && year < 1900) {
-		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;
-}
-
-char *
-header_location_decode(const char *in)
-{
-	const char *p;
-
-	/* Sigh. RFC2557 says:
-	 *   content-location =   "Content-Location:" [CFWS] URI [CFWS]
-	 *      where URI is restricted to the syntax for URLs as
-	 *      defined in Uniform Resource Locators [URL] until
-	 *      IETF specifies other kinds of URIs.
-	 *
-	 * But Netscape puts quotes around the URI when sending web
-	 * pages.
-	 */
-
-	header_decode_lwsp(&in);
-	if (*in == '"')
-		return header_decode_quoted_string(&in);
-	else {
-		for (p = in; *p && !is_lwsp(*p); p++)
-			;
-		return g_strndup(in, p - in);
-	}
-}
-
-
-/* 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;
-	size_t 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;
-}
-
-char *
-header_msgid_generate (void)
-{
-	char host[MAXHOSTNAMELEN];
-#ifdef ENABLE_THREADS
-	static pthread_mutex_t count_lock = PTHREAD_MUTEX_INITIALIZER;
-#define COUNT_LOCK() pthread_mutex_lock (&count_lock)
-#define COUNT_UNLOCK() pthread_mutex_unlock (&count_lock)
-#else
-#define COUNT_LOCK()
-#define COUNT_UNLOCK()
-#endif /* ENABLE_THREADS */
-	static int count = 0;
-	int hrv;
-	char *ret;
-	
-	hrv = gethostname (host, sizeof (host));
-	
-	COUNT_LOCK ();
-	ret = g_strdup_printf ("%d.%d.%d.camel@%s", (gint) time (NULL), getpid (), count++,
-			       (hrv == 0 && host && *host) ? host : "unknown.host");
-	COUNT_UNLOCK ();
-	
-	return ret;
-}
-
-
-static struct {
-	char *name;
-	char *pattern;
-	regex_t regex;
-} mail_list_magic[] = {
-	/* X-Mailing-List: <gnome-hackers@gnome.org> arcive/latest/100 */
-	/* X-Mailing-List: gnome-hackers@gnome.org */
-	/* X-Mailing-List: gnome-hackers */
-	/* X-Mailing-List: <gnome-hackers> */
-	{ "X-Mailing-List", " <?([^@>]+)@?([^ \n\t\r>]*)" },
-	/* X-Loop: gnome-hackers@gnome.org */
-	{ "X-Loop", " *([^@]+)@?([^ \n\t\r>]*)" },
-	/* List-Id: GNOME stuff <gnome-hackers.gnome.org> */
-	/* List-Id: <gnome-hackers.gnome.org> */
-	/* List-Id: <gnome-hackers> */
-	/* This old one wasn't very useful: { "List-Id", " *([^<]+)" },*/
-	{ "List-Id", "[^<]*<([^\\.>]+)\\.?([^ \n\t\r>]*)" },
-	/* List-Post: <mailto:gnome-hackers@gnome.org> */
-	/* List-Post: <mailto:gnome-hackers> */
-	{ "List-Post", " *<mailto:([^@>]+)@?([^ \n\t\r>]*)" },
-	/* Mailing-List: list gnome-hackers@gnome.org; contact gnome-hackers-owner@gnome.org */
-	{ "Mailing-List", " *list ([^@]+)@?([^ \n\t\r>;])*" },
-	/* Originator: gnome-hackers@gnome.org */
-	{ "Originator", " *([^@]+)@?([^ \n\t\r>]*)" },
-	/* X-List: gnome-hackers */
-	/* X-List: gnome-hackers@gnome.org */
-	{ "X-List", " *([^@]+)@?([^ \n\t\r>]*)" },	
-	/* Sender: owner-gnome-hackers@gnome.org */
-	/* Sender: owner-gnome-hacekrs */
-	{ "Sender", " *owner-([^@]+)@?([^ @\n\t\r>]*)" },
-	/* Sender: gnome-hackers-owner@gnome.org */
-	/* Sender: gnome-hackers-owner */
-	{ "Sender", " *([^@]+)-owner@?([^ @\n\t\r>]*)" },
-	/* Delivered-To: mailing list gnome-hackers@gnome.org */
-	/* Delivered-To: mailing list gnome-hackers */
-	{ "Delivered-To", " *mailing list ([^@]+)@?([^ \n\t\r>]*)" },
-	/* Sender: owner-gnome-hackers@gnome.org */
-	/* Sender: <owner-gnome-hackers@gnome.org> */
-	/* Sender: owner-gnome-hackers */
-	/* Sender: <owner-gnome-hackers> */
-	{ "Return-Path", " <?owner-([^@>]+)@?([^ \n\t\r>]*)" },
-	/* X-BeenThere: gnome-hackers@gnome.org */
-	/* X-BeenThere: gnome-hackers */
-	{ "X-BeenThere", " *([^@]+)@?([^ \n\t\r>]*)" },
-};
-
-char *
-header_raw_check_mailing_list(struct _header_raw **list)
-{
-	const char *v;
-	regmatch_t match[3];
-	int i;
-	
-	for (i = 0; i < sizeof (mail_list_magic) / sizeof (mail_list_magic[0]); i++) {
-		v = header_raw_find (list, mail_list_magic[i].name, NULL);
-		if (v != NULL && regexec (&mail_list_magic[i].regex, v, 3, match, 0) == 0 && match[1].rm_so != -1) {
-			char *list;
-			int len1, len2;
-
-			len1 = match[1].rm_eo - match[1].rm_so;
-			len2 = match[2].rm_eo - match[2].rm_so;
-
-			list = g_malloc(len1+len2+2);
-			memcpy(list, v + match[1].rm_so, len1);
-			if (len2) {
-				list[len1] = '@';
-				memcpy(list+len1+1, v+match[2].rm_so, len2);
-				list[len1+len2+1]=0;
-			} else {
-				list[len1] = 0;
-			}
-
-			return list;
-		}
-	}
-
-	return 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;
-}
-
-/* if encode is true, then the result is suitable for mailing, otherwise
-   the result is suitable for display only (and may not even be re-parsable) */
-static void
-header_address_list_encode_append(GString *out, int encode, struct _header_address *a)
-{
-	char *text;
-
-	while (a) {
-		switch (a->type) {
-		case HEADER_ADDRESS_NAME:
-			if (encode)
-				text = header_encode_phrase (a->name);
-			else
-				text = a->name;
-			if (text && *text)
-				g_string_sprintfa(out, "%s <%s>", text, a->v.addr);
-			else
-				g_string_append(out, a->v.addr);
-			if (encode)
-				g_free(text);
-			break;
-		case HEADER_ADDRESS_GROUP:
-			if (encode)
-				text = header_encode_phrase(a->name);
-			else
-				text = a->name;
-			g_string_sprintfa(out, "%s: ", text);
-			header_address_list_encode_append(out, encode, a->v.members);
-			g_string_sprintfa(out, ";");
-			if (encode)
-				g_free(text);
-			break;
-		default:
-			g_warning("Invalid address type");
-			break;
-		}
-		a = a->next;
-		if (a)
-			g_string_append(out, ", ");
-	}
-}
-
-char *
-header_address_list_encode(struct _header_address *a)
-{
-	GString *out;
-	char *ret;
-
-	if (a == NULL)
-		return NULL;
-
-	out = g_string_new("");
-
-	header_address_list_encode_append(out, TRUE, a);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-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_encode_append(out, FALSE, a);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-char *
-header_address_fold (const char *in, size_t headerlen)
-{
-	size_t len, outlen;
-	const char *inptr = in, *space, *p, *n;
-	GString *out;
-	char *ret;
-	int i, needunfold = FALSE;
-	
-	if (in == NULL)
-		return NULL;
-	
-	/* first, check to see if we even need to fold */
-	len = headerlen + 2;
-	p = in;
-	while (*p) {
-		n = strchr (p, '\n');
-		if (n == NULL) {
-			len += strlen (p);
-			break;
-		}
-		
-		needunfold = TRUE;
-		len += n-p;
-		
-		if (len >= CAMEL_FOLD_SIZE)
-			break;
-		len = 0;
-		p = n + 1;
-	}
-	if (len < CAMEL_FOLD_SIZE)
-		return g_strdup (in);
-	
-	/* we need to fold, so first unfold (if we need to), then process */
-	if (needunfold)
-		inptr = in = header_unfold (in);
-	
-	out = g_string_new ("");
-	outlen = headerlen + 2;
-	while (*inptr) {
-		space = strchr (inptr, ' ');
-		if (space) {
-			len = space - inptr + 1;
-		} else {
-			len = strlen (inptr);
-		}
-		
-		d(printf("next word '%.*s'\n", len, inptr));
-		
-		if (outlen + len > CAMEL_FOLD_SIZE) {
-			d(printf("outlen = %d wordlen = %d\n", outlen, len));
-			/* strip trailing space */
-			if (out->len > 0 && out->str[out->len-1] == ' ')
-				g_string_truncate (out, out->len-1);
-			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);
-	
-	if (needunfold)
-		g_free ((char *)in);
-	
-	return ret;	
-}
-
-/* simple header folding */
-/* will work even if the header is already folded */
-char *
-header_fold(const char *in, size_t headerlen)
-{
-	size_t len, outlen, i;
-	const char *inptr = in, *space, *p, *n;
-	GString *out;
-	char *ret;
-	int needunfold = FALSE;
-
-	if (in == NULL)
-		return NULL;
-
-	/* first, check to see if we even need to fold */
-	len = headerlen + 2;
-	p = in;
-	while (*p) {
-		n = strchr(p, '\n');
-		if (n == NULL) {
-			len += strlen (p);
-			break;
-		}
-
-		needunfold = TRUE;
-		len += n-p;
-		
-		if (len >= CAMEL_FOLD_SIZE)
-			break;
-		len = 0;
-		p = n + 1;
-	}
-	if (len < CAMEL_FOLD_SIZE)
-		return g_strdup(in);
-
-	/* we need to fold, so first unfold (if we need to), then process */
-	if (needunfold)
-		inptr = in = header_unfold(in);
-
-	out = g_string_new("");
-	outlen = headerlen+2;
-	while (*inptr) {
-		space = strchr(inptr, ' ');
-		if (space) {
-			len = space-inptr+1;
-		} else {
-			len = strlen(inptr);
-		}
-		d(printf("next word '%.*s'\n", len, inptr));
-		if (outlen + len > CAMEL_FOLD_SIZE) {
-			d(printf("outlen = %d wordlen = %d\n", outlen, len));
-			/* strip trailing space */
-			if (out->len > 0 && out->str[out->len-1] == ' ')
-				g_string_truncate(out, out->len-1);
-			g_string_append(out, "\n\t");
-			outlen = 1;
-			/* check for very long words, just cut them up */
-			while (outlen+len > CAMEL_FOLD_MAX_SIZE) {
-				for (i=0;i<CAMEL_FOLD_MAX_SIZE-outlen;i++)
-					g_string_append_c(out, inptr[i]);
-				inptr += CAMEL_FOLD_MAX_SIZE-outlen;
-				len -= CAMEL_FOLD_MAX_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);
-
-	if (needunfold)
-		g_free((char *)in);
-
-	return ret;	
-}
-
-char *
-header_unfold(const char *in)
-{
-	char *out = g_malloc(strlen(in)+1);
-	const char *inptr = in;
-	char c, *o = out;
-
-	o = out;
-	while ((c = *inptr++)) {
-		if (c == '\n') {
-			if (is_lwsp(*inptr)) {
-				do {
-					inptr++;
-				} while (is_lwsp(*inptr));
-				*o++ = ' ';
-			} else {
-				*o++ = c;
-			}
-		} else {
-			*o++ = c;
-		}
-	}
-	*o = 0;
-
-	return out;
-}
-
-void
-camel_mime_utils_init(void)
-{
-	int i, errcode, regex_compilation_failed=0;
-
-	/* Init tables */
-	header_decode_init();
-	base64_init();
-
-	/* precompile regex's for speed at runtime */
-	for (i = 0; i < sizeof(mail_list_magic) / sizeof(mail_list_magic[0]); i++) {
-		errcode = regcomp(&mail_list_magic[i].regex, mail_list_magic[i].pattern, REG_EXTENDED|REG_ICASE);
-		if (errcode != 0) {
-			char *errstr;
-			size_t len;
-		
-			len = regerror(errcode, &mail_list_magic[i].regex, NULL, 0);
-			errstr = g_malloc0(len + 1);
-			regerror(errcode, &mail_list_magic[i].regex, errstr, len);
-		
-			g_warning("Internal error, compiling regex failed: %s: %s", mail_list_magic[i].pattern, errstr);
-			g_free(errstr);
-			regex_compilation_failed++;
-		}
-	}
-
-	g_assert(regex_compilation_failed == 0);
-}
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
deleted file mode 100644
index 91d1d71553..0000000000
--- a/camel/camel-mime-utils.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_UTILS_H
-#define _CAMEL_MIME_UTILS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <time.h>
-#include <glib.h>
-
-/* maximum recommended size of a line from header_fold() */
-#define CAMEL_FOLD_SIZE (77)
-/* maximum hard size of a line from header_fold() */
-#define CAMEL_FOLD_MAX_SIZE (998)
-
-#define CAMEL_UUDECODE_STATE_INIT   (0)
-#define CAMEL_UUDECODE_STATE_BEGIN  (1 << 16)
-#define CAMEL_UUDECODE_STATE_END    (1 << 17)
-#define CAMEL_UUDECODE_STATE_MASK   (CAMEL_UUDECODE_STATE_BEGIN | CAMEL_UUDECODE_STATE_END)
-
-/* 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;
-};
-
-/* MUST be called before everything else */
-void camel_mime_utils_init(void);
-
-/* 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);
-/* for mailing */
-char *header_address_list_encode(struct _header_address *a);
-/* for display */
-char *header_address_list_format(struct _header_address *a);
-
-/* structured header prameters */
-struct _header_param *header_param_list_decode(const char *in);
-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_format_append(GString *out, struct _header_param *p);
-char *header_param_list_format(struct _header_param *p);
-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);
-char *header_content_type_simple(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 *offset);
-const char *header_raw_find_next(struct _header_raw **list, const char *name, int *offset, 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_fold(struct _header_raw **list);
-void header_raw_clear(struct _header_raw **list);
-
-char *header_raw_check_mailing_list(struct _header_raw **list);
-
-/* fold a header */
-char *header_address_fold (const char *in, size_t headerlen);
-char *header_fold (const char *in, size_t headerlen);
-char *header_unfold (const char *in);
-
-/* decode a header which is a simple token */
-char *header_token_decode (const char *in);
-
-int header_decode_int (const char **in);
-
-/* decode/encode a string type, like a subject line */
-char *header_decode_string (const char *in, const char *default_charset);
-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 or In-Reply-To header */
-struct _header_references *header_references_inreplyto_decode (const char *in);
-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 content-location */
-char *header_location_decode(const char *in);
-
-/* decode the mime-type header */
-void header_mime_decode(const char *in, int *maj, int *min);
-
-/* do incremental base64/quoted-printable (de/en)coding */
-size_t base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save);
-
-size_t base64_encode_step(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
-size_t base64_encode_close(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
-
-size_t uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save);
-
-size_t uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state,
-		      guint32 *save);
-size_t uuencode_close (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state,
-		       guint32 *save);
-
-size_t quoted_decode_step(unsigned char *in, size_t len, unsigned char *out, int *savestate, int *saveme);
-
-size_t quoted_encode_step(unsigned char *in, size_t len, unsigned char *out, int *state, int *save);
-size_t quoted_encode_close(unsigned char *in, size_t len, unsigned char *out, int *state, int *save);
-
-char *base64_encode_simple (const char *data, size_t len);
-size_t base64_decode_simple (char *data, size_t len);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
deleted file mode 100644
index c4f22b6332..0000000000
--- a/camel/camel-movemail.c
+++ /dev/null
@@ -1,543 +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@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include "camel-movemail.h"
-#include "camel-exception.h"
-
-#include "camel-mime-parser.h"
-#include "camel-mime-filter.h"
-#include "camel-mime-filter-from.h"
-
-#include "camel-lock-client.h"
-
-#define d(x)
-
-#ifdef MOVEMAIL_PATH
-#include <sys/wait.h>
-
-static void movemail_external (const char *source, const char *dest,
-			       CamelException *ex);
-#endif
-
-#ifdef HAVE_BROKEN_SPOOL
-static int camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter);
-static int camel_movemail_solaris (int oldsfd, int dfd, CamelException *ex);
-#else
-/* these could probably be exposed as a utility? (but only mbox needs it) */
-static int camel_movemail_copy_file(int sfd, int dfd, CamelException *ex);
-#endif
-
-#if 0
-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).
- *
- * Return Value: Returns -1 on error.
- **/
-int
-camel_movemail(const char *source, const char *dest, CamelException *ex)
-{
-	int lockid = -1;
-	int res = -1;
-	int sfd, dfd;
-	struct stat st;
-
-	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,
-					      strerror (errno));
-		}
-		return -1;
-	}
-
-	if (st.st_size == 0)
-		return 0;
-
-	/* open files */
-	sfd = open (source, O_RDWR);
-	if (sfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open mail file %s: %s"),
-				      source, strerror (errno));
-		return -1;
-	}
-
-	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,
-				      strerror (errno));
-		close (sfd);
-		return -1;
-	}
-
-	/* lock our source mailbox */
-	lockid = camel_lock_helper_lock(source, ex);
-	if (lockid == -1) {
-		close(sfd);
-		close(dfd);
-		return -1;
-	}
-
-#ifdef HAVE_BROKEN_SPOOL
-	res = camel_movemail_solaris(sfd, dfd, ex);
-#else
-	res = camel_movemail_copy_file(sfd, dfd, ex);
-#endif
-
-	/* If no errors occurred copying the data, and we successfully
-	 * close the destination file, then truncate the source file.
-	 */
-	if (res != -1) {
-		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,
-					      strerror(errno));
-			res = -1;
-		}
-	} else
-		close (dfd);
-	close (sfd);
-
-	camel_lock_helper_unlock(lockid);
-
-	return res;
-}
-
-#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"),
-				      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"),
-				      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
-
-#ifndef HAVE_BROKEN_SPOOL
-static int
-camel_movemail_copy_file(int sfd, int dfd, CamelException *ex)
-{
-	int nread, nwrote;
-	char buf[4096];
-
-	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"),
-					      strerror (errno));
-			return -1;
-		}
-
-		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"),
-						      strerror (errno));
-				return -1;
-			}
-			written += nwrote;
-			nread -= nwrote;
-		}
-	}
-
-	return 0;
-}
-#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)
-
-#ifdef HAVE_BROKEN_SPOOL
-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;
-
-		d(printf("read %d unfiltered bytes\n", towrite));
-
-                /* 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;
-		}
-
-		d(printf("writing %d filtered bytes\n", towrite));
-
-		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 oldsfd, int dfd, CamelException *ex)
-{
-	CamelMimeParser *mp;
-	char *buffer;
-	int len;
-	int sfd;
-	CamelMimeFilterFrom *ffrom;
-	int ret = 1;
-	char *from = NULL;
-
-	/* need to dup as the mime parser will close on finish */
-	sfd = dup(oldsfd);
-	if (sfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Error copying mail temp file: %s"),
-				      strerror (errno));
-		return -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) {
-		g_assert(camel_mime_parser_from_line(mp));
-		from = g_strdup(camel_mime_parser_from_line(mp));
-		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);
-
-			if (write(dfd, from, strlen(from)) != strlen(from))
-				goto fail;
-
-			/* write out headers, but NOT content-length header */
-			if (solaris_header_write(dfd, camel_mime_parser_headers_raw(mp)) == -1)
-				goto fail;
-
-			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));
-		}
-		g_free(from);
-	}
-
-	camel_object_unref((CamelObject *)mp);
-	camel_object_unref((CamelObject *)ffrom);
-
-	return ret;
-
-fail:
-	g_free(from);
-
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-			      _("Error copying mail temp file: %s"),
-			      strerror (errno));
-
-
-	camel_object_unref((CamelObject *)mp);
-	camel_object_unref((CamelObject *)ffrom);
-
-	return -1;
-}
-#endif /* HAVE_BROKEN_SPOOL */
-
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
deleted file mode 100644
index 3e5206f672..0000000000
--- a/camel/camel-movemail.h
+++ /dev/null
@@ -1,44 +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@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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>
-
-int 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 f82b66312a..0000000000
--- a/camel/camel-multipart.c
+++ /dev/null
@@ -1,541 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h> /* strlen() */
-#include <unistd.h> /* for getpid */
-#include <time.h>   /* for time */
-
-#include "camel-stream-mem.h"
-#include "camel-multipart.h"
-#include "camel-mime-part.h"
-#include "camel-exception.h"
-#include "md5-utils.h"
-
-#define d(x)
-
-static gboolean              is_offline        (CamelDataWrapper *data_wrapper);
-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,
-						const char *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;
-	camel_data_wrapper_class->is_offline = is_offline;
-}
-
-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, const char *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;
-	}
-
-	header_content_type_set_param (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, const char *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 header_content_type_param (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);
-}
-
-static gboolean
-is_offline (CamelDataWrapper *data_wrapper)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);
-	GList *node;
-	CamelDataWrapper *part;
-
-	if (parent_class->is_offline (data_wrapper))
-		return TRUE;
-	for (node = multipart->parts; node; node = node->next) {
-		part = node->data;
-		if (camel_data_wrapper_is_offline (part))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-/* 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, -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 dfa8908bb2..0000000000
--- a/camel/camel-multipart.h
+++ /dev/null
@@ -1,104 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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, const char *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,
-						    const char *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 c8a170781a..0000000000
--- a/camel/camel-news-address.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-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 ca1505e9a6..0000000000
--- a/camel/camel-news-address.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <NotZed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_NEWS_ADDRESS_H
-#define _CAMEL_NEWS_ADDRESS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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 CAMEL_IS_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;
-};
-
-CamelType		camel_news_address_get_type	(void);
-CamelNewsAddress      *camel_news_address_new	(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_NEWS_ADDRESS_H */
diff --git a/camel/camel-object.c b/camel/camel-object.c
deleted file mode 100644
index 48a77971f7..0000000000
--- a/camel/camel-object.c
+++ /dev/null
@@ -1,983 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
- *
- * Author:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 2000-2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <string.h>
-#include "camel-object.h"
-
-#include <e-util/e-memory.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#include <e-util/e-msgport.h>
-#endif
-
-/* I just mashed the keyboard for these... */
-#define CAMEL_OBJECT_MAGIC           	 0x77A344ED
-#define CAMEL_OBJECT_CLASS_MAGIC     	 0xEE26A997
-#define CAMEL_OBJECT_FINALISED_MAGIC       0x84AC365F
-#define CAMEL_OBJECT_CLASS_FINALISED_MAGIC 0x7621ABCD
-
-/* ** Quickie type system ************************************************* */
-
-/* A 'locked' hooklist, that is only allocated on demand */
-typedef struct _CamelHookList {
-	EMutex *lock;
-
-	unsigned int depth:30;	/* recursive event depth */
-	unsigned int flags:2;	/* flags, see below */
-
-	unsigned int list_length;
-	struct _CamelHookPair *list;
-} CamelHookList;
-
-#define CAMEL_HOOK_PAIR_REMOVED (1<<0)
-
-/* a 'hook pair', actually a hook tuple, we just store all hooked events in the same list,
-   and just comapre as we go, rather than storing separate lists for each hook type
-
-   the name field just points directly to the key field in the class's preplist hashtable.
-   This way we can just use a direct pointer compare when scanning it, and also saves
-   copying the string */
-typedef struct _CamelHookPair
-{
-	struct _CamelHookPair *next; /* next MUST be the first member */
-
-	unsigned int id:30;
-	unsigned int flags:2;	/* removed, etc */
-
-	const char *name;	/* points to the key field in the classes preplist, static memory */
-	union {
-		CamelObjectEventHookFunc event;
-		CamelObjectEventPrepFunc prep;
-	} func;
-	void *data;
-} CamelHookPair;
-
-/* ********************************************************************** */
-
-static void camel_object_free_hooks(CamelObject *o);
-
-/* ********************************************************************** */
-
-static pthread_mutex_t chunks_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static EMemChunk *pair_chunks;
-static EMemChunk *hook_chunks;
-static unsigned int pair_id = 1;
-
-static EMutex *type_lock;
-
-static GHashTable *type_table;
-static EMemChunk *type_chunks;
-
-CamelType camel_object_type;
-
-#ifdef ENABLE_THREADS
-#define P_LOCK(l) (pthread_mutex_lock(&l))
-#define P_UNLOCK(l) (pthread_mutex_unlock(&l))
-#define E_LOCK(l) (e_mutex_lock(l))
-#define E_UNLOCK(l) (e_mutex_unlock(l))
-#define CLASS_LOCK(k) (g_mutex_lock((((CamelObjectClass *)k)->lock)))
-#define CLASS_UNLOCK(k) (g_mutex_unlock((((CamelObjectClass *)k)->lock)))
-#else
-#define P_LOCK(l)
-#define P_UNLOCK(l)
-#define E_LOCK(l)
-#define E_UNLOCK(l)
-#define CLASS_LOCK(k)
-#define CLASS_UNLOCK(k)
-#endif
-
-static struct _CamelHookPair *
-pair_alloc(void)
-{
-	CamelHookPair *pair;
-
-	P_LOCK(chunks_lock);
-	pair = e_memchunk_alloc(pair_chunks);
-	pair->id = pair_id++;
-	if (pair_id == 0)
-		pair_id = 1;
-	P_UNLOCK(chunks_lock);
-
-	return pair;
-}
-
-static void
-pair_free(CamelHookPair *pair)
-{
-	g_assert(pair_chunks != NULL);
-
-	P_LOCK(chunks_lock);
-	e_memchunk_free(pair_chunks, pair);
-	P_UNLOCK(chunks_lock);
-}
-
-static struct _CamelHookList *
-hooks_alloc(void)
-{
-	CamelHookList *hooks;
-
-	P_LOCK(chunks_lock);
-	hooks = e_memchunk_alloc(hook_chunks);
-	P_UNLOCK(chunks_lock);
-
-	return hooks;
-}
-
-static void
-hooks_free(CamelHookList *hooks)
-{
-	g_assert(hook_chunks != NULL);
-
-	P_LOCK(chunks_lock);
-	e_memchunk_free(hook_chunks, hooks);
-	P_UNLOCK(chunks_lock);
-}
-
-/* not checked locked, who cares, only required for people that want to redefine root objects */
-void
-camel_type_init(void)
-{
-	static int init = FALSE;
-
-	if (init)
-		return;
-
-	init = TRUE;
-	pair_chunks = e_memchunk_new(16, sizeof(CamelHookPair));
-	hook_chunks = e_memchunk_new(16, sizeof(CamelHookList));
-	type_lock = e_mutex_new(E_MUTEX_REC);
-	type_chunks = e_memchunk_new(32, sizeof(CamelType));
-	type_table = g_hash_table_new(NULL, NULL);
-}
-
-/* ************************************************************************ */
-
-/* Should this return the object to the caller? */
-static void
-cobject_init (CamelObject *o, CamelObjectClass *klass)
-{
-	o->klass = klass;
-	o->magic = CAMEL_OBJECT_MAGIC;
-	o->ref_count = 1;
-	o->flags = 0;
-}
-
-static void
-cobject_finalise(CamelObject *o)
-{
-	g_assert(o->ref_count == 0);
-
-	camel_object_free_hooks(o);
-
-	o->magic = CAMEL_OBJECT_FINALISED_MAGIC;
-	o->klass = NULL;
-}
-
-static int
-cobject_getv(CamelObject *o, CamelException *ex, CamelArgGetV *args)
-{
-	/* could have flags or stuff here? */
-	return 0;
-}
-
-static int
-cobject_setv(CamelObject *o, CamelException *ex, CamelArgV *args)
-{
-	/* could have flags or stuff here? */
-	return 0;
-}
-
-static void
-cobject_class_init(CamelObjectClass *klass)
-{
-	klass->magic = CAMEL_OBJECT_CLASS_MAGIC;
-
-	klass->getv = cobject_getv;
-	klass->setv = cobject_setv;
-
-	camel_object_class_add_event(klass, "finalize", NULL);
-}
-
-static void
-cobject_class_finalise(CamelObjectClass * klass)
-{
-	klass->magic = CAMEL_OBJECT_CLASS_FINALISED_MAGIC;
-
-	g_free(klass);
-}
-
-CamelType
-camel_object_get_type (void)
-{
-	if (camel_object_type == CAMEL_INVALID_TYPE) {
-		camel_type_init();
-
-		camel_object_type = camel_type_register(NULL, "CamelObject", /*, 0, 0*/
-							sizeof(CamelObject), sizeof(CamelObjectClass),
-							cobject_class_init, cobject_class_finalise,
-							cobject_init, cobject_finalise);
-	}
-
-	return camel_object_type;
-}
-
-static void
-camel_type_class_init(CamelObjectClass *klass, CamelObjectClass *type)
-{
-	if (type->parent)
-		camel_type_class_init(klass, type->parent);
-
-	if (type->klass_init)
-		type->klass_init(klass);
-}
-
-CamelType
-camel_type_register (CamelType parent, const char * name,
-		     /*unsigned int ver, unsigned int rev,*/
-		     size_t object_size, size_t klass_size,
-		     CamelObjectClassInitFunc class_init,
-		     CamelObjectClassFinalizeFunc class_finalise,
-		     CamelObjectInitFunc object_init,
-		     CamelObjectFinalizeFunc object_finalise)
-{
-	CamelObjectClass *klass;
-	/*int offset;
-	  size_t size;*/
-
-	if (parent != NULL && parent->magic != CAMEL_OBJECT_CLASS_MAGIC) {
-		g_warning("camel_type_register: invalid junk parent class for '%s'", name);
-		return NULL;
-	}
-
-	E_LOCK(type_lock);
-
-	/* Have to check creation, it might've happened in another thread before we got here */
-	klass = g_hash_table_lookup(type_table, name);
-	if (klass != NULL) {
-		if (klass->klass_size != klass_size || klass->object_size != object_size
-		    || klass->klass_init != class_init || klass->klass_finalise != class_finalise
-		    || klass->init != object_init || klass->finalise != object_finalise) {
-			g_warning("camel_type_register: Trying to re-register class '%s'", name);
-			klass = NULL;
-		}
-		E_UNLOCK(type_lock);
-		return klass;
-	}
-
-	/* this is for objects with no parent as part of their struct ('interfaces'?) */
-	/*offset = parent?parent->klass_size:0;
-	offset = (offset + 3) & (~3);
-
-	size = offset + klass_size;
-
-	klass = g_malloc0(size);
-
-	klass->klass_size = size;
-	klass->klass_data = offset;
-
-	offset = parent?parent->object_size:0;
-	offset = (offset + 3) & (~3);
-
-	klass->object_size = offset + object_size;
-	klass->object_data = offset;*/
-
-	if (parent
-	    && klass_size < parent->klass_size) {
-		g_warning("camel_type_register: '%s' has smaller class size than parent '%s'", name, parent->name);
-		E_UNLOCK(type_lock);
-		return NULL;
-	}
-
-	klass = g_malloc0(klass_size);
-	klass->klass_size = klass_size;
-	klass->object_size = object_size;	
-#ifdef ENABLE_THREADS
-	klass->lock = g_mutex_new();
-#endif
-	klass->instance_chunks = e_memchunk_new(8, object_size);
-
-	klass->parent = parent;
-	if (parent) {
-		klass->next = parent->child;
-		parent->child = klass;
-	}
-	klass->name = name;
-
-	/*klass->version = ver;
-	  klass->revision = rev;*/
-
-	klass->klass_init = class_init;
-	klass->klass_finalise = class_finalise;
-
-	klass->init = object_init;
-	klass->finalise = object_finalise;
-
-	/* setup before class init, incase class init func uses the type or looks it up ? */
-	g_hash_table_insert(type_table, (void *)name, klass);
-
-	camel_type_class_init(klass, klass);
-
-	E_UNLOCK(type_lock);
-
-	return klass;
-}
-
-static void
-camel_object_init(CamelObject *o, CamelObjectClass *klass, CamelType type)
-{
-	if (type->parent)
-		camel_object_init(o, klass, type->parent);
-
-	if (type->init)
-		type->init(o, klass);
-}
-
-CamelObject *
-camel_object_new(CamelType type)
-{
-	CamelObject *o;
-
-	if (type == NULL)
-		return NULL;
-
-	if (type->magic != CAMEL_OBJECT_CLASS_MAGIC)
-		return NULL;
-
-	CLASS_LOCK(type);
-	o = e_memchunk_alloc0(type->instance_chunks);
-
-#ifdef CAMEL_OBJECT_TRACK_INSTANCES
-	if (type->instances)
-		type->instances->prev = o;
-	o->next = type->instances;
-	o->prev = NULL;
-	type->instances = o;
-#endif
-
-	CLASS_UNLOCK(type);
-	camel_object_init(o, type, type);
-
-	return o;
-}
-
-void
-camel_object_ref(CamelObject *o)
-{
-	CLASS_LOCK(o->klass);
-	o->ref_count++;
-	CLASS_UNLOCK(o->klass);
-}
-
-void
-camel_object_unref(CamelObject *o)
-{
-	register CamelObjectClass *klass = o->klass, *k;
-	
-	CLASS_LOCK(klass);
-	o->ref_count--;
-	if (o->ref_count > 0
-	    || (o->flags & CAMEL_OBJECT_DESTROY)) {
-		CLASS_UNLOCK(klass);
-		return;
-	}
-
-	o->flags |= CAMEL_OBJECT_DESTROY;
-
-	CLASS_UNLOCK(klass);
-
-	camel_object_trigger_event(o, "finalize", NULL);
-
-	k = klass;
-	while (k) {
-		if (k->finalise)
-			k->finalise(o);
-		k = k->parent;
-	}
-
-	o->magic = CAMEL_OBJECT_FINALISED_MAGIC;
-
-	CLASS_LOCK(klass);
-#ifdef CAMEL_OBJECT_TRACK_INSTANCES
-	if (o->prev)
-		o->prev->next = o->next;
-	else
-		klass->instances = o->next;
-	if (o->next)
-		o->next->prev = o->prev;
-#endif
-	e_memchunk_free(klass->instance_chunks, o);
-	CLASS_UNLOCK(klass);
-}
-
-const char *
-camel_type_to_name (CamelType type)
-{
-	if (type == NULL)
-		return "(NULL class)";
-
-	if (type->magic == CAMEL_OBJECT_CLASS_MAGIC)
-		return type->name;
-
-	return "(Junk class)";
-}
-
-CamelType camel_name_to_type(const char *name)
-{
-	/* TODO: Load a class off disk (!) */
-
-	return g_hash_table_lookup(type_table, name);
-}
-
-static char *
-desc_data(CamelObject *o, int ok)
-{
-	char *what;
-
-	if (o == NULL)
-		what = g_strdup("NULL OBJECT");
-	else if (o->magic == ok)
-		what = NULL;
-	else if (o->magic == CAMEL_OBJECT_MAGIC)
-		what = g_strdup_printf("CLASS '%s'", ((CamelObjectClass *)o)->name);
-	else if (o->magic == CAMEL_OBJECT_CLASS_MAGIC)
-		what = g_strdup_printf("CLASS '%s'", ((CamelObjectClass *)o)->name);
-	else if (o->magic == CAMEL_OBJECT_FINALISED_MAGIC)
-		what = g_strdup_printf("finalised OBJECT");
-	else if (o->magic == CAMEL_OBJECT_CLASS_FINALISED_MAGIC)
-		what = g_strdup_printf("finalised CLASS");
-	else 
-		what = g_strdup_printf("junk data");
-
-	return what;
-}
-
-static gboolean
-check_magic(void *o, CamelType ctype, int isob)
-{
-	char *what, *to;
-
-	what = desc_data(o, isob?CAMEL_OBJECT_MAGIC:CAMEL_OBJECT_CLASS_MAGIC);
-	to = desc_data((CamelObject *)ctype, CAMEL_OBJECT_CLASS_MAGIC);
-
-	if (what || to) {
-		if (what == NULL) {
-			if (isob)
-				what = g_strdup_printf("OBJECT '%s'", ((CamelObject *)o)->klass->name);
-			else
-				what = g_strdup_printf("OBJECT '%s'", ((CamelObjectClass *)o)->name);
-		}		
-		if (to == NULL)
-			to = g_strdup_printf("OBJECT '%s'", ctype->name);
-		g_warning("Trying to check %s is %s", what, to);
-		g_free(what);
-		g_free(to);
-
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean
-camel_object_is (CamelObject *o, CamelType ctype)
-{
-	CamelObjectClass *k;
-
-	g_return_val_if_fail(check_magic(o, ctype, TRUE), FALSE);
-
-	k = o->klass;
-	while (k) {
-		if (k == ctype)
-			return TRUE;
-		k = k->parent;
-	}
-
-	return FALSE;
-}
-
-gboolean
-camel_object_class_is (CamelObjectClass *k, CamelType ctype)
-{
-	g_return_val_if_fail(check_magic(k, ctype, FALSE), FALSE);
-
-	while (k) {
-		if (k == ctype)
-			return TRUE;
-		k = k->parent;
-	}
-
-	return FALSE;
-}
-
-CamelObject *
-camel_object_cast(CamelObject *o, CamelType ctype)
-{
-	CamelObjectClass *k;
-
-	g_return_val_if_fail(check_magic(o, ctype, TRUE), NULL);
-
-	k = o->klass;
-	while (k) {
-		if (k == ctype)
-			return o;
-		k = k->parent;
-	}
-
-	g_warning("Object %p (class '%s') doesn't have '%s' in its hierarchy", o, o->klass->name, ctype->name);
-
-	return NULL;
-}
-
-CamelObjectClass *
-camel_object_class_cast(CamelObjectClass *k, CamelType ctype)
-{
-	CamelObjectClass *r = k;
-
-	g_return_val_if_fail(check_magic(k, ctype, FALSE), NULL);
-
-	while (k) {
-		if (k == ctype)
-			return r;
-		k = k->parent;
-	}
-
-	g_warning("Class '%s' doesn't have '%s' in its hierarchy", r->name, ctype->name);
-
-	return NULL;
-}
-
-void
-camel_object_class_add_event(CamelObjectClass *klass, const char *name, CamelObjectEventPrepFunc prep)
-{
-	CamelHookPair *pair;
-
-	g_return_if_fail (name);
-
-	pair = klass->hooks;
-	while (pair) {
-		if (strcmp(pair->name, name) == 0) {
-			g_warning("camel_object_class_add_event: `%s' is already declared for '%s'\n",
-				  name, klass->name);
-			return;
-		}
-		pair = pair->next;
-	}
-
-	pair = pair_alloc();
-	pair->name = name;
-	pair->func.prep = prep;
-	pair->flags = 0;
-
-	pair->next = klass->hooks;
-	klass->hooks = pair;
-}
-
-/* free hook data */
-static void camel_object_free_hooks(CamelObject *o)
-{
-	CamelHookPair *pair, *next;
-
-	if (o->hooks) {
-		g_assert(o->hooks->depth == 0);
-		g_assert((o->hooks->flags & CAMEL_HOOK_PAIR_REMOVED) == 0);
-
-		pair = o->hooks->list;
-		while (pair) {
-			next = pair->next;
-			pair_free(pair);
-			pair = next;
-		}
-		e_mutex_destroy(o->hooks->lock);
-		hooks_free(o->hooks);
-		o->hooks = NULL;
-	}
-}
-
-/* return (allocate if required) the object's hook list, locking at the same time */
-static CamelHookList *camel_object_get_hooks(CamelObject *o)
-{
-#ifdef ENABLE_THREADS
-	static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-#endif
-	CamelHookList *hooks;
-
-	/* if we have it, we dont have to do any other locking,
-	   otherwise use a global lock to setup the object's hook data */
-#ifdef ENABLE_THREADS
-	if (o->hooks == NULL) {
-		pthread_mutex_lock(&lock);
-#endif
-		if (o->hooks == NULL) {
-			hooks = hooks_alloc();
-#ifdef ENABLE_THREADS
-			hooks->lock = e_mutex_new(E_MUTEX_REC);
-#endif
-			hooks->flags = 0;
-			hooks->depth = 0;
-			hooks->list_length = 0;
-			hooks->list = NULL;
-			o->hooks = hooks;
-		}
-#ifdef ENABLE_THREADS
-		pthread_mutex_unlock(&lock);
-	}
-#endif
-
-#ifdef ENABLE_THREADS
-	e_mutex_lock(o->hooks->lock);
-#endif
-	return o->hooks;	
-}
-
-/* unlock object hooks' list */
-#ifdef ENABLE_THREADS
-#define camel_object_unget_hooks(o) (e_mutex_unlock((CAMEL_OBJECT(o)->hooks->lock)))
-#else
-#define camel_object_unget_hooks(o)
-#endif
-
-unsigned int
-camel_object_hook_event(CamelObject * obj, const char * name, CamelObjectEventHookFunc func, void *data)
-{
-	CamelHookPair *pair, *hook;
-	CamelHookList *hooks;
-	int id;
-
-	g_return_val_if_fail (CAMEL_IS_OBJECT (obj), 0);
-	g_return_val_if_fail (name != NULL, 0);
-	g_return_val_if_fail (func != NULL, 0);
-
-	hook = obj->klass->hooks;
-	while (hook) {
-		if (strcmp(hook->name, name) == 0)
-			goto setup;
-		hook = hook->next;
-	}
-
-	g_warning("camel_object_hook_event: trying to hook event `%s' in class `%s' with no defined events.",
-		  name, obj->klass->name);
-
-	return 0;
-
-setup:
-	/* setup hook pair */
-	pair = pair_alloc();
-	pair->name = hook->name;	/* effectively static! */
-	pair->func.event = func;
-	pair->data = data;
-	pair->flags = 0;
-	id = pair->id;
-
-	/* get the hook list object, locked, link in new event hook, unlock */
-	hooks = camel_object_get_hooks(obj);
-	pair->next = hooks->list;
-	hooks->list = pair;
-	hooks->list_length++;
-	camel_object_unget_hooks(obj);
-
-	return id;
-}
-
-void
-camel_object_remove_event(CamelObject * obj, unsigned int id)
-{
-	CamelHookList *hooks;
-	CamelHookPair *pair, *parent;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (id != 0);
-
-	if (obj->hooks == NULL) {
-		g_warning("camel_object_unhook_event: trying to unhook `%d` from an instance of `%s' with no hooks",
-			  id, obj->klass->name);
-		return;
-	}
-
-	/* scan hooks for this event, remove it, or flag it if we're busy */
-	hooks = camel_object_get_hooks(obj);
-	parent = (CamelHookPair *)&hooks->list;
-	pair = parent->next;
-	while (pair) {
-		if (pair->id == id
-		    && (pair->flags & CAMEL_HOOK_PAIR_REMOVED) == 0) {
-			if (hooks->depth > 0) {
-				pair->flags |= CAMEL_HOOK_PAIR_REMOVED;
-				hooks->flags |= CAMEL_HOOK_PAIR_REMOVED;
-			} else {
-				parent->next = pair->next;
-				pair_free(pair);
-				hooks->list_length--;
-			}
-			camel_object_unget_hooks(obj);
-			return;
-		}
-		parent = pair;
-		pair = pair->next;
-	}
-	camel_object_unget_hooks(obj);
-
-	g_warning("camel_object_unhook_event: cannot find hook id %d in instance of `%s'",
-		  id, obj->klass->name);
-}
-
-void
-camel_object_unhook_event(CamelObject * obj, const char * name, CamelObjectEventHookFunc func, void *data)
-{
-	CamelHookList *hooks;
-	CamelHookPair *pair, *parent;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (func != NULL);
-
-	if (obj->hooks == NULL) {
-		g_warning("camel_object_unhook_event: trying to unhook `%s` from an instance of `%s' with no hooks",
-			  name, obj->klass->name);
-		return;
-	}
-
-	/* scan hooks for this event, remove it, or flag it if we're busy */
-	hooks = camel_object_get_hooks(obj);
-	parent = (CamelHookPair *)&hooks->list;
-	pair = parent->next;
-	while (pair) {
-		if (pair->func.event == func
-		    && pair->data == data
-		    && strcmp(pair->name, name) == 0
-		    && (pair->flags & CAMEL_HOOK_PAIR_REMOVED) == 0) {
-			if (hooks->depth > 0) {
-				pair->flags |= CAMEL_HOOK_PAIR_REMOVED;
-				hooks->flags |= CAMEL_HOOK_PAIR_REMOVED;
-			} else {
-				parent->next = pair->next;
-				pair_free(pair);
-				hooks->list_length--;
-			}
-			camel_object_unget_hooks(obj);
-			return;
-		}
-		parent = pair;
-		pair = pair->next;
-	}
-	camel_object_unget_hooks(obj);
-
-	g_warning("camel_object_unhook_event: cannot find hook/data pair %p/%p in an instance of `%s' attached to `%s'",
-		  func, data, obj->klass->name, name);
-}
-
-void
-camel_object_trigger_event (CamelObject * obj, const char * name, void *event_data)
-{
-	CamelHookList *hooks;
-	CamelHookPair *pair, **pairs, *parent, *hook;
-	int i, size;
-	const char *prepname;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-
-	hook = obj->klass->hooks;
-	while (hook) {
-		if (strcmp(hook->name, name) == 0)
-			goto trigger;
-		hook = hook->next;
-	}
-
-	g_warning("camel_object_trigger_event: trying to trigger unknown event `%s' in class `%s'",
-		  name, obj->klass->name);
-
-	return;
-
-trigger:
-	/* try prep function, if false, then quit */
-	if (hook->func.prep != NULL && !hook->func.prep(obj, event_data))
-		return;
-
-	/* also, no hooks, dont bother going further */
-	if (obj->hooks == NULL)
-		return;
-
-	/* lock the object for hook emission */
-	camel_object_ref(obj);
-	hooks = camel_object_get_hooks(obj);
-	
-	if (hooks->list) {
-		/* first, copy the items in the list, and say we're in an event */
-		hooks->depth++;
-		pair = hooks->list;
-		size = 0;
-		pairs = alloca(sizeof(pairs[0]) * hooks->list_length);
-		prepname = hook->name;
-		while (pair) {
-			if (pair->name == prepname)
-				pairs[size++] = pair;
-			pair = pair->next;
-		}
-
-		/* now execute the events we have, if they haven't been removed during our calls */
-		for (i=0;i<size;i++) {
-			pair = pairs[i];
-			if ((pair->flags & CAMEL_HOOK_PAIR_REMOVED) == 0)
-				(pair->func.event) (obj, event_data, pair->data);
-		}
-		hooks->depth--;
-
-		/* and if we're out of any events, then clean up any pending removes */
-		if (hooks->depth == 0 && (hooks->flags & CAMEL_HOOK_PAIR_REMOVED)) {
-			parent = (CamelHookPair *)&hooks->list;
-			pair = parent->next;
-			while (pair) {
-				if (pair->flags & CAMEL_HOOK_PAIR_REMOVED) {
-					parent->next = pair->next;
-					pair_free(pair);
-					hooks->list_length--;
-				} else {
-					parent = pair;
-				}
-				pair = parent->next;
-			}
-			hooks->flags &= ~CAMEL_HOOK_PAIR_REMOVED;
-		}
-	}
-
-	camel_object_unget_hooks(obj);
-	camel_object_unref(obj);
-}
-
-/* get/set arg methods */
-int camel_object_set(CamelObject *o, CamelException *ex, ...)
-{
-	CamelArgV args;
-	CamelObjectClass *klass = o->klass;
-	int ret = 0;
-
-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);
-
-	camel_argv_start(&args, ex);
-
-	while (camel_argv_build(&args) && ret == 0)
-		ret = klass->setv(o, ex, &args);
-	if (ret == 0)
-		ret = klass->setv(o, ex, &args);
-
-	camel_argv_end(&args);
-
-	return ret;
-}
-
-int camel_object_setv(CamelObject *o, CamelException *ex, CamelArgV *args)
-{
-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);
-
-	return o->klass->setv(o, ex, args);
-}
-
-int camel_object_get(CamelObject *o, CamelException *ex, ...)
-{
-	CamelArgGetV args;
-	CamelObjectClass *klass = o->klass;
-	int ret = 0;
-
-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);
-
-	camel_argv_start(&args, ex);
-
-	while (camel_arggetv_build(&args) && ret == 0)
-		ret = klass->getv(o, ex, &args);
-	if (ret == 0)
-		ret = klass->getv(o, ex, &args);
-
-	camel_argv_end(&args);
-
-	return ret;
-}
-
-int camel_object_getv(CamelObject *o, CamelException *ex, CamelArgGetV *args)
-{
-	CamelObjectClass *klass = o->klass;
-
-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);
-
-	return klass->getv(o, ex, args);
-}
-
-static void
-object_class_dump_tree_rec(CamelType root, int depth)
-{
-	char *p;
-#ifdef CAMEL_OBJECT_TRACK_INSTANCES
-	struct _CamelObject *o;
-#endif
-
-	p = alloca(depth*2+1);
-	memset(p, ' ', depth*2);
-	p[depth*2] = 0;
-
-	while (root) {
-		CLASS_LOCK(root);
-		printf("%sClass: %s\n", p, root->name);
-		/*printf("%sVersion: %u.%u\n", p, root->version, root->revision);*/
-		if (root->hooks) {
-			CamelHookPair *pair = root->hooks;
-
-			while (pair) {
-				printf("%s  event '%s' prep %p\n", p, pair->name, pair->func.prep);
-				pair = pair->next;
-			}
-		}
-#ifdef CAMEL_OBJECT_TRACK_INSTANCES
-		o = root->instances;
-		while (o) {
-			printf("%s instance %p [%d]\n", p, o, o->ref_count);
-			/* todo: should lock hooks while it scans them */
-			if (o->hooks) {
-				CamelHookPair *pair = o->hooks->list;
-
-				while (pair) {
-					printf("%s  hook '%s' func %p data %p\n", p, pair->name, pair->func.event, pair->data);
-					pair = pair->next;
-				}
-			}
-			o = o->next;
-		}
-#endif
-		CLASS_UNLOCK(root);
-
-		if (root->child)
-			object_class_dump_tree_rec(root->child, depth+1);
-
-		root = root->next;
-	}
-}
-
-void
-camel_object_class_dump_tree(CamelType root)
-{
-	object_class_dump_tree_rec(root, 0);
-}
diff --git a/camel/camel-object.h b/camel/camel-object.h
deleted file mode 100644
index cf574fe9f6..0000000000
--- a/camel/camel-object.h
+++ /dev/null
@@ -1,208 +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@ximian.com>
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#include <stdarg.h>
-#include <camel/camel-arg.h>
-#include <camel/camel-types.h>	/* this is a @##$@#SF stupid header */
-
-/* this crap shouldn't be here */
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-/* turn on so that camel_object_class_dump_tree() dumps object instances as well */
-/*#define CAMEL_OBJECT_TRACK_INSTANCES*/
-
-typedef struct _CamelObjectClass *CamelType;
-
-#ifdef G_DISABLE_CHECKS
-#define CAMEL_CHECK_CAST(obj, ctype, ptype)         ((ptype *) obj)
-#define CAMEL_CHECK_CLASS_CAST(klass, ctype, ptype) ((ptype *) klass)
-#else
-#define CAMEL_CHECK_CAST(obj, ctype, ptype)         ((ptype *) camel_object_cast ((CamelObject *)(obj), (CamelType)(ctype)))
-#define CAMEL_CHECK_CLASS_CAST(klass, ctype, ptype) ((ptype *) camel_object_class_cast ((CamelObjectClass *)(klass), (CamelType)(ctype) ))
-#endif
-#define CAMEL_CHECK_TYPE(obj, ctype)                (camel_object_is ((CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_TYPE(klass, ctype)        (camel_object_class_is ((CamelObjectClass *)(klass), (CamelType)(ctype)))
-
-extern CamelType camel_object_type;
-
-#define CAMEL_OBJECT_TYPE        (camel_object_type)
-
-/* we can't check casts till we've got the type, use the global type variable because its cheaper */
-#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))->klass)
-#define CAMEL_OBJECT_GET_TYPE(o)  ((CamelType)(CAMEL_OBJECT(o))->klass)
-
-typedef struct _CamelObjectClass CamelObjectClass;
-typedef struct _CamelObject CamelObject;
-typedef unsigned int CamelObjectHookID;
-
-typedef void (*CamelObjectClassInitFunc) (CamelObjectClass *);
-typedef void (*CamelObjectClassFinalizeFunc) (CamelObjectClass *);
-typedef void (*CamelObjectInitFunc) (CamelObject *, CamelObjectClass *);
-typedef void (*CamelObjectFinalizeFunc) (CamelObject *);
-
-typedef gboolean (*CamelObjectEventPrepFunc) (CamelObject *, gpointer);
-typedef void (*CamelObjectEventHookFunc) (CamelObject *, gpointer, gpointer);
-
-#define CAMEL_INVALID_TYPE (NULL)
-
-enum _CamelObjectFlags {
-	CAMEL_OBJECT_DESTROY = (1<<0),
-};
-
-/* TODO: create a simpleobject which has no events on it, or an interface for events */
-struct _CamelObject {
-	struct _CamelObjectClass *klass;
-
-	guint32 magic;		/* only really needed for debugging ... */
-
-	/* current hooks on this object */
-	struct _CamelHookList *hooks;
-
-	guint32 ref_count:24;
-	guint32 flags:8;
-
-#ifdef CAMEL_OBJECT_TRACK_INSTANCES
-	struct _CamelObject *next, *prev;
-#endif
-};
-
-struct _CamelObjectClass
-{
-	struct _CamelObjectClass *parent;
-
-	guint32 magic;		/* in same spot for validation */
-
-	struct _CamelObjectClass *next, *child; /* maintain heirarchy, just for kicks */
-
-	const char *name;
-
-	void *lock;		/* lock when used in threading, else just pads struct */
-
-	/*unsigned short version, revision;*/
-
-	/* if the object's bigger than 64K, it could use redesigning */
-	unsigned short object_size/*, object_data*/;
-	unsigned short klass_size/*, klass_data*/;
-
-	/* available hooks for this class */
-	struct _CamelHookPair *hooks;
-
-	/* memchunks for this type */
-	struct _EMemChunk *instance_chunks;
-#ifdef CAMEL_OBJECT_TRACK_INSTANCES
-	struct _CamelObject *instances;
-#endif
-
-	/* init class */
-	void (*klass_init)(struct _CamelObjectClass *);
-	void (*klass_finalise)(struct _CamelObjectClass *);
-
-	/* init/finalise object */
-	void (*init)(struct _CamelObject *, struct _CamelObjectClass *);
-	void (*finalise)(struct _CamelObject *);
-
-	/* get/set interface */
-	int (*setv)(struct _CamelObject *, struct _CamelException *ex, CamelArgV *args);
-	int (*getv)(struct _CamelObject *, struct _CamelException *ex, CamelArgGetV *args);
-};
-
-/* The type system .... it's pretty simple..... */
-void camel_type_init (void);
-CamelType camel_type_register(CamelType parent, const char * name, /*unsigned int ver, unsigned int rev,*/
-			      size_t instance_size,
-			      size_t classfuncs_size,
-			      CamelObjectClassInitFunc class_init,
-			      CamelObjectClassFinalizeFunc  class_finalize,
-			      CamelObjectInitFunc instance_init,
-			      CamelObjectFinalizeFunc instance_finalize);
-
-/* deprecated interface */
-#define camel_type_get_global_classfuncs(x) ((CamelObjectClass *)(x))
-
-/* object class methods (types == classes now) */
-const char *camel_type_to_name (CamelType type);
-CamelType camel_name_to_type (const char *name);
-void camel_object_class_add_event (CamelObjectClass *class, const char *name, CamelObjectEventPrepFunc prep);
-
-void camel_object_class_dump_tree (CamelType root);
-
-/* casting */
-CamelObject *camel_object_cast(CamelObject *obj, CamelType ctype);
-gboolean camel_object_is(CamelObject *obj, CamelType ctype);
-
-CamelObjectClass *camel_object_class_cast (CamelObjectClass *klass, CamelType ctype);
-gboolean camel_object_class_is (CamelObjectClass *klass, CamelType ctype);
-
-CamelType camel_object_get_type (void);
-
-CamelObject *camel_object_new (CamelType type);
-CamelObject *camel_object_new_name (const char *name);
-
-void camel_object_ref (CamelObject *obj);
-void camel_object_unref (CamelObject *obj);
-
-#ifdef CAMEL_DEBUG
-#define camel_object_ref(o) (printf("%s (%s:%d):ref (%p)\n", __FUNCTION__, __FILE__, __LINE__, o), camel_object_ref(o))
-#define camel_object_unref(o) (printf("%s (%s:%d):unref (%p)\n", __FUNCTION__, __FILE__, __LINE__, o), camel_object_unref (o))
-#endif
-
-/* hooks */
-CamelObjectHookID camel_object_hook_event(CamelObject *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
-void camel_object_remove_event(CamelObject *obj, CamelObjectHookID id);
-void camel_object_unhook_event(CamelObject *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
-void camel_object_trigger_event(CamelObject *obj, const char *name, void *event_data);
-
-/* get/set methods */
-int camel_object_set(CamelObject *obj, struct _CamelException *ex, ...);
-int camel_object_setv(CamelObject *obj, struct _CamelException *ex, CamelArgV *);
-int camel_object_get(CamelObject *obj, struct _CamelException *ex, ...);
-int camel_object_getv(CamelObject *obj, struct _CamelException *ex, CamelArgGetV *);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_OBJECT_H */
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
deleted file mode 100644
index 6c490df73f..0000000000
--- a/camel/camel-operation.c
+++ /dev/null
@@ -1,676 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include "camel-operation.h"
-#include "e-util/e-msgport.h"
-
-#define d(x)
-
-/* ********************************************************************** */
-
-struct _status_stack {
-	guint32 flags;
-	char *msg;
-	int pc;				/* last pc reported */
-	unsigned int stamp;		/* last stamp reported */
-};
-
-struct _CamelOperation {
-	pthread_t id;		/* id of running thread */
-	guint32 flags;		/* cancelled ? */
-	int blocked;		/* cancellation blocked depth */
-	int refcount;
-
-	CamelOperationStatusFunc status;
-	void *status_data;
-	unsigned int status_update;
-
-	/* stack of status messages (struct _status_stack *) */
-	GSList *status_stack;
-	struct _status_stack *lastreport;
-
-#ifdef ENABLE_THREADS
-	EMsgPort *cancel_port;
-	int cancel_fd;
-#endif
-};
-
-#define CAMEL_OPERATION_CANCELLED (1<<0)
-#define CAMEL_OPERATION_TRANSIENT (1<<1)
-
-/* Delay before a transient operation has any effect on the status */
-#define CAMEL_OPERATION_TRANSIENT_DELAY (5)
-
-#ifdef ENABLE_THREADS
-#define CAMEL_ACTIVE_LOCK() pthread_mutex_lock(&operation_active_lock)
-#define CAMEL_ACTIVE_UNLOCK() pthread_mutex_unlock(&operation_active_lock)
-static pthread_mutex_t operation_active_lock = PTHREAD_MUTEX_INITIALIZER;
-#else
-#define CAMEL_ACTIVE_LOCK()
-#define CAMEL_ACTIVE_UNLOCK()
-#endif
-
-static unsigned int stamp (void);
-
-static GHashTable *operation_active;
-
-typedef struct _CamelOperationMsg {
-	EMsg msg;
-} CamelOperationMsg ;
-
-/**
- * camel_operation_new:
- * @status: Callback for receiving status messages.
- * @status_data: User data.
- * 
- * Create a new camel operation handle.  Camel operation handles can
- * be used in a multithreaded application (or a single operation
- * handle can be used in a non threaded appliation) to cancel running
- * operations and to obtain notification messages of the internal
- * status of messages.
- * 
- * Return value: A new operation handle.
- **/
-CamelOperation *camel_operation_new(CamelOperationStatusFunc status, void *status_data)
-{
-	CamelOperation *cc;
-
-	cc = g_malloc0(sizeof(*cc));
-
-	cc->flags = 0;
-	cc->blocked = 0;
-	cc->refcount = 1;
-	cc->status = status;
-	cc->status_data = status_data;
-#ifdef ENABLE_THREADS
-	cc->id = ~0;
-	cc->cancel_port = e_msgport_new();
-	cc->cancel_fd = -1;
-#endif
-
-	return cc;
-}
-
-/* return the registered operation, or NULL if none registered */
-/* need to unref when done with it */
-CamelOperation *camel_operation_registered(void)
-{
-	CamelOperation *cc = NULL;
-
-	CAMEL_ACTIVE_LOCK();
-	if (operation_active != NULL
-	    && (cc = g_hash_table_lookup(operation_active, (void *)pthread_self()))) {
-		g_assert(cc->refcount > 0);
-		cc->refcount++;
-	}
-	CAMEL_ACTIVE_UNLOCK();
-
-	return cc;
-}
-
-/**
- * camel_operation_reset:
- * @cc: 
- * 
- * Resets an operation cancel state and message.
- **/
-void camel_operation_reset(CamelOperation *cc)
-{
-	GSList *n;
-
-#ifdef ENABLE_THREADS
-	CamelOperationMsg *msg;
-
-	while ((msg = (CamelOperationMsg *)e_msgport_get(cc->cancel_port)))
-		g_free(msg);
-#endif
-
-	n = cc->status_stack;
-	while (n) {
-		g_free(n->data);
-		n = n->next;
-	}
-	g_slist_free(cc->status_stack);
-	cc->status_stack = NULL;
-
-	cc->flags = 0;
-	cc->blocked = 0;
-}
-
-/**
- * camel_operation_ref:
- * @cc: 
- * 
- * Add a reference to the CamelOperation @cc.
- **/
-void camel_operation_ref(CamelOperation *cc)
-{
-	g_assert(cc->refcount > 0);
-
-	CAMEL_ACTIVE_LOCK();
-	cc->refcount++;
-	CAMEL_ACTIVE_UNLOCK();
-}
-
-/**
- * camel_operation_unref:
- * @cc: 
- * 
- * Unref and potentially free @cc.
- **/
-void camel_operation_unref(CamelOperation *cc)
-{
-	GSList *n;
-
-	g_assert(cc->refcount > 0);
-
-	CAMEL_ACTIVE_LOCK();
-	if (cc->refcount == 1) {
-#ifdef ENABLE_THREADS
-		CamelOperationMsg *msg;
-
-		while ((msg = (CamelOperationMsg *)e_msgport_get(cc->cancel_port)))
-			g_free(msg);
-
-		e_msgport_destroy(cc->cancel_port);
-#endif
-
-		if (cc->id != (~0)) {
-			g_warning("Unreffing operation status which was still registered: %p\n", cc);
-			g_hash_table_remove(operation_active, (void *)cc->id);
-		}
-
-		n = cc->status_stack;
-		while (n) {
-			g_warning("Camel operation status stack non empty: %s", (char *)n->data);
-			g_free(n->data);
-			n = n->next;
-		}
-		g_slist_free(cc->status_stack);
-
-		g_free(cc);
-	} else {
-		cc->refcount--;
-	}
-	CAMEL_ACTIVE_UNLOCK();
-}
-
-/**
- * camel_operation_cancel_block:
- * @cc: 
- * 
- * Block cancellation for this operation.  If @cc is NULL, then the
- * current thread is blocked.
- **/
-void camel_operation_cancel_block(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc)
-		cc->blocked++;
-	CAMEL_ACTIVE_UNLOCK();
-}
-
-/**
- * camel_operation_cancel_unblock:
- * @cc: 
- * 
- * Unblock cancellation, when the unblock count reaches the block
- * count, then this operation can be cancelled.  If @cc is NULL, then
- * the current thread is unblocked.
- **/
-void camel_operation_cancel_unblock(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc)
-		cc->blocked--;
-	CAMEL_ACTIVE_UNLOCK();
-}
-
-static void
-cancel_thread(void *key, CamelOperation *cc, void *data)
-{
-	CamelOperationMsg *msg;
-
-	if (cc) {
-		d(printf("cancelling thread %d\n", cc->id));
-
-		cc->flags |= CAMEL_OPERATION_CANCELLED;
-		msg = g_malloc0(sizeof(*msg));
-		e_msgport_put(cc->cancel_port, (EMsg *)msg);
-	}
-}
-
-/**
- * camel_operation_cancel:
- * @cc: 
- * 
- * Cancel a given operation.  If @cc is NULL then all outstanding
- * operations are cancelled.
- **/
-void camel_operation_cancel(CamelOperation *cc)
-{
-	CamelOperationMsg *msg;
-	
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL) {
-		if (operation_active) {
-			g_hash_table_foreach(operation_active, (GHFunc)cancel_thread, NULL);
-		}
-	} else if ((cc->flags & CAMEL_OPERATION_CANCELLED) == 0) {
-		d(printf("cancelling thread %d\n", cc->id));
-
-		cc->flags |= CAMEL_OPERATION_CANCELLED;
-		msg = g_malloc0(sizeof(*msg));
-		e_msgport_put(cc->cancel_port, (EMsg *)msg);
-	}
-
-	CAMEL_ACTIVE_UNLOCK();
-}
-
-/**
- * camel_operation_register:
- * @cc: 
- * 
- * Register a thread or the main thread for cancellation through @cc.
- * If @cc is NULL, then a new cancellation is created for this thread,
- * but may only be cancelled from the same thread.
- *
- * All calls to operation_register() should be matched with calls to
- * operation_unregister(), or resources will be lost.
- **/
-void camel_operation_register(CamelOperation *cc)
-{
-	pthread_t id = pthread_self();
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL) {
-		cc = g_hash_table_lookup(operation_active, (void *)id);
-		if (cc == NULL) {
-			cc = camel_operation_new(NULL, NULL);
-		}
-	}
-
-	if (cc->id == (~0)) {
-		cc->id = id;
-		g_hash_table_insert(operation_active, (void *)id, cc);
-	} else {
-		g_warning("Re-registering thread %lu for cancellation as thread %lu", cc->id, id);
-	}
-
-	d(printf("registering thread %ld for cancellation\n", id));
-
-	CAMEL_ACTIVE_UNLOCK();
-}
-
-/**
- * camel_operation_unregister:
- * @cc: 
- * 
- * Unregister a given operation from being cancelled.  If @cc is NULL,
- * then the current thread is used.
- **/
-void camel_operation_unregister(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL) {
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-		if (cc == NULL) {
-			g_warning("Trying to unregister a thread that was never registered for cancellation");
-		}
-	}
-
-	if (cc) {
-		if (cc->id != (~0)) {
-			g_hash_table_remove(operation_active, (void *)cc->id);
-			cc->id = ~0;
-		} else {
-			g_warning("Unregistering an operation that was already unregistered");
-		}
-	}
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	d({if (cc) printf("unregistering thread %d for cancellation\n", cc->id);});
-}
-
-/**
- * camel_operation_cancel_check:
- * @cc: 
- * 
- * Check if cancellation has been applied to @cc.  If @cc is NULL,
- * then the CamelOperation registered for the current thread is used.
- * 
- * Return value: TRUE if the operation has been cancelled.
- **/
-gboolean camel_operation_cancel_check(CamelOperation *cc)
-{
-	CamelOperationMsg *msg;
-	int cancelled;
-
-	d(printf("checking for cancel in thread %d\n", pthread_self()));
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL && operation_active)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc == NULL || cc->blocked > 0) {
-		d(printf("ahah!  cancellation is blocked\n"));
-		cancelled = FALSE;
-	} else if (cc->flags & CAMEL_OPERATION_CANCELLED) {
-		d(printf("previously cancelled\n"));
-		cancelled = TRUE;
-	} else if ((msg = (CamelOperationMsg *)e_msgport_get(cc->cancel_port))) {
-		d(printf("Got cancellation message\n"));
-		g_free(msg);
-		cc->flags |= CAMEL_OPERATION_CANCELLED;
-		cancelled = TRUE;
-	} else
-		cancelled = FALSE;
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	return cancelled;
-}
-
-/**
- * camel_operation_cancel_fd:
- * @cc: 
- * 
- * Retrieve a file descriptor that can be waited on (select, or poll)
- * for read, to asynchronously detect cancellation.
- * 
- * Return value: The fd, or -1 if cancellation is not available
- * (blocked, or has not been registered for this thread).
- **/
-int camel_operation_cancel_fd(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL && operation_active) {
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-	}
-
-	if (cc == NULL
-	    || cc->blocked) {
-		CAMEL_ACTIVE_UNLOCK();
-		return -1;
-	}
-
-	if (cc->cancel_fd == -1)
-		cc->cancel_fd = e_msgport_fd(cc->cancel_port);
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	return cc->cancel_fd;
-}
-
-/**
- * camel_operation_start:
- * @cc: 
- * @what: 
- * @: 
- * 
- * Report the start of an operation.  All start operations should have
- * similar end operations.
- **/
-void camel_operation_start(CamelOperation *cc, char *what, ...)
-{
-	va_list ap;
-	char *msg;
-	struct _status_stack *s;
-
-	if (operation_active == NULL)
-		return;
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc == NULL || cc->status == NULL) {
-		CAMEL_ACTIVE_UNLOCK();
-		return;
-	}
-
-	va_start(ap, what);
-	msg = g_strdup_vprintf(what, ap);
-	va_end(ap);
-	cc->status_update = 0;
-	s = g_malloc0(sizeof(*s));
-	s->msg = msg;
-	s->flags = 0;
-	cc->lastreport = s;
-	cc->status_stack = g_slist_prepend(cc->status_stack, s);
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	cc->status(cc, msg, CAMEL_OPERATION_START, cc->status_data);
-
-	d(printf("start '%s'\n", msg, pc));
-}
-
-/**
- * camel_operation_start_transient:
- * @cc: 
- * @what: 
- * @: 
- * 
- * Start a transient event.  We only update this to the display if it
- * takes very long to process, and if we do, we then go back to the
- * previous state when finished.
- **/
-void camel_operation_start_transient(CamelOperation *cc, char *what, ...)
-{
-	va_list ap;
-	char *msg;
-	struct _status_stack *s;
-
-	if (operation_active == NULL)
-		return;
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc == NULL || cc->status == NULL) {
-		CAMEL_ACTIVE_UNLOCK();
-		return;
-	}
-
-	va_start(ap, what);
-	msg = g_strdup_vprintf(what, ap);
-	va_end(ap);
-	cc->status_update = 0;
-	s = g_malloc0(sizeof(*s));
-	s->msg = msg;
-	s->flags = CAMEL_OPERATION_TRANSIENT;
-	s->stamp = stamp();
-	cc->status_stack = g_slist_prepend(cc->status_stack, s);
-	d(printf("start '%s'\n", msg, pc));
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	/* we dont report it yet */
-	/*cc->status(cc, msg, CAMEL_OPERATION_START, cc->status_data);*/
-}
-
-static unsigned int stamp(void)
-{
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-	/* update 4 times/second */
-	return (tv.tv_sec * 4) + tv.tv_usec / (1000000/4);
-}
-
-/**
- * camel_operation_progress:
- * @cc: Operation to report to.
- * @pc: Percent complete, 0 to 100.
- * 
- * Report progress on the current operation.  If @cc is NULL, then the
- * currently registered operation is used.  @pc reports the current
- * percentage of completion, which should be in the range of 0 to 100.
- *
- * If the total percentage is not know, then use
- * camel_operation_progress_count().
- **/
-void camel_operation_progress(CamelOperation *cc, int pc)
-{
-	unsigned int now;
-	struct _status_stack *s;
-	char *msg = NULL;
-
-	if (operation_active == NULL)
-		return;
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc == NULL || cc->status == NULL || cc->status_stack == NULL) {
-		CAMEL_ACTIVE_UNLOCK();
-		return;
-	}
-
-	s = cc->status_stack->data;
-	s->pc = pc;
-
-	/* Transient messages dont start updating till 4 seconds after
-	   they started, then they update every second */
-	now = stamp();
-	if (cc->status_update == now) {
-		cc = NULL;
-	} else if (s->flags & CAMEL_OPERATION_TRANSIENT) {
-		if (s->stamp + CAMEL_OPERATION_TRANSIENT_DELAY > now) {
-			cc = NULL;
-		} else {
-			cc->status_update = now;
-			cc->lastreport = s;
-			msg = g_strdup(s->msg);
-		}
-	} else {
-		s->stamp = cc->status_update = now;
-		cc->lastreport = s;
-		msg = g_strdup(s->msg);
-	}
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	if (cc) {
-		cc->status(cc, msg, pc, cc->status_data);
-		g_free(msg);
-	}
-}
-
-void camel_operation_progress_count(CamelOperation *cc, int sofar)
-{
-	camel_operation_progress(cc, sofar);
-}
-
-/**
- * camel_operation_end:
- * @cc: 
- * @what: Format string.
- * @: 
- * 
- * Report the end of an operation.  If @cc is NULL, then the currently
- * registered operation is notified.
- **/
-void camel_operation_end(CamelOperation *cc)
-{
-	struct _status_stack *s, *p;
-	unsigned int now;
-	char *msg = NULL;
-	int pc = 0;
-
-	if (operation_active == NULL)
-		return;
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-
-	if (cc == NULL || cc->status == NULL || cc->status_stack == NULL) {
-		CAMEL_ACTIVE_UNLOCK();
-		return;
-	}
-
-	/* so what we do here is this.  If the operation that just
-	 * ended was transient, see if we have any other transient
-	 * messages that haven't been updated yet above us, otherwise,
-	 * re-update as a non-transient at the last reported pc */
-	now = stamp();
-	s = cc->status_stack->data;
-	if (s->flags & CAMEL_OPERATION_TRANSIENT) {
-		if (cc->lastreport == s) {
-			GSList *l = cc->status_stack->next;
-			while (l) {
-				p = l->data;
-				if (p->flags & CAMEL_OPERATION_TRANSIENT) {
-					if (p->stamp + CAMEL_OPERATION_TRANSIENT_DELAY < now) {
-						msg = g_strdup(p->msg);
-						pc = p->pc;
-						cc->lastreport = p;
-						break;
-					}
-				} else {
-					msg = g_strdup(p->msg);
-					pc = p->pc;
-					cc->lastreport = p;
-					break;
-				}
-				l = l->next;
-			}
-		}
-		g_free(s->msg);
-	} else {
-		msg = s->msg;
-		pc = CAMEL_OPERATION_END;
-		cc->lastreport = s;
-	}
-	g_free(s);
-	cc->status_stack = g_slist_remove_link(cc->status_stack, cc->status_stack);
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	if (msg) {
-		cc->status(cc, msg, pc, cc->status_data);
-		g_free(msg);
-	}
-}
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
deleted file mode 100644
index 08da410b68..0000000000
--- a/camel/camel-operation.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <NotZed@Ximian.com>
- *
- * Copyright 2001 Ximian, Inc. (www.ximian.com/)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_OPERATION_H
-#define CAMEL_OPERATION_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* cancellation helper stuff, not yet finalised */
-
-typedef struct _CamelOperation CamelOperation;
-
-typedef void (*CamelOperationStatusFunc)(struct _CamelOperation *op, const char *what, int pc, void *data);
-
-enum _camel_operation_status_t {
-	CAMEL_OPERATION_START = -1,
-	CAMEL_OPERATION_END = -2,
-};
-
-/* main thread functions */
-CamelOperation *camel_operation_new(CamelOperationStatusFunc status, void *status_data);
-void camel_operation_ref(CamelOperation *cc);
-void camel_operation_unref(CamelOperation *cc);
-void camel_operation_reset(CamelOperation *cc);
-void camel_operation_cancel(CamelOperation *cc);
-/* subthread functions */
-void camel_operation_register(CamelOperation *cc);
-void camel_operation_unregister(CamelOperation *cc);
-/* called internally by camel, for the current thread */
-void camel_operation_cancel_block(CamelOperation *cc);
-void camel_operation_cancel_unblock(CamelOperation *cc);
-int camel_operation_cancel_check(CamelOperation *cc);
-int camel_operation_cancel_fd(CamelOperation *cc);
-/* return the registered operation for this thread, if there is one */
-CamelOperation *camel_operation_registered(void);
-
-void camel_operation_start(CamelOperation *cc, char *what, ...);
-void camel_operation_start_transient(CamelOperation *cc, char *what, ...);
-void camel_operation_progress(CamelOperation *cc, int pc);
-void camel_operation_progress_count(CamelOperation *cc, int sofar);
-void camel_operation_end(CamelOperation *cc);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_OPERATION_H */
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
deleted file mode 100644
index 68e0e257b5..0000000000
--- a/camel/camel-partition-table.c
+++ /dev/null
@@ -1,1015 +0,0 @@
-/*
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "e-util/e-msgport.h"
-
-#include "camel-block-file.h"
-#include "camel-partition-table.h"
-
-/* Do we synchronously write table updates - makes the
-   tables consistent after program crash without sync */
-/*#define SYNC_UPDATES*/
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
-/* key index debug */
-#define k(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
-
-#ifdef ENABLE_THREADS
-
-struct _CamelPartitionTablePrivate {
-	pthread_mutex_t lock;	/* for locking partition */
-};
-
-#define CAMEL_PARTITION_TABLE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
-#define CAMEL_PARTITION_TABLE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
-#else
-#define CAMEL_PARTITION_TABLE_LOCK(kf, lock)
-#define CAMEL_PARTITION_TABLE_UNLOCK(kf, lock)
-#endif
-
-static void
-camel_partition_table_class_init(CamelPartitionTableClass *klass)
-{
-}
-
-static void
-camel_partition_table_init(CamelPartitionTable *cpi)
-{
-	struct _CamelPartitionTablePrivate *p;
-
-	e_dlist_init(&cpi->partition);
-
-	p = cpi->priv = g_malloc0(sizeof(*cpi->priv));
-#ifdef ENABLE_THREADS
-	pthread_mutex_init(&p->lock, NULL);
-#endif
-}
-
-static void
-camel_partition_table_finalise(CamelPartitionTable *cpi)
-{
-	CamelBlock *bl;
-	struct _CamelPartitionTablePrivate *p;
-
-	p = cpi->priv;
-
-	if (cpi->blocks) {
-		while ((bl = (CamelBlock *)e_dlist_remhead(&cpi->partition))) {
-			camel_block_file_sync_block(cpi->blocks, bl);
-			camel_block_file_unref_block(cpi->blocks, bl);
-		}
-		camel_block_file_sync(cpi->blocks);
-
-		camel_object_unref((CamelObject *)cpi->blocks);
-	}
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_destroy(&p->lock);
-#endif
-	g_free(p);
-
-}
-
-CamelType
-camel_partition_table_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelPartitionTable",
-					   sizeof (CamelPartitionTable),
-					   sizeof (CamelPartitionTableClass),
-					   (CamelObjectClassInitFunc) camel_partition_table_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_partition_table_init,
-					   (CamelObjectFinalizeFunc) camel_partition_table_finalise);
-	}
-	
-	return type;
-}
-
-/* ********************************************************************** */
-
-/*
-  Have 2 hashes:
-  Name -> nameid
-  Word -> wordid
-
-nameid is pointer to name file, includes a bit to say if name is deleted
-wordid is a pointer to word file, includes pointer to start of word entries
-
-delete a name -> set it as deleted, do nothing else though
-
-lookup word, if nameid is deleted, mark it in wordlist as unused and mark for write (?)
-*/
-
-/* ********************************************************************** */
-
-/* This simple hash seems to work quite well */
-static camel_hash_t hash_key(const char *key)
-{
-	camel_hash_t hash = 0xABADF00D;
-
-	while (*key) {
-		hash = hash * (*key) ^ (*key);
-		key++;
-	}
-
-	return hash;
-}
-
-/* Call with lock held */
-static CamelBlock *find_partition(CamelPartitionTable *cpi, camel_hash_t id, int *indexp)
-{
-	int index, jump;
-	CamelBlock *bl;
-	CamelPartitionMapBlock *ptb;
-	CamelPartitionMap *part;
-
-	/* first, find the block this key might be in, then binary search the block */
-	bl = (CamelBlock *)cpi->partition.head;
-	while (bl->next) {
-		ptb = (CamelPartitionMapBlock *)&bl->data;
-		part = ptb->partition;
-		if (ptb->used > 0 && id <= part[ptb->used-1].hashid) {
-			index = ptb->used/2;
-			jump = ptb->used/4;
-
-			if (jump == 0)
-				jump = 1;
-
-			while (1) {
-				if (id <= part[index].hashid) {
-					if (index == 0 || id > part[index-1].hashid)
-						break;
-					index -= jump;
-				} else {
-					if (index >= ptb->used-1)
-						break;
-					index += jump;
-				}
-				jump = jump/2;
-				if (jump == 0)
-					jump = 1;
-			}
-			*indexp = index;
-
-			return bl;
-		}
-		bl = bl->next;
-	}
-
-	g_warning("could not find a partition that could fit !  partition table corrupt!");
-
-	/* This should never be reached */
-
-	return NULL;
-}
-
-CamelPartitionTable *camel_partition_table_new(struct _CamelBlockFile *bs, camel_block_t root)
-{
-	CamelPartitionTable *cpi;
-	CamelPartitionMapBlock *ptb;
-	CamelPartitionKeyBlock *kb;
-	CamelBlock *block, *pblock;
-
-	cpi = (CamelPartitionTable *)camel_object_new(camel_partition_table_get_type());
-	cpi->rootid = root;
-	cpi->blocks = bs;
-	camel_object_ref((CamelObject *)bs);
-
-	/* read the partition table into memory */
-	do {
-		block = camel_block_file_get_block(bs, root);
-		if (block == NULL)
-			goto fail;
-
-		ptb = (CamelPartitionMapBlock *)&block->data;
-
-		d(printf("Adding partition block, used = %d, hashid = %08x\n", ptb->used, ptb->partition[0].hashid));
-
-		/* if we have no data, prime initial block */
-		if (ptb->used == 0 && e_dlist_empty(&cpi->partition) && ptb->next == 0) {
-			pblock = camel_block_file_new_block(bs);
-			if (pblock == NULL) {
-				camel_block_file_unref_block(bs, block);
-				goto fail;
-			}
-			kb = (CamelPartitionKeyBlock *)&pblock->data;
-			kb->used = 0;
-			ptb->used = 1;
-			ptb->partition[0].hashid = 0xffffffff;
-			ptb->partition[0].blockid = pblock->id;
-			camel_block_file_touch_block(bs, pblock);
-			camel_block_file_unref_block(bs, pblock);
-			camel_block_file_touch_block(bs, block);
-#ifdef SYNC_UPDATES
-			camel_block_file_sync_block(bs, block);
-#endif
-		}
-
-		root = ptb->next;
-		camel_block_file_detach_block(bs, block);
-		e_dlist_addtail(&cpi->partition, (EDListNode *)block);
-	} while (root);
-
-	return cpi;
-
-fail:
-	camel_object_unref((CamelObject *)cpi);
-	return NULL;
-}
-
-/* sync our blocks, the caller must still sync the blockfile itself */
-int
-camel_partition_table_sync(CamelPartitionTable *cpi)
-{
-	CamelBlock *bl, *bn;
-	struct _CamelPartitionTablePrivate *p;
-	int ret = 0;
-
-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);
-
-	p = cpi->priv;
-
-	if (cpi->blocks) {
-		bl = (CamelBlock *)cpi->partition.head;
-		bn = bl->next;
-		while (bn) {
-			ret = camel_block_file_sync_block(cpi->blocks, bl);
-			if (ret == -1)
-				goto fail;
-			bl = bn;
-			bn = bn->next;
-		}
-	}
-fail:
-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-
-	return ret;
-}
-
-camel_key_t camel_partition_table_lookup(CamelPartitionTable *cpi, const char *key)
-{
-	CamelPartitionKeyBlock *pkb;
-	CamelPartitionMapBlock *ptb;
-	CamelBlock *block, *ptblock;
-	camel_hash_t hashid;
-	camel_key_t keyid = 0;
-	int index, i;
-
-	hashid = hash_key(key);
-
-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);
-
-	ptblock = find_partition(cpi, hashid, &index);
-	if (ptblock == NULL) {
-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-		return 0;
-	}
-	ptb = (CamelPartitionMapBlock *)&ptblock->data;
-	block = camel_block_file_get_block(cpi->blocks, ptb->partition[index].blockid);
-	if (block == NULL) {
-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-		return 0;
-	}
-
-	pkb = (CamelPartitionKeyBlock *)&block->data;
-
-	/* What to do about duplicate hash's? */
-	for (i=0;i<pkb->used;i++) {
-		if (pkb->keys[i].hashid == hashid) {
-			/* !! need to: lookup and compare string value */
-			/* get_key() if key == key ... */
-			keyid = pkb->keys[i].keyid;
-			break;
-		}
-	}
-
-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-	
-	camel_block_file_unref_block(cpi->blocks, block);
-
-	return keyid;
-}
-
-void camel_partition_table_remove(CamelPartitionTable *cpi, const char *key)
-{
-	CamelPartitionKeyBlock *pkb;
-	CamelPartitionMapBlock *ptb;
-	CamelBlock *block, *ptblock;
-	camel_hash_t hashid;
-	camel_key_t keyid = 0;
-	int index, i;
-
-	hashid = hash_key(key);
-
-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);
-	
-	ptblock = find_partition(cpi, hashid, &index);
-	if (ptblock == NULL) {
-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-		return;
-	}
-	ptb = (CamelPartitionMapBlock *)&ptblock->data;
-	block = camel_block_file_get_block(cpi->blocks, ptb->partition[index].blockid);
-	if (block == NULL) {
-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-		return;
-	}
-	pkb = (CamelPartitionKeyBlock *)&block->data;
-
-	/* What to do about duplicate hash's? */
-	for (i=0;i<pkb->used;i++) {
-		if (pkb->keys[i].hashid == hashid) {
-			/* !! need to: lookup and compare string value */
-			/* get_key() if key == key ... */
-			keyid = pkb->keys[i].keyid;
-
-			/* remove this key */
-			pkb->used--;
-			for (;i<pkb->used;i++) {
-				pkb->keys[i].keyid = pkb->keys[i+1].keyid;
-				pkb->keys[i].hashid = pkb->keys[i+1].hashid;
-			}
-			camel_block_file_touch_block(cpi->blocks, block);
-			break;
-		}
-	}
-
-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-	
-	camel_block_file_unref_block(cpi->blocks, block);
-}
-
-static int
-keys_cmp(const void *ap, const void *bp)
-{
-	const CamelPartitionKey *a = ap;
-	const CamelPartitionKey *b = bp;
-
-	if (a->hashid < b->hashid)
-		return -1;
-	else if (a->hashid > b->hashid)
-		return 1;
-
-	return 0;
-}
-
-int
-camel_partition_table_add(CamelPartitionTable *cpi, const char *key, camel_key_t keyid)
-{
-	camel_hash_t hashid, partid;
-	int index, newindex = 0; /* initialisation of this and pkb/nkb is just to silence compiler */
-	CamelPartitionMapBlock *ptb, *ptn;
-	CamelPartitionKeyBlock *kb, *newkb, *nkb = NULL, *pkb = NULL;
-	CamelBlock *block, *ptblock, *ptnblock;
-	int i, half, len;
-	struct _CamelPartitionKey keys[CAMEL_BLOCK_SIZE/4];
-	int ret = -1;
-
-#define KEY_SIZE (sizeof(kb->keys)/sizeof(kb->keys[0]))
-
-	hashid = hash_key(key);
-
-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);
-	ptblock = find_partition(cpi, hashid, &index);
-	if (ptblock == NULL) {
-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-		return -1;
-	}
-	ptb = (CamelPartitionMapBlock *)&ptblock->data;
-	block = camel_block_file_get_block(cpi->blocks, ptb->partition[index].blockid);
-	if (block == NULL) {
-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-		return -1;
-	}
-	kb = (CamelPartitionKeyBlock *)&block->data;
-
-	/* TODO: Keep the key array in sorted order, cheaper lookups and split operation */
-
-	if (kb->used < sizeof(kb->keys)/sizeof(kb->keys[0])) {
-		/* Have room, just put it in */
-		kb->keys[kb->used].hashid = hashid;
-		kb->keys[kb->used].keyid = keyid;
-		kb->used++;
-	} else {
-		CamelBlock *newblock = NULL, *nblock = NULL, *pblock = NULL;
-
-		/* Need to split?  See if previous or next has room, then split across that instead */
-
-		/* TODO: Should look at next/previous partition table block as well ... */
-
-		if (index > 0) {
-			pblock = camel_block_file_get_block(cpi->blocks, ptb->partition[index-1].blockid);
-			if (pblock == NULL)
-				goto fail;
-			pkb = (CamelPartitionKeyBlock *)&pblock->data;
-		}
-		if (index < (ptb->used-1)) {
-			nblock = camel_block_file_get_block(cpi->blocks, ptb->partition[index+1].blockid);
-			if (nblock == NULL) {
-				if (pblock)
-					camel_block_file_unref_block(cpi->blocks, pblock);
-				goto fail;
-			}
-			nkb = (CamelPartitionKeyBlock *)&nblock->data;
-		}
-
-		if (pblock && pkb->used < KEY_SIZE) {
-			if (nblock && nkb->used < KEY_SIZE) {
-				if (pkb->used < nkb->used) {
-					newindex = index+1;
-					newblock = nblock;
-				} else {
-					newindex = index-1;
-					newblock = pblock;
-				}
-			} else {
-				newindex = index-1;
-				newblock = pblock;
-			}
-		} else {
-			if (nblock && nkb->used < KEY_SIZE) {
-				newindex = index+1;
-				newblock = nblock;
-			}
-		}
-
-		/* We had no room, need to split across another block */
-		if (newblock == NULL) {
-			/* See if we have room in the partition table for this block or need to split that too */
-			if (ptb->used >= sizeof(ptb->partition)/sizeof(ptb->partition[0])) {
-				/* TODO: Could check next block to see if it'll fit there first */
-				ptnblock = camel_block_file_new_block(cpi->blocks);
-				if (ptnblock == NULL) {
-					if (nblock)
-						camel_block_file_unref_block(cpi->blocks, nblock);
-					if (pblock)
-						camel_block_file_unref_block(cpi->blocks, pblock);
-					goto fail;
-				}
-				camel_block_file_detach_block(cpi->blocks, ptnblock);
-
-				/* split block and link on-disk, always sorted */
-				ptn = (CamelPartitionMapBlock *)&ptnblock->data;
-				ptn->next = ptb->next;
-				ptb->next = ptnblock->id;
-				len = ptb->used / 2;
-				ptn->used = ptb->used - len;
-				ptb->used = len;
-				memcpy(ptn->partition, &ptb->partition[len], ptn->used * sizeof(ptb->partition[0]));
-
-				/* link in-memory */
-				ptnblock->next = ptblock->next;
-				ptblock->next->prev = ptnblock;
-				ptblock->next = ptnblock;
-				ptnblock->prev = ptblock;
-
-				/* write in right order to ensure structure */
-				camel_block_file_touch_block(cpi->blocks, ptnblock);
-#ifdef SYNC_UPDATES
-				camel_block_file_sync_block(cpi->blocks, ptnblock);
-#endif
-				if (index > len) {
-					camel_block_file_touch_block(cpi->blocks, ptblock);
-#ifdef SYNC_UPDATES
-					camel_block_file_sync_block(cpi->blocks, ptblock);
-#endif
-					index -= len;
-					ptb = ptn;
-					ptblock = ptnblock;
-				}
-			}
-
-			/* try get newblock before modifying existing */
-			newblock = camel_block_file_new_block(cpi->blocks);
-			if (newblock == NULL) {
-				if (nblock)
-					camel_block_file_unref_block(cpi->blocks, nblock);
-				if (pblock)
-					camel_block_file_unref_block(cpi->blocks, pblock);
-				goto fail;
-			}
-
-			for (i=ptb->used-1;i>index;i--) {
-				ptb->partition[i+1].hashid = ptb->partition[i].hashid;
-				ptb->partition[i+1].blockid = ptb->partition[i].blockid;
-			}
-			ptb->used++;
-
-			newkb = (CamelPartitionKeyBlock *)&newblock->data;
-			newkb->used = 0;
-			newindex = index+1;
-
-			ptb->partition[newindex].hashid = ptb->partition[index].hashid;
-			ptb->partition[newindex].blockid = newblock->id;
-
-			if (nblock)
-				camel_block_file_unref_block(cpi->blocks, nblock);
-			if (pblock)
-				camel_block_file_unref_block(cpi->blocks, pblock);
-		} else {
-			newkb = (CamelPartitionKeyBlock *)&newblock->data;
-
-			if (newblock == pblock) {
-				if (nblock)
-					camel_block_file_unref_block(cpi->blocks, nblock);
-			} else {
-				if (pblock)
-					camel_block_file_unref_block(cpi->blocks, pblock);
-			}
-		}
-
-		/* sort keys to find midpoint */
-		len = kb->used;
-		memcpy(keys, kb->keys, sizeof(kb->keys[0])*len);
-		memcpy(keys+len, newkb->keys, sizeof(newkb->keys[0])*newkb->used);
-		len += newkb->used;
-		keys[len].hashid = hashid;
-		keys[len].keyid = keyid;
-		len++;
-		qsort(keys, len, sizeof(keys[0]), keys_cmp);
-
-		/* Split keys, fix partition table */
-		half = len/2;
-		partid = keys[half-1].hashid;
-
-		if (index < newindex) {
-			memcpy(kb->keys, keys, sizeof(keys[0])*half);
-			kb->used = half;
-			memcpy(newkb->keys, keys+half, sizeof(keys[0])*(len-half));
-			newkb->used = len-half;
-			ptb->partition[index].hashid = partid;
-		} else {
-			memcpy(newkb->keys, keys, sizeof(keys[0])*half);
-			newkb->used = half;
-			memcpy(kb->keys, keys+half, sizeof(keys[0])*(len-half));
-			kb->used = len-half;
-			ptb->partition[newindex].hashid = partid;
-		}
-
-		camel_block_file_touch_block(cpi->blocks, ptblock);
-#ifdef SYNC_UPDATES
-		camel_block_file_sync_block(cpi->blocks, ptblock);
-#endif
-		camel_block_file_touch_block(cpi->blocks, newblock);
-		camel_block_file_unref_block(cpi->blocks, newblock);
-	}
-
-	camel_block_file_touch_block(cpi->blocks, block);
-	camel_block_file_unref_block(cpi->blocks, block);
-
-	ret = 0;
-fail:
-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);
-
-	return ret;
-}
-
-/* ********************************************************************** */
-
-
-#ifdef ENABLE_THREADS
-
-struct _CamelKeyTablePrivate {
-	pthread_mutex_t lock;	/* for locking key */
-};
-
-#define CAMEL_KEY_TABLE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
-#define CAMEL_KEY_TABLE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
-#else
-#define CAMEL_KEY_TABLE_LOCK(kf, lock)
-#define CAMEL_KEY_TABLE_UNLOCK(kf, lock)
-#endif
-
-static void
-camel_key_table_class_init(CamelKeyTableClass *klass)
-{
-}
-
-static void
-camel_key_table_init(CamelKeyTable *ki)
-{
-	struct _CamelKeyTablePrivate *p;
-
-	p = ki->priv = g_malloc0(sizeof(*ki->priv));
-#ifdef ENABLE_THREADS
-	pthread_mutex_init(&p->lock, NULL);
-#endif
-}
-
-static void
-camel_key_table_finalise(CamelKeyTable *ki)
-{
-	struct _CamelKeyTablePrivate *p;
-
-	p = ki->priv;
-
-	if (ki->blocks) {
-		if (ki->root_block) {
-			camel_block_file_sync_block(ki->blocks, ki->root_block);
-			camel_block_file_unref_block(ki->blocks, ki->root_block);
-		}
-		camel_block_file_sync(ki->blocks);
-		camel_object_unref((CamelObject *)ki->blocks);
-	}
-
-#ifdef ENABLE_THREADS
-	pthread_mutex_destroy(&p->lock);
-#endif
-	g_free(p);
-
-}
-
-CamelType
-camel_key_table_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelKeyTable",
-					   sizeof (CamelKeyTable),
-					   sizeof (CamelKeyTableClass),
-					   (CamelObjectClassInitFunc) camel_key_table_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_key_table_init,
-					   (CamelObjectFinalizeFunc) camel_key_table_finalise);
-	}
-	
-	return type;
-}
-
-
-CamelKeyTable *
-camel_key_table_new(CamelBlockFile *bs, camel_block_t root)
-{
-	CamelKeyTable *ki;
-
-	ki = (CamelKeyTable *)camel_object_new(camel_key_table_get_type());
-
-	ki->blocks = bs;
-	camel_object_ref((CamelObject *)bs);
-	ki->rootid = root;
-
-	ki->root_block = camel_block_file_get_block(bs, ki->rootid);
-	if (ki->root_block == NULL) {
-		camel_object_unref((CamelObject *)ki);
-		ki = NULL;
-	} else {
-		camel_block_file_detach_block(bs, ki->root_block);
-		ki->root = (CamelKeyRootBlock *)&ki->root_block->data;
-
-		k(printf("Opening key index\n"));
-		k(printf(" first %u\n last %u\n free %u\n", ki->root->first, ki->root->last, ki->root->free));
-	}
-
-	return ki;
-}
-
-int
-camel_key_table_sync(CamelKeyTable *ki)
-{
-#ifdef SYNC_UPDATES
-	return 0;
-#else
-	return camel_block_file_sync_block(ki->blocks, ki->root_block);
-#endif
-}
-
-camel_key_t
-camel_key_table_add(CamelKeyTable *ki, const char *key, camel_block_t data, unsigned int flags)
-{
-	CamelBlock *last, *next;
-	CamelKeyBlock *kblast, *kbnext;
-	int len, left;
-	unsigned int offset;
-	camel_key_t keyid = 0;
-
-	/* Maximum key size = 128 chars */
-	len = strlen(key);
-	if (len > CAMEL_KEY_TABLE_MAX_KEY)
-		len = 128;
-
-	CAMEL_KEY_TABLE_LOCK(ki, lock);
-
-	if (ki->root->last == 0) {
-		last = camel_block_file_new_block(ki->blocks);
-		if (last == NULL)
-			goto fail;
-		ki->root->last = ki->root->first = last->id;
-		camel_block_file_touch_block(ki->blocks, ki->root_block);
-		k(printf("adding first block, first = %u\n", ki->root->first));
-	} else {
-		last = camel_block_file_get_block(ki->blocks, ki->root->last);
-		if (last == NULL)
-			goto fail;
-	}
-
-	kblast = (CamelKeyBlock *)&last->data;
-
-	if (kblast->used >= 127)
-		goto fail;
-
-	if (kblast->used > 0) {
-		/*left = &kblast->u.keydata[kblast->u.keys[kblast->used-1].offset] - (char *)(&kblast->u.keys[kblast->used+1]);*/
-		left = kblast->u.keys[kblast->used-1].offset - sizeof(kblast->u.keys[0])*(kblast->used+1);
-		d(printf("key '%s' used = %d (%d), filled = %d, left = %d  len = %d?\n",
-			 key, kblast->used, kblast->used * sizeof(kblast->u.keys[0]),
-			 sizeof(kblast->u.keydata) - kblast->u.keys[kblast->used-1].offset,
-			 left, len));
-		if (left < len) {
-			next = camel_block_file_new_block(ki->blocks);
-			if (next == NULL) {
-				camel_block_file_unref_block(ki->blocks, last);
-				goto fail;
-			}
-			kbnext = (CamelKeyBlock *)&next->data;
-			kblast->next = next->id;
-			ki->root->last = next->id;
-			d(printf("adding new block, first = %u, last = %u\n", ki->root->first, ki->root->last));
-			camel_block_file_touch_block(ki->blocks, ki->root_block);
-			camel_block_file_touch_block(ki->blocks, last);
-			camel_block_file_unref_block(ki->blocks, last);
-			kblast = kbnext;
-			last = next;
-		}
-	}
-
-	if (kblast->used > 0)
-		offset = kblast->u.keys[kblast->used-1].offset - len;
-	else
-		offset = sizeof(kblast->u.keydata)-len;
-
-	kblast->u.keys[kblast->used].flags = flags;
-	kblast->u.keys[kblast->used].data = data;
-	kblast->u.keys[kblast->used].offset = offset;
-	memcpy(kblast->u.keydata + offset, key, len);
-
-	keyid = (last->id & (~(CAMEL_BLOCK_SIZE-1))) | kblast->used;
-
-	kblast->used++;
-
-	g_assert(kblast->used < 127);
-
-	camel_block_file_touch_block(ki->blocks, last);
-	camel_block_file_unref_block(ki->blocks, last);
-
-#ifdef SYNC_UPDATES
-	camel_block_file_sync_block(ki->blocks, ki->root_block);
-#endif
-fail:
-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-
-	return keyid;
-}
-
-void
-camel_key_table_set_data(CamelKeyTable *ki, camel_key_t keyid, camel_block_t data)
-{
-	CamelBlock *bl;
-	camel_block_t blockid;
-	int index;
-	CamelKeyBlock *kb;
-
-	if (keyid == 0)
-		return;
-
-	blockid =  keyid & (~(CAMEL_BLOCK_SIZE-1));
-	index = keyid & (CAMEL_BLOCK_SIZE-1);
-
-	bl = camel_block_file_get_block(ki->blocks, blockid);
-	if (bl == NULL)
-		return;
-	kb = (CamelKeyBlock *)&bl->data;
-
-	CAMEL_KEY_TABLE_LOCK(ki, lock);
-
-	if (kb->u.keys[index].data != data) {
-		kb->u.keys[index].data = data;
-		camel_block_file_touch_block(ki->blocks, bl);
-	}
-
-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-
-	camel_block_file_unref_block(ki->blocks, bl);
-}
-
-void
-camel_key_table_set_flags(CamelKeyTable *ki, camel_key_t keyid, unsigned int flags, unsigned int set)
-{
-	CamelBlock *bl;
-	camel_block_t blockid;
-	int index;
-	CamelKeyBlock *kb;
-	unsigned int old;
-
-	if (keyid == 0)
-		return;
-
-	blockid =  keyid & (~(CAMEL_BLOCK_SIZE-1));
-	index = keyid & (CAMEL_BLOCK_SIZE-1);
-
-	bl = camel_block_file_get_block(ki->blocks, blockid);
-	if (bl == NULL)
-		return;
-	kb = (CamelKeyBlock *)&bl->data;
-
-	g_assert(kb->used < 127);
-	g_assert(index < kb->used);
-
-	CAMEL_KEY_TABLE_LOCK(ki, lock);
-
-	old = kb->u.keys[index].flags;
-	if ((old & set) != (flags & set)) {
-		kb->u.keys[index].flags = (old & (~set)) | (flags & set);
-		camel_block_file_touch_block(ki->blocks, bl);
-	}
-
-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-
-	camel_block_file_unref_block(ki->blocks, bl);
-}
-
-camel_block_t
-camel_key_table_lookup(CamelKeyTable *ki, camel_key_t keyid, char **keyp, unsigned int *flags)
-{
-	CamelBlock *bl;
-	camel_block_t blockid;
-	int index, len, off;
-	char *key;
-	CamelKeyBlock *kb;
-
-	if (keyp)
-		*keyp = 0;
-	if (flags)
-		*flags = 0;
-	if (keyid == 0)
-		return 0;
-
-	blockid =  keyid & (~(CAMEL_BLOCK_SIZE-1));
-	index = keyid & (CAMEL_BLOCK_SIZE-1);
-
-	bl = camel_block_file_get_block(ki->blocks, blockid);
-	if (bl == NULL)
-		return 0;
-
-	kb = (CamelKeyBlock *)&bl->data;
-
-#if 1
-	g_assert(kb->used < 127); /* this should be more accurate */
-	g_assert(index < kb->used);
-#else
-	if (kb->used >=127 || index >= kb->used) {
-		g_warning("Block %x: Invalid index or content: index %d used %d\n", blockid, index, kb->used);
-		return 0;
-	}
-#endif
-
-	CAMEL_KEY_TABLE_LOCK(ki, lock);
-
-	blockid = kb->u.keys[index].data;
-	if (flags)
-		*flags = kb->u.keys[index].flags;
-
-	if (keyp) {
-		off = kb->u.keys[index].offset;
-		if (index == 0)
-			len = sizeof(kb->u.keydata) - off;
-		else
-			len = kb->u.keys[index-1].offset - off;
-		*keyp = key = g_malloc(len+1);
-		memcpy(key, kb->u.keydata + off, len);
-		key[len] = 0;
-	}
-
-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-
-	camel_block_file_unref_block(ki->blocks, bl);
-
-	return blockid;
-}
-
-/* iterate through all keys */
-camel_key_t
-camel_key_table_next(CamelKeyTable *ki, camel_key_t next, char **keyp, unsigned int *flagsp, camel_block_t *datap)
-{
-	CamelBlock *bl;
-	CamelKeyBlock *kb;
-	camel_block_t blockid;
-	int index;
-
-	if (keyp)
-		*keyp = 0;
-	if (flagsp)
-		*flagsp = 0;
-	if (datap)
-		*datap = 0;
-
-	CAMEL_KEY_TABLE_LOCK(ki, lock);
-
-	if (next == 0) {
-		next = ki->root->first;
-		if (next == 0)
-			return 0;
-	} else
-		next++;
-
-	do {
-		blockid =  next & (~(CAMEL_BLOCK_SIZE-1));
-		index = next & (CAMEL_BLOCK_SIZE-1);
-		
-		bl = camel_block_file_get_block(ki->blocks, blockid);
-		if (bl == NULL) {
-			CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-			return 0;
-		}
-
-		kb = (CamelKeyBlock *)&bl->data;
-
-		/* see if we need to goto the next block */
-		if (index >= kb->used) {
-			/* FIXME: check for loops */
-			next = kb->next;
-			camel_block_file_unref_block(ki->blocks, bl);
-			bl = NULL;
-		}
-	} while (bl == NULL);
-
-	/* invalid block data */
-	if ((kb->u.keys[index].offset >= sizeof(kb->u.keydata)
-	     /*|| kb->u.keys[index].offset < kb->u.keydata - (char *)&kb->u.keys[kb->used])*/
-	     || kb->u.keys[index].offset < sizeof(kb->u.keys[0]) * kb->used
-	    || (index > 0 &&
-		(kb->u.keys[index-1].offset >= sizeof(kb->u.keydata)
-		 /*|| kb->u.keys[index-1].offset < kb->u.keydata - (char *)&kb->u.keys[kb->used]))) {*/
-		 || kb->u.keys[index-1].offset < sizeof(kb->u.keys[0]) * kb->used)))) {
-		g_warning("Block %u invalid scanning keys", bl->id);
-		camel_block_file_unref_block(ki->blocks, bl);
-		CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-		return 0;
-	}
-
-	if (datap)
-		*datap = kb->u.keys[index].data;
-
-	if (flagsp)
-		*flagsp = kb->u.keys[index].flags;
-
-	if (keyp) {
-		int len, off = kb->u.keys[index].offset;
-		char *key;
-
-		if (index == 0)
-			len = sizeof(kb->u.keydata) - off;
-		else
-			len = kb->u.keys[index-1].offset - off;
-		*keyp = key = g_malloc(len+1);
-		memcpy(key, kb->u.keydata + off, len);
-		key[len] = 0;
-	}
-
-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);
-
-	camel_block_file_unref_block(ki->blocks, bl);
-
-	return next;
-}
-
-/* ********************************************************************** */
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
deleted file mode 100644
index 3433da3cf1..0000000000
--- a/camel/camel-partition-table.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_PARTITION_TABLE_H
-#define _CAMEL_PARTITION_TABLE_H
-
-#include <camel/camel-object.h>
-#include <glib.h>
-#include <e-util/e-msgport.h>
-
-#include "camel-block-file.h"
-
-/* ********************************************************************** */
-
-/* CamelPartitionTable - index of key to keyid */
-
-typedef guint32 camel_hash_t;	/* a hashed key */
-
-typedef struct _CamelPartitionKey CamelPartitionKey;
-typedef struct _CamelPartitionKeyBlock CamelPartitionKeyBlock;
-typedef struct _CamelPartitionMap CamelPartitionMap;
-typedef struct _CamelPartitionMapBlock CamelPartitionMapBlock;
-
-typedef struct _CamelPartitionTable CamelPartitionTable;
-typedef struct _CamelPartitionTableClass CamelPartitionTableClass;
-
-struct _CamelPartitionKey {
-	camel_hash_t hashid;
-	camel_key_t keyid;
-};
-
-struct _CamelPartitionKeyBlock {
-	guint32 used;
-	struct _CamelPartitionKey keys[(CAMEL_BLOCK_SIZE-4)/sizeof(struct _CamelPartitionKey)];
-};
-
-struct _CamelPartitionMap {
-	camel_hash_t hashid;
-	camel_block_t blockid;
-};
-
-struct _CamelPartitionMapBlock {
-	camel_block_t next;
-	guint32 used;
-	struct _CamelPartitionMap partition[(CAMEL_BLOCK_SIZE-8)/sizeof(struct _CamelPartitionMap)];
-};
-
-struct _CamelPartitionTable {
-	CamelObject parent;
-
-	struct _CamelPartitionTablePrivate *priv;
-
-	CamelBlockFile *blocks;
-	camel_block_t rootid;
-
-	int (*is_key)(CamelPartitionTable *cpi, const char *key, camel_key_t keyid, void *data);
-	void *is_key_data;
-
-	/* we keep a list of partition blocks active at all times */
-	EDList partition;
-};
-
-struct _CamelPartitionTableClass {
-	CamelObjectClass parent;
-};
-
-CamelType camel_partition_table_get_type(void);
-
-CamelPartitionTable *camel_partition_table_new(struct _CamelBlockFile *bs, camel_block_t root);
-int camel_partition_table_sync(CamelPartitionTable *cpi);
-int camel_partition_table_add(CamelPartitionTable *cpi, const char *key, camel_key_t keyid);
-camel_key_t camel_partition_table_lookup(CamelPartitionTable *cpi, const char *key);
-void camel_partition_table_remove(CamelPartitionTable *cpi, const char *key);
-
-/* ********************************************************************** */
-
-/* CamelKeyTable - index of keyid to key and flag and data mapping */
-
-typedef struct _CamelKeyBlock CamelKeyBlock;
-typedef struct _CamelKeyRootBlock CamelKeyRootBlock;
-
-typedef struct _CamelKeyTable CamelKeyTable;
-typedef struct _CamelKeyTableClass CamelKeyTableClass;
-
-struct _CamelKeyRootBlock {
-	camel_block_t first;
-	camel_block_t last;
-	camel_key_t free;	/* free list */
-};
-
-struct _CamelKeyKey {
-	camel_block_t data;
-	unsigned int offset:10;
-	unsigned int flags:22;
-};
-
-struct _CamelKeyBlock {
-	camel_block_t next;
-	guint32 used;
-	union {
-		struct _CamelKeyKey keys[(CAMEL_BLOCK_SIZE-8)/sizeof(struct _CamelKeyKey)];
-		char keydata[CAMEL_BLOCK_SIZE-8];
-	} u;
-};
-
-#define CAMEL_KEY_TABLE_MAX_KEY (128) /* max size of any key */
-
-struct _CamelKeyTable {
-	CamelObject parent;
-
-	struct _CamelKeyTablePrivate *priv;
-
-	CamelBlockFile *blocks;
-
-	camel_block_t rootid;
-
-	CamelKeyRootBlock *root;
-	CamelBlock *root_block;
-};
-
-struct _CamelKeyTableClass {
-	CamelObjectClass parent;
-};
-
-CamelType camel_key_table_get_type(void);
-
-CamelKeyTable * camel_key_table_new(CamelBlockFile *bs, camel_block_t root);
-int camel_key_table_sync(CamelKeyTable *ki);
-camel_key_t camel_key_table_add(CamelKeyTable *ki, const char *key, camel_block_t data, unsigned int flags);
-void camel_key_table_set_data(CamelKeyTable *ki, camel_key_t keyid, camel_block_t data);
-void camel_key_table_set_flags(CamelKeyTable *ki, camel_key_t keyid, unsigned int flags, unsigned int set);
-camel_block_t camel_key_table_lookup(CamelKeyTable *ki, camel_key_t keyid, char **key, unsigned int *flags);
-camel_key_t camel_key_table_next(CamelKeyTable *ki, camel_key_t next, char **keyp, unsigned int *flagsp, camel_block_t *datap);
-
-#endif /* ! _CAMEL_PARTITION_TABLE_H */
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
deleted file mode 100644
index e6ef1a7820..0000000000
--- a/camel/camel-pgp-context.c
+++ /dev/null
@@ -1,1478 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-pgp-context.h"
-
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
-
-#include "camel-operation.h"
-
-#include "camel-charset-map.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
-
-#include <iconv.h>
-#include <gal/unicode/gunicode.h>
-#include <gal/util/e-iconv.h>
-
-#define d(x)
-
-struct _CamelPgpContextPrivate {
-	CamelPgpType type;
-	char *path;
-};
-
-static int                  pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-				      CamelStream *istream, CamelStream *ostream, CamelException *ex);
-static int                  pgp_clearsign (CamelCipherContext *context, const char *userid,
-					   CamelCipherHash hash, CamelStream *istream,
-					   CamelStream *ostream, CamelException *ex);
-static CamelCipherValidity *pgp_verify (CamelCipherContext *context, CamelCipherHash hash,
-					CamelStream *istream, CamelStream *sigstream,
-					CamelException *ex);
-static int                  pgp_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,
-					 GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,
-					 CamelException *ex);
-static int                  pgp_decrypt (CamelCipherContext *context, CamelStream *istream,
-					 CamelStream *ostream, CamelException *ex);
-
-static CamelCipherContextClass *parent_class;
-
-static void
-camel_pgp_context_init (CamelPgpContext *context)
-{
-	context->priv = g_new0 (struct _CamelPgpContextPrivate, 1);
-}
-
-static void
-camel_pgp_context_finalise (CamelObject *o)
-{
-	CamelPgpContext *context = (CamelPgpContext *)o;
-	
-	g_free (context->priv->path);
-	
-	g_free (context->priv);
-}
-
-static void
-camel_pgp_context_class_init (CamelPgpContextClass *camel_pgp_context_class)
-{
-	CamelCipherContextClass *camel_cipher_context_class =
-		CAMEL_CIPHER_CONTEXT_CLASS (camel_pgp_context_class);
-	
-	parent_class = CAMEL_CIPHER_CONTEXT_CLASS (camel_type_get_global_classfuncs (camel_cipher_context_get_type ()));
-	
-	camel_cipher_context_class->sign = pgp_sign;
-	camel_cipher_context_class->clearsign = pgp_clearsign;
-	camel_cipher_context_class->verify = pgp_verify;
-	camel_cipher_context_class->encrypt = pgp_encrypt;
-	camel_cipher_context_class->decrypt = pgp_decrypt;
-}
-
-CamelType
-camel_pgp_context_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_cipher_context_get_type (),
-					    "CamelPgpContext",
-					    sizeof (CamelPgpContext),
-					    sizeof (CamelPgpContextClass),
-					    (CamelObjectClassInitFunc) camel_pgp_context_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_pgp_context_init,
-					    (CamelObjectFinalizeFunc) camel_pgp_context_finalise);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_pgp_context_new:
- * @session: CamelSession
- * @type: One of CAMEL_PGP_TYPE_PGP2, PGP5, GPG, or PGP6
- * @path: path to PGP binary
- * @remember: Remember the pgp passphrase
- *
- * This creates a new CamelPgpContext object which is used to sign,
- * verify, encrypt and decrypt streams.
- *
- * Return value: the new CamelPgpContext
- **/
-CamelPgpContext *
-camel_pgp_context_new (CamelSession *session, CamelPgpType type, const char *path)
-{
-	CamelPgpContext *context;
-	
-	g_return_val_if_fail (session != NULL, NULL);
-	
-	if (type == CAMEL_PGP_TYPE_NONE || !path || !*path)
-		return NULL;
-	
-	context = CAMEL_PGP_CONTEXT (camel_object_new (CAMEL_PGP_CONTEXT_TYPE));
-	
-	camel_cipher_context_construct (CAMEL_CIPHER_CONTEXT (context), session);
-	
-	context->priv->type = type;
-	context->priv->path = g_strdup (path);
-	
-	return context;
-}
-
-
-
-static const gchar *
-pgp_get_type_as_string (CamelPgpType type)
-{
-	switch (type) {
-	case CAMEL_PGP_TYPE_PGP2:
-		return "PGP 2.6.x";
-	case CAMEL_PGP_TYPE_PGP5:
-		return "PGP 5.0";
-	case CAMEL_PGP_TYPE_PGP6:
-		return "PGP 6.5.8";
-	case CAMEL_PGP_TYPE_GPG:
-		return "GnuPG";
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-static gchar *
-pgp_get_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)
-{
-	gchar *passphrase, *prompt;
-	const char *type;
-	
-	type = pgp_get_type_as_string (pgp_type);
-	
-	if (userid)
-		prompt = g_strdup_printf (_("Please enter your %s passphrase for %s"),
-					  type, userid);
-	else
-		prompt = g_strdup_printf (_("Please enter your %s passphrase"),
-					  type);
-	
-	/* Use the userid as a key if possible, else be generic and use the type */
-	passphrase = camel_session_get_password (session, prompt, TRUE,
-						 NULL, userid ? userid : type,
-						 NULL);
-	g_free (prompt);
-	
-	return passphrase;
-}
-
-static void
-pgp_forget_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)
-{
-	const char *type = NULL;
-	
-	if (!userid)
-		type = pgp_get_type_as_string (pgp_type);
-	
-	camel_session_forget_password (session, NULL, userid ? userid : type, NULL);
-}
-
-static void
-pass_free (char *passphrase)
-{
-	if (passphrase) {
-		memset (passphrase, 0, strlen (passphrase));
-		g_free (passphrase);
-	}
-}
-
-static int
-cleanup_child (pid_t child)
-{
-	int status;
-	pid_t wait_result;
-	sigset_t mask, omask;
-	
-	/* PGP5 closes fds before exiting, meaning this might be called
-	 * too early. So wait a bit for the result.
-	 */
-	sigemptyset (&mask);
-	sigaddset (&mask, SIGALRM);
-	sigprocmask (SIG_BLOCK, &mask, &omask);
-	alarm (1);
-	wait_result = waitpid (child, &status, 0);
-	alarm (0);
-	sigprocmask (SIG_SETMASK, &omask, NULL);
-	
-	if (wait_result == -1 && errno == EINTR) {
-		/* The child is hanging: send a friendly reminder. */
-		kill (child, SIGTERM);
-		sleep (1);
-		wait_result = waitpid (child, &status, WNOHANG);
-		if (wait_result == 0) {
-			/* Still hanging; use brute force. */
-			kill (child, SIGKILL);
-			sleep (1);
-			wait_result = waitpid (child, &status, WNOHANG);
-		}
-	}
-	
-	if (wait_result != -1 && WIFEXITED (status))
-		return WEXITSTATUS (status);
-	else
-		return -1;
-}
-
-static void
-cleanup_before_exec (int fd)
-{
-	int maxfd, i;
-	
-	maxfd = sysconf (_SC_OPEN_MAX);
-	if (maxfd < 0)
-		return;
-	
-	/* Loop over all fds. */
-	for (i = 0; i < maxfd; i++) {
-		if ((STDIN_FILENO != i) &&
-		    (STDOUT_FILENO != i) &&
-		    (STDERR_FILENO != i) &&
-		    (fd != i))
-			close (i);
-	}
-}
-
-static int
-crypto_exec_with_passwd (const char *path, char *argv[], const char *input, int inlen,
-			 int passwd_fds[], const char *passphrase,
-			 char **output, int *outlen, char **diagnostics)
-{
-	gboolean eof_seen, diag_eof_seen, passwd_eof_seen, input_eof_seen;
-	size_t passwd_remaining, passwd_incr, input_remaining, input_incr;
-	size_t size, alloc_size, diag_size, diag_alloc_size;
-	int select_result, read_len, write_len, cancel_fd;
-	int fds[6], *ip_fds, *op_fds, *diag_fds;
-	const char *passwd_next, *input_next;
-	char *buf = NULL, *diag_buf = NULL;
-	fd_set fdset, write_fdset;
-	struct timeval timeout;
-	size_t tmp_len;
-	pid_t child;
-	int i;
-	
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	for (i = 0; i < 6; i++)
-		fds[i] = -1;
-	
-	ip_fds = fds;
-	op_fds = fds + 2;
-	diag_fds = fds + 4;
-	
-	if ((pipe (ip_fds) == -1) || (pipe (op_fds) == -1) || (pipe (diag_fds) == -1)) {
-		*diagnostics = g_strdup_printf ("Couldn't create pipe to %s: %s",
-						path, g_strerror (errno));
-		
-		for (i = 0; i < 6; i++)
-			close (fds[i]);
-		
-		close (passwd_fds[0]);
-		close (passwd_fds[1]);
-		
-		return -1;
-	}
-	
-	if (!(child = fork ())) {
-		/* In child */
-		
-		if ((dup2 (ip_fds[0], STDIN_FILENO) < 0 ) ||
-		    (dup2 (op_fds[1], STDOUT_FILENO) < 0 ) ||
-		    (dup2 (diag_fds[1], STDERR_FILENO) < 0 )) {
-			_exit (255);
-		}
-		
-		/* Dissociate from evolution-mail's controlling
-		 * terminal so that pgp/gpg won't be able to read from
-		 * it: PGP 2 will fall back to asking for the password
-		 * on /dev/tty if the passed-in password is incorrect.
-		 * This will make that fail rather than hanging.
-		 */
-		setsid ();
-		
-		/* Close excess fds */
-		cleanup_before_exec (passwd_fds[0]);
-		
-		execvp (path, argv);
-		fprintf (stderr, "Could not execute %s: %s\n", argv[0],
-			 g_strerror (errno));
-		_exit (255);
-	} else if (child < 0) {
-		*diagnostics = g_strdup_printf ("Cannot fork %s: %s",
-						argv[0], g_strerror (errno));
-		return -1;
-	}
-	
-	/* Parent */
-	close (ip_fds[0]);
-	close (op_fds[1]);
-	close (diag_fds[1]);
-	close (passwd_fds[0]);
-	
-	fcntl (ip_fds[1], F_SETFL, O_NONBLOCK);
-	fcntl (op_fds[0], F_SETFL, O_NONBLOCK);
-	fcntl (diag_fds[0], F_SETFL, O_NONBLOCK);
-	
-	timeout.tv_sec = 10; /* timeout in seconds */
-	timeout.tv_usec = 0;
-	
-	size = diag_size = 0;
-	alloc_size = 4096;
-	diag_alloc_size = 1024;
-	eof_seen = diag_eof_seen = FALSE;
-	
-	buf = g_malloc (alloc_size);
-	diag_buf = g_malloc (diag_alloc_size);
-	
-	passwd_next = passphrase;
-	passwd_remaining = passphrase ? strlen (passphrase) : 0;
-	passwd_incr = fpathconf (passwd_fds[1], _PC_PIPE_BUF);
-	/* Use a reasonable default value on error. */
-	if (passwd_incr <= 0)
-		passwd_incr = 1024;
-	passwd_eof_seen = FALSE;
-	
-	input_next = input;
-	input_remaining = inlen;
-	input_incr = fpathconf (ip_fds[1], _PC_PIPE_BUF);
-	if (input_incr <= 0)
-		input_incr = 1024;
-	input_eof_seen = FALSE;
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	
-	while (!(eof_seen && diag_eof_seen)) {
-		int max = 0;
-		
-		FD_ZERO (&fdset);
-		if (!eof_seen) {
-			FD_SET (op_fds[0], &fdset);
-			max = op_fds[0];
-		}
-		if (!diag_eof_seen) {
-			FD_SET (diag_fds[0], &fdset);
-			max = MAX (max, diag_fds[0]);
-		}
-		if (cancel_fd != -1) {
-			FD_SET (cancel_fd, &fdset);
-			max = MAX (max, cancel_fd);
-		}
-		
-		FD_ZERO (&write_fdset);
-		if (!passwd_eof_seen) {
-			FD_SET (passwd_fds[1], &write_fdset);
-			max = MAX (max, passwd_fds[1]);
-		}
-		if (!input_eof_seen) {
-			FD_SET (ip_fds[1], &write_fdset);
-			max = MAX (max, ip_fds[1]);
-		}
-		
-		select_result = select (max + 1, &fdset, &write_fdset,
-					NULL, &timeout);
-		
-		if (select_result < 0) {
-			if (errno == EINTR)
-				continue;
-			break;
-		} else if (select_result == 0) {
-			/* timeout */
-			break;
-		}
-		
-		if (cancel_fd != -1 && FD_ISSET (cancel_fd, &fdset)) {
-			/* user-cancelled */
-			break;
-		}
-		
-		if (FD_ISSET (op_fds[0], &fdset)) {
-			/* More output is available. */
-			
-			if (size + 4096 > alloc_size) {
-				alloc_size += 4096;
-				buf = g_realloc (buf, alloc_size);
-			}
-			read_len = read (op_fds[0], &buf[size],
-					 alloc_size - size - 1);
-			if (read_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			if (read_len == 0)
-				eof_seen = TRUE;
-			size += read_len;
-		}
-		
-		if (FD_ISSET (diag_fds[0], &fdset) ) {
-			/* More stderr is available. */
-			
-			if (diag_size + 1024 > diag_alloc_size) {
-				diag_alloc_size += 1024;
-				diag_buf = g_realloc (diag_buf,
-						      diag_alloc_size);
-			}
-			
-			read_len = read (diag_fds[0], &diag_buf[diag_size],
-					 diag_alloc_size - diag_size - 1);
-			if (read_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			if (read_len == 0)
-				diag_eof_seen = TRUE;
-			diag_size += read_len;
-		}
-		
-		if (FD_ISSET (passwd_fds[1], &write_fdset)) {
-			/* Ready for more password input. */
-			
-			tmp_len = passwd_incr;
-			if (tmp_len > passwd_remaining)
-				tmp_len = passwd_remaining;
-			write_len = write (passwd_fds[1], passwd_next,
-					   tmp_len);
-			if (write_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			passwd_next += write_len;
-			passwd_remaining -= write_len;
-			if (passwd_remaining == 0) {
-				close (passwd_fds[1]);
-				passwd_eof_seen = TRUE;
-			}
-		}
-		
-		if (FD_ISSET (ip_fds[1], &write_fdset)) {
-			/* Ready for more ciphertext input. */
-			
-			tmp_len = input_incr;
-			if (tmp_len > input_remaining)
-				tmp_len = input_remaining;
-			write_len = write (ip_fds[1], input_next, tmp_len);
-			if (write_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			input_next += write_len;
-			input_remaining -= write_len;
-			if (input_remaining == 0 ) {
-				close (ip_fds[1]);
-				input_eof_seen = TRUE;
-			}
-		}
-	}
-	
-	buf[size] = 0;
-	diag_buf[diag_size] = 0;
-	close (op_fds[0]);
-	close (diag_fds[0]);
-	
-	if (!passwd_eof_seen)
-		close (passwd_fds[1]);
-	
-	*output = buf;
-	if (outlen)
-		*outlen = size;
-	*diagnostics = diag_buf;
-	
-	return cleanup_child (child);
-}
-
-
-/*----------------------------------------------------------------------*
- *                     Public crypto functions
- *----------------------------------------------------------------------*/
-
-static char *
-hash_string (CamelPgpContext *ctx, CamelCipherHash hash)
-{
-	if (hash == CAMEL_CIPHER_HASH_DEFAULT)
-		return NULL;
-	
-	switch (ctx->priv->type) {
-	case CAMEL_PGP_TYPE_GPG:
-		switch (hash) {
-		case CAMEL_CIPHER_HASH_MD2:
-			return "MD2";
-		case CAMEL_CIPHER_HASH_MD5:
-			return "MD5";
-		case CAMEL_CIPHER_HASH_SHA1:
-			return "SHA1";
-		case CAMEL_CIPHER_HASH_RIPEMD160:
-			return "RIPEMD160";
-		default:
-			g_assert_not_reached ();
-		}
-		break;
-	case CAMEL_PGP_TYPE_PGP2:
-		/* FIXME: find a way to specify a hash algorithm for pgp2 */
-		return NULL;
-	case CAMEL_PGP_TYPE_PGP5:
-	case CAMEL_PGP_TYPE_PGP6:
-		switch (hash) {
-		case CAMEL_CIPHER_HASH_MD2:
-			return "+hashnum=5";
-		case CAMEL_CIPHER_HASH_MD5:
-			return "+hashnum=1";
-		case CAMEL_CIPHER_HASH_SHA1:
-			return "+hashnum=2";
-		case CAMEL_CIPHER_HASH_RIPEMD160:
-			return "+hashnum=3";
-		default:
-			g_assert_not_reached ();
-		}
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	return NULL;
-}
-
-static int
-pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-	  CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);
-	GByteArray *plaintext;
-	CamelStream *stream;
-	char *argv[20];
-	char *ciphertext = NULL;
-	char *diagnostics = NULL;
-	char *passphrase = NULL;
-	char *hash_str = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	int retval, i;
-	
-	/* check for the now unsupported pgp 2.6.x type */
-	if (context->priv->type == CAMEL_PGP_TYPE_PGP2) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     "PGP 2.6.x is no longer supported.");
-		return -1;
-	}
-	
-	/* get the plaintext in a form we can use */
-	plaintext = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);
-	camel_stream_write_to_stream (istream, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	if (!plaintext->len) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot sign this message: no plaintext to sign"));
-		goto exception;
-	}
-	
-	passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid);
-	if (!passphrase) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     _("Cannot sign this message: no password provided"));
-		goto exception;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot sign this message: couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		goto exception;
-	}
-	
-	hash_str = hash_string (context, hash);
-	
-	i = 0;
-	switch (context->priv->type) {
-	case CAMEL_PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--sign";
-		argv[i++] = "-b";
-		if (hash_str) {
-			argv[i++] = "--digest-algo";
-			argv[i++] = hash_str;
-		}
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "--verbose";
-		argv[i++] = "--no-secmem-warning";
-		argv[i++] = "--no-greeting";
-		argv[i++] = "--yes";
-		argv[i++] = "--always-trust";
-		argv[i++] = "--batch";
-		
-		argv[i++] = "--armor";
-		
-		argv[i++] = "--output";
-		argv[i++] = "-";            /* output to stdout */
-		
-		argv[i++] = "--passphrase-fd";
-		sprintf (passwd_fd, "%d", passwd_fds[0]);
-		argv[i++] = passwd_fd;
-		break;
-	case CAMEL_PGP_TYPE_PGP5:
-		argv[i++] = "pgps";
-		
-		if (hash_str)
-			argv[i++] = hash_str;
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-b";  /* -b means break off (detach) the signature */
-		argv[i++] = "-f";  /* -f means act as a unix-style filter */
-		argv[i++] = "-v";  /* -v means verbose diagnostic messages */
-		argv[i++] = "-z";  /* FIXME: do we want this option!? */
-		argv[i++] = "-a";  /* -a means ascii armor */
-		argv[i++] = "-o";  /* -o specifies an output stream */
-		argv[i++] = "-";   /* ...in this case, stdout */
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	case CAMEL_PGP_TYPE_PGP2:
-	case CAMEL_PGP_TYPE_PGP6:
-		argv[i++] = "pgp";
-		
-		if (hash_str)
-			argv[i++] = hash_str;
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-f";  /* -f means act as a unix-style filter */
-		argv[i++] = "-l";  /* -l means show longer more descriptive diagnostic messages */
-		argv[i++] = "-a";  /* -a means ascii armor */
-		argv[i++] = "-o";  /* -o specifies an output stream */
-		argv[i++] = "-";   /* ...in this case, stdout */
-		
-		argv[i++] = "-sb"; /* create a detached signature */
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	retval = crypto_exec_with_passwd (context->priv->path, argv,
-					  plaintext->data, plaintext->len,
-					  passwd_fds, passphrase,
-					  &ciphertext, NULL,
-					  &diagnostics);
-	
-	g_byte_array_free (plaintext, TRUE);
-	pass_free (passphrase);
-	
-	if (retval != 0 || !*ciphertext) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);
-		g_free (diagnostics);
-		g_free (ciphertext);
-		pgp_forget_passphrase (ctx->session, context->priv->type, (char *) userid);
-		
-		return -1;
-	}
-	
-	g_free (diagnostics);
-	
-	camel_stream_write (ostream, ciphertext, strlen (ciphertext));
-	g_free (ciphertext);
-	
-	return 0;
-	
- exception:
-	
-	g_byte_array_free (plaintext, TRUE);
-	
-	if (passphrase) {
-		pgp_forget_passphrase (ctx->session, context->priv->type, (char *) userid);
-		pass_free (passphrase);
-	}
-	
-	return -1;
-}
-
-
-static int
-pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-	       CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);
-	GByteArray *plaintext;
-	CamelStream *stream;
-	char *argv[20];
-	char *ciphertext = NULL;
-	char *diagnostics = NULL;
-	char *passphrase = NULL;
-	char *hash_str = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	int retval, i;
-	
-	/* check for the now unsupported pgp 2.6.x type */
-	if (context->priv->type == CAMEL_PGP_TYPE_PGP2) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     "PGP 2.6.x is no longer supported.");
-		return -1;
-	}
-	
-	/* get the plaintext in a form we can use */
-	plaintext = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);
-	camel_stream_write_to_stream (istream, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	if (!plaintext->len) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot sign this message: no plaintext to clearsign"));
-		goto exception;
-	}
-	
-	passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid);
-	if (!passphrase) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     _("Cannot sign this message: no password provided"));
-		goto exception;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot sign this message: couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		goto exception;
-	}
-	
-	hash_str = hash_string (context, hash);
-	
-	i = 0;
-	switch (context->priv->type) {
-	case CAMEL_PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--clearsign";
-		
-		if (hash_str) {
-			argv[i++] = "--digest-algo";
-			argv[i++] = hash_str;
-		}
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "--verbose";
-		argv[i++] = "--no-secmem-warning";
-		argv[i++] = "--no-greeting";
-		argv[i++] = "--yes";
-		argv[i++] = "--always-trust";
-		argv[i++] = "--batch";
-		
-		argv[i++] = "--armor";
-		
-		argv[i++] = "--output";
-		argv[i++] = "-";            /* output to stdout */
-		
-		argv[i++] = "--passphrase-fd";
-		sprintf (passwd_fd, "%d", passwd_fds[0]);
-		argv[i++] = passwd_fd;
-		break;
-	case CAMEL_PGP_TYPE_PGP5:
-		argv[i++] = "pgps";
-		
-		if (hash_str)
-			argv[i++] = hash_str;
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-f";  /* -f means act as a unix-style filter */
-		argv[i++] = "-v";  /* -v means verbose diagnostic messages */
-		argv[i++] = "-z";  /* FIXME: do we want this option!? */
-		argv[i++] = "-a";  /* -a means ascii armor */
-		argv[i++] = "-o";  /* -o specifies an output stream */
-		argv[i++] = "-";   /* ...in this case, stdout */
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	case CAMEL_PGP_TYPE_PGP2:
-	case CAMEL_PGP_TYPE_PGP6:
-		argv[i++] = "pgp";
-		
-		if (hash_str)
-			argv[i++] = hash_str;
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-f";  /* -f means act as a unix-style filter */
-		argv[i++] = "-l";  /* -l means show longer more descriptive diagnostic messages */
-		argv[i++] = "-a";  /* -a means ascii armor */
-		argv[i++] = "-o";  /* -o specifies an output stream */
-		argv[i++] = "-";   /* ...in this case, stdout */
-		
-		argv[i++] = "-st";
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	retval = crypto_exec_with_passwd (context->priv->path, argv,
-					  plaintext->data, plaintext->len,
-					  passwd_fds, passphrase,
-					  &ciphertext, NULL,
-					  &diagnostics);
-	
-	g_byte_array_free (plaintext, TRUE);
-	pass_free (passphrase);
-	
-	if (retval != 0 || !*ciphertext) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);
-		g_free (diagnostics);
-		g_free (ciphertext);
-		pgp_forget_passphrase (ctx->session, context->priv->type, (char *) userid);
-	}
-	
-	g_free (diagnostics);
-	
-	camel_stream_write (ostream, ciphertext, strlen (ciphertext));
-	g_free (ciphertext);
-	
-	return 0;
-	
- exception:
-	
-	g_byte_array_free (plaintext, TRUE);
-	
-	if (passphrase) {
-		pgp_forget_passphrase (ctx->session, context->priv->type, (char *) userid);
-		pass_free (passphrase);
-	}
-	
-	return -1;
-}
-
-
-static char *
-swrite (CamelStream *istream)
-{
-	CamelStream *ostream;
-	char *template;
-	int fd;
-	
-	template = g_strdup ("/tmp/evolution-pgp.XXXXXX");
-	fd = mkstemp (template);
-	if (fd == -1) {
-		g_free (template);
-		return NULL;
-	}
-	
-	ostream = camel_stream_fs_new_with_fd (fd);
-	camel_stream_write_to_stream (istream, ostream);
-	camel_object_unref (CAMEL_OBJECT (ostream));
-	
-	return template;
-}
-
-
-static CamelCipherValidity *
-pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
-	    CamelStream *sigstream, CamelException *ex)
-{
-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);
-	CamelCipherValidity *valid = NULL;
-	GByteArray *plaintext;
-	CamelStream *stream;
-	char *argv[20];
-	char *cleartext = NULL;
-	char *diagnostics = NULL;
-	int passwd_fds[2];
-	char *sigfile = NULL;
-	int retval, i, clearlen;
-	
-	/* check for the now unsupported pgp 2.6.x type */
-	if (context->priv->type == CAMEL_PGP_TYPE_PGP2) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     "PGP 2.6.x is no longer supported.");
-		return NULL;
-	}
-	
-	/* get the plaintext in a form we can use */
-	plaintext = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);
-	camel_stream_write_to_stream (istream, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	if (!plaintext->len) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot verify this message: no plaintext to verify"));
-		goto exception;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot verify this message: couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		goto exception;
-	}
-	
-	if (sigstream != NULL) {
-		/* We are going to verify a detached signature so save
-		   the signature to a temp file. */
-		sigfile = swrite (sigstream);
-		if (!sigfile) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot verify this message: couldn't create temp file: %s"),
-					      g_strerror (errno));
-			goto exception;
-		}
-	}
-	
-	i = 0;
-	switch (context->priv->type) {
-	case CAMEL_PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--verbose";
-		argv[i++] = "--no-secmem-warning";
-		argv[i++] = "--no-greeting";
-		argv[i++] = "--no-tty";
-		if (!camel_session_is_online (ctx->session))
-			argv[i++] = "--no-auto-key-retrieve";
-		
-		argv[i++] = "--yes";
-		argv[i++] = "--batch";
-		
-		argv[i++] = "--verify";
-		
-		if (sigstream != NULL)
-			argv[i++] = sigfile;
-		
-		argv[i++] = "-";
-		break;
-	case CAMEL_PGP_TYPE_PGP5:
-		argv[i++] = "pgpv";
-		
-		argv[i++] = "-z";
-		
-		if (sigstream != NULL)
-			argv[i++] = sigfile;
-		
-		argv[i++] = "-f";
-		
-		break;
-	case CAMEL_PGP_TYPE_PGP2:
-	case CAMEL_PGP_TYPE_PGP6:
-		argv[i++] = "pgp";
-		
-		if (sigstream != NULL)
-			argv[i++] = sigfile;
-		
-		argv[i++] = "-f";
-		
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	clearlen = 0;
-	retval = crypto_exec_with_passwd (context->priv->path, argv,
-					  plaintext->data, plaintext->len,
-					  passwd_fds, NULL,
-					  &cleartext, &clearlen,
-					  &diagnostics);
-	
-	g_byte_array_free (plaintext, TRUE);
-	
-	/* cleanup */
-	if (sigfile) {
-		unlink (sigfile);
-		g_free (sigfile);
-	}
-	
-	valid = camel_cipher_validity_new ();
-	
-	if (retval != 0) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);
-		
-		camel_cipher_validity_set_valid (valid, FALSE);
-	} else {
-		camel_cipher_validity_set_valid (valid, TRUE);
-	}
-	
-	if (diagnostics) {
-		const char *locale;
-		char *desc, *outbuf;
-		size_t inlen, outlen;
-		iconv_t cd;
-		
-		inlen = strlen (diagnostics);
-		outlen = inlen * 4;
-		
-		desc = outbuf = g_new (unsigned char, outlen + 1);
-		
-		locale = e_iconv_locale_charset ();
-		if (!locale)
-			locale = "iso-8859-1";
-		
-		cd = e_iconv_open ("UTF-8", locale);
-		if (cd != (iconv_t) -1) {
-			const char *inbuf;
-			size_t ret;
-			
-			inbuf = diagnostics;
-			ret = e_iconv (cd, &inbuf, &inlen, &outbuf, &outlen);
-			if (ret != (size_t) -1) {
-				e_iconv (cd, NULL, 0, &outbuf, &outlen);
-			}
-			e_iconv_close (cd);
-			
-			*outbuf = '\0';
-		} else {
-			const char *inptr, *inend;
-			
-			g_warning ("CamelPgpContext::pgp_verify: cannot convert from %s to UTF-8", locale);
-			
-			inptr = diagnostics;
-			inend = inptr + inlen;
-			
-			while (inptr && inptr < inend && g_unichar_validate (g_utf8_get_char (inptr))) {
-				*outbuf++ = g_utf8_get_char (inptr) & 0xff;
-				inptr = g_utf8_next_char (inptr);
-			}
-			
-			*outbuf = '\0';
-		}
-		
-		camel_cipher_validity_set_description (valid, desc);
-		g_free (desc);
-	}
-	
-	g_free (diagnostics);
-	g_free (cleartext);
-	
-	return valid;
-	
- exception:
-	
-	g_byte_array_free (plaintext, TRUE);
-	
-	return NULL;
-}
-
-
-static int
-pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArray *recipients,
-	     CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);
-	GByteArray *plaintext;
-	CamelStream *stream;
-	GPtrArray *argv;
-	int retval, r;
-	char *ciphertext = NULL;
-	char *diagnostics = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	char *passphrase = NULL;
-	
-	/* check for the now unsupported pgp 2.6.x type */
-	if (context->priv->type == CAMEL_PGP_TYPE_PGP2) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     "PGP 2.6.x is no longer supported.");
-		return -1;
-	}
-	
-	/* get the plaintext in a form we can use */
-	plaintext = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);
-	camel_stream_write_to_stream (istream, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	if (!plaintext->len) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot encrypt this message: no plaintext to encrypt"));
-		goto exception;
-	}
-	
-	if (sign) {
-		/* we only need a passphrase if we intend on signing */
-		passphrase = pgp_get_passphrase (ctx->session, context->priv->type,
-						 (char *) userid);
-		if (!passphrase) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Cannot encrypt this message: no password provided"));
-			goto exception;
-		}
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		
-		goto exception;
-	}
-	
-	/* check to make sure we have recipients */
-	if (recipients->len == 0) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot encrypt this message: no recipients specified"));
-		
-		goto exception;
-	}
-	
-	argv = g_ptr_array_new ();
-	
-	switch (context->priv->type) {
-	case CAMEL_PGP_TYPE_GPG:
-		g_ptr_array_add (argv, "gpg");
-		
-		g_ptr_array_add (argv, "--verbose");
-		g_ptr_array_add (argv, "--no-secmem-warning");
-		g_ptr_array_add (argv, "--no-greeting");
-		g_ptr_array_add (argv, "--yes");
-		g_ptr_array_add (argv, "--always-trust");
-		g_ptr_array_add (argv, "--batch");
-		
-		g_ptr_array_add (argv, "--armor");
-		
-		for (r = 0; r < recipients->len; r++) {
-			g_ptr_array_add (argv, "-r");
-			g_ptr_array_add (argv, recipients->pdata[r]);
-		}
-		
-		g_ptr_array_add (argv, "--output");
-		g_ptr_array_add (argv, "-");            /* output to stdout */
-		
-		g_ptr_array_add (argv, "--encrypt");
-		
-		if (sign) {
-			g_ptr_array_add (argv, "--sign");
-			
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (char *) userid);
-			
-			g_ptr_array_add (argv, "--passphrase-fd");
-			sprintf (passwd_fd, "%d", passwd_fds[0]);
-			g_ptr_array_add (argv, passwd_fd);
-		}
-		break;
-	case CAMEL_PGP_TYPE_PGP5:
-		g_ptr_array_add (argv, "pgpe");
-		
-		for (r = 0; r < recipients->len; r++) {
-			g_ptr_array_add (argv, "-r");
-			g_ptr_array_add (argv, recipients->pdata[r]);
-		}
-		
-		g_ptr_array_add (argv, "-f");
-		g_ptr_array_add (argv, "-z");
-		g_ptr_array_add (argv, "-a");
-		g_ptr_array_add (argv, "-o");
-		g_ptr_array_add (argv, "-");        /* output to stdout */
-		
-		if (sign) {
-			g_ptr_array_add (argv, "-s");
-			
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (gchar *) userid);
-			
-			sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-			putenv (passwd_fd);
-		}
-		break;
-	case CAMEL_PGP_TYPE_PGP2:
-	case CAMEL_PGP_TYPE_PGP6:
-		g_ptr_array_add (argv, "pgp");
-		g_ptr_array_add (argv, "-f");
-		g_ptr_array_add (argv, "-e");
-		g_ptr_array_add (argv, "-a");
-		g_ptr_array_add (argv, "-o");
-		g_ptr_array_add (argv, "-");
-		
-		for (r = 0; r < recipients->len; r++)
-			g_ptr_array_add (argv, recipients->pdata[r]);
-		
-		if (sign) {
-			g_ptr_array_add (argv, "-s");
-			
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (gchar *) userid);
-			
-			sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-			putenv (passwd_fd);
-		}
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	g_ptr_array_add (argv, NULL);
-	
-	retval = crypto_exec_with_passwd (context->priv->path,
-					  (char **) argv->pdata,
-					  plaintext->data, plaintext->len,
-					  passwd_fds, passphrase,
-					  &ciphertext, NULL,
-					  &diagnostics);
-	
-	g_byte_array_free (plaintext, TRUE);
-	
-	pass_free (passphrase);
-	g_ptr_array_free (argv, TRUE);
-	
-	if (retval != 0 || !*ciphertext) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);
-		g_free (diagnostics);
-		g_free (ciphertext);
-		if (sign)
-			pgp_forget_passphrase (ctx->session, context->priv->type,
-					       (char *) userid);
-		
-		return -1;
-	}
-	
-	g_free (diagnostics);
-	
-	camel_stream_write (ostream, ciphertext, strlen (ciphertext));
-	g_free (ciphertext);
-	
-	return 0;
-	
- exception:
-	
-	g_byte_array_free (plaintext, TRUE);
-	
-	if (sign) {
-		pass_free (passphrase);
-		pgp_forget_passphrase (ctx->session, context->priv->type, (char *) userid);
-	}
-	
-	return -1;
-}
-
-
-static int
-pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream,
-	     CamelStream *ostream, CamelException *ex)
-{
-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);
-	GByteArray *ciphertext;
-	CamelStream *stream;
-	char *argv[15];
-	char *plaintext = NULL;
-	int plainlen;
-	char *diagnostics = NULL;
-	char *passphrase = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	int retval, i;
-	
-	/* check for the now unsupported pgp 2.6.x type */
-	if (context->priv->type == CAMEL_PGP_TYPE_PGP2) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     "PGP 2.6.x is no longer supported.");
-		return -1;
-	}
-	
-	/* get the ciphertext in a form we can use */
-	ciphertext = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), ciphertext);
-	camel_stream_write_to_stream (istream, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	if (!ciphertext->len) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot decrypt this message: no ciphertext to decrypt"));
-		
-		goto exception;
-	}
-	
-	passphrase = pgp_get_passphrase (ctx->session, context->priv->type, NULL);
-	if (!passphrase) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     _("Cannot decrypt this message: no password provided"));
-		
-		goto exception;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		
-		goto exception;
-	}
-	
-	i = 0;
-	switch (context->priv->type) {
-	case CAMEL_PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--verbose";
-		argv[i++] = "--no-secmem-warning";
-		argv[i++] = "--no-greeting";
-		argv[i++] = "--yes";
-		argv[i++] = "--batch";
-		
-		if (!camel_session_is_online (ctx->session))
-			argv[i++] = "--no-auto-key-retrieve";
-		
-		argv[i++] = "--output";
-		argv[i++] = "-";            /* output to stdout */
-		
-		argv[i++] = "--decrypt";
-		
-		argv[i++] = "--passphrase-fd";
-		sprintf (passwd_fd, "%d", passwd_fds[0]);
-		argv[i++] = passwd_fd;
-		break;
-	case CAMEL_PGP_TYPE_PGP5:
-		argv[i++] = "pgpv";
-		
-		argv[i++] = "-f";
-		argv[i++] = "+batchmode=1";
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	case CAMEL_PGP_TYPE_PGP2:
-	case CAMEL_PGP_TYPE_PGP6:
-		argv[i++] = "pgp";
-		
-		argv[i++] = "-f";
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	retval = crypto_exec_with_passwd (context->priv->path, argv,
-					  ciphertext->data, ciphertext->len,
-					  passwd_fds, passphrase,
-					  &plaintext, &plainlen,
-					  &diagnostics);
-	
-	g_byte_array_free (ciphertext, TRUE);
-	pass_free (passphrase);
-	
-	/* gpg returns '1' if it succeedes in decrypting but can't verify the signature */
-	if (retval != 0 || (context->priv->type == CAMEL_PGP_TYPE_GPG && retval == 1) || !*plaintext) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);
-		g_free (plaintext);
-		g_free (diagnostics);
-		
-		pgp_forget_passphrase (ctx->session, context->priv->type, NULL);
-		
-		return -1;
-	}
-	
-	g_free (diagnostics);
-	
-	camel_stream_write (ostream, plaintext, plainlen);
-	g_free (plaintext);
-	
-	return 0;
-	
- exception:
-	
-	g_byte_array_free (ciphertext, TRUE);
-	
-	if (passphrase) {
-		pgp_forget_passphrase (ctx->session, context->priv->type, NULL);
-		pass_free (passphrase);
-	}
-	
-	return -1;
-}
diff --git a/camel/camel-pgp-context.h b/camel/camel-pgp-context.h
deleted file mode 100644
index 0eaa3ec4e3..0000000000
--- a/camel/camel-pgp-context.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_PGP_CONTEXT_H
-#define CAMEL_PGP_CONTEXT_H
-
-#include <camel/camel-session.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-cipher-context.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CAMEL_PGP_CONTEXT_TYPE     (camel_pgp_context_get_type ())
-#define CAMEL_PGP_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PGP_CONTEXT_TYPE, CamelPgpContext))
-#define CAMEL_PGP_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PGP_CONTEXT_TYPE, CamelPgpContextClass))
-#define CAMEL_IS_PGP_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PGP_CONTEXT_TYPE))
-
-typedef enum {
-	CAMEL_PGP_TYPE_NONE,
-	CAMEL_PGP_TYPE_PGP2,   /* no longer supported */
-	CAMEL_PGP_TYPE_PGP5,
-	CAMEL_PGP_TYPE_PGP6,
-	CAMEL_PGP_TYPE_GPG
-} CamelPgpType;
-
-typedef struct _CamelPgpContext {
-	CamelCipherContext parent_object;
-	
-	struct _CamelPgpContextPrivate *priv;
-	
-} CamelPgpContext;
-
-typedef struct _CamelPgpContextClass {
-	CamelCipherContextClass parent_class;
-	
-} CamelPgpContextClass;
-
-CamelType         camel_pgp_context_get_type (void);
-
-CamelPgpContext  *camel_pgp_context_new (CamelSession *session, CamelPgpType type,
-					 const char *path);
-
-/* PGP routines */
-#define camel_pgp_sign(c, u, h, i, o, e) camel_cipher_sign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)
-
-#define camel_pgp_clearsign(c, u, h, i, o, e) camel_cipher_clearsign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)
-
-#define camel_pgp_verify(c, i, s, e) camel_cipher_verify (CAMEL_CIPHER_CONTEXT (c), CAMEL_CIPHER_HASH_DEFAULT, i, s, e)
-
-#define camel_pgp_encrypt(c, s, u, r, i, o, e) camel_cipher_encrypt (CAMEL_CIPHER_CONTEXT (c), s, u, r, i, o, e)
-
-#define camel_pgp_decrypt(c, i, o, e) camel_cipher_decrypt (CAMEL_CIPHER_CONTEXT (c), i, o, e)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_PGP_CONTEXT_H */
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
deleted file mode 100644
index b16232c085..0000000000
--- a/camel/camel-pgp-mime.c
+++ /dev/null
@@ -1,607 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-pgp-mime.h"
-#include "camel-mime-message.h"
-#include "camel-mime-filter-from.h"
-#include "camel-mime-filter-bestenc.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-chomp.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-null.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-fs.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define PGPMIME_DEBUG
-
-#define d(x) x
-
-/** rfc2015/rfc3156 stuff (aka PGP/MIME) *******************************/
-
-gboolean
-camel_pgp_mime_is_rfc2015_signed (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	const char *param, *micalg;
-#endif
-	int nparts;
-	
-	/* check that we have a multipart/signed */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "signed"))
-		return FALSE;
-
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	/* check that we have a protocol param with the value: "application/pgp-signature" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || g_strcasecmp (param, "application/pgp-signature"))
-		return FALSE;
-	
-	/* check that we have a micalg parameter */
-	micalg = header_content_type_param (type, "micalg");
-	if (!micalg)
-		return FALSE;
-#endif /* ENABLE_PEDANTIC_PGPMIME */
-	
-	/* check that we have exactly 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts != 2)
-		return FALSE;
-	
-	/* The first part may be of any type except for 
-	 * application/pgp-signature - check it. */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (header_content_type_is (type, "application", "pgp-signature"))
-		return FALSE;
-	
-	/* The second part should be application/pgp-signature. */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pgp-signature"))
-		return FALSE;
-	
-	return TRUE;
-}
-
-gboolean
-camel_pgp_mime_is_rfc2015_encrypted (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	const char *param;
-#endif
-	int nparts;
-	
-	/* check that we have a multipart/encrypted */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "encrypted"))
-		return FALSE;
-
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	/* check that we have a protocol param with the value: "application/pgp-encrypted" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || g_strcasecmp (param, "application/pgp-encrypted"))
-		return FALSE;
-#endif /* ENABLE_PEDANTIC_PGPMIME */
-	
-	/* check that we have at least 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts < 2)
-		return FALSE;
-	
-	/* The first part should be application/pgp-encrypted */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pgp-encrypted"))
-		return FALSE;
-	
-	/* The second part should be application/octet-stream - this
-           is the one we care most about */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "octet-stream"))
-		return FALSE;
-	
-	return TRUE;
-}
-
-
-static void
-pgp_mime_part_sign_restore_part (CamelMimePart *mime_part, GSList **encodings)
-{
-	CamelDataWrapper *wrapper;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	if (!wrapper)
-		return;
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		int parts, i;
-		
-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));
-		for (i = 0; i < parts; i++) {
-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);
-			
-			pgp_mime_part_sign_restore_part (part, encodings);
-		}
-	} else {
-		CamelMimePartEncodingType encoding;
-		
-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			/* restore the message parts' subparts */
-			pgp_mime_part_sign_restore_part (CAMEL_MIME_PART (wrapper), encodings);
-		} else {
-			encoding = GPOINTER_TO_INT ((*encodings)->data);
-			
-			camel_mime_part_set_encoding (mime_part, encoding);
-			
-			*encodings = (*encodings)->next;
-		}
-	}
-}
-
-static void
-pgp_mime_part_sign_prepare_part (CamelMimePart *mime_part, GSList **encodings)
-{
-	CamelDataWrapper *wrapper;
-	int parts, i;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	if (!wrapper)
-		return;
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));
-		for (i = 0; i < parts; i++) {
-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);
-			
-			pgp_mime_part_sign_prepare_part (part, encodings);
-		}
-	} else {
-		CamelMimePartEncodingType encoding, best;
-		CamelStream *stream, *filtered_stream;
-		CamelMimeFilterBestenc *bestenc;
-		guint32 flags;
-		
-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			/* prepare the message parts' subparts */
-			pgp_mime_part_sign_prepare_part (CAMEL_MIME_PART (wrapper), encodings);
-		} else {
-			encoding = camel_mime_part_get_encoding (mime_part);
-			
-			if (encoding != CAMEL_MIME_PART_ENCODING_BASE64) {
-				flags = CAMEL_BESTENC_GET_ENCODING;
-				
-				stream = camel_stream_null_new ();
-				filtered_stream = (CamelStream *) camel_stream_filter_new_with_stream (stream);
-				camel_object_unref (CAMEL_OBJECT (stream));
-				bestenc = camel_mime_filter_bestenc_new (flags);
-				camel_stream_filter_add (CAMEL_STREAM_FILTER (filtered_stream),
-							 CAMEL_MIME_FILTER (bestenc));
-				
-				camel_data_wrapper_write_to_stream (wrapper, filtered_stream);
-				
-				best = camel_mime_filter_bestenc_get_best_encoding (bestenc, CAMEL_BESTENC_7BIT);
-				
-				camel_object_unref (CAMEL_OBJECT (filtered_stream));
-				camel_object_unref (CAMEL_OBJECT (bestenc));
-				
-				if (encoding != best) {
-					camel_mime_part_set_encoding (mime_part, best);
-					
-					*encodings = g_slist_append (*encodings, GINT_TO_POINTER (encoding));
-				}
-			}
-		}
-	}
-}
-
-
-/**
- * camel_pgp_mime_part_sign:
- * @context: PGP Context
- * @mime_part: a MIME part that will be replaced by a pgp signed part
- * @userid: userid to sign with
- * @hash: one of CAMEL_PGP_HASH_TYPE_MD5 or CAMEL_PGP_HASH_TYPE_SHA1
- * @ex: exception which will be set if there are any errors.
- *
- * Constructs a PGP/MIME multipart in compliance with rfc2015 and
- * replaces @part with the generated multipart/signed. On failure,
- * @ex will be set and #part will remain untouched.
- **/
-void
-camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, const char *userid,
-			  CamelCipherHash hash, CamelException *ex)
-{
-	CamelMimePart *part, *signed_part;
-	CamelMultipart *multipart;
-	CamelContentType *mime_type;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter, *from_filter, *chomp_filter;
-	CamelStream *stream, *sigstream;
-	GSList *encodings = NULL;
-	char *hash_type = NULL;
-	
-	g_return_if_fail (*mime_part != NULL);
-	g_return_if_fail (CAMEL_IS_MIME_PART (*mime_part));
-	g_return_if_fail (userid != NULL);
-	
-	part = *mime_part;
-	
-	/* Prepare all the parts for signing... */
-	pgp_mime_part_sign_prepare_part (part, &encodings);
-	
-	/* get the cleartext */
-	stream = camel_stream_mem_new ();
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	
-	/* Note: see rfc3156, section 3 - second note */
-	from_filter = CAMEL_MIME_FILTER (camel_mime_filter_from_new ());
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (from_filter));
-	camel_object_unref (CAMEL_OBJECT (from_filter));
-	
-	/* Note: see rfc3156, section 5.4 (this is the big thing that changed between rfc2015 and rfc3156) */
-	chomp_filter = camel_mime_filter_chomp_new ();
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (chomp_filter));
-	camel_object_unref (CAMEL_OBJECT (chomp_filter));
-	
-	/* Note: see rfc2015 or rfc3156, section 5.1 */
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,
-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
-	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	
-	/* reset the stream */
-	camel_stream_reset (stream);
-	
-	printf ("attempting to sign data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",
-		CAMEL_STREAM_MEM (stream)->buffer->len, CAMEL_STREAM_MEM (stream)->buffer->data);
-	
-	/* construct the signature stream */
-	sigstream = camel_stream_mem_new ();
-	
-	switch (hash) {
-	case CAMEL_CIPHER_HASH_MD2:
-		/* this is a new addition with rfc3156 */
-		hash_type = "pgp-md2";
-		break;
-	case CAMEL_CIPHER_HASH_MD5:
-		hash_type = "pgp-md5";
-		break;
-	case CAMEL_CIPHER_HASH_SHA1:
-		hash_type = "pgp-sha1";
-		break;
-	case CAMEL_CIPHER_HASH_RIPEMD160:
-		hash_type = "pgp-ripemd160";
-		break;
-	default:
-		/* set a reasonable default */
-		hash = CAMEL_CIPHER_HASH_SHA1;
-		hash_type = "pgp-sha1";
-		break;
-	}
-	
-	/* get the signature */
-	if (camel_pgp_sign (context, userid, hash, stream, sigstream, ex) == -1) {
-		GSList *list;
-		
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_object_unref (CAMEL_OBJECT (sigstream));
-		
-		/* restore the original encoding */
-		list = encodings;
-		pgp_mime_part_sign_restore_part (part, &list);
-		g_slist_free (encodings);
-		return;
-	}
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	camel_stream_reset (sigstream);
-	
-	/* we don't need these anymore... */
-	g_slist_free (encodings);
-	
-	/* construct the pgp-signature mime part */
-	signed_part = camel_mime_part_new ();
-	camel_mime_part_set_content (signed_part, CAMEL_STREAM_MEM (sigstream)->buffer->data,
-				     CAMEL_STREAM_MEM (sigstream)->buffer->len,
-				     "application/pgp-signature; name=signature.asc");
-	camel_mime_part_set_description (signed_part, _("This is a digitally signed message part"));
-	camel_object_unref (CAMEL_OBJECT (sigstream));
-	
-	/* construct the container multipart/signed */
-	multipart = camel_multipart_new ();
-	
-	mime_type = header_content_type_new ("multipart", "signed");
-	header_content_type_set_param (mime_type, "micalg", hash_type);
-	header_content_type_set_param (mime_type, "protocol", "application/pgp-signature");
-	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (multipart), mime_type);
-	header_content_type_unref (mime_type);
-	
-	camel_multipart_set_boundary (multipart, NULL);
-	
-	/* add the parts to the multipart */
-	camel_multipart_add_part (multipart, part);
-	camel_object_unref (CAMEL_OBJECT (part));
-	camel_multipart_add_part (multipart, signed_part);
-	camel_object_unref (CAMEL_OBJECT (signed_part));
-	
-	/* replace the input part with the output part */
-	*mime_part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (*mime_part),
-					 CAMEL_DATA_WRAPPER (multipart));
-	camel_object_unref (CAMEL_OBJECT (multipart));
-}
-
-
-/**
- * camel_pgp_mime_part_verify:
- * @context: PGP Context
- * @mime_part: a multipart/signed MIME Part
- * @ex: exception
- *
- * Returns a CamelCipherValidity on success or NULL on fail.
- **/
-CamelCipherValidity *
-camel_pgp_mime_part_verify (CamelPgpContext *context, CamelMimePart *mime_part, CamelException *ex)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *multipart;
-	CamelMimePart *part, *sigpart;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter, *chomp_filter;
-	CamelStream *stream, *sigstream;
-	CamelCipherValidity *valid;
-	
-	g_return_val_if_fail (mime_part != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);
-	
-	if (!camel_pgp_mime_is_rfc2015_signed (mime_part))
-		return NULL;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	/* get the plain part */
-	part = camel_multipart_get_part (multipart, 0);
-	stream = camel_stream_mem_new ();
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	
-	/* Note: see rfc3156, section 5.4 (this is the big thing that changed between rfc2015 and rfc3156) */
-	chomp_filter = camel_mime_filter_chomp_new ();
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (chomp_filter));
-	camel_object_unref (CAMEL_OBJECT (chomp_filter));
-	
-	/* Note: see rfc2015 or rfc3156, section 5.1 */
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,
-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	
-	wrapper = CAMEL_DATA_WRAPPER (part);
-	camel_data_wrapper_write_to_stream (wrapper, CAMEL_STREAM (filtered_stream));
-	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	camel_stream_reset (stream);
-	
-	/* get the signed part */
-	sigpart = camel_multipart_get_part (multipart, 1);
-	sigstream = camel_stream_mem_new ();
-	camel_data_wrapper_write_to_stream (camel_medium_get_content_object (CAMEL_MEDIUM (sigpart)),
-					    sigstream);
-	camel_stream_reset (sigstream);
-	
-	/* verify */
-	valid = camel_pgp_verify (context, stream, sigstream, ex);
-	
-	printf ("attempted to verify data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",
-		CAMEL_STREAM_MEM (stream)->buffer->len, CAMEL_STREAM_MEM (stream)->buffer->data);
-	
-	camel_object_unref (CAMEL_OBJECT (sigstream));
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return valid;
-}
-
-
-/**
- * camel_pgp_mime_part_encrypt:
- * @context: PGP Context
- * @mime_part: a MIME part that will be replaced by a pgp encrypted part
- * @recipients: list of recipient PGP Key IDs
- * @ex: exception which will be set if there are any errors.
- *
- * Constructs a PGP/MIME multipart in compliance with rfc2015 and
- * replaces #mime_part with the generated multipart/signed. On failure,
- * #ex will be set and #part will remain untouched.
- **/
-void
-camel_pgp_mime_part_encrypt (CamelPgpContext *context, CamelMimePart **mime_part,
-			     GPtrArray *recipients, CamelException *ex)
-{
-	CamelMultipart *multipart;
-	CamelMimePart *part, *version_part, *encrypted_part;
-	CamelContentType *mime_type;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter;
-	CamelStream *stream, *ciphertext;
-	
-	g_return_if_fail (*mime_part != NULL);
-	g_return_if_fail (CAMEL_IS_MIME_PART (*mime_part));
-	g_return_if_fail (recipients != NULL);
-	
-	part = *mime_part;
-	
-	/* get the contents */
-	stream = camel_stream_mem_new ();
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,
-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	camel_stream_reset (stream);
-	
-	/* pgp encrypt */
-	ciphertext = camel_stream_mem_new ();
-	if (camel_pgp_encrypt (context, FALSE, NULL, recipients, stream, ciphertext, ex) == -1) {
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_object_unref (CAMEL_OBJECT (ciphertext));
-		return;
-	}
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	camel_stream_reset (ciphertext);
-	
-	/* construct the version part */
-	version_part = camel_mime_part_new ();
-	camel_mime_part_set_encoding (version_part, CAMEL_MIME_PART_ENCODING_7BIT);
-	camel_mime_part_set_content (version_part, "Version: 1", strlen ("Version: 1"),
-				     "application/pgp-encrypted");
-	
-	/* construct the pgp-encrypted mime part */
-	encrypted_part = camel_mime_part_new ();
-	camel_mime_part_set_content (encrypted_part, CAMEL_STREAM_MEM (ciphertext)->buffer->data,
-				     CAMEL_STREAM_MEM (ciphertext)->buffer->len,
-				     "application/octet-stream; name=encrypted.asc");
-	camel_object_unref (CAMEL_OBJECT (ciphertext));
-	camel_mime_part_set_encoding (encrypted_part, CAMEL_MIME_PART_ENCODING_7BIT);
-	
-	/* construct the container multipart/encrypted */
-	multipart = camel_multipart_new ();
-	
-	mime_type = header_content_type_new ("multipart", "encrypted");
-	header_content_type_set_param (mime_type, "protocol", "application/pgp-encrypted");
-	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (multipart), mime_type);
-	header_content_type_unref (mime_type);
-	
-	camel_multipart_set_boundary (multipart, NULL);
-	
-	/* add the parts to the multipart */
-	camel_multipart_add_part (multipart, version_part);
-	camel_object_unref (CAMEL_OBJECT (version_part));
-	camel_multipart_add_part (multipart, encrypted_part);
-	camel_object_unref (CAMEL_OBJECT (encrypted_part));
-	
-	/* replace the input part with the output part */
-	camel_object_unref (CAMEL_OBJECT (*mime_part));
-	*mime_part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (*mime_part),
-					 CAMEL_DATA_WRAPPER (multipart));
-	camel_object_unref (CAMEL_OBJECT (multipart));
-}
-
-
-/**
- * camel_pgp_mime_part_decrypt:
- * @context: PGP Context
- * @mime_part: a multipart/encrypted MIME Part
- * @ex: exception
- *
- * Returns the decrypted MIME Part on success or NULL on fail.
- **/
-CamelMimePart *
-camel_pgp_mime_part_decrypt (CamelPgpContext *context, CamelMimePart *mime_part, CamelException *ex)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *multipart;
-	CamelMimePart *encrypted_part, *part;
-	CamelContentType *mime_type;
-	CamelStream *stream, *ciphertext;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter;
-	
-	g_return_val_if_fail (mime_part != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);
-	
-	/* make sure the mime part is a multipart/encrypted */
-	if (!camel_pgp_mime_is_rfc2015_encrypted (mime_part))
-		return NULL;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	/* get the encrypted part (second part) */
-	encrypted_part = camel_multipart_get_part (multipart, 1 /* second part starting at 0 */);
-	mime_type = camel_mime_part_get_content_type (encrypted_part);
-	if (!header_content_type_is (mime_type, "application", "octet-stream"))
-		return NULL;
-	
-	/* get the ciphertext */
-	ciphertext = camel_stream_mem_new ();
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (encrypted_part), ciphertext);
-	camel_stream_reset (ciphertext);
-	
-	/* get the cleartext */
-	stream = camel_stream_mem_new ();
-	if (camel_pgp_decrypt (context, ciphertext, stream, ex) == -1) {
-		camel_object_unref (CAMEL_OBJECT (ciphertext));
-		camel_object_unref (CAMEL_OBJECT (stream));
-		return NULL;
-	}
-	
-	camel_object_unref (CAMEL_OBJECT (ciphertext));
-	camel_stream_reset (stream);
-	
-	/* construct the new decrypted mime part from the stream */
-	part = camel_mime_part_new ();
-	
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE,
-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
-	
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	
-	return part;
-}
diff --git a/camel/camel-pgp-mime.h b/camel/camel-pgp-mime.h
deleted file mode 100644
index 7f7928967d..0000000000
--- a/camel/camel-pgp-mime.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_PGP_MIME_H
-#define CAMEL_PGP_MIME_H
-
-#include <glib.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-pgp-context.h>
-#include <camel/camel-exception.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-gboolean camel_pgp_mime_is_rfc2015_signed (CamelMimePart *part);
-gboolean camel_pgp_mime_is_rfc2015_encrypted (CamelMimePart *part);
-
-void camel_pgp_mime_part_sign (CamelPgpContext *context,
-			       CamelMimePart **mime_part,
-			       const char *userid,
-			       CamelCipherHash hash,
-			       CamelException *ex);
-
-CamelCipherValidity *camel_pgp_mime_part_verify (CamelPgpContext *context,
-						 CamelMimePart *mime_part,
-						 CamelException *ex);
-
-void camel_pgp_mime_part_encrypt (CamelPgpContext *context,
-				  CamelMimePart **mime_part,
-				  GPtrArray *recipients,
-				  CamelException *ex);
-
-CamelMimePart *camel_pgp_mime_part_decrypt (CamelPgpContext *context,
-					    CamelMimePart *mime_part,
-					    CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! CAMEL_PGP_MIME_H */
diff --git a/camel/camel-pkcs7-context.c b/camel/camel-pkcs7-context.c
deleted file mode 100644
index c70a8fa96b..0000000000
--- a/camel/camel-pkcs7-context.c
+++ /dev/null
@@ -1,691 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-pkcs7-context.h"
-
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
-
-#include <nss.h>
-#include <cert.h>
-#include <secpkcs7.h>
-
-#include <gtk/gtk.h> /* for _() macro */
-
-#define d(x)
-
-struct _CamelPkcs7ContextPrivate {
-	CERTCertDBHandle *certdb;
-};
-
-
-static int                  pkcs7_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-					CamelStream *istream, CamelStream *ostream, CamelException *ex);
-static int                  pkcs7_clearsign (CamelCipherContext *context, const char *userid,
-					     CamelCipherHash hash, CamelStream *istream,
-					     CamelStream *ostream, CamelException *ex);
-static CamelCipherValidity *pkcs7_verify (CamelCipherContext *context, CamelStream *istream,
-					  CamelStream *sigstream, CamelException *ex);
-static int                  pkcs7_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,
-					   GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,
-					   CamelException *ex);
-static int                  pkcs7_decrypt (CamelCipherContext *context, CamelStream *istream,
-					   CamelStream *ostream, CamelException *ex);
-
-
-static CamelCipherContextClass *parent_class;
-
-static void
-camel_pkcs7_context_init (CamelPkcs7Context *context)
-{
-	context->priv = g_new0 (struct _CamelPkcs7ContextPrivate, 1);
-}
-
-static void
-camel_pkcs7_context_finalise (CamelObject *o)
-{
-	CamelPkcs7Context *context = (CamelPkcs7Context *)o;
-	
-	CERT_ClosePermCertDB (context->priv->certdb);
-	g_free (context->priv->certdb);
-	
-	g_free (context->priv);
-}
-
-static void
-camel_pkcs7_context_class_init (CamelPkcs7ContextClass *camel_pkcs7_context_class)
-{
-	CamelCipherContextClass *camel_cipher_context_class =
-		CAMEL_CIPHER_CONTEXT_CLASS (camel_pkcs7_context_class);
-	
-	parent_class = CAMEL_CIPHER_CONTEXT_CLASS (camel_type_get_global_classfuncs (camel_cipher_context_get_type ()));
-	
-	camel_cipher_context_class->sign = pkcs7_sign;
-	camel_cipher_context_class->clearsign = pkcs7_clearsign;
-	camel_cipher_context_class->verify = pkcs7_verify;
-	camel_cipher_context_class->encrypt = pkcs7_encrypt;
-	camel_cipher_context_class->decrypt = pkcs7_decrypt;
-}
-
-CamelType
-camel_pkcs7_context_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_cipher_context_get_type (),
-					    "CamelPkcs7Context",
-					    sizeof (CamelPkcs7Context),
-					    sizeof (CamelPkcs7ContextClass),
-					    (CamelObjectClassInitFunc) camel_pkcs7_context_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_pkcs7_context_init,
-					    (CamelObjectFinalizeFunc) camel_pkcs7_context_finalise);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_pkcs7_context_new:
- * @session: CamelSession
- * @certdb: certificate db
- *
- * This creates a new CamelPkcs7Context object which is used to sign,
- * verify, encrypt and decrypt streams.
- *
- * Return value: the new CamelPkcs7Context
- **/
-CamelPkcs7Context *
-camel_pkcs7_context_new (CamelSession *session, const char *certdb)
-{
-	CamelPkcs7Context *context;
-	CERTCertDBHandle *handle;
-	
-	g_return_val_if_fail (session != NULL, NULL);
-	
-	context = CAMEL_PKCS7_CONTEXT (camel_object_new (CAMEL_PKCS7_CONTEXT_TYPE));
-	
-	camel_cipher_construct (CAMEL_CIPHER_CONTEXT (context), session);
-	
-	handle = g_new0 (CERTCertDBHandle, 1);
-	if (certdb) {
-		if (!CERT_OpenCertDBFilename (handle, certdb, FALSE)) {
-			g_free (handle);
-			return NULL;
-		}
-	} else {
-		if (!CERT_OpenVolatileCertDB (handle)) {
-			g_free (handle);
-			return NULL;
-		}
-	}
-	
-	context->priv->certdb = handle;
-	
-	return context;
-}
-
-/*----------------------------------------------------------------------*
- *                     Public crypto functions
- *----------------------------------------------------------------------*/
-
-struct _GetPasswdData {
-	CamelSession *session;
-	CamelException *ex;
-	const char *userid;
-};
-
-static SECItem *
-get_zero_len_passwd (SECKEYKeyDBHandle *handle)
-{
-	SECItem *pwitem;
-	SECStatus rv;
-	
-	/* hash the empty string as a password */
-	pwitem = SECKEY_DeriveKeyDBPassword (handle, "");
-	if (pwitem == NULL)
-		return NULL;
-	
-	/* check to see if this is the right password */
-	rv = SECKEY_CheckKeyDBPassword (handle, pwitem);
-	if (rv == SECFailure)
-		return NULL;
-	
-	return pwitem;
-}
-
-static SECItem *
-get_password (void *arg, SECKEYKeyDBHandle *handle)
-{
-	CamelSession *session = ((struct _GetPasswdData *) arg)->session;
-	CamelException *ex = ((struct _GetPasswdData *) arg)->ex;
-	const char *userid = ((struct _GetPasswdData *) arg)->userid;
-	char *prompt, *passwd = NULL;
-	SECItem *pwitem;
-	SECStatus rv;
-	
-	/* Check to see if zero length password or not */
-	pwitem = get_zero_len_passwd (handle);
-	if (pwitem)
-		return pwitem;
-	
-	prompt = g_strdup_printf (_("Please enter your password for %s"), userid);
-	passwd = camel_session_get_password (session, prompt, TRUE,
-					     NULL, userid, NULL);
-	g_free (prompt);
-	
-	/* hash the password */
-	pwitem = SECKEY_DeriveKeyDBPassword (handle, passwd ? passwd : "");
-	
-	/* clear out the password strings */
-	if (passwd) {
-		memset (passwd, 0, strlen (passwd));
-		g_free (passwd);
-	}
-	
-	if (pwitem == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Error hashing password."));
-		
-		return NULL;
-	}
-	
-	/* confirm the password */
-	rv = SECKEY_CheckKeyDBPassword (handle, pwitem);
-	if (rv) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Invalid password."));
-		
-		SECITEM_ZfreeItem (pwitem, PR_TRUE);
-		
-		return NULL;
-	}
-	
-	return pwitem;
-}
-
-static HASH_HashType
-camel_cipher_hash_to_nss (CamelCipherHash hash)
-{
-	switch (hash) {
-	case CAMEL_CIPHER_HASH_DEFAULT:
-		return HASH_AlgSHA1;
-	case CAMEL_CIPHER_HASH_MD2:
-		return HASH_AlgMD2;
-	case CAMEL_CIPHER_HASH_MD5:
-		return HASH_AlgMD5;
-	case CAMEL_CIPHER_HASH_SHA1:
-		return HASH_AlgSHA1;
-	}
-	
-	return HASH_AlgNULL;
-}
-
-static SECOidTag
-nss_hash_to_sec_oid (HASH_HashType hash)
-{
-	switch (hash) {
-	case HASH_AlgMD2:
-		return SEC_OID_MD2;
-	case HASH_AlgMD5:
-		return SEC_OID_MD5;
-	case Hash_AlgSHA1:
-		return SEC_OID_SHA1;
-	default:
-		g_assert_not_reached ();
-		return 0;
-	}
-}
-
-static int
-pkcs7_digest (SECItem *data, char *digestdata, unsigned int *len, unsigned int maxlen, HASH_HashType hash)
-{
-	SECHashObject *hashObj;
-	void *hashcx;
-	
-	hashObj = &SECHashObjects[hash];
-	
-	hashcx = (* hashObj->create)();
-	if (hashcx == NULL)
-		return -1;
-	
-	(* hashObj->begin)(hashcx);
-	(* hashObj->update)(hashcx, data->data, data->len);
-	(* hashObj->end)(hashcx, (unsigned char *)digestdata, len, maxlen);
-	(* hashObj->destroy)(hashcx, PR_TRUE);
-	
-	return 0;
-}
-
-static void
-sec_output_cb (void *arg, const char *buf, unsigned long len)
-{
-	CamelStream *stream;
-	
-	stream = CAMEL_STREAM (arg);
-	camel_stream_write (stream, buf, len);
-}
-
-static int
-pkcs7_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-	    CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);
-	struct _GetPasswdData *data;
-	SEC_PKCS7ContentInfo *cinfo;
-	SECItem data2sign, digest;
-	HASH_HashType hash_type;
-	CERTCertificate *cert;
-	guchar digestdata[32];
-	CamelStream *stream;
-	GByteArray *buf;
-	guint len;
-	
-	g_return_val_if_fail (userid != NULL, -1);
-	g_return_val_if_fail (istream != NULL, -1);
-	g_return_val_if_fail (ostream != NULL, -1);
-	
-	stream = camel_stream_mem_new ();
-	camel_stream_write_to_stream (istream, stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	data2sign.data = buf->data;
-	data2sign.len = buf->len;
-	
-	hash_type = camel_cipher_hash_to_nss (hash);
-	pkcs7_digest (&data2sign, digestdata, &len, 32, hash_type);
-	digest.data = (unsigned char *)digestdata;
-	digest.len = len;
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	cert = CERT_FindCertByNickname (context->priv->certdb, userid);
-	if (!cert) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not sign: certificate not found for \"%s\"."),
-				      userid);
-		return -1;
-	}
-	
-	cinfo = SEC_PKCS7CreateSignedData (cert, certUsageEmailSigner, NULL,
-					   nss_hash_to_sec_oid (hash_type),
-					   &digest, NULL, NULL);
-	
-	SEC_PKCS7IncludeCertChain (cinfo, NULL);
-	
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = ctx->session;
-	data->userid = userid;
-	data->ex = ex;
-	
-	SEC_PKCS7Encode (cinfo, sec_output_cb, ostream, NULL, get_password, data);
-	
-	g_free (data);
-	
-	SEC_PKCS7DestroyContentInfo (cinfo);
-	
-	return 0;
-}
-
-
-static int
-pkcs7_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
-		 CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);
-	struct _GetPasswdData *data;
-	SEC_PKCS7ContentInfo *cinfo;
-	HASH_HashType hash_type;
-	CERTCertificate *cert;
-	CamelStream *stream;
-	SECItem data2sign;
-	GByteArray *buf;
-	
-	g_return_val_if_fail (userid != NULL, -1);
-	g_return_val_if_fail (istream != NULL, -1);
-	g_return_val_if_fail (ostream != NULL, -1);
-	
-	hash_type = camel_cipher_hash_to_nss (hash);
-	
-	cert = CERT_FindCertByNickname (context->priv->certdb, userid);
-	if (!cert) {
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not clearsign: certificate not found for \"%s\"."),
-				      userid);
-		return -1;
-	}
-	
-	cinfo = SEC_PKCS7CreateSignedData (cert, certUsageEmailSigner, NULL,
-					   nss_hash_to_sec_oid (hash_type),
-					   NULL, NULL, NULL);
-	
-	stream = camel_stream_mem_new ();
-	camel_stream_write_to_stream (istream, stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	data2sign.data = buf->data;
-	data2sign.len = buf->len;
-	SEC_PKCS7SetContent (cinfo, (char *)data2sign.data, data2sign.len);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	SEC_PKCS7IncludeCertChain (cinfo, NULL);
-	
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = ctx->session;
-	data->userid = userid;
-	data->ex = ex;
-	
-	SEC_PKCS7Encode (cinfo, sec_output_cb, ostream, NULL, get_password, data);
-	
-	g_free (data);
-	
-	SEC_PKCS7DestroyContentInfo (cinfo);
-	
-	return 0;
-}
-
-#if 0
-/* this is just meant as a reference so I can see what the valid enums are */
-typedef enum {
-	certUsageSSLClient,
-	certUsageSSLServer,
-	certUsageSSLServerWithStepUp,
-	certUsageSSLCA,
-	certUsageEmailSigner,
-	certUsageEmailRecipient,
-	certUsageObjectSigner,
-	certUsageUserCertImport,
-	certUsageVerifyCA,
-	certUsageProtectedObjectSigner,
-	certUsageStatusResponder,
-	certUsageAnyCA
-} SECCertUsage;
-#endif
-
-#if 0
-static HASH_HashType
-AlgorithmToHashType (SECAlgorithmID *digestAlgorithms)
-{
-	SECOidTag tag;
-	
-	tag = SECOID_GetAlgorithmTag (digestAlgorithms);
-	
-	switch (tag) {
-	case SEC_OID_MD2:
-		return HASH_AlgMD2;
-	case SEC_OID_MD5:
-		return HASH_AlgMD5;
-	case SEC_OID_SHA1:
-		return HASH_AlgSHA1;
-	default:
-		g_assert_not_reached ();
-		return HASH_AlgNULL;
-	}
-}
-#endif
-
-/* FIXME: god knows if this code works, NSS "docs" are so not helpful at all */
-static CamelCipherValidity *
-pkcs7_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
-	      CamelStream *sigstream, CamelException *ex)
-{
-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);
-	CamelCipherValidity *valid = NULL;
-	SEC_PKCS7ContentInfo *cinfo;
-	SECCertUsage usage;
-	GByteArray *plaintext;
-	CamelStream *stream;
-	
-	/* create our ContentInfo object */
-	stream = camel_stream_mem_new ();
-	camel_stream_write_to_stream (istream, stream);
-	plaintext = CAMEL_STREAM_MEM (stream)->buffer;
-	cinfo = SEC_PKCS7CreateData ();
-	SEC_PKCS7SetContent (cinfo, plaintext->data, plaintext->len);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	usage = certUsageEmailSigner;  /* just a guess. or maybe certUsageVerifyCA?? */
-	
-	valid = camel_cipher_validity_new ();
-	
-	if (sigstream) {
-		HASH_HashType digest_type;
-		GByteArray *signature;
-		SECItem digest;
-		
-		/* create our digest object */
-		stream = camel_stream_mem_new ();
-		camel_stream_write_to_stream (sigstream, stream);
-		signature = CAMEL_STREAM_MEM (stream)->buffer;
-		digest.data = signature->data;
-		digest.len = signature->len;
-		
-		switch (hash) {
-		default:
-		case CAMEL_CIPHER_HASH_DEFAULT:
-			digest_type = HASH_AlgNULL;
-			break;
-		case CAMEL_CIPHER_HASH_MD2:
-			digest_type = HASH_AlgMD2;
-			break;
-		case CAMEL_CIPHER_HASH_MD5:
-			digest_type = HASH_AlgMD5;
-			break;
-		case CAMEL_CIPHER_HASH_SHA1:
-			digest_type = HASH_AlgSHA1;
-			break;
-		}
-		
-		valid->valid = SEC_PKCS7VerifyDetachedSignature (cinfo, usage, &digest, digest_type, PR_FALSE);
-		camel_object_unref (CAMEL_OBJECT (stream));
-	} else {
-		valid->valid = SEC_PKCS7VerifySignature (cinfo, usage, PR_FALSE);
-	}
-	
-	SEC_PKCS7DestroyContentInfo (cinfo);
-	
-	/* FIXME: set a meaningful description...in UTF8 */
-	camel_cipher_validity_set_description (valid, "");
-	
-	return valid;
-}
-
-/* FIXME: we need to respect the 'sign' argument... */
-static int
-pkcs7_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArray *recipients,
-	       CamelStream *istream, CamelStream *ostream, CamelException *ex)
-{
-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);
-	const char *invalid_userkey = NULL;
-	SEC_PKCS7ContentInfo *cinfo = NULL;
-	CERTCertificate *cert, *usercert;
-	SEC_PKCS7EncoderContext *ecx;
-	struct _GetPasswdData *data;
-	CamelStream *stream = NULL;
-	SECItem secdata;
-	GByteArray *buf;
-	int i = 0;
-	
-	g_return_val_if_fail (userid != NULL, -1);
-	g_return_val_if_fail (recipients != NULL, -1);
-	g_return_val_if_fail (recipients->len != 0, -1);
-	g_return_val_if_fail (istream != NULL, -1);
-	g_return_val_if_fail (ostream != NULL, -1);
-
-#if 0
-	/* this isn't needed until we respect the 'sign' argument... */
-	usercert = CERT_FindCertByNickname (context->priv->certdb, userid);
-	if (!usercert) {
-		invalid_userkey = userid;
-		goto exception;
-	}
-#endif
-	
-	cert = CERT_FindCertByNickname (context->priv->certdb, recipients->pdata[i]);
-	if (!cert) {
-		invalid_userkey = recipients->pdata[i];
-		goto exception;
-	}
-	
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = session;
-	data->userid = userid;
-	data->ex = ex;
-	
-	/* FIXME: extend CamelCipherContext to allow selecting an encryption algorithm?? */
-	cinfo = SEC_PKCS7CreateEncryptedData (SEC_OID_DES_EDE3_CBC, 0, 
-					      get_password, data);
-	
-	g_free (data);
-	
-	if (!cinfo) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not encrypt: failed to create enveloped data."));
-		goto exception;
-	}
-	
-	for (i++; i < recipients->len; i++) {
-		SECStatus retval;
-		
-		cert = CERT_FindCertByNickname (context->priv->certdb, recipients->pdata[i]);
-		if (!cert) {
-			invalid_userkey = recipients->pdata[i];
-			goto exception;
-		}
-		
-		retval = SEC_PKCS7AddRecipient (cinfo, cert, certUsageEmailRecipient, NULL);
-		if (retval != SECSuccess) {
-			invalid_userkey = recipients->pdata[i];
-			goto exception;
-		}
-	}
-	
-	ecx = SEC_PKCS7EncoderStart (cinfo, sec_output_cb, ostream, NULL);
-	if (ecx == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not encrypt: failed to create encryption context."));
-		goto exception;
-	}
-	
-	stream = camel_stream_mem_new ();
-	camel_stream_write_to_stream (istream, stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	if (SEC_PKCS7EncoderUpdate (ecx, buf->data, buf->len) != SECSuccess)
-		goto exception;
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	stream = NULL;
-	
-	if (SEC_PKCS7EncoderFinish (ecx, NULL, NULL) != SECSuccess)
-		goto exception;
-	
-	SEC_PKCS7DestroyContentInfo (cinfo);
-	
-	return 0;
-	
- exception:
-	
-	if (stream)
-		camel_object_unref (CAMEL_OBJECT (stream));
-	
-	if (cinfo)
-		SEC_PKCS7DestroyContentInfo (cinfo);
-	
-	if (invalid_userkey) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not encrypt data: invalid user key: \"%s\"."),
-				      invalid_userkey);
-	}
-	
-	if (!camel_exception_is_set (ex)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not encrypt: encoding failed."));
-	}
-	
-	return -1;
-}
-
-static PRBool
-decryption_allowed (SECAlgorithmID *algid, PK11SymKey *key)
-{
-	return PR_TRUE;
-}
-
-static int
-pkcs7_decrypt (CamelCipherContext *ctx, CamelStream *istream,
-	       CamelStream *ostream, CamelException *ex)
-{
-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);
-	struct _GetPasswdData *data;
-	SEC_PKCS7DecoderContext *dcx;
-	SEC_PKCS7ContentInfo *cinfo;
-	CamelStream *stream = NULL;
-	SECItem secdata;
-	GByteArray *buf;
-	
-	g_return_val_if_fail (istream != NULL, -1);
-	g_return_val_if_fail (ostream != NULL, -1);
-	
-	stream = camel_stream_mem_new ();
-	camel_stream_write_to_stream (istream, stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	secdata.data = buf->data;
-	secdata.len = buf->len;
-	
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = ctx->session;
-	data->userid = NULL;
-	data->ex = ex;
-	
-	dcx = SEC_PKCS7DecoderStart (sec_output_cb, ostream, get_password, data,
-				     NULL, NULL, decryption_allowed);
-	if (dcx == NULL)
-		goto exception;
-	
-	SEC_PKCS7DecoderUpdate (dcx, secdata.data, secdata.len);
-	cinfo = SEC_PKCS7DecoderFinish (dcx);
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	g_free (data);
-	
-	if (cinfo == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to decrypt: Unknown"));
-		return -1;
-	}
-	
-	SEC_PKCS7DestroyContentInfo (cinfo);
-	
-	return 0;
-	
- exception:
-	
-	if (stream)
-		camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return -1;
-}
diff --git a/camel/camel-pkcs7-context.h b/camel/camel-pkcs7-context.h
deleted file mode 100644
index 98c0bd1a86..0000000000
--- a/camel/camel-pkcs7-context.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_PKCS7_CONTEXT_H
-#define CAMEL_PKCS7_CONTEXT_H
-
-#include <camel/camel-session.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-cipher-context.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CAMEL_PKCS7_CONTEXT_TYPE     (camel_pkcs7_context_get_type ())
-#define CAMEL_PKCS7_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PKCS7_CONTEXT_TYPE, CamelPkcs7Context))
-#define CAMEL_PKCS7_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PKCS7_CONTEXT_TYPE, CamelPkcs7ContextClass))
-#define CAMEL_IS_PKCS7_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PKCS7_CONTEXT_TYPE))
-
-typedef struct _CamelPkcs7Context {
-	CamelCipherContext parent_object;
-	
-	struct _CamelPkcs7ContextPrivate *priv;
-	
-} CamelPkcs7Context;
-
-typedef struct _CamelPkcs7ContextClass {
-	CamelCipherContextClass parent_class;
-	
-} CamelPkcs7ContextClass;
-
-
-CamelType            camel_pkcs7_context_get_type (void);
-
-CamelPkcs7Context   *camel_pkcs7_context_new (CamelSession *session, const char *certdb_path);
-
-/* PKCS7 routines */
-#define camel_pkcs7_sign(c, u, h, i, o, e) camel_cipher_sign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)
-
-#define camel_pkcs7_clearsign(c, u, h, i, o, e) camel_cipher_clearsign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)
-
-#define camel_pkcs7_verify(c, i, s, e) camel_cipher_verify (CAMEL_CIPHER_CONTEXT (c), i, s, e)
-
-#define camel_pkcs7_encrypt(c, s, u, r, i, o, e) camel_cipher_encrypt (CAMEL_CIPHER_CONTEXT (c), s, u, r, i, o, e)
-
-#define camel_pkcs7_decrypt(c, i, o, e) camel_cipher_decrypt (CAMEL_CIPHER_CONTEXT (c), i, o, e)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_PKCS7_CONTEXT_H */
diff --git a/camel/camel-private.h b/camel/camel-private.h
deleted file mode 100644
index 81cf2a4dad..0000000000
--- a/camel/camel-private.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *  camel-private.h: Private info for class implementers.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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_PRIVATE_H
-#define CAMEL_PRIVATE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* need a way to configure and save this data, if this header is to
-   be installed.  For now, dont install it */
-
-#include "config.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#include <e-util/e-msgport.h>
-#endif
-
-struct _CamelFolderPrivate {
-#ifdef ENABLE_THREADS
-	EMutex *lock;
-	EMutex *change_lock;
-#endif
-
-	/* must require the 'change_lock' to access this */
-	int frozen;
-	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelFolder *)f)->priv->l))
-#define CAMEL_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelFolder *)f)->priv->l))
-#else
-#define CAMEL_FOLDER_LOCK(f, l)
-#define CAMEL_FOLDER_UNLOCK(f, l)
-#endif
-
-struct _CamelStorePrivate {
-#ifdef ENABLE_THREADS
-	EMutex *folder_lock;	/* for locking folder operations */
-	EMutex *cache_lock;	/* for locking access to the cache */
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)->priv->l))
-#define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)->priv->l))
-#else
-#define CAMEL_STORE_LOCK(f, l)
-#define CAMEL_STORE_UNLOCK(f, l)
-#endif
-
-struct _CamelTransportPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *send_lock;   /* for locking send operations */
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_TRANSPORT_LOCK(f, l) (g_mutex_lock(((CamelTransport *)f)->priv->l))
-#define CAMEL_TRANSPORT_UNLOCK(f, l) (g_mutex_unlock(((CamelTransport *)f)->priv->l))
-#else
-#define CAMEL_TRANSPORT_LOCK(f, l)
-#define CAMEL_TRANSPORT_UNLOCK(f, l)
-#endif
-
-struct _CamelServicePrivate {
-#ifdef ENABLE_THREADS
-	EMutex *connect_lock;	/* for locking connection operations */
-	EMutex *connect_op_lock;/* for locking the connection_op */
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
-#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
-#else
-#define CAMEL_SERVICE_LOCK(f, l)
-#define CAMEL_SERVICE_UNLOCK(f, l)
-#endif
-
-struct _CamelSessionPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *lock;		/* for locking everything basically */
-	GMutex *thread_lock;	/* locking threads */
-
-	int thread_id;
-	GHashTable *thread_active;
-	EThread *thread_queue;
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_SESSION_LOCK(f, l) (g_mutex_lock(((CamelSession *)f)->priv->l))
-#define CAMEL_SESSION_UNLOCK(f, l) (g_mutex_unlock(((CamelSession *)f)->priv->l))
-#else
-#define CAMEL_SESSION_LOCK(f, l)
-#define CAMEL_SESSION_UNLOCK(f, l)
-#endif
-
-
-struct _CamelRemoteStorePrivate {
-#ifdef ENABLE_THREADS
-	EMutex *stream_lock;	/* for locking stream operations */
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_REMOTE_STORE_LOCK(f, l) (e_mutex_lock(((CamelRemoteStore *)f)->priv->l))
-#define CAMEL_REMOTE_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelRemoteStore *)f)->priv->l))
-#else
-#define CAMEL_REMOTE_STORE_LOCK(f, l)
-#define CAMEL_REMOTE_STORE_UNLOCK(f, l)
-#endif
-
-/* most of this stuff really is private, but the lock can be used by subordinate classes */
-struct _CamelFolderSummaryPrivate {
-	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */
-
-	struct _CamelMimeFilterIndex *filter_index;
-	struct _CamelMimeFilterBasic *filter_64;
-	struct _CamelMimeFilterBasic *filter_qp;
-	struct _CamelMimeFilterBasic *filter_uu;
-	struct _CamelMimeFilterSave *filter_save;
-	struct _CamelMimeFilterHTML *filter_html;
-
-	struct _CamelStreamFilter *filter_stream;
-
-	struct _CamelIndex *index;
-
-#ifdef ENABLE_THREADS
-	GMutex *summary_lock;	/* for the summary hashtable/array */
-	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
-	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
-	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelFolderSummary *)f)->priv->l))
-#define CAMEL_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelFolderSummary *)f)->priv->l))
-#else
-#define CAMEL_SUMMARY_LOCK(f, l)
-#define CAMEL_SUMMARY_UNLOCK(f, l)
-#endif
-
-struct _CamelStoreSummaryPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *summary_lock;	/* for the summary hashtable/array */
-	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
-	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_STORE_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelStoreSummary *)f)->priv->l))
-#define CAMEL_STORE_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelStoreSummary *)f)->priv->l))
-#else
-#define CAMEL_STORE_SUMMARY_LOCK(f, l)
-#define CAMEL_STORE_SUMMARY_UNLOCK(f, l)
-#endif
-
-struct _CamelVeeFolderPrivate {
-	GList *folders;			/* lock using subfolder_lock before changing/accessing */
-	GList *folders_changed;		/* for list of folders that have changed between updates */
-
-#ifdef ENABLE_THREADS
-	GMutex *summary_lock;		/* for locking vfolder summary */
-	GMutex *subfolder_lock;		/* for locking the subfolder list */
-	GMutex *changed_lock;		/* for locking the folders-changed list */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_VEE_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelVeeFolder *)f)->priv->l))
-#define CAMEL_VEE_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelVeeFolder *)f)->priv->l))
-#else
-#define CAMEL_VEE_FOLDER_LOCK(f, l)
-#define CAMEL_VEE_FOLDER_UNLOCK(f, l)
-#endif
-
-struct _CamelDataWrapperPrivate {
-#ifdef ENABLE_THREADS
-	pthread_mutex_t stream_lock;
-#else
-	gpointer dummy;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_DATA_WRAPPER_LOCK(dw, l)   (pthread_mutex_lock(&((CamelDataWrapper *)dw)->priv->l))
-#define CAMEL_DATA_WRAPPER_UNLOCK(dw, l) (pthread_mutex_unlock(&((CamelDataWrapper *)dw)->priv->l))
-#else
-#define CAMEL_DATA_WRAPPER_LOCK(dw, l)
-#define CAMEL_DATA_WRAPPER_UNLOCK(dw, l)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_PRIVATE_H */
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
deleted file mode 100644
index f8484278d7..0000000000
--- a/camel/camel-provider.c
+++ /dev/null
@@ -1,191 +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@ximian.com>
- *  Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 ? */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <gmodule.h>
-
-#include "camel-provider.h"
-#include "camel-exception.h"
-#include "hash-table-utils.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];
-	
-	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))) {
-		FILE *fp;
-		
-		p = strchr (d->d_name, '.');
-		if (!p || strcmp (p, ".urls") != 0)
-			continue;
-
-		name = g_strdup_printf ("%s/%s", CAMEL_PROVIDERDIR, d->d_name);
-		fp = fopen (name, "r");
-		if (!fp) {
-			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), fp))) {
-			buf[sizeof (buf) - 1] = '\0';
-			p = strchr (buf, '\n');
-			if (p)
-				*p = '\0';
-			
-			if (*buf)
-				g_hash_table_insert (providers, g_strdup (buf), g_strdup (name));
-		}
-		
-		g_free (name);
-		fclose (fp);
-	}
-
-	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);
-}
-
-
-/**
- * camel_provider_auto_detect:
- * @provider: camel provider
- * @settings: currently set settings
- * @auto_detected: output hash table of auto-detected values
- * @ex: exception
- *
- * After filling in the standard Username/Hostname/Port/Path settings
- * (which must be set in @settings), if the provider supports it, you
- * may wish to have the provider auto-detect further settings based on
- * the aformentioned settings.
- *
- * If the provider does not support auto-detection, @auto_detected
- * will be set to %NULL. Otherwise the provider will attempt to
- * auto-detect whatever it can and file them into @auto_detected. If
- * for some reason it cannot auto-detect anything (not enough
- * information provided in @settings?) then @auto_deetected will be
- * set to %NULL and an exception may be set to explain why it failed.
- *
- * Returns 0 on success or -1 on fail.
- **/
-int
-camel_provider_auto_detect (CamelProvider *provider, CamelURL *url,
-			    GHashTable **auto_detected, CamelException *ex)
-{
-	g_return_val_if_fail (provider != NULL, -1);
-	
-	if (provider->auto_detect) {
-		return provider->auto_detect (url, auto_detected, ex);
-	} else {
-		*auto_detected = NULL;
-		return 0;
-	}
-}
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
deleted file mode 100644
index 5579a8c3d7..0000000000
--- a/camel/camel-provider.h
+++ /dev/null
@@ -1,195 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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>
-#include <camel/camel-exception.h>
-#include <camel/camel-url.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];
-
-/* Provider flags:
- *
- * _IS_REMOTE   the provider works with remote data
- * _IS_LOCAL    it can be used as a backend for local folder
- *                tree folders. (*Not* just the opposite of _IS_REMOTE)
- * _IS_SOURCE   mail arrives there, so it should be offered as an
- *                option in the mail config dialog.
- * _IS_STORAGE  mail is stored there. it will appear in the folder tree.
- * _IS_EXTERNAL it appears in the folder tree but is not created by
- *                the mail component.
- */
-#define CAMEL_PROVIDER_IS_REMOTE	(1 << 0)
-#define CAMEL_PROVIDER_IS_LOCAL		(1 << 1)
-#define CAMEL_PROVIDER_IS_EXTERNAL	(1 << 2)
-#define CAMEL_PROVIDER_IS_SOURCE	(1 << 3)
-#define CAMEL_PROVIDER_IS_STORAGE	(1 << 4)
-#define CAMEL_PROVIDER_SUPPORTS_SSL	(1 << 5)
-
-
-/* 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_PART_USER	 (1 << 0)
-#define CAMEL_URL_PART_AUTH	 (1 << 1)
-#define CAMEL_URL_PART_PASSWORD	 (1 << 2)
-#define CAMEL_URL_PART_HOST	 (1 << 3)
-#define CAMEL_URL_PART_PORT	 (1 << 4)
-#define CAMEL_URL_PART_PATH	 (1 << 5)
-
-#define CAMEL_URL_PART_NEED	       6
-
-/* Use these macros to test a provider's url_flags */
-#define CAMEL_PROVIDER_ALLOWS(prov, flags) (prov->url_flags & (flags | (flags << CAMEL_URL_PART_NEED)))
-#define CAMEL_PROVIDER_NEEDS(prov, flags) (prov->url_flags & (flags << CAMEL_URL_PART_NEED))
-
-/* Providers use these macros to actually define their url_flags */
-#define CAMEL_URL_ALLOW_USER	 (CAMEL_URL_PART_USER)
-#define CAMEL_URL_ALLOW_AUTH	 (CAMEL_URL_PART_AUTH)
-#define CAMEL_URL_ALLOW_PASSWORD (CAMEL_URL_PART_PASSWORD)
-#define CAMEL_URL_ALLOW_HOST	 (CAMEL_URL_PART_HOST)
-#define CAMEL_URL_ALLOW_PORT	 (CAMEL_URL_PART_PORT)
-#define CAMEL_URL_ALLOW_PATH	 (CAMEL_URL_PART_PATH)
-
-#define CAMEL_URL_NEED_USER	 (CAMEL_URL_PART_USER << CAMEL_URL_PART_NEED)
-#define CAMEL_URL_NEED_AUTH	 (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_NEED)
-#define CAMEL_URL_NEED_PASSWORD	 (CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_NEED)
-#define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED)
-#define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED)
-#define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED)
-
-#define CAMEL_URL_PATH_IS_ABSOLUTE (1 << 12)
-
-
-#define CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(prov) (prov->object_types[CAMEL_PROVIDER_STORE] && prov->object_types[CAMEL_PROVIDER_TRANSPORT])
-
-/* Generic extra config stuff */
-typedef enum {
-	CAMEL_PROVIDER_CONF_END,
-	CAMEL_PROVIDER_CONF_SECTION_START,
-	CAMEL_PROVIDER_CONF_SECTION_END,
-	CAMEL_PROVIDER_CONF_CHECKBOX,
-	CAMEL_PROVIDER_CONF_CHECKSPIN,
-	CAMEL_PROVIDER_CONF_ENTRY,
-	CAMEL_PROVIDER_CONF_LABEL,
-} CamelProviderConfType;
-
-typedef struct {
-	CamelProviderConfType type;
-	char *name, *depname;
-	char *text, *value;
-} CamelProviderConfEntry;
-
-
-/* Some defaults */
-#define CAMEL_PROVIDER_CONF_DEFAULT_USERNAME  { CAMEL_PROVIDER_CONF_LABEL, "username", NULL, N_("User_name:"), NULL }
-#define CAMEL_PROVIDER_CONF_DEFAULT_HOSTNAME  { CAMEL_PROVIDER_CONF_LABEL, "hostname", NULL, N_("_Host:"), NULL }
-#define CAMEL_PROVIDER_CONF_DEFAULT_PATH      { CAMEL_PROVIDER_CONF_ENTRY, "path", NULL, N_("_Path:"), "" }
-
-typedef int (*CamelProviderAutoDetectFunc) (CamelURL *url, GHashTable **auto_detected, CamelException *ex);
-
-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;
-	
-	/* Flags describing the provider, flags describing its URLs */
-	int flags, url_flags;
-	
-	/* Extra configuration information */
-	CamelProviderConfEntry *extra_conf;
-	
-	/* auto-detection function */
-	CamelProviderAutoDetectFunc auto_detect;
-	
-	/* CamelType(s) of its store and/or transport. If both are
-	 * set, then they are assumed to be linked together and the
-	 * transport type can only be used in an account that also
-	 * uses the store type (eg, Exchange or NNTP).
-	 */
-	CamelType object_types[CAMEL_NUM_PROVIDER_TYPES];
-	
-	/* GList of CamelServiceAuthTypes the provider supports */
-	GList *authtypes;
-	
-	GHashTable *service_cache[CAMEL_NUM_PROVIDER_TYPES];
-	
-	GHashFunc url_hash;
-	GCompareFunc url_equal;
-} 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);
-
-
-int camel_provider_auto_detect (CamelProvider *provider, CamelURL *url,
-				GHashTable **auto_detected, CamelException *ex);
-
-#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 e9eb4325dd..0000000000
--- a/camel/camel-remote-store.c
+++ /dev/null
@@ -1,634 +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@ximian.com>
- *           based on camel-imap-provider.c
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/time.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-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-tcp-stream.h"
-#include "camel-tcp-stream-raw.h"
-
-#ifdef HAVE_SSL
-#include "camel-tcp-stream-ssl.h"
-#endif
-
-#include "camel-url.h"
-#include "string-utils.h"
-
-#include "camel-private.h"
-#include "camel-operation.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 *parent_class = NULL;
-
-static void     remote_construct       (CamelService *service, CamelSession *session,
-					CamelProvider *provider, CamelURL *url,
-					CamelException *ex);
-static gboolean remote_connect         (CamelService *service, CamelException *ex);
-static gboolean remote_disconnect      (CamelService *service, gboolean clean, CamelException *ex);
-static GList   *remote_query_auth_types(CamelService *service, CamelException *ex);
-static char    *remote_get_name        (CamelService *service, gboolean brief);
-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 int remote_store_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-static int remote_store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-static void
-camel_remote_store_class_init (CamelRemoteStoreClass *camel_remote_store_class)
-{
-	/* virtual method overload */
-	CamelObjectClass *camel_object_class =
-		CAMEL_OBJECT_CLASS (camel_remote_store_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_remote_store_class);
-	
-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));
-	
-	/* virtual method overload */
-	camel_object_class->setv = remote_store_setv;
-	camel_object_class->getv = remote_store_getv;
-	
-	camel_service_class->construct = remote_construct;
-	camel_service_class->connect = remote_connect;
-	camel_service_class->disconnect = remote_disconnect;
-	camel_service_class->query_auth_types = remote_query_auth_types;
-	camel_service_class->get_name = remote_get_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)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	
-	remote_store->istream = NULL;
-	remote_store->ostream = NULL;
-	remote_store->timeout_id = 0;
-
-	remote_store->priv = g_malloc0(sizeof(*remote_store->priv));
-#ifdef ENABLE_THREADS
-	remote_store->priv->stream_lock = e_mutex_new(E_MUTEX_REC);
-#endif
-}
-
-static void
-camel_remote_store_finalise (CamelObject *object)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	CamelService *service = CAMEL_SERVICE (object);
-	
-	if (service->status == CAMEL_SERVICE_CONNECTED) {
-		CamelException ex;
-		
-		camel_exception_init (&ex);
-		camel_service_disconnect (service, TRUE, &ex);
-		if (camel_exception_is_set (&ex)) {
-			g_warning ("camel_remote_store_finalize: silent disconnect failure: %s",
-				   camel_exception_get_description (&ex));   
-		}
-	}
-	
-#ifdef ENABLE_THREADS
-	e_mutex_destroy (remote_store->priv->stream_lock);
-#endif
-	g_free (remote_store->priv);
-}
-
-
-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) camel_remote_store_finalise);
-	}
-	
-	return camel_remote_store_type;
-}
-
-static int
-remote_store_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
-	CamelService *service = (CamelService *) object;
-	CamelURL *url = service->url;
-	guint32 tag;
-	int i;
-	
-	for (i = 0; i < args->argc; i++) {
-		tag = args->argv[i].tag;
-		
-		/* make sure this arg wasn't already handled */
-		if (tag & CAMEL_ARG_IGNORE)
-			continue;
-		
-		/* make sure this is an arg we're supposed to handle */
-		if ((tag & CAMEL_ARG_TAG) <= CAMEL_REMOTE_STORE_ARG_FIRST ||
-		    (tag & CAMEL_ARG_TAG) >= CAMEL_REMOTE_STORE_ARG_FIRST + 100)
-			continue;
-		
-		if (tag == CAMEL_REMOTE_STORE_SSL) {
-			/* set the ssl mode */
-			camel_url_set_param (url, "use_ssl", args->argv[i].ca_str);
-		} else {
-			/* error? */
-			continue;
-		}
-		
-		/* let our parent know that we've handled this arg */
-		camel_argv_ignore (args, i);
-	}
-	
-	return CAMEL_OBJECT_CLASS (parent_class)->setv (object, ex, args);
-}
-
-static int
-remote_store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	CamelService *service = (CamelService *) object;
-	CamelURL *url = service->url;
-	guint32 tag;
-	int i;
-	
-	for (i = 0; i < args->argc; i++) {
-		tag = args->argv[i].tag;
-		
-		/* make sure this is an arg we're supposed to handle */
-		if ((tag & CAMEL_ARG_TAG) <= CAMEL_REMOTE_STORE_ARG_FIRST ||
-		    (tag & CAMEL_ARG_TAG) >= CAMEL_REMOTE_STORE_ARG_FIRST + 100)
-			continue;
-		
-		if (tag == CAMEL_REMOTE_STORE_SSL) {
-			/* get the ssl mode */
-			*args->argv[i].ca_str = (char *) camel_url_get_param (url, "use_ssl");
-		} else {
-			/* error? */
-		}
-	}
-	
-	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
-}
-
-static void
-remote_construct (CamelService *service, CamelSession *session,
-		  CamelProvider *provider, CamelURL *url,
-		  CamelException *ex)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (service);
-
-	CAMEL_SERVICE_CLASS (parent_class)->construct (service, session, provider, url, ex);
-
-	if (camel_url_get_param (url, "use_ssl"))
-		remote_store->use_ssl = TRUE;
-}
-
-
-/* Auth stuff... for now, nothing, but might eventually add SSH tunneling
- */
-
-static GList *
-remote_query_auth_types (CamelService *service, CamelException *ex)
-{
-	return NULL;
-}
-
-GList *
-camel_remote_store_authtype_list (void)
-{
-	return NULL;
-}
-
-
-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)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE(data);
-
-	CRSC (data)->keepalive(store);
-
-	return TRUE;
-}
-
-static gboolean
-remote_connect (CamelService *service, CamelException *ex)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);
-	CamelStream *tcp_stream;
-	struct hostent *h;
-	gint ret, port;
-	
-	h = camel_service_gethost (service, ex);
-	if (!h)
-		return FALSE;
-	
-	if (service->url->port)
-		port = service->url->port;
-	else if (store->use_ssl)
-		port = store->default_ssl_port;
-	else
-		port = store->default_port;	
-	
-#ifdef HAVE_SSL
-	if (store->use_ssl) {
-		tcp_stream = camel_tcp_stream_ssl_new (service, service->url->host);
-	} else {
-		tcp_stream = camel_tcp_stream_raw_new ();
-	}
-#else
-	tcp_stream = camel_tcp_stream_raw_new ();
-#endif /* HAVE_SSL */
-	
-	ret = camel_tcp_stream_connect (CAMEL_TCP_STREAM (tcp_stream), h, port);
-	camel_free_host(h);
-	if (ret == -1) {
-		if (errno == EINTR)
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
-		else
-			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));
-		return FALSE;
-	}
-	
-	/* parent class connect initialization */
-	if (CAMEL_SERVICE_CLASS (parent_class)->connect (service, ex) == FALSE)
-		return FALSE;
-	
-	store->ostream = tcp_stream;
-	store->istream = camel_stream_buffer_new (tcp_stream, CAMEL_STREAM_BUFFER_READ);
-	
-	/* 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 void
-sync_remote_folder (gpointer key, gpointer value, gpointer data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (value);
-	
-	if (!camel_exception_is_set ((CamelException *) data))
-		camel_folder_sync (folder, FALSE, (CamelException *) data);
-}
-
-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 (parent_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 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 (!camel_remote_store_connected (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 if (strstr (cmdbuf, "LOGIN {"))
-			fprintf (stderr, "sending : ------ LOGIN {N+} ....\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) {
-		if (errno == EINTR)
-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-		else
-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));
-		g_free (cmdbuf);
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-	g_free (cmdbuf);
-	
-	return 0;
-}
-
-/* FIXME: All of these functions need an api overhaul, they're not like
-   any other functions, anywhere in the world ... */
-
-/**
- * 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);
-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);
-	ret = CRSC (store)->send_string (store, ex, fmt, ap);
-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);
-	va_end (ap);
-	
-	return ret;
-}
-
-static gint
-remote_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)
-{
-	int ret;
-
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. */
-
-	if (!camel_remote_store_connected (store, ex))
-		return -1;
-	
-	d(fprintf (stderr, "(sending stream)\n"));
-	
-	ret = camel_stream_write_to_stream (stream, store->ostream);
-	if (ret == -1) {
-		if (errno == EINTR)
-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-		else
-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-	}
-
-	return ret;
-}
-
-/**
- * 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)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);
-	
-	ret = CRSC (store)->send_stream (store, stream, ex);
-
-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);
-
-	return ret;
-}
-
-static int
-remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex)
-{
-	CamelStreamBuffer *stream;
-	char *buf;
-	
-	*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 (!camel_remote_store_connected (store, ex)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
-				     g_strerror (errno));
-		return -1;
-	}
-	stream = CAMEL_STREAM_BUFFER (store->istream);
-	
-	buf = camel_stream_buffer_read_line (stream);
-	
-	if (buf == NULL) {
-		if (errno == EINTR)
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Server unexpectedly disconnected: %s"),
-					      g_strerror (errno));
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-	
-	*dest = buf;
-	
-#if d(!)0
-	if (camel_verbose_debug)
-		fprintf (stderr, "received: %s\n", *dest);
-#endif
-	
-	return strlen (*dest);
-}
-
-/**
- * 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: -1 on error, otherwise the length read.
- *
- * Reads a line from the server (terminated by \n or \r\n).
- **/
-
-gint 
-camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,
-			      CamelException *ex)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (dest, -1);
-
-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);
-	
-	ret = CRSC (store)->recv_line (store, dest, ex);
-
-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);
-
-	return ret;
-}
-
-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)
-{
-	CAMEL_STORE_LOCK(store, cache_lock);
-
-	g_hash_table_foreach (CAMEL_STORE (store)->folders, refresh_folder_info, ex);
-
-	CAMEL_STORE_UNLOCK(store, cache_lock);
-}	
-
-/**
- * camel_remote_store_connected:
- * @store: a CamelRemoteStore
- * @ex: a CamelException
- *
- * Ensure that the remote store is connected.
- *
- * Return value: Whether or not it is connected
- **/
-gboolean
-camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex)
-{
-	if (store->istream == NULL)
-		return camel_service_connect (CAMEL_SERVICE (store), ex);
-	return TRUE;
-}
diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h
deleted file mode 100644
index 936388fab0..0000000000
--- a/camel/camel-remote-store.h
+++ /dev/null
@@ -1,93 +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@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/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))
-
-
-enum {
-	CAMEL_REMOTE_STORE_ARG_FIRST  = CAMEL_STORE_ARG_FIRST + 100,
-	CAMEL_REMOTE_STORE_ARG_SSL,
-};
-
-#define CAMEL_REMOTE_STORE_SSL (CAMEL_REMOTE_STORE_ARG_SSL | CAMEL_ARG_STR)
-
-typedef struct {
-	CamelStore parent_object;	
-	struct _CamelRemoteStorePrivate *priv;
-
-	CamelStream *istream, *ostream;
-	guint timeout_id, default_port, default_ssl_port;
-	gboolean use_ssl;
-} 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);
-
-/* FIXME: All of these i/o functions need an api overhaul, they're not like
-   any other functions, anywhere in the world ... */
-
-/* Extra public functions */
-GList *camel_remote_store_authtype_list (void);
-
-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);
-gboolean camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_REMOTE_STORE_H */
diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c
deleted file mode 100644
index 903212492d..0000000000
--- a/camel/camel-sasl-anonymous.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#include "camel-sasl-anonymous.h"
-#include "camel-internet-address.h"
-#include <string.h>
-
-CamelServiceAuthType camel_sasl_anonymous_authtype = {
-	N_("Anonymous"),
-	
-	N_("This option will connect to the server using an anonymous login."),
-	
-	"ANONYMOUS",
-	FALSE
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslAnonymous */
-#define CSA_CLASS(so) CAMEL_SASL_ANONYMOUS_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *anon_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_anonymous_class_init (CamelSaslAnonymousClass *camel_sasl_anonymous_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_anonymous_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = anon_challenge;
-}
-
-static void
-camel_sasl_anonymous_finalize (CamelObject *object)
-{
-	CamelSaslAnonymous *sasl = CAMEL_SASL_ANONYMOUS (object);
-	
-	g_free (sasl->trace_info);
-}
-
-
-CamelType
-camel_sasl_anonymous_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslAnonymous",
-					    sizeof (CamelSaslAnonymous),
-					    sizeof (CamelSaslAnonymousClass),
-					    (CamelObjectClassInitFunc) camel_sasl_anonymous_class_init,
-					    NULL,
-					    NULL,
-					    (CamelObjectFinalizeFunc) camel_sasl_anonymous_finalize);
-	}
-	
-	return type;
-}
-
-CamelSasl *
-camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info)
-{
-	CamelSaslAnonymous *sasl_anon;
-	
-	if (!trace_info && type != CAMEL_SASL_ANON_TRACE_EMPTY) return NULL;
-	
-	sasl_anon = CAMEL_SASL_ANONYMOUS (camel_object_new (camel_sasl_anonymous_get_type ()));
-	sasl_anon->trace_info = g_strdup (trace_info);
-	sasl_anon->type = type;
-	
-	return CAMEL_SASL (sasl_anon);
-}
-
-static GByteArray *
-anon_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	CamelSaslAnonymous *sasl_anon = CAMEL_SASL_ANONYMOUS (sasl);
-	CamelInternetAddress *cia;
-	GByteArray *ret = NULL;
-
-	if (token) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Authentication failed."));
-		return NULL;
-	}
-
-	switch (sasl_anon->type) {
-	case CAMEL_SASL_ANON_TRACE_EMAIL:
-		cia = camel_internet_address_new ();
-		if (camel_internet_address_add (cia, NULL, sasl_anon->trace_info) != 1) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Invalid email address trace information:\n%s"),
-					      sasl_anon->trace_info);
-			camel_object_unref (CAMEL_OBJECT (cia));
-			return NULL;
-		}
-		camel_object_unref (CAMEL_OBJECT (cia));
-		ret = g_byte_array_new ();
-		g_byte_array_append (ret, sasl_anon->trace_info, strlen (sasl_anon->trace_info));
-		break;
-	case CAMEL_SASL_ANON_TRACE_OPAQUE:
-		if (strchr (sasl_anon->trace_info, '@')) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Invalid opaque trace information:\n%s"),
-					      sasl_anon->trace_info);
-			return NULL;
-		}
-		ret = g_byte_array_new ();
-		g_byte_array_append (ret, sasl_anon->trace_info, strlen (sasl_anon->trace_info));
-		break;
-	case CAMEL_SASL_ANON_TRACE_EMPTY:
-		ret = g_byte_array_new ();
-		break;
-	default:
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Invalid trace information:\n%s"),
-				      sasl_anon->trace_info);
-		return NULL;
-	}
-
-	sasl->authenticated = TRUE;
-	return ret;
-}
diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h
deleted file mode 100644
index 5c8bed4a4b..0000000000
--- a/camel/camel-sasl-anonymous.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_ANONYMOUS_H
-#define CAMEL_SASL_ANONYMOUS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_ANONYMOUS_TYPE     (camel_sasl_anonymous_get_type ())
-#define CAMEL_SASL_ANONYMOUS(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymous))
-#define CAMEL_SASL_ANONYMOUS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymousClass))
-#define CAMEL_IS_SASL_ANONYMOUS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_ANONYMOUS_TYPE))
-
-typedef enum {
-	CAMEL_SASL_ANON_TRACE_EMAIL,
-	CAMEL_SASL_ANON_TRACE_OPAQUE,
-	CAMEL_SASL_ANON_TRACE_EMPTY
-} CamelSaslAnonTraceType;
-
-typedef struct _CamelSaslAnonymous {
-	CamelSasl parent_object;
-	
-	char *trace_info;
-	CamelSaslAnonTraceType type;
-} CamelSaslAnonymous;
-
-
-typedef struct _CamelSaslAnonymousClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslAnonymousClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_anonymous_get_type (void);
-
-/* public methods */
-CamelSasl *camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info);
-
-extern CamelServiceAuthType camel_sasl_anonymous_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_ANONYMOUS_H */
diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c
deleted file mode 100644
index f544d48a22..0000000000
--- a/camel/camel-sasl-cram-md5.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <stdio.h>
-#include <string.h>
-#include "camel-sasl-cram-md5.h"
-#include "camel-mime-utils.h"
-#include "camel-service.h"
-#include <e-util/md5-utils.h>
-
-CamelServiceAuthType camel_sasl_cram_md5_authtype = {
-	N_("CRAM-MD5"),
-
-	N_("This option will connect to the server using a "
-	   "secure CRAM-MD5 password, if the server supports it."),
-
-	"CRAM-MD5",
-	TRUE
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslCramMd5 */
-#define CSCM_CLASS(so) CAMEL_SASL_CRAM_MD5_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *cram_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_cram_md5_class_init (CamelSaslCramMd5Class *camel_sasl_cram_md5_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_cram_md5_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = cram_md5_challenge;
-}
-
-CamelType
-camel_sasl_cram_md5_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslCramMd5",
-					    sizeof (CamelSaslCramMd5),
-					    sizeof (CamelSaslCramMd5Class),
-					    (CamelObjectClassInitFunc) camel_sasl_cram_md5_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-/* CRAM-MD5 algorithm:
- * MD5 ((passwd XOR opad), MD5 ((passwd XOR ipad), timestamp))
- */
-
-static GByteArray *
-cram_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	char *passwd;
-	guchar digest[16], md5asc[33], *s, *p;
-	GByteArray *ret = NULL;
-	guchar ipad[64];
-	guchar opad[64];
-	MD5Context ctx;
-	int i, pw_len;
-	
-	/* Need to wait for the server */
-	if (!token)
-		return NULL;
-	
-	g_return_val_if_fail (sasl->service->url->passwd != NULL, NULL);
-	
-	memset (ipad, 0, sizeof (ipad));
-	memset (opad, 0, sizeof (opad));
-	
-	passwd = sasl->service->url->passwd;
-	pw_len = strlen (passwd);
-	if (pw_len <= 64) {
-		memcpy (ipad, passwd, pw_len);
-		memcpy (opad, passwd, pw_len);
-	} else {
-		md5_get_digest (passwd, pw_len, ipad);
-		memcpy (opad, ipad, 16);
-	}
-	
-	for (i = 0; i < 64; i++) {
-		ipad[i] ^= 0x36;
-		opad[i] ^= 0x5c;
-	}
-	
-	md5_init (&ctx);
-	md5_update (&ctx, ipad, 64);
-	md5_update (&ctx, token->data, token->len);
-	md5_final (&ctx, digest);
-	
-	md5_init (&ctx);
-	md5_update (&ctx, opad, 64);
-	md5_update (&ctx, digest, 16);
-	md5_final (&ctx, digest);
-	
-	/* lowercase hexify that bad-boy... */
-	for (s = digest, p = md5asc; p < md5asc + 32; s++, p += 2)
-		sprintf (p, "%.2x", *s);
-	
-	ret = g_byte_array_new ();
-	g_byte_array_append (ret, sasl->service->url->user, strlen (sasl->service->url->user));
-	g_byte_array_append (ret, " ", 1);
-	g_byte_array_append (ret, md5asc, 32);
-	
-	sasl->authenticated = TRUE;
-	
-	return ret;
-}
diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h
deleted file mode 100644
index 2404b453f6..0000000000
--- a/camel/camel-sasl-cram-md5.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_CRAM_MD5_H
-#define CAMEL_SASL_CRAM_MD5_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_CRAM_MD5_TYPE     (camel_sasl_cram_md5_get_type ())
-#define CAMEL_SASL_CRAM_MD5(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5))
-#define CAMEL_SASL_CRAM_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5Class))
-#define CAMEL_IS_SASL_CRAM_MD5(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_CRAM_MD5_TYPE))
-
-typedef struct _CamelSaslCramMd5 {
-	CamelSasl parent_object;
-
-} CamelSaslCramMd5;
-
-
-typedef struct _CamelSaslCramMd5Class {
-	CamelSaslClass parent_class;
-	
-} CamelSaslCramMd5Class;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_cram_md5_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_cram_md5_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_CRAM_MD5_H */
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
deleted file mode 100644
index a88612de7b..0000000000
--- a/camel/camel-sasl-digest-md5.c
+++ /dev/null
@@ -1,895 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <iconv.h>
-#include "camel-sasl-digest-md5.h"
-#include "camel-mime-utils.h"
-#include "camel-charset-map.h"
-#include <e-util/md5-utils.h>
-#include <gal/util/e-iconv.h>
-
-#define d(x)
-
-#define PARANOID(x) x
-
-CamelServiceAuthType camel_sasl_digest_md5_authtype = {
-	N_("DIGEST-MD5"),
-
-	N_("This option will connect to the server using a "
-	   "secure DIGEST-MD5 password, if the server supports it."),
-
-	"DIGEST-MD5",
-	TRUE
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslDigestMd5 */
-#define CSCM_CLASS(so) CAMEL_SASL_DIGEST_MD5_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *digest_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-enum {
-	STATE_AUTH,
-	STATE_FINAL
-};
-
-typedef struct {
-	char *name;
-	guint type;
-} DataType;
-
-enum {
-	DIGEST_REALM,
-	DIGEST_NONCE,
-	DIGEST_QOP,
-	DIGEST_STALE,
-	DIGEST_MAXBUF,
-	DIGEST_CHARSET,
-	DIGEST_ALGORITHM,
-	DIGEST_CIPHER,
-	DIGEST_UNKNOWN
-};
-
-static DataType digest_args[] = {
-	{ "realm",     DIGEST_REALM     },
-	{ "nonce",     DIGEST_NONCE     },
-	{ "qop",       DIGEST_QOP       },
-	{ "stale",     DIGEST_STALE     },
-	{ "maxbuf",    DIGEST_MAXBUF    },
-	{ "charset",   DIGEST_CHARSET   },
-	{ "algorithm", DIGEST_ALGORITHM },
-	{ "cipher",    DIGEST_CIPHER    },
-	{ NULL,        DIGEST_UNKNOWN   }
-};
-
-#define QOP_AUTH           (1<<0)
-#define QOP_AUTH_INT       (1<<1)
-#define QOP_AUTH_CONF      (1<<2)
-#define QOP_INVALID        (1<<3)
-
-static DataType qop_types[] = {
-	{ "auth",      QOP_AUTH      },
-	{ "auth-int",  QOP_AUTH_INT  },
-	{ "auth-conf", QOP_AUTH_CONF },
-	{ NULL,        QOP_INVALID   }
-};
-
-#define CIPHER_DES         (1<<0)
-#define CIPHER_3DES        (1<<1)
-#define CIPHER_RC4         (1<<2)
-#define CIPHER_RC4_40      (1<<3)
-#define CIPHER_RC4_56      (1<<4)
-#define CIPHER_INVALID     (1<<5)
-
-static DataType cipher_types[] = {
-	{ "des",    CIPHER_DES     },
-	{ "3des",   CIPHER_3DES    },
-	{ "rc4",    CIPHER_RC4     },
-	{ "rc4-40", CIPHER_RC4_40  },
-	{ "rc4-56", CIPHER_RC4_56  },
-	{ NULL,     CIPHER_INVALID }
-};
-
-struct _param {
-	char *name;
-	char *value;
-};
-
-struct _DigestChallenge {
-	GPtrArray *realms;
-	char *nonce;
-	guint qop;
-	gboolean stale;
-	gint32 maxbuf;
-	char *charset;
-	char *algorithm;
-	guint cipher;
-	GList *params;
-};
-
-struct _DigestURI {
-	char *type;
-	char *host;
-	char *name;
-};
-
-struct _DigestResponse {
-	char *username;
-	char *realm;
-	char *nonce;
-	char *cnonce;
-	char nc[9];
-	guint qop;
-	struct _DigestURI *uri;
-	char resp[33];
-	guint32 maxbuf;
-	char *charset;
-	guint cipher;
-	char *authzid;
-	char *param;
-};
-
-struct _CamelSaslDigestMd5Private {
-	struct _DigestChallenge *challenge;
-	struct _DigestResponse *response;
-	int state;
-};
-
-static void
-camel_sasl_digest_md5_class_init (CamelSaslDigestMd5Class *camel_sasl_digest_md5_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_digest_md5_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = digest_md5_challenge;
-}
-
-static void
-camel_sasl_digest_md5_init (gpointer object, gpointer klass)
-{
-	CamelSaslDigestMd5 *sasl_digest = CAMEL_SASL_DIGEST_MD5 (object);
-	
-	sasl_digest->priv = g_new0 (struct _CamelSaslDigestMd5Private, 1);
-}
-
-static void
-camel_sasl_digest_md5_finalize (CamelObject *object)
-{
-	CamelSaslDigestMd5 *sasl = CAMEL_SASL_DIGEST_MD5 (object);
-	struct _DigestChallenge *c = sasl->priv->challenge;
-	struct _DigestResponse *r = sasl->priv->response;
-	GList *p;
-	int i;
-	
-	for (i = 0; i < c->realms->len; i++)
-		g_free (c->realms->pdata[i]);
-	g_ptr_array_free (c->realms, TRUE);
-	g_free (c->nonce);
-	g_free (c->charset);
-	g_free (c->algorithm);
-	for (p = c->params; p; p = p->next) {
-		struct _param *param = p->data;
-		
-		g_free (param->name);
-		g_free (param->value);
-		g_free (param);
-	}
-	g_list_free (c->params);
-	g_free (c);
-	
-	g_free (r->username);
-	g_free (r->realm);
-	g_free (r->nonce);
-	g_free (r->cnonce);
-	if (r->uri) {
-		g_free (r->uri->type);
-		g_free (r->uri->host);
-		g_free (r->uri->name);
-	}
-	g_free (r->charset);
-	g_free (r->authzid);
-	g_free (r->param);
-	g_free (r);
-	
-	g_free (sasl->priv);
-}
-
-
-CamelType
-camel_sasl_digest_md5_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslDigestMd5",
-					    sizeof (CamelSaslDigestMd5),
-					    sizeof (CamelSaslDigestMd5Class),
-					    (CamelObjectClassInitFunc) camel_sasl_digest_md5_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_sasl_digest_md5_init,
-					    (CamelObjectFinalizeFunc) camel_sasl_digest_md5_finalize);
-	}
-	
-	return type;
-}
-
-static void
-decode_lwsp (const char **in)
-{
-	const char *inptr = *in;
-	
-	while (isspace (*inptr))
-		inptr++;
-	
-	*in = inptr;
-}
-
-static char *
-decode_quoted_string (const char **in)
-{
-	const char *inptr = *in;
-	char *out = NULL, *outptr;
-	int outlen;
-	int c;
-	
-	decode_lwsp (&inptr);
-	if (*inptr == '"') {
-		const char *intmp;
-		int skip = 0;
-		
-		/* first, calc length */
-		inptr++;
-		intmp = inptr;
-		while ((c = *intmp++) && c != '"') {
-			if (c == '\\' && *intmp) {
-				intmp++;
-				skip++;
-			}
-		}
-		
-		outlen = intmp - inptr - skip;
-		out = outptr = g_malloc (outlen + 1);
-		
-		while ((c = *inptr++) && c != '"') {
-			if (c == '\\' && *inptr) {
-				c = *inptr++;
-			}
-			*outptr++ = c;
-		}
-		*outptr = '\0';
-	}
-	
-	*in = inptr;
-	
-	return out;
-}
-
-static char *
-decode_token (const char **in)
-{
-	const char *inptr = *in;
-	const char *start;
-	
-	decode_lwsp (&inptr);
-	start = inptr;
-	
-	while (*inptr && *inptr != '=' && *inptr != ',')
-		inptr++;
-	
-	if (inptr > start) {
-		*in = inptr;
-		return g_strndup (start, inptr - start);
-	} else {
-		return NULL;
-	}
-}
-
-static char *
-decode_value (const char **in)
-{
-	const char *inptr = *in;
-	
-	decode_lwsp (&inptr);
-	if (*inptr == '"') {
-		d(printf ("decoding quoted string token\n"));
-		return decode_quoted_string (in);
-	} else {
-		d(printf ("decoding string token\n"));
-		return decode_token (in);
-	}
-}
-
-static GList *
-parse_param_list (const char *tokens)
-{
-	GList *params = NULL;
-	struct _param *param;
-	const char *ptr;
-	
-	for (ptr = tokens; ptr && *ptr; ) {
-		param = g_new0 (struct _param, 1);
-		param->name = decode_token (&ptr);
-		if (*ptr == '=') {
-			ptr++;
-			param->value = decode_value (&ptr);
-		}
-		
-		params = g_list_prepend (params, param);
-		
-		if (*ptr == ',')
-			ptr++;
-	}
-	
-	return params;
-}
-
-static guint
-decode_data_type (DataType *dtype, const char *name)
-{
-	int i;
-	
-	for (i = 0; dtype[i].name; i++) {
-		if (!g_strcasecmp (dtype[i].name, name))
-			break;
-	}
-	
-	return dtype[i].type;
-}
-
-#define get_digest_arg(name) decode_data_type (digest_args, name)
-#define decode_qop(name)     decode_data_type (qop_types, name)
-#define decode_cipher(name)  decode_data_type (cipher_types, name)
-
-static const char *
-type_to_string (DataType *dtype, guint type)
-{
-	int i;
-	
-	for (i = 0; dtype[i].name; i++) {
-		if (dtype[i].type == type)
-			break;
-	}
-	
-	return dtype[i].name;
-}
-
-#define qop_to_string(type)    type_to_string (qop_types, type)
-#define cipher_to_string(type) type_to_string (cipher_types, type)
-
-static void
-digest_abort (gboolean *have_type, gboolean *abort)
-{
-	if (*have_type)
-		*abort = TRUE;
-	*have_type = TRUE;
-}
-
-static struct _DigestChallenge *
-parse_server_challenge (const char *tokens, gboolean *abort)
-{
-	struct _DigestChallenge *challenge = NULL;
-	GList *params, *p;
-	const char *ptr;
-#ifdef PARANOID
-	gboolean got_algorithm = FALSE;
-	gboolean got_stale = FALSE;
-	gboolean got_maxbuf = FALSE;
-	gboolean got_charset = FALSE;
-#endif /* PARANOID */
-	
-	params = parse_param_list (tokens);
-	if (!params) {
-		*abort = TRUE;
-		return NULL;
-	}
-	
-	*abort = FALSE;
-	
-	challenge = g_new0 (struct _DigestChallenge, 1);
-	challenge->realms = g_ptr_array_new ();
-	challenge->maxbuf = 65536;
-	
-	for (p = params; p; p = p->next) {
-		struct _param *param = p->data;
-		int type;
-		
-		type = get_digest_arg (param->name);
-		switch (type) {
-		case DIGEST_REALM:
-			for (ptr = param->value; ptr && *ptr; ) {
-				char *token;
-				
-				token = decode_token (&ptr);
-				if (token)
-					g_ptr_array_add (challenge->realms, token);
-				
-				if (*ptr == ',')
-					ptr++;
-			}
-			g_free (param->value);
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_NONCE:
-			g_free (challenge->nonce);
-			challenge->nonce = param->value;
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_QOP:
-			for (ptr = param->value; ptr && *ptr; ) {
-				char *token;
-				
-				token = decode_token (&ptr);
-				if (token)
-					challenge->qop |= decode_qop (token);
-				
-				if (*ptr == ',')
-					ptr++;
-			}
-			
-			if (challenge->qop & QOP_INVALID)
-				challenge->qop = QOP_INVALID;
-			g_free (param->value);
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_STALE:
-			PARANOID (digest_abort (&got_stale, abort));
-			if (!g_strcasecmp (param->value, "true"))
-				challenge->stale = TRUE;
-			else
-				challenge->stale = FALSE;
-			g_free (param->value);
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_MAXBUF:
-			PARANOID (digest_abort (&got_maxbuf, abort));
-			challenge->maxbuf = atoi (param->value);
-			g_free (param->value);
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_CHARSET:
-			PARANOID (digest_abort (&got_charset, abort));
-			g_free (challenge->charset);
-			if (param->value && *param->value)
-				challenge->charset = param->value;
-			else
-				challenge->charset = NULL;
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_ALGORITHM:
-			PARANOID (digest_abort (&got_algorithm, abort));
-			g_free (challenge->algorithm);
-			challenge->algorithm = param->value;
-			g_free (param->name);
-			g_free (param);
-			break;
-		case DIGEST_CIPHER:
-			for (ptr = param->value; ptr && *ptr; ) {
-				char *token;
-				
-				token = decode_token (&ptr);
-				if (token)
-					challenge->cipher |= decode_cipher (token);
-				
-				if (*ptr == ',')
-					ptr++;
-			}
-			if (challenge->cipher & CIPHER_INVALID)
-				challenge->cipher = CIPHER_INVALID;
-			g_free (param->value);
-			g_free (param->name);
-			g_free (param);
-			break;
-		default:
-			challenge->params = g_list_prepend (challenge->params, param);
-			break;
-		}
-	}
-	
-	g_list_free (params);
-	
-	return challenge;
-}
-
-static void
-digest_hex (guchar *digest, guchar hex[33])
-{
-	guchar *s, *p;
-	
-	/* lowercase hexify that bad-boy... */
-	for (s = digest, p = hex; p < hex + 32; s++, p += 2)
-		sprintf (p, "%.2x", *s);
-}
-
-static char *
-digest_uri_to_string (struct _DigestURI *uri)
-{
-	if (uri->name)
-		return g_strdup_printf ("%s/%s/%s", uri->type, uri->host, uri->name);
-	else
-		return g_strdup_printf ("%s/%s", uri->type, uri->host);
-}
-
-static void
-compute_response (struct _DigestResponse *resp, const char *passwd, gboolean client, guchar out[33])
-{
-	guchar hex_a1[33], hex_a2[33];
-	guchar digest[16];
-	MD5Context ctx;
-	char *buf;
-	
-	/* compute A1 */
-	md5_init (&ctx);
-	md5_update (&ctx, resp->username, strlen (resp->username));
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, resp->realm, strlen (resp->realm));
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, passwd, strlen (passwd));
-	md5_final (&ctx, digest);
-	
-	md5_init (&ctx);
-	md5_update (&ctx, digest, 16);
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, resp->nonce, strlen (resp->nonce));
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, resp->cnonce, strlen (resp->cnonce));
-	if (resp->authzid) {
-		md5_update (&ctx, ":", 1);
-		md5_update (&ctx, resp->authzid, strlen (resp->authzid));
-	}
-	
-	/* hexify A1 */
-	md5_final (&ctx, digest);
-	digest_hex (digest, hex_a1);
-	
-	/* compute A2 */
-	md5_init (&ctx);
-	if (client) {
-		/* we are calculating the client response */
-		md5_update (&ctx, "AUTHENTICATE:", strlen ("AUTHENTICATE:"));
-	} else {
-		/* we are calculating the server rspauth */
-		md5_update (&ctx, ":", 1);
-	}
-	
-	buf = digest_uri_to_string (resp->uri);
-	md5_update (&ctx, buf, strlen (buf));
-	g_free (buf);
-	
-	if (resp->qop == QOP_AUTH_INT || resp->qop == QOP_AUTH_CONF)
-		md5_update (&ctx, ":00000000000000000000000000000000", 33);
-	
-	/* now hexify A2 */
-	md5_final (&ctx, digest);
-	digest_hex (digest, hex_a2);
-	
-	/* compute KD */
-	md5_init (&ctx);
-	md5_update (&ctx, hex_a1, 32);
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, resp->nonce, strlen (resp->nonce));
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, resp->nc, 8);
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, resp->cnonce, strlen (resp->cnonce));
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, qop_to_string (resp->qop), strlen (qop_to_string (resp->qop)));
-	md5_update (&ctx, ":", 1);
-	md5_update (&ctx, hex_a2, 32);
-	md5_final (&ctx, digest);
-	
-	digest_hex (digest, out);
-}
-
-static struct _DigestResponse *
-generate_response (struct _DigestChallenge *challenge, struct hostent *host,
-		   const char *protocol, const char *user, const char *passwd)
-{
-	struct _DigestResponse *resp;
-	struct _DigestURI *uri;
-	char *bgen, digest[16];
-	
-	resp = g_new0 (struct _DigestResponse, 1);
-	resp->username = g_strdup (user);
-	/* FIXME: we should use the preferred realm */
-	if (challenge->realms && challenge->realms->len > 0)
-		resp->realm = g_strdup (challenge->realms->pdata[0]);
-	else
-		resp->realm = g_strdup ("");
-	
-	resp->nonce = g_strdup (challenge->nonce);
-	
-	/* generate the cnonce */
-	bgen = g_strdup_printf ("%p:%lu:%lu", resp,
-				(unsigned long) getpid (),
-				(unsigned long) time (0));
-	md5_get_digest (bgen, strlen (bgen), digest);
-	g_free (bgen);
-	/* take our recommended 64 bits of entropy */
-	resp->cnonce = base64_encode_simple (digest, 8);
-	
-	/* we don't support re-auth so the nonce count is always 1 */
-	strcpy (resp->nc, "00000001");
-	
-	/* choose the QOP */
-	/* FIXME: choose - probably choose "auth" ??? */
-	resp->qop = QOP_AUTH;
-	
-	/* create the URI */
-	uri = g_new0 (struct _DigestURI, 1);
-	uri->type = g_strdup (protocol);
-	uri->host = g_strdup (host->h_name);
-	uri->name = NULL;
-	resp->uri = uri;
-	
-	/* charsets... yay */
-	if (challenge->charset) {
-		/* I believe that this is only ever allowed to be
-		 * UTF-8. We strdup the charset specified by the
-		 * challenge anyway, just in case it's not UTF-8.
-		 */
-		resp->charset = g_strdup (challenge->charset);
-	}
-	
-	resp->cipher = CIPHER_INVALID;
-	if (resp->qop == QOP_AUTH_CONF) {
-		/* FIXME: choose a cipher? */
-		resp->cipher = CIPHER_INVALID;
-	}
-	
-	/* we don't really care about this... */
-	resp->authzid = NULL;
-	
-	compute_response (resp, passwd, TRUE, resp->resp);
-	
-	return resp;
-}
-
-static GByteArray *
-digest_response (struct _DigestResponse *resp)
-{
-	GByteArray *buffer;
-	const char *str;
-	char *buf;
-	
-	buffer = g_byte_array_new ();
-	g_byte_array_append (buffer, "username=\"", 10);
-	if (resp->charset) {
-		/* Encode the username using the requested charset */
-		char *username, *outbuf;
-		const char *charset;
-		size_t len, outlen;
-		const char *buf;
-		iconv_t cd;
-		
-		charset = e_iconv_locale_charset();
-		if (!charset)
-			charset = "iso-8859-1";
-		
-		cd = e_iconv_open (resp->charset, charset);
-		
-		len = strlen (resp->username);
-		outlen = 2 * len; /* plenty of space */
-		
-		outbuf = username = g_malloc0 (outlen + 1);
-		buf = resp->username;
-		if (cd == (iconv_t) -1 || e_iconv (cd, &buf, &len, &outbuf, &outlen) == (size_t) -1) {
-			/* We can't convert to UTF-8 - pretend we never got a charset param? */
-			g_free (resp->charset);
-			resp->charset = NULL;
-			
-			/* Set the username to the non-UTF-8 version */
-			g_free (username);
-			username = g_strdup (resp->username);
-		}
-		
-		if (cd != (iconv_t) -1)
-			e_iconv_close (cd);
-		
-		g_byte_array_append (buffer, username, strlen (username));
-		g_free (username);
-	} else {
-		g_byte_array_append (buffer, resp->username, strlen (resp->username));
-	}
-	
-	g_byte_array_append (buffer, "\",realm=\"", 9);
-	g_byte_array_append (buffer, resp->realm, strlen (resp->realm));
-	
-	g_byte_array_append (buffer, "\",nonce=\"", 9);
-	g_byte_array_append (buffer, resp->nonce, strlen (resp->nonce));
-	
-	g_byte_array_append (buffer, "\",cnonce=\"", 10);
-	g_byte_array_append (buffer, resp->cnonce, strlen (resp->cnonce));
-	
-	g_byte_array_append (buffer, "\",nc=", 5);
-	g_byte_array_append (buffer, resp->nc, 8);
-	
-	g_byte_array_append (buffer, ",qop=\"", 6);
-	str = qop_to_string (resp->qop);
-	g_byte_array_append (buffer, str, strlen (str));
-	
-	g_byte_array_append (buffer, "\",digest-uri=\"", 14);
-	buf = digest_uri_to_string (resp->uri);
-	g_byte_array_append (buffer, buf, strlen (buf));
-	g_free (buf);
-	
-	g_byte_array_append (buffer, "\",response=\"", 12);
-	g_byte_array_append (buffer, resp->resp, 32);
-	g_byte_array_append (buffer, "\"", 1);
-	
-	if (resp->maxbuf > 0) {
-		g_byte_array_append (buffer, ",maxbuf=", 8);
-		buf = g_strdup_printf ("%d", resp->maxbuf);
-		g_byte_array_append (buffer, buf, strlen (buf));
-		g_free (buf);
-	}
-	
-	if (resp->charset) {
-		g_byte_array_append (buffer, ",charset=\"", 10);
-		g_byte_array_append (buffer, resp->charset, strlen (resp->charset));
-		g_byte_array_append (buffer, "\"", 1);
-	}
-	
-	if (resp->cipher != CIPHER_INVALID) {
-		str = cipher_to_string (resp->cipher);
-		if (str) {
-			g_byte_array_append (buffer, ",cipher=\"", 9);
-			g_byte_array_append (buffer, str, strlen (str));
-			g_byte_array_append (buffer, "\"", 1);
-		}
-	}
-	
-	if (resp->authzid) {
-		g_byte_array_append (buffer, ",authzid=\"", 10);
-		g_byte_array_append (buffer, resp->authzid, strlen (resp->authzid));
-		g_byte_array_append (buffer, "\"", 1);
-	}
-	
-	return buffer;
-}
-
-static GByteArray *
-digest_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	CamelSaslDigestMd5 *sasl_digest = CAMEL_SASL_DIGEST_MD5 (sasl);
-	struct _CamelSaslDigestMd5Private *priv = sasl_digest->priv;
-	struct _param *rspauth;
-	GByteArray *ret = NULL;
-	gboolean abort = FALSE;
-	struct hostent *h;
-	const char *ptr;
-	guchar out[33];
-	char *tokens;
-	
-	/* Need to wait for the server */
-	if (!token)
-		return NULL;
-	
-	g_return_val_if_fail (sasl->service->url->passwd != NULL, NULL);
-	
-	switch (priv->state) {
-	case STATE_AUTH:
-		if (token->len > 2048) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Server challenge too long (>2048 octets)\n"));
-			return NULL;
-		}
-		
-		tokens = g_strndup (token->data, token->len);
-		priv->challenge = parse_server_challenge (tokens, &abort);
-		g_free (tokens);
-		if (!priv->challenge || abort) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Server challenge invalid\n"));
-			return NULL;
-		}
-		
-		if (priv->challenge->qop == QOP_INVALID) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Server challenge contained invalid "
-						"\"Quality of Protection\" token\n"));
-			return NULL;
-		}
-		
-		h = camel_service_gethost (sasl->service, ex);
-		priv->response = generate_response (priv->challenge, h, sasl->service_name,
-						    sasl->service->url->user,
-						    sasl->service->url->passwd);
-		camel_free_host(h);
-		ret = digest_response (priv->response);
-		
-		break;
-	case STATE_FINAL:
-		if (token->len)
-			tokens = g_strndup (token->data, token->len);
-		else
-			tokens = NULL;
-		
-		if (!tokens || !*tokens) {
-			g_free (tokens);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Server response did not contain authorization data\n"));
-			return NULL;
-		}
-		
-		rspauth = g_new0 (struct _param, 1);
-		
-		ptr = tokens;
-		rspauth->name = decode_token (&ptr);
-		if (*ptr == '=') {
-			ptr++;
-			rspauth->value = decode_value (&ptr);
-		}
-		g_free (tokens);
-		
-		if (!rspauth->value) {
-			g_free (rspauth->name);
-			g_free (rspauth);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Server response contained incomplete authorization data\n"));
-			return NULL;
-		}
-		
-		compute_response (priv->response, sasl->service->url->passwd, FALSE, out);
-		if (memcmp (out, rspauth->value, 32) != 0) {
-			g_free (rspauth->name);
-			g_free (rspauth->value);
-			g_free (rspauth);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Server response does not match\n"));
-			sasl->authenticated = TRUE;
-			
-			return NULL;
-		}
-		
-		g_free (rspauth->name);
-		g_free (rspauth->value);
-		g_free (rspauth);
-		
-		ret = g_byte_array_new ();
-		
-		sasl->authenticated = TRUE;
-	default:
-		break;
-	}
-	
-	priv->state++;
-	
-	return ret;
-}
diff --git a/camel/camel-sasl-digest-md5.h b/camel/camel-sasl-digest-md5.h
deleted file mode 100644
index b71abaa1df..0000000000
--- a/camel/camel-sasl-digest-md5.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_DIGEST_MD5_H
-#define CAMEL_SASL_DIGEST_MD5_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <sys/types.h>
-#include <netdb.h>
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_DIGEST_MD5_TYPE     (camel_sasl_digest_md5_get_type ())
-#define CAMEL_SASL_DIGEST_MD5(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5))
-#define CAMEL_SASL_DIGEST_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5Class))
-#define CAMEL_IS_SASL_DIGEST_MD5(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_DIGEST_MD5_TYPE))
-
-typedef struct _CamelSaslDigestMd5 {
-	CamelSasl parent_object;
-	struct _CamelSaslDigestMd5Private *priv;
-	
-} CamelSaslDigestMd5;
-
-
-typedef struct _CamelSaslDigestMd5Class {
-	CamelSaslClass parent_class;
-	
-} CamelSaslDigestMd5Class;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_digest_md5_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_digest_md5_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_DIGEST_MD5_H */
diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c
deleted file mode 100644
index 50b4581d3f..0000000000
--- a/camel/camel-sasl-kerberos4.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#ifdef HAVE_KRB4
-
-#include <krb.h>
-/* MIT krb4 des.h #defines _. Sigh. We don't need it. #undef it here
- * so we get the gettexty _ definition later.
- */
-#undef _
-
-#include <string.h>
-#include "camel-sasl-kerberos4.h"
-#include "camel-service.h"
-
-CamelServiceAuthType camel_sasl_kerberos4_authtype = {
-	N_("Kerberos 4"),
-
-	N_("This option will connect to the server using "
-	   "Kerberos 4 authentication."),
-
-	"KERBEROS_V4",
-	FALSE
-};
-
-#define KERBEROS_V4_PROTECTION_NONE      1
-#define KERBEROS_V4_PROTECTION_INTEGRITY 2
-#define KERBEROS_V4_PROTECTION_PRIVACY   4
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslKerberos4 */
-#define CSK4_CLASS(so) CAMEL_SASL_KERBEROS4_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-struct _CamelSaslKerberos4Private {
-	int state;
-	
-	guint32 nonce_n;
-	guint32 nonce_h;
-	
-	des_cblock session;
-	des_key_schedule schedule;
-};
-
-static void
-camel_sasl_kerberos4_class_init (CamelSaslKerberos4Class *camel_sasl_kerberos4_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_kerberos4_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = krb4_challenge;
-}
-
-static void
-camel_sasl_kerberos4_init (gpointer object, gpointer klass)
-{
-	CamelSaslKerberos4 *sasl_krb4 = CAMEL_SASL_KERBEROS4 (object);
-	
-	sasl_krb4->priv = g_new0 (struct _CamelSaslKerberos4Private, 1);
-}
-
-static void
-camel_sasl_kerberos4_finalize (CamelObject *object)
-{
-	CamelSaslKerberos4 *sasl = CAMEL_SASL_KERBEROS4 (object);
-
-	if (sasl->priv) {
-		memset (sasl->priv, 0, sizeof (sasl->priv));
-		g_free (sasl->priv);
-	}
-}
-
-
-CamelType
-camel_sasl_kerberos4_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslKerberos4",
-					    sizeof (CamelSaslKerberos4),
-					    sizeof (CamelSaslKerberos4Class),
-					    (CamelObjectClassInitFunc) camel_sasl_kerberos4_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_sasl_kerberos4_init,
-					    (CamelObjectFinalizeFunc) camel_sasl_kerberos4_finalize);
-	}
-	
-	return type;
-}
-
-static GByteArray *
-krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	struct _CamelSaslKerberos4Private *priv = CAMEL_SASL_KERBEROS4 (sasl)->priv;
-	GByteArray *ret = NULL;
-	char *inst, *realm, *username;
-	struct hostent *h;
-	int status, len;
-	KTEXT_ST authenticator;
-	CREDENTIALS credentials;
-	guint32 plus1;
-
-	/* Need to wait for the server */
-	if (!token)
-		return NULL;
-
-	switch (priv->state) {
-	case 0:
-		if (token->len != 4)
-			goto lose;
-
-		memcpy (&priv->nonce_n, token->data, 4);
-		priv->nonce_h = ntohl (priv->nonce_n);
-
-		/* Our response is an authenticator including that number. */
-		h = camel_service_gethost (sasl->service, ex);
-		inst = g_strndup (h->h_name, strcspn (h->h_name, "."));
-		g_strdown (inst);
-		realm = g_strdup (krb_realmofhost (h->h_name));
-		camel_free_host(h);
-		status = krb_mk_req (&authenticator, sasl->service_name, inst, realm, priv->nonce_h);
-		if (status == KSUCCESS) {
-			status = krb_get_cred (sasl->service_name, inst, realm, &credentials);
-			memcpy (priv->session, credentials.session, sizeof (priv->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 (&priv->session, priv->schedule);
-
-		ret = g_byte_array_new ();
-		g_byte_array_append (ret, (const guint8 *)authenticator.dat, authenticator.length);
-		break;
-
-	case 1:
-		if (token->len != 8)
-			goto lose;
-
-		/* This one is encrypted. */
-		des_ecb_encrypt ((des_cblock *)token->data, (des_cblock *)token->data, priv->schedule, 0);
-
-		/* Check that the returned value is the original nonce plus one. */
-		memcpy (&plus1, token->data, 4);
-		if (ntohl (plus1) != priv->nonce_h + 1)
-			goto lose;
-
-		/* "the fifth octet contain[s] a bit-mask specifying the
-		 * protection mechanisms supported by the server"
-		 */
-		if (!(token->data[4] & KERBEROS_V4_PROTECTION_NONE)) {
-			g_warning ("Server does not support `no protection' :-(");
-			goto lose;
-		}
-
-		username = sasl->service->url->user;
-		len = strlen (username) + 9;
-		len += 8 - len % 8;
-		ret = g_byte_array_new ();
-		g_byte_array_set_size (ret, len);
-		memset (ret->data, 0, len);
-		memcpy (ret->data, &priv->nonce_n, 4);
-		ret->data[4] = KERBEROS_V4_PROTECTION_NONE;
-		ret->data[5] = ret->data[6] = ret->data[7] = 0;
-		strcpy (ret->data + 8, username);
-
-		des_pcbc_encrypt ((void *)ret->data, (void *)ret->data, len,
-				  priv->schedule, &priv->session, 1);
-		memset (&priv->session, 0, sizeof (priv->session));
-
-		sasl->authenticated = TRUE;
-		break;
-	}
-
-	priv->state++;
-	return ret;
-
- lose:
-	memset (&priv->session, 0, sizeof (priv->session));
-
-	if (!camel_exception_is_set (ex)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Bad authentication response from server."));
-	}
-	return NULL;
-}
-
-#endif /* HAVE_KRB4 */
diff --git a/camel/camel-sasl-kerberos4.h b/camel/camel-sasl-kerberos4.h
deleted file mode 100644
index cf84345513..0000000000
--- a/camel/camel-sasl-kerberos4.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_KERBEROS4_H
-#define CAMEL_SASL_KERBEROS4_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <sys/types.h>
-#include <netdb.h>
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_KERBEROS4_TYPE     (camel_sasl_kerberos4_get_type ())
-#define CAMEL_SASL_KERBEROS4(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4))
-#define CAMEL_SASL_KERBEROS4_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4Class))
-#define CAMEL_IS_SASL_KERBEROS4(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_KERBEROS4_TYPE))
-
-typedef struct _CamelSaslKerberos4 {
-	CamelSasl parent_object;
-	struct _CamelSaslKerberos4Private *priv;
-
-} CamelSaslKerberos4;
-
-
-typedef struct _CamelSaslKerberos4Class {
-	CamelSaslClass parent_class;
-	
-} CamelSaslKerberos4Class;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_kerberos4_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_kerberos4_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_KERBEROS4_H */
diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c
deleted file mode 100644
index f6c3c9e5f8..0000000000
--- a/camel/camel-sasl-login.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#include "camel-sasl-login.h"
-#include "camel-service.h"
-
-CamelServiceAuthType camel_sasl_login_authtype = {
-	N_("Login"),
-	
-	N_("This option will connect to the server using a "
-	   "simple password."),
-	
-	"LOGIN",
-	TRUE
-};
-
-enum {
-	LOGIN_USER,
-	LOGIN_PASSWD
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslLogin */
-#define CSP_CLASS(so) CAMEL_SASL_LOGIN_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *login_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-struct _CamelSaslLoginPrivate {
-	int state;
-};
-
-static void
-camel_sasl_login_class_init (CamelSaslLoginClass *camel_sasl_login_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_login_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = login_challenge;
-}
-
-static void
-camel_sasl_login_init (gpointer object, gpointer klass)
-{
-	CamelSaslLogin *sasl_login = CAMEL_SASL_LOGIN (object);
-	
-	sasl_login->priv = g_new0 (struct _CamelSaslLoginPrivate, 1);
-}
-
-static void
-camel_sasl_login_finalize (CamelObject *object)
-{
-	CamelSaslLogin *sasl = CAMEL_SASL_LOGIN (object);
-	
-	g_free (sasl->priv);
-}
-
-
-CamelType
-camel_sasl_login_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslLogin",
-					    sizeof (CamelSaslLogin),
-					    sizeof (CamelSaslLoginClass),
-					    (CamelObjectClassInitFunc) camel_sasl_login_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_sasl_login_init,
-					    (CamelObjectFinalizeFunc) camel_sasl_login_finalize);
-	}
-	
-	return type;
-}
-
-static GByteArray *
-login_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	struct _CamelSaslLoginPrivate *priv = CAMEL_SASL_LOGIN (sasl)->priv;
-	GByteArray *buf = NULL;
-	CamelURL *url = sasl->service->url;
-	
-	g_return_val_if_fail (url->passwd != NULL, NULL);
-	
-	switch (priv->state) {
-	case LOGIN_USER:
-		buf = g_byte_array_new ();
-		g_byte_array_append (buf, url->user, strlen (url->user));
-		break;
-	case LOGIN_PASSWD:
-		buf = g_byte_array_new ();
-		g_byte_array_append (buf, url->passwd, strlen (url->passwd));
-		
-		sasl->authenticated = TRUE;
-		break;
-	default:
-		if (!camel_exception_is_set (ex)) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					     _("Unknown authentication state."));
-		}
-	}
-	
-	priv->state++;
-	
-	return buf;
-}
diff --git a/camel/camel-sasl-login.h b/camel/camel-sasl-login.h
deleted file mode 100644
index dffa657202..0000000000
--- a/camel/camel-sasl-login.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_LOGIN_H
-#define CAMEL_SASL_LOGIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_LOGIN_TYPE     (camel_sasl_login_get_type ())
-#define CAMEL_SASL_LOGIN(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_LOGIN_TYPE, CamelSaslLogin))
-#define CAMEL_SASL_LOGIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_LOGIN_TYPE, CamelSaslLoginClass))
-#define CAMEL_IS_SASL_LOGIN(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_LOGIN_TYPE))
-
-typedef struct _CamelSaslLogin {
-	CamelSasl parent_object;
-	
-	struct _CamelSaslLoginPrivate *priv;
-	
-} CamelSaslLogin;
-
-
-typedef struct _CamelSaslLoginClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslLoginClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_login_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_login_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_LOGIN_H */
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
deleted file mode 100644
index ad341353c4..0000000000
--- a/camel/camel-sasl-ntlm.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-sasl-ntlm.h"
-
-#include <ctype.h>
-#include <string.h>
-
-CamelServiceAuthType camel_sasl_ntlm_authtype = {
-	N_("NTLM / SPA"),
-
-	N_("This option will connect to a Windows-based server using "
-	   "NTLM / Secure Password Authentication."),
-
-	"NTLM",
-	TRUE
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-static GByteArray *ntlm_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_ntlm_class_init (CamelSaslNTLMClass *camel_sasl_ntlm_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_ntlm_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = ntlm_challenge;
-}
-
-CamelType
-camel_sasl_ntlm_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_sasl_get_type (), "CamelSaslNTLM",
-			sizeof (CamelSaslNTLM),
-			sizeof (CamelSaslNTLMClass),
-			(CamelObjectClassInitFunc) camel_sasl_ntlm_class_init,
-			NULL, NULL, NULL);
-	}
-
-	return type;
-}
-
-#define NTLM_REQUEST "NTLMSSP\x00\x01\x00\x00\x00\x06\x82\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00"
-
-#define NTLM_CHALLENGE_NONCE_OFFSET      24
-#define NTLM_CHALLENGE_DOMAIN_OFFSET     48
-#define NTLM_CHALLENGE_DOMAIN_LEN_OFFSET 44
-
-#define NTLM_RESPONSE_HEADER         "NTLMSSP\x00\x03\x00\x00\x00"
-#define NTLM_RESPONSE_FLAGS          "\x82\x01"
-#define NTLM_RESPONSE_BASE_SIZE      64
-#define NTLM_RESPONSE_LM_RESP_OFFSET 12
-#define NTLM_RESPONSE_NT_RESP_OFFSET 20
-#define NTLM_RESPONSE_DOMAIN_OFFSET  28
-#define NTLM_RESPONSE_USER_OFFSET    36
-#define NTLM_RESPONSE_HOST_OFFSET    44
-#define NTLM_RESPONSE_FLAGS_OFFSET   60
-
-static void ntlm_calc_response   (const guchar key[21],
-				  const guchar plaintext[8],
-				  guchar results[24]);
-static void ntlm_lanmanager_hash (const char *password, char hash[21]);
-static void ntlm_nt_hash         (const char *password, char hash[21]);
-static void ntlm_set_string      (GByteArray *ba, int offset,
-				  const char *data, int len);
-
-static GByteArray *
-ntlm_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	GByteArray *ret;
-	guchar nonce[8], hash[21], lm_resp[24], nt_resp[24];
-
-	ret = g_byte_array_new ();
-
-	if (!token || !token->len) {
-		g_byte_array_append (ret, NTLM_REQUEST,
-				     sizeof (NTLM_REQUEST) - 1);
-		return ret;
-	}
-
-	memcpy (nonce, token->data + NTLM_CHALLENGE_NONCE_OFFSET, 8);
-	ntlm_lanmanager_hash (sasl->service->url->passwd, hash);
-	ntlm_calc_response (hash, nonce, lm_resp);
-	ntlm_nt_hash (sasl->service->url->passwd, hash);
-	ntlm_calc_response (hash, nonce, nt_resp);
-
-	ret = g_byte_array_new ();
-	g_byte_array_set_size (ret, NTLM_RESPONSE_BASE_SIZE);
-	memset (ret->data, 0, NTLM_RESPONSE_BASE_SIZE);
-	memcpy (ret->data, NTLM_RESPONSE_HEADER,
-		sizeof (NTLM_RESPONSE_HEADER) - 1);
-	memcpy (ret->data + NTLM_RESPONSE_FLAGS_OFFSET,
-		NTLM_RESPONSE_FLAGS, sizeof (NTLM_RESPONSE_FLAGS) - 1);
-
-	ntlm_set_string (ret, NTLM_RESPONSE_DOMAIN_OFFSET,
-			 token->data + NTLM_CHALLENGE_DOMAIN_OFFSET,
-			 atoi (token->data + NTLM_CHALLENGE_DOMAIN_LEN_OFFSET));
-	ntlm_set_string (ret, NTLM_RESPONSE_USER_OFFSET,
-			 sasl->service->url->user,
-			 strlen (sasl->service->url->user));
-	ntlm_set_string (ret, NTLM_RESPONSE_HOST_OFFSET,
-			 "UNKNOWN", sizeof ("UNKNOWN") - 1);
-	ntlm_set_string (ret, NTLM_RESPONSE_LM_RESP_OFFSET,
-			 lm_resp, sizeof (lm_resp));
-	ntlm_set_string (ret, NTLM_RESPONSE_NT_RESP_OFFSET,
-			 nt_resp, sizeof (nt_resp));
-
-	sasl->authenticated = TRUE;
-	return ret;
-}
-
-/* MD4 */
-static void md4sum                (const unsigned char *in, 
-				   int                  nbytes, 
-				   unsigned char        digest[16]);
-
-/* DES */
-typedef unsigned long DES_KS[16][2]; /* Single-key DES key schedule */
-
-static void deskey                (DES_KS, unsigned char *, int);
-
-static void des                   (DES_KS, unsigned char *);
-
-static void setup_schedule        (const guchar *key_56, DES_KS ks);
-
-
-
-#define LM_PASSWORD_MAGIC "\x4B\x47\x53\x21\x40\x23\x24\x25" \
-                          "\x4B\x47\x53\x21\x40\x23\x24\x25" \
-			  "\x00\x00\x00\x00\x00"
-
-static void
-ntlm_lanmanager_hash (const char *password, char hash[21])
-{
-	guchar lm_password [15];
-	DES_KS ks;
-	int i;
-
-	for (i = 0; i < 14 && password [i]; i++)
-		lm_password [i] = toupper ((unsigned char) password [i]);
-
-	for (; i < 15; i++)
-		lm_password [i] = '\0';
-
-	memcpy (hash, LM_PASSWORD_MAGIC, 21);
-
-	setup_schedule (lm_password, ks);
-	des (ks, hash);
-
-	setup_schedule (lm_password + 7, ks);
-	des (ks, hash + 8);
-}
-
-static void
-ntlm_nt_hash (const char *password, char hash[21])
-{
-	unsigned char *buf, *p;
-
-	p = buf = g_malloc (strlen (password) * 2);
-
-	while (*password) {
-		*p++ = *password++;
-		*p++ = '\0';
-	}
-
-	md4sum (buf, p - buf, hash);
-	memset (hash + 16, 0, 5);
-
-	g_free (buf);
-}
-
-static void
-ntlm_set_string (GByteArray *ba, int offset, const char *data, int len)
-{
-	ba->data[offset    ] = ba->data[offset + 2] =  len       & 0xFF;
-	ba->data[offset + 1] = ba->data[offset + 3] = (len >> 8) & 0xFF;
-	ba->data[offset + 4] =  ba->len       & 0xFF;
-	ba->data[offset + 5] = (ba->len >> 8) & 0xFF;
-	g_byte_array_append (ba, data, len);
-}
-
-
-#define KEYBITS(k,s) \
-        (((k[(s)/8] << ((s)%8)) & 0xFF) | (k[(s)/8+1] >> (8-(s)%8)))
-
-/* DES utils */
-/* Set up a key schedule based on a 56bit key */
-static void
-setup_schedule (const guchar *key_56, DES_KS ks)
-{
-	guchar key[8];
-	int i, c, bit;
-
-	for (i = 0; i < 8; i++) {
-		key [i] = KEYBITS (key_56, i * 7);
-
-		/* Fix parity */
-		for (c = bit = 0; bit < 8; bit++)
-			if (key [i] & (1 << bit))
-				c++;
-		if (!(c & 1))
-			key [i] ^= 0x01;
-	}
-
-        deskey (ks, key, 0);
-}
-
-static void
-ntlm_calc_response (const guchar key[21], const guchar plaintext[8],
-		    guchar results[24])
-{
-        DES_KS ks;
-
-	memcpy (results, plaintext, 8);
-	memcpy (results + 8, plaintext, 8);
-	memcpy (results + 16, plaintext, 8);
-
-        setup_schedule (key, ks);
-	des (ks, results);
-
-        setup_schedule (key + 7, ks);
-	des (ks, results + 8);
-
-        setup_schedule (key + 14, ks);
-        des (ks, results + 16);
-}
-
-
-/* 
- * MD4 encoder. (The one everyone else uses is not GPL-compatible;
- * this is a reimplementation from spec.) This doesn't need to be
- * efficient for our purposes, although it would be nice to fix
- * it to not malloc()...
- */
-
-#define F(X,Y,Z) ( ((X)&(Y)) | ((~(X))&(Z)) )
-#define G(X,Y,Z) ( ((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z)) )
-#define H(X,Y,Z) ( (X)^(Y)^(Z) )
-#define ROT(val, n) ( ((val) << (n)) | ((val) >> (32 - (n))) )
-
-static void
-md4sum (const unsigned char *in, int nbytes, unsigned char digest[16])
-{
-	unsigned char *M;
-	guint32 A, B, C, D, AA, BB, CC, DD, X[16];
-	int pbytes, nbits = nbytes * 8, i, j;
-
-	pbytes = (120 - (nbytes % 64)) % 64;
-	M = alloca (nbytes + pbytes + 8);
-	memcpy (M, in, nbytes);
-	memset (M + nbytes, 0, pbytes + 8);
-	M[nbytes] = 0x80;
-	M[nbytes + pbytes] = nbits & 0xFF;
-	M[nbytes + pbytes + 1] = (nbits >> 8) & 0xFF;
-	M[nbytes + pbytes + 2] = (nbits >> 16) & 0xFF;
-	M[nbytes + pbytes + 3] = (nbits >> 24) & 0xFF;
-
-	A = 0x67452301;
-	B = 0xEFCDAB89;
-	C = 0x98BADCFE;
-	D = 0x10325476;
-
-	for (i = 0; i < nbytes + pbytes + 8; i += 64) {
-		for (j = 0; j < 16; j++) {
-			X[j] =  (M[i + j*4]) |
-				(M[i + j*4 + 1] << 8) |
-				(M[i + j*4 + 2] << 16) |
-				(M[i + j*4 + 3] << 24);
-		}
-
-		AA = A;
-		BB = B;
-		CC = C;
-		DD = D;
-
-		A = ROT (A + F(B, C, D) + X[0], 3);
-		D = ROT (D + F(A, B, C) + X[1], 7);
-		C = ROT (C + F(D, A, B) + X[2], 11);
-		B = ROT (B + F(C, D, A) + X[3], 19);
-		A = ROT (A + F(B, C, D) + X[4], 3);
-		D = ROT (D + F(A, B, C) + X[5], 7);
-		C = ROT (C + F(D, A, B) + X[6], 11);
-		B = ROT (B + F(C, D, A) + X[7], 19);
-		A = ROT (A + F(B, C, D) + X[8], 3);
-		D = ROT (D + F(A, B, C) + X[9], 7);
-		C = ROT (C + F(D, A, B) + X[10], 11);
-		B = ROT (B + F(C, D, A) + X[11], 19);
-		A = ROT (A + F(B, C, D) + X[12], 3);
-		D = ROT (D + F(A, B, C) + X[13], 7);
-		C = ROT (C + F(D, A, B) + X[14], 11);
-		B = ROT (B + F(C, D, A) + X[15], 19);
-
-		A = ROT (A + G(B, C, D) + X[0] + 0x5A827999, 3);
-		D = ROT (D + G(A, B, C) + X[4] + 0x5A827999, 5);
-		C = ROT (C + G(D, A, B) + X[8] + 0x5A827999, 9);
-		B = ROT (B + G(C, D, A) + X[12] + 0x5A827999, 13);
-		A = ROT (A + G(B, C, D) + X[1] + 0x5A827999, 3);
-		D = ROT (D + G(A, B, C) + X[5] + 0x5A827999, 5);
-		C = ROT (C + G(D, A, B) + X[9] + 0x5A827999, 9);
-		B = ROT (B + G(C, D, A) + X[13] + 0x5A827999, 13);
-		A = ROT (A + G(B, C, D) + X[2] + 0x5A827999, 3);
-		D = ROT (D + G(A, B, C) + X[6] + 0x5A827999, 5);
-		C = ROT (C + G(D, A, B) + X[10] + 0x5A827999, 9);
-		B = ROT (B + G(C, D, A) + X[14] + 0x5A827999, 13);
-		A = ROT (A + G(B, C, D) + X[3] + 0x5A827999, 3);
-		D = ROT (D + G(A, B, C) + X[7] + 0x5A827999, 5);
-		C = ROT (C + G(D, A, B) + X[11] + 0x5A827999, 9);
-		B = ROT (B + G(C, D, A) + X[15] + 0x5A827999, 13);
-
-		A = ROT (A + H(B, C, D) + X[0] + 0x6ED9EBA1, 3);
-		D = ROT (D + H(A, B, C) + X[8] + 0x6ED9EBA1, 9);
-		C = ROT (C + H(D, A, B) + X[4] + 0x6ED9EBA1, 11);
-		B = ROT (B + H(C, D, A) + X[12] + 0x6ED9EBA1, 15);
-		A = ROT (A + H(B, C, D) + X[2] + 0x6ED9EBA1, 3);
-		D = ROT (D + H(A, B, C) + X[10] + 0x6ED9EBA1, 9);
-		C = ROT (C + H(D, A, B) + X[6] + 0x6ED9EBA1, 11);
-		B = ROT (B + H(C, D, A) + X[14] + 0x6ED9EBA1, 15);
-		A = ROT (A + H(B, C, D) + X[1] + 0x6ED9EBA1, 3);
-		D = ROT (D + H(A, B, C) + X[9] + 0x6ED9EBA1, 9);
-		C = ROT (C + H(D, A, B) + X[5] + 0x6ED9EBA1, 11);
-		B = ROT (B + H(C, D, A) + X[13] + 0x6ED9EBA1, 15);
-		A = ROT (A + H(B, C, D) + X[3] + 0x6ED9EBA1, 3);
-		D = ROT (D + H(A, B, C) + X[11] + 0x6ED9EBA1, 9);
-		C = ROT (C + H(D, A, B) + X[7] + 0x6ED9EBA1, 11);
-		B = ROT (B + H(C, D, A) + X[15] + 0x6ED9EBA1, 15);
-
-		A += AA;
-		B += BB;
-		C += CC;
-		D += DD;
-	}
-
-	digest[0]  =  A        & 0xFF;
-	digest[1]  = (A >>  8) & 0xFF;
-	digest[2]  = (A >> 16) & 0xFF;
-	digest[3]  = (A >> 24) & 0xFF;
-	digest[4]  =  B        & 0xFF;
-	digest[5]  = (B >>  8) & 0xFF;
-	digest[6]  = (B >> 16) & 0xFF;
-	digest[7]  = (B >> 24) & 0xFF;
-	digest[8]  =  C        & 0xFF;
-	digest[9]  = (C >>  8) & 0xFF;
-	digest[10] = (C >> 16) & 0xFF;
-	digest[11] = (C >> 24) & 0xFF;
-	digest[12] =  D        & 0xFF;
-	digest[13] = (D >>  8) & 0xFF;
-	digest[14] = (D >> 16) & 0xFF;
-	digest[15] = (D >> 24) & 0xFF;
-}
-
-
-/* Public domain DES implementation from Phil Karn */
-static unsigned long Spbox[8][64] = {
-	{ 0x01010400, 0x00000000, 0x00010000, 0x01010404,
-	  0x01010004, 0x00010404, 0x00000004, 0x00010000,
-	  0x00000400, 0x01010400, 0x01010404, 0x00000400,
-	  0x01000404, 0x01010004, 0x01000000, 0x00000004,
-	  0x00000404, 0x01000400, 0x01000400, 0x00010400,
-	  0x00010400, 0x01010000, 0x01010000, 0x01000404,
-	  0x00010004, 0x01000004, 0x01000004, 0x00010004,
-	  0x00000000, 0x00000404, 0x00010404, 0x01000000,
-	  0x00010000, 0x01010404, 0x00000004, 0x01010000,
-	  0x01010400, 0x01000000, 0x01000000, 0x00000400,
-	  0x01010004, 0x00010000, 0x00010400, 0x01000004,
-	  0x00000400, 0x00000004, 0x01000404, 0x00010404,
-	  0x01010404, 0x00010004, 0x01010000, 0x01000404,
-	  0x01000004, 0x00000404, 0x00010404, 0x01010400,
-	  0x00000404, 0x01000400, 0x01000400, 0x00000000,
-	  0x00010004, 0x00010400, 0x00000000, 0x01010004 },
-	{ 0x80108020, 0x80008000, 0x00008000, 0x00108020,
-	  0x00100000, 0x00000020, 0x80100020, 0x80008020,
-	  0x80000020, 0x80108020, 0x80108000, 0x80000000,
-	  0x80008000, 0x00100000, 0x00000020, 0x80100020,
-	  0x00108000, 0x00100020, 0x80008020, 0x00000000,
-	  0x80000000, 0x00008000, 0x00108020, 0x80100000,
-	  0x00100020, 0x80000020, 0x00000000, 0x00108000,
-	  0x00008020, 0x80108000, 0x80100000, 0x00008020,
-	  0x00000000, 0x00108020, 0x80100020, 0x00100000,
-	  0x80008020, 0x80100000, 0x80108000, 0x00008000,
-	  0x80100000, 0x80008000, 0x00000020, 0x80108020,
-	  0x00108020, 0x00000020, 0x00008000, 0x80000000,
-	  0x00008020, 0x80108000, 0x00100000, 0x80000020,
-	  0x00100020, 0x80008020, 0x80000020, 0x00100020,
-	  0x00108000, 0x00000000, 0x80008000, 0x00008020,
-	  0x80000000, 0x80100020, 0x80108020, 0x00108000 },
-	{ 0x00000208, 0x08020200, 0x00000000, 0x08020008,
-	  0x08000200, 0x00000000, 0x00020208, 0x08000200,
-	  0x00020008, 0x08000008, 0x08000008, 0x00020000,
-	  0x08020208, 0x00020008, 0x08020000, 0x00000208,
-	  0x08000000, 0x00000008, 0x08020200, 0x00000200,
-	  0x00020200, 0x08020000, 0x08020008, 0x00020208,
-	  0x08000208, 0x00020200, 0x00020000, 0x08000208,
-	  0x00000008, 0x08020208, 0x00000200, 0x08000000,
-	  0x08020200, 0x08000000, 0x00020008, 0x00000208,
-	  0x00020000, 0x08020200, 0x08000200, 0x00000000,
-	  0x00000200, 0x00020008, 0x08020208, 0x08000200,
-	  0x08000008, 0x00000200, 0x00000000, 0x08020008,
-	  0x08000208, 0x00020000, 0x08000000, 0x08020208,
-	  0x00000008, 0x00020208, 0x00020200, 0x08000008,
-	  0x08020000, 0x08000208, 0x00000208, 0x08020000,
-	  0x00020208, 0x00000008, 0x08020008, 0x00020200 },
-	{ 0x00802001, 0x00002081, 0x00002081, 0x00000080,
-	  0x00802080, 0x00800081, 0x00800001, 0x00002001,
-	  0x00000000, 0x00802000, 0x00802000, 0x00802081,
-	  0x00000081, 0x00000000, 0x00800080, 0x00800001,
-	  0x00000001, 0x00002000, 0x00800000, 0x00802001,
-	  0x00000080, 0x00800000, 0x00002001, 0x00002080,
-	  0x00800081, 0x00000001, 0x00002080, 0x00800080,
-	  0x00002000, 0x00802080, 0x00802081, 0x00000081,
-	  0x00800080, 0x00800001, 0x00802000, 0x00802081,
-	  0x00000081, 0x00000000, 0x00000000, 0x00802000,
-	  0x00002080, 0x00800080, 0x00800081, 0x00000001,
-	  0x00802001, 0x00002081, 0x00002081, 0x00000080,
-	  0x00802081, 0x00000081, 0x00000001, 0x00002000,
-	  0x00800001, 0x00002001, 0x00802080, 0x00800081,
-	  0x00002001, 0x00002080, 0x00800000, 0x00802001,
-	  0x00000080, 0x00800000, 0x00002000, 0x00802080 },
-	{ 0x00000100, 0x02080100, 0x02080000, 0x42000100,
-	  0x00080000, 0x00000100, 0x40000000, 0x02080000,
-	  0x40080100, 0x00080000, 0x02000100, 0x40080100,
-	  0x42000100, 0x42080000, 0x00080100, 0x40000000,
-	  0x02000000, 0x40080000, 0x40080000, 0x00000000,
-	  0x40000100, 0x42080100, 0x42080100, 0x02000100,
-	  0x42080000, 0x40000100, 0x00000000, 0x42000000,
-	  0x02080100, 0x02000000, 0x42000000, 0x00080100,
-	  0x00080000, 0x42000100, 0x00000100, 0x02000000,
-	  0x40000000, 0x02080000, 0x42000100, 0x40080100,
-	  0x02000100, 0x40000000, 0x42080000, 0x02080100,
-	  0x40080100, 0x00000100, 0x02000000, 0x42080000,
-	  0x42080100, 0x00080100, 0x42000000, 0x42080100,
-	  0x02080000, 0x00000000, 0x40080000, 0x42000000,
-	  0x00080100, 0x02000100, 0x40000100, 0x00080000,
-	  0x00000000, 0x40080000, 0x02080100, 0x40000100 },
-	{ 0x20000010, 0x20400000, 0x00004000, 0x20404010,
-	  0x20400000, 0x00000010, 0x20404010, 0x00400000,
-	  0x20004000, 0x00404010, 0x00400000, 0x20000010,
-	  0x00400010, 0x20004000, 0x20000000, 0x00004010,
-	  0x00000000, 0x00400010, 0x20004010, 0x00004000,
-	  0x00404000, 0x20004010, 0x00000010, 0x20400010,
-	  0x20400010, 0x00000000, 0x00404010, 0x20404000,
-	  0x00004010, 0x00404000, 0x20404000, 0x20000000,
-	  0x20004000, 0x00000010, 0x20400010, 0x00404000,
-	  0x20404010, 0x00400000, 0x00004010, 0x20000010,
-	  0x00400000, 0x20004000, 0x20000000, 0x00004010,
-	  0x20000010, 0x20404010, 0x00404000, 0x20400000,
-	  0x00404010, 0x20404000, 0x00000000, 0x20400010,
-	  0x00000010, 0x00004000, 0x20400000, 0x00404010,
-	  0x00004000, 0x00400010, 0x20004010, 0x00000000,
-	  0x20404000, 0x20000000, 0x00400010, 0x20004010 },
-	{ 0x00200000, 0x04200002, 0x04000802, 0x00000000,
-	  0x00000800, 0x04000802, 0x00200802, 0x04200800,
-	  0x04200802, 0x00200000, 0x00000000, 0x04000002,
-	  0x00000002, 0x04000000, 0x04200002, 0x00000802,
-	  0x04000800, 0x00200802, 0x00200002, 0x04000800,
-	  0x04000002, 0x04200000, 0x04200800, 0x00200002,
-	  0x04200000, 0x00000800, 0x00000802, 0x04200802,
-	  0x00200800, 0x00000002, 0x04000000, 0x00200800,
-	  0x04000000, 0x00200800, 0x00200000, 0x04000802,
-	  0x04000802, 0x04200002, 0x04200002, 0x00000002,
-	  0x00200002, 0x04000000, 0x04000800, 0x00200000,
-	  0x04200800, 0x00000802, 0x00200802, 0x04200800,
-	  0x00000802, 0x04000002, 0x04200802, 0x04200000,
-	  0x00200800, 0x00000000, 0x00000002, 0x04200802,
-	  0x00000000, 0x00200802, 0x04200000, 0x00000800,
-	  0x04000002, 0x04000800, 0x00000800, 0x00200002 },
-	{ 0x10001040, 0x00001000, 0x00040000, 0x10041040,
-	  0x10000000, 0x10001040, 0x00000040, 0x10000000,
-	  0x00040040, 0x10040000, 0x10041040, 0x00041000,
-	  0x10041000, 0x00041040, 0x00001000, 0x00000040,
-	  0x10040000, 0x10000040, 0x10001000, 0x00001040,
-	  0x00041000, 0x00040040, 0x10040040, 0x10041000,
-	  0x00001040, 0x00000000, 0x00000000, 0x10040040,
-	  0x10000040, 0x10001000, 0x00041040, 0x00040000,
-	  0x00041040, 0x00040000, 0x10041000, 0x00001000,
-	  0x00000040, 0x10040040, 0x00001000, 0x00041040,
-	  0x10001000, 0x00000040, 0x10000040, 0x10040000,
-	  0x10040040, 0x10000000, 0x00040000, 0x10001040,
-	  0x00000000, 0x10041040, 0x00040040, 0x10000040,
-	  0x10040000, 0x10001000, 0x10001040, 0x00000000,
-	  0x10041040, 0x00041000, 0x00041000, 0x00001040,
-	  0x00001040, 0x00040040, 0x10000000, 0x10041000 }
-};
-
-#undef F
-#define	F(l,r,key){\
-	work = ((r >> 4) | (r << 28)) ^ key[0];\
-	l ^= Spbox[6][work & 0x3f];\
-	l ^= Spbox[4][(work >> 8) & 0x3f];\
-	l ^= Spbox[2][(work >> 16) & 0x3f];\
-	l ^= Spbox[0][(work >> 24) & 0x3f];\
-	work = r ^ key[1];\
-	l ^= Spbox[7][work & 0x3f];\
-	l ^= Spbox[5][(work >> 8) & 0x3f];\
-	l ^= Spbox[3][(work >> 16) & 0x3f];\
-	l ^= Spbox[1][(work >> 24) & 0x3f];\
-}
-/* Encrypt or decrypt a block of data in ECB mode */
-static void
-des(ks,block)
-unsigned long ks[16][2];	/* Key schedule */
-unsigned char block[8];		/* Data block */
-{
-	unsigned long left,right,work;
-	
-	/* Read input block and place in left/right in big-endian order */
-	left = ((unsigned long)block[0] << 24)
-	 | ((unsigned long)block[1] << 16)
-	 | ((unsigned long)block[2] << 8)
-	 | (unsigned long)block[3];
-	right = ((unsigned long)block[4] << 24)
-	 | ((unsigned long)block[5] << 16)
-	 | ((unsigned long)block[6] << 8)
-	 | (unsigned long)block[7];
-
-	/* Hoey's clever initial permutation algorithm, from Outerbridge
-	 * (see Schneier p 478)	
-	 *
-	 * The convention here is the same as Outerbridge: rotate each
-	 * register left by 1 bit, i.e., so that "left" contains permuted
-	 * input bits 2, 3, 4, ... 1 and "right" contains 33, 34, 35, ... 32	
-	 * (using origin-1 numbering as in the FIPS). This allows us to avoid
-	 * one of the two rotates that would otherwise be required in each of
-	 * the 16 rounds.
-	 */
-	work = ((left >> 4) ^ right) & 0x0f0f0f0f;
-	right ^= work;
-	left ^= work << 4;
-	work = ((left >> 16) ^ right) & 0xffff;
-	right ^= work;
-	left ^= work << 16;
-	work = ((right >> 2) ^ left) & 0x33333333;
-	left ^= work;
-	right ^= (work << 2);
-	work = ((right >> 8) ^ left) & 0xff00ff;
-	left ^= work;
-	right ^= (work << 8);
-	right = (right << 1) | (right >> 31);
-	work = (left ^ right) & 0xaaaaaaaa;
-	left ^= work;
-	right ^= work;
-	left = (left << 1) | (left >> 31);
-
-	/* Now do the 16 rounds */
-	F(left,right,ks[0]);
-	F(right,left,ks[1]);
-	F(left,right,ks[2]);
-	F(right,left,ks[3]);
-	F(left,right,ks[4]);
-	F(right,left,ks[5]);
-	F(left,right,ks[6]);
-	F(right,left,ks[7]);
-	F(left,right,ks[8]);
-	F(right,left,ks[9]);
-	F(left,right,ks[10]);
-	F(right,left,ks[11]);
-	F(left,right,ks[12]);
-	F(right,left,ks[13]);
-	F(left,right,ks[14]);
-	F(right,left,ks[15]);
-
-	/* Inverse permutation, also from Hoey via Outerbridge and Schneier */
-	right = (right << 31) | (right >> 1);
-	work = (left ^ right) & 0xaaaaaaaa;
-	left ^= work;
-	right ^= work;
-	left = (left >> 1) | (left  << 31);
-	work = ((left >> 8) ^ right) & 0xff00ff;
-	right ^= work;
-	left ^= work << 8;
-	work = ((left >> 2) ^ right) & 0x33333333;
-	right ^= work;
-	left ^= work << 2;
-	work = ((right >> 16) ^ left) & 0xffff;
-	left ^= work;
-	right ^= work << 16;
-	work = ((right >> 4) ^ left) & 0x0f0f0f0f;
-	left ^= work;
-	right ^= work << 4;
-
-	/* Put the block back into the user's buffer with final swap */
-	block[0] = right >> 24;
-	block[1] = right >> 16;
-	block[2] = right >> 8;
-	block[3] = right;
-	block[4] = left >> 24;
-	block[5] = left >> 16;
-	block[6] = left >> 8;
-	block[7] = left;
-}
-
-/* Key schedule-related tables from FIPS-46 */
-
-/* permuted choice table (key) */
-static unsigned char pc1[] = {
-	57, 49, 41, 33, 25, 17,  9,
-	 1, 58, 50, 42, 34, 26, 18,
-	10,  2, 59, 51, 43, 35, 27,
-	19, 11,  3, 60, 52, 44, 36,
-
-	63, 55, 47, 39, 31, 23, 15,
-	 7, 62, 54, 46, 38, 30, 22,
-	14,  6, 61, 53, 45, 37, 29,
-	21, 13,  5, 28, 20, 12,  4
-};
-
-/* number left rotations of pc1 */
-static unsigned char totrot[] = {
-	1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28
-};
-
-/* permuted choice key (table) */
-static unsigned char pc2[] = {
-	14, 17, 11, 24,  1,  5,
-	 3, 28, 15,  6, 21, 10,
-	23, 19, 12,  4, 26,  8,
-	16,  7, 27, 20, 13,  2,
-	41, 52, 31, 37, 47, 55,
-	30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53,
-	46, 42, 50, 36, 29, 32
-};
-
-/* End of DES-defined tables */
-
-
-/* bit 0 is left-most in byte */
-static int bytebit[] = {
-	0200,0100,040,020,010,04,02,01
-};
-
-
-/* Generate key schedule for encryption or decryption
- * depending on the value of "decrypt"
- */
-static void
-deskey(k,key,decrypt)
-DES_KS k;			/* Key schedule array */
-unsigned char *key;		/* 64 bits (will use only 56) */
-int decrypt;			/* 0 = encrypt, 1 = decrypt */
-{
-	unsigned char pc1m[56];		/* place to modify pc1 into */
-	unsigned char pcr[56];		/* place to rotate pc1 into */
-	register int i,j,l;
-	int m;
-	unsigned char ks[8];
-
-	for (j=0; j<56; j++) {		/* convert pc1 to bits of key */
-		l=pc1[j]-1;		/* integer bit location	 */
-		m = l & 07;		/* find bit		 */
-		pc1m[j]=(key[l>>3] &	/* find which key byte l is in */
-			bytebit[m])	/* and which bit of that byte */
-			? 1 : 0;	/* and store 1-bit result */
-	}
-	for (i=0; i<16; i++) {		/* key chunk for each iteration */
-		memset(ks,0,sizeof(ks));	/* Clear key schedule */
-		for (j=0; j<56; j++)	/* rotate pc1 the right amount */
-			pcr[j] = pc1m[(l=j+totrot[decrypt? 15-i : i])<(j<28? 28 : 56) ? l: l-28];
-			/* rotate left and right halves independently */
-		for (j=0; j<48; j++){	/* select bits individually */
-			/* check bit that goes to ks[j] */
-			if (pcr[pc2[j]-1]){
-				/* mask it in if it's there */
-				l= j % 6;
-				ks[j/6] |= bytebit[l] >> 2;
-			}
-		}
-		/* Now convert to packed odd/even interleaved form */
-		k[i][0] = ((long)ks[0] << 24)
-		 | ((long)ks[2] << 16)
-		 | ((long)ks[4] << 8)
-		 | ((long)ks[6]);
-		k[i][1] = ((long)ks[1] << 24)
-		 | ((long)ks[3] << 16)
-		 | ((long)ks[5] << 8)
-		 | ((long)ks[7]);
-	}
-}
diff --git a/camel/camel-sasl-ntlm.h b/camel/camel-sasl-ntlm.h
deleted file mode 100644
index 3818081c74..0000000000
--- a/camel/camel-sasl-ntlm.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_NTLM_H
-#define CAMEL_SASL_NTLM_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_NTLM_TYPE     (camel_sasl_ntlm_get_type ())
-#define CAMEL_SASL_NTLM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLM))
-#define CAMEL_SASL_NTLM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLMClass))
-#define CAMEL_IS_SASL_NTLM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_NTLM_TYPE))
-
-typedef struct _CamelSaslNTLM {
-	CamelSasl parent_object;
-
-} CamelSaslNTLM;
-
-
-typedef struct _CamelSaslNTLMClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslNTLMClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_ntlm_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_ntlm_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_NTLM_H */
diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c
deleted file mode 100644
index 6965f32c4d..0000000000
--- a/camel/camel-sasl-plain.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#include "camel-sasl-plain.h"
-#include "camel-service.h"
-
-CamelServiceAuthType camel_sasl_plain_authtype = {
-	N_("Password"),
-
-	N_("This option will connect to the server using a "
-	   "simple password."),
-
-	"PLAIN",
-	TRUE
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslPlain */
-#define CSP_CLASS(so) CAMEL_SASL_PLAIN_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_plain_class_init (CamelSaslPlainClass *camel_sasl_plain_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_plain_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = plain_challenge;
-}
-
-CamelType
-camel_sasl_plain_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslPlain",
-					    sizeof (CamelSaslPlain),
-					    sizeof (CamelSaslPlainClass),
-					    (CamelObjectClassInitFunc) camel_sasl_plain_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static GByteArray *
-plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	GByteArray *buf = NULL;
-	CamelURL *url = sasl->service->url;
-
-#if 0
-	if (token) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Authentication failed."));
-		return NULL;
-	}
-#endif
-	
-	g_return_val_if_fail (url->passwd != NULL, NULL);
-	
-	/* FIXME: make sure these are "UTF8-SAFE" */
-	buf = g_byte_array_new ();
-	g_byte_array_append (buf, "", 1);
-	g_byte_array_append (buf, url->user, strlen (url->user));
-	g_byte_array_append (buf, "", 1);
-	g_byte_array_append (buf, url->passwd, strlen (url->passwd));
-	
-	sasl->authenticated = TRUE;
-	
-	return buf;
-}
diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h
deleted file mode 100644
index a23568047e..0000000000
--- a/camel/camel-sasl-plain.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_PLAIN_H
-#define CAMEL_SASL_PLAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_PLAIN_TYPE     (camel_sasl_plain_get_type ())
-#define CAMEL_SASL_PLAIN(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlain))
-#define CAMEL_SASL_PLAIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlainClass))
-#define CAMEL_IS_SASL_PLAIN(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_PLAIN_TYPE))
-
-typedef struct _CamelSaslPlain {
-	CamelSasl parent_object;
-
-} CamelSaslPlain;
-
-
-typedef struct _CamelSaslPlainClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslPlainClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_plain_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_plain_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_PLAIN_H */
diff --git a/camel/camel-sasl-popb4smtp.c b/camel/camel-sasl-popb4smtp.c
deleted file mode 100644
index 7e1b6baaf0..0000000000
--- a/camel/camel-sasl-popb4smtp.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#include <time.h>
-#include "camel-sasl-popb4smtp.h"
-#include "camel-service.h"
-#include "camel-session.h"
-
-CamelServiceAuthType camel_sasl_popb4smtp_authtype = {
-	N_("POP before SMTP"),
-
-	N_("This option will authorise a POP connection before attempting SMTP"),
-
-	"POPB4SMTP",
-	FALSE,
-};
-
-/* last time the pop was accessed (through the auth method anyway), *time_t */
-static GHashTable *poplast;
-
-/* use 1 hour as our pop timeout */
-#define POPB4SMTP_TIMEOUT (60*60)
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-#define POPB4SMTP_LOCK(l) pthread_mutex_lock(&l)
-#define POPB4SMTP_UNLOCK(l) pthread_mutex_unlock(&l)
-#else
-#define POPB4SMTP_LOCK(l)
-#define POPB4SMTP_UNLOCK(l)
-#endif
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslPOPB4SMTP */
-#define CSP_CLASS(so) CAMEL_SASL_POPB4SMTP_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *popb4smtp_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_popb4smtp_class_init (CamelSaslPOPB4SMTPClass *camel_sasl_popb4smtp_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_popb4smtp_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = popb4smtp_challenge;
-
-	poplast = g_hash_table_new(g_str_hash, g_str_equal);
-}
-
-CamelType
-camel_sasl_popb4smtp_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslPOPB4SMTP",
-					    sizeof (CamelSaslPOPB4SMTP),
-					    sizeof (CamelSaslPOPB4SMTPClass),
-					    (CamelObjectClassInitFunc) camel_sasl_popb4smtp_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static GByteArray *
-popb4smtp_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	char *popuri;
-	CamelSession *session = sasl->service->session;
-	CamelStore *store;
-	time_t now, *timep;
-
-	sasl->authenticated = FALSE;
-
-	popuri = camel_session_get_password(session, _("POP Source URI"), FALSE,
-					    sasl->service, "popb4smtp_uri", ex);
-
-	if (popuri == NULL) {
-		camel_exception_setv(ex, 1, _("POP Before SMTP auth using an unknown transport"));
-		return NULL;
-	}
-
-	if (strncasecmp(popuri, "pop:", 4) != 0) {
-		camel_exception_setv(ex, 1, _("POP Before SMTP auth using a non-pop source"));
-		return NULL;
-	}
-
-	/* check if we've done it before recently in this session */
-	now = time(0);
-
-	/* need to lock around the whole thing until finished with timep */
-
-	POPB4SMTP_LOCK(lock);
-	timep = g_hash_table_lookup(poplast, popuri);
-	if (timep) {
-		if ((*timep + POPB4SMTP_TIMEOUT) > now) {
-			sasl->authenticated = TRUE;
-			POPB4SMTP_UNLOCK(lock);
-			g_free(popuri);
-			return NULL;
-		}
-	} else {
-		timep = g_malloc0(sizeof(*timep));
-		g_hash_table_insert(poplast, g_strdup(popuri), timep);
-	}
-
-	/* connect to pop session */
-	store = camel_session_get_store(session, popuri, ex);
-	if (store) {
-		sasl->authenticated = TRUE;
-		camel_object_unref((CamelObject *)store);
-		*timep = now;
-	} else {
-		sasl->authenticated = FALSE;
-		*timep = 0;
-	}
-
-	POPB4SMTP_UNLOCK(lock);
-
-	g_free(popuri);
-	
-	return NULL;
-}
diff --git a/camel/camel-sasl-popb4smtp.h b/camel/camel-sasl-popb4smtp.h
deleted file mode 100644
index b94bed0d49..0000000000
--- a/camel/camel-sasl-popb4smtp.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_POPB4SMTP_H
-#define CAMEL_SASL_POPB4SMTP_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_POPB4SMTP_TYPE     (camel_sasl_popb4smtp_get_type ())
-#define CAMEL_SASL_POPB4SMTP(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTP))
-#define CAMEL_SASL_POPB4SMTP_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTPClass))
-#define CAMEL_IS_SASL_POPB4SMTP(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_POPB4SMTP_TYPE))
-
-typedef struct _CamelSaslPOPB4SMTP {
-	CamelSasl parent_object;
-
-} CamelSaslPOPB4SMTP;
-
-
-typedef struct _CamelSaslPOPB4SMTPClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslPOPB4SMTPClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_popb4smtp_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_popb4smtp_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_POPB4SMTP_H */
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
deleted file mode 100644
index 1ce1286be1..0000000000
--- a/camel/camel-sasl.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#include "camel-sasl.h"
-#include "camel-mime-utils.h"
-#include "camel-service.h"
-
-#include "camel-sasl-cram-md5.h"
-#include "camel-sasl-digest-md5.h"
-#include "camel-sasl-kerberos4.h"
-#include "camel-sasl-login.h"
-#include "camel-sasl-plain.h"
-#include "camel-sasl-popb4smtp.h"
-#include "camel-sasl-ntlm.h"
-
-#define w(x)
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelSasl */
-#define CS_CLASS(so) CAMEL_SASL_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_class_init (CamelSaslClass *camel_sasl_class)
-{
-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);
-	
-	/* virtual method definition */
-	camel_sasl_class->challenge = sasl_challenge;
-}
-
-static void
-camel_sasl_finalize (CamelSasl *sasl)
-{
-	g_free (sasl->service_name);
-	camel_object_unref (CAMEL_OBJECT (sasl->service));
-}
-
-CamelType
-camel_sasl_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_OBJECT_TYPE,
-					    "CamelSasl",
-					    sizeof (CamelSasl),
-					    sizeof (CamelSaslClass),
-					    (CamelObjectClassInitFunc) camel_sasl_class_init,
-					    NULL,
-					    NULL,
-					    (CamelObjectFinalizeFunc) camel_sasl_finalize);
-	}
-	
-	return type;
-}
-
-
-static GByteArray *
-sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	w(g_warning ("sasl_challenge: Using default implementation!"));
-	return NULL;
-}
-
-/**
- * camel_sasl_challenge:
- * @sasl: a SASL object
- * @token: a token, or %NULL
- * @ex: exception
- *
- * If @token is %NULL, generate the initial SASL message to send to
- * the server. (This will be %NULL if the client doesn't initiate the
- * exchange.) Otherwise, @token is a challenge from the server, and
- * the return value is the response.
- *
- * Return value: The SASL response or %NULL. If an error occurred, @ex
- * will also be set.
- **/
-GByteArray *
-camel_sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_SASL (sasl), NULL);
-	
-	return CS_CLASS (sasl)->challenge (sasl, token, ex);
-}
-
-/**
- * camel_sasl_challenge_base64:
- * @sasl: a SASL object
- * @token: a base64-encoded token
- * @ex: exception
- *
- * As with camel_sasl_challenge(), but the challenge @token and the
- * response are both base64-encoded.
- *
- * Return value: As with camel_sasl_challenge(), but base64-encoded.
- **/
-char *
-camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex)
-{
-	GByteArray *token_binary, *ret_binary;
-	char *ret;
-	int len;
-	
-	g_return_val_if_fail (CAMEL_IS_SASL (sasl), NULL);
-	
-	if (token) {
-		token_binary = g_byte_array_new ();
-		len = strlen (token);
-		g_byte_array_append (token_binary, token, len);
-		token_binary->len = base64_decode_simple (token_binary->data, len);
-	} else
-		token_binary = NULL;
-	
-	ret_binary = camel_sasl_challenge (sasl, token_binary, ex);
-	if (token_binary)
-		g_byte_array_free (token_binary, TRUE);
-	if (!ret_binary)
-		return NULL;
-	
-	ret = base64_encode_simple (ret_binary->data, ret_binary->len);
-	g_byte_array_free (ret_binary, TRUE);
-
-	return ret;
-}
-
-/**
- * camel_sasl_authenticated:
- * @sasl: a SASL object
- *
- * Return value: whether or not @sasl has successfully authenticated
- * the user. This will be %TRUE after it returns the last needed response.
- * The caller must still pass that information on to the server and verify
- * that it has accepted it.
- **/
-gboolean
-camel_sasl_authenticated (CamelSasl *sasl)
-{
-	return sasl->authenticated;
-}
-
-
-/**
- * camel_sasl_new:
- * @service_name: the SASL service name
- * @mechanism: the SASL mechanism
- * @service: the CamelService that will be using this SASL
- *
- * Return value: a new CamelSasl for the given @service_name,
- * @mechanism, and @service, or %NULL if the mechanism is not
- * supported.
- **/
-CamelSasl *
-camel_sasl_new (const char *service_name, const char *mechanism, CamelService *service)
-{
-	CamelSasl *sasl;
-	
-	g_return_val_if_fail (service_name != NULL, NULL);
-	g_return_val_if_fail (mechanism != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-	
-	/* We don't do ANONYMOUS here, because it's a little bit weird. */
-	
-	if (!strcmp (mechanism, "CRAM-MD5"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_CRAM_MD5_TYPE);
-	else if (!strcmp (mechanism, "DIGEST-MD5"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_DIGEST_MD5_TYPE);
-#ifdef HAVE_KRB4
-	else if (!strcmp (mechanism, "KERBEROS_V4"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_KERBEROS4_TYPE);
-#endif
-	else if (!strcmp (mechanism, "PLAIN"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_PLAIN_TYPE);
-	else if (!strcmp (mechanism, "LOGIN"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_LOGIN_TYPE);
-	else if (!strcmp (mechanism, "POPB4SMTP"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_POPB4SMTP_TYPE);
-	else if (!strcmp (mechanism, "NTLM"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_NTLM_TYPE);
-	else
-		return NULL;
-	
-	sasl->service_name = g_strdup (service_name);
-	sasl->service = service;
-	camel_object_ref (CAMEL_OBJECT (service));
-	
-	return sasl;
-}
-
-/**
- * camel_sasl_authtype_list:
- * @include_plain: whether or not to include the PLAIN mechanism
- *
- * Return value: a GList of SASL-supported authtypes. The caller must
- * free the list, but not the contents.
- **/
-GList *
-camel_sasl_authtype_list (gboolean include_plain)
-{
-	GList *types = NULL;
-	
-	types = g_list_prepend (types, &camel_sasl_cram_md5_authtype);
-	types = g_list_prepend (types, &camel_sasl_digest_md5_authtype);
-#ifdef HAVE_KRB4
-	types = g_list_prepend (types, &camel_sasl_kerberos4_authtype);
-#endif
-	types = g_list_prepend (types, &camel_sasl_ntlm_authtype);
-	if (include_plain)
-		types = g_list_prepend (types, &camel_sasl_plain_authtype);
-	
-	return types;
-}
-
-/**
- * camel_sasl_authtype:
- * @mechanism: the SASL mechanism to get an authtype for
- *
- * Return value: a CamelServiceAuthType for the given mechanism, if
- * it is supported.
- **/
-CamelServiceAuthType *
-camel_sasl_authtype (const char *mechanism)
-{
-	if (!strcmp (mechanism, "CRAM-MD5"))
-		return &camel_sasl_cram_md5_authtype;
-	else if (!strcmp (mechanism, "DIGEST-MD5"))
-		return &camel_sasl_digest_md5_authtype;
-#ifdef HAVE_KRB4
-	else if (!strcmp (mechanism, "KERBEROS_V4"))
-		return &camel_sasl_kerberos4_authtype;
-#endif
-	else if (!strcmp (mechanism, "PLAIN"))
-		return &camel_sasl_plain_authtype;
-	else if (!strcmp (mechanism, "LOGIN"))
-		return &camel_sasl_login_authtype;
-	else if (!strcmp(mechanism, "POPB4SMTP"))
-		return &camel_sasl_popb4smtp_authtype;
-	else if (!strcmp (mechanism, "NTLM"))
-		return &camel_sasl_ntlm_authtype;
-	else
-		return NULL;
-}
diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h
deleted file mode 100644
index 38b9a8f02b..0000000000
--- a/camel/camel-sasl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SASL_H
-#define CAMEL_SASL_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <camel/camel-object.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-
-#define CAMEL_SASL_TYPE     (camel_sasl_get_type ())
-#define CAMEL_SASL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_TYPE, CamelSasl))
-#define CAMEL_SASL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_TYPE, CamelSaslClass))
-#define CAMEL_IS_SASL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_TYPE))
-
-typedef struct _CamelSasl {
-	CamelObject parent_object;
-	
-	char *service_name;
-	CamelService *service;
-	gboolean authenticated;
-} CamelSasl;
-
-
-typedef struct _CamelSaslClass {
-	CamelObjectClass parent_class;
-	
-	GByteArray *    (*challenge)   (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-} CamelSaslClass;
-
-
-/* Standard Camel function */
-CamelType  camel_sasl_get_type (void);
-
-/* public methods */
-GByteArray *camel_sasl_challenge        (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-char       *camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex);
-
-gboolean    camel_sasl_authenticated    (CamelSasl *sasl);
-
-/* utility functions */
-CamelSasl  *camel_sasl_new              (const char *service_name, const char *mechanism, CamelService *service);
-
-GList                *camel_sasl_authtype_list (gboolean include_plain);
-CamelServiceAuthType *camel_sasl_authtype      (const char *mechanism);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_H */
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
deleted file mode 100644
index 7e8553cd35..0000000000
--- a/camel/camel-search-private.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	     Michael Zucchi <NotZed@Ximian.com>
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *  Copyright 2001 Ximian Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-/* (from glibc headers:
-   POSIX says that <sys/types.h> must be included (by the caller) before <regex.h>.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <regex.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include "camel-exception.h"
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "e-util/e-sexp.h"
-
-#include "camel-search-private.h"
-
-#include <gal/unicode/gunicode.h>
-
-#define d(x)
-
-/* builds the regex into pattern */
-/* taken from camel-folder-search, with added isregex & exception parameter */
-/* Basically, we build a new regex, either based on subset regex's, or substrings,
-   that can be executed once over the whoel body, to match anything suitable.
-   This is more efficient than multiple searches, and probably most (naive) strstr
-   implementations, over long content.
-
-   A small issue is that case-insenstivity wont work entirely correct for utf8 strings. */
-int
-camel_search_build_match_regex (regex_t *pattern, camel_search_flags_t type, int argc,
-				struct _ESExpResult **argv, CamelException *ex)
-{
-	GString *match = g_string_new("");
-	int c, i, count=0, err;
-	char *word;
-	int flags;
-	
-	/* 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, '|');
-			
-			word = argv[i]->value.string;
-			if (type & CAMEL_SEARCH_MATCH_REGEX) {
-				/* no need to escape because this should already be a valid regex */
-				g_string_append (match, word);
-			} else {
-				/* escape any special chars (not sure if this list is complete) */
-				if (type & CAMEL_SEARCH_MATCH_START)
-					g_string_append_c (match, '^');
-				while ((c = *word++)) {
-					if (strchr ("*\\.()[]^$+", c) != NULL) {
-						g_string_append_c (match, '\\');
-					}
-					g_string_append_c (match, c);
-				}
-				if (type & CAMEL_SEARCH_MATCH_END)
-					g_string_append_c (match, '^');
-			}
-			count++;
-		} else {
-			g_warning("Invalid type passed to body-contains match function");
-		}
-	}
-	if (argc > 1)
-		g_string_append_c (match, ')');
-	flags = REG_EXTENDED|REG_NOSUB;
-	if (type & CAMEL_SEARCH_MATCH_ICASE)
-		flags |= REG_ICASE;
-	if (type & CAMEL_SEARCH_MATCH_NEWLINE)
-		flags |= REG_NEWLINE;
-	err = regcomp (pattern, match->str, flags);
-	if (err != 0) {
-		/* regerror gets called twice to get the full error string 
-		   length to do proper posix error reporting */
-		int len = regerror (err, pattern, 0, 0);
-		char *buffer = g_malloc0 (len + 1);
-		
-		regerror (err, pattern, buffer, len);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Regular expression compilation failed: %s: %s"),
-				      match->str, buffer);
-		
-		regfree (pattern);
-	}
-	d(printf("Built regex: '%s'\n", match->str));
-	g_string_free (match, TRUE);
-	
-	return err;
-}
-
-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 gboolean
-header_soundex (const char *header, const char *match)
-{
-	char mcode[5], hcode[5];
-	const char *p;
-	char c;
-	GString *word;
-	int truth = FALSE;
-	
-	soundexify (match, mcode);
-	
-	/* split the header into words, and soundexify and compare each one */
-	/* FIXME: Should this convert to utf8, and split based on that, and what not?
-	   soundex only makes sense for us-ascii though ... */
-	
-	word = g_string_new("");
-	p = header;
-	do {
-		c = *p++;
-		if (c == 0 || isspace (c)) {
-			if (word->len > 0) {
-				soundexify (word->str, hcode);
-				if (strcmp (hcode, mcode) == 0)
-					truth = TRUE;
-			}
-			g_string_truncate (word, 0);
-		} else if (isalpha (c))
-			g_string_append_c (word, c);
-	} while (c && !truth);
-	g_string_free (word, TRUE);
-	
-	return truth;
-}
-
-/* FIXME: This is stupidly slow and needs to be removed */
-static gunichar
-utf8_get (const char **inp)
-{
-	const unsigned char *p = *inp;
-	gunichar c;
-
-	if (p == NULL)
-		return 0;
-	
-	c = g_utf8_get_char (p);
-	*inp = g_unichar_validate (c) ? g_utf8_next_char (p) : NULL;
-	
-	return c;
-}
-
-const char *
-camel_ustrstrcase (const char *haystack, const char *needle)
-{
-	gunichar *nuni, *puni;
-	gunichar u;
-	const char *p;
-	
-	g_return_val_if_fail (haystack != NULL, NULL);
-	g_return_val_if_fail (needle != NULL, NULL);
-	
-	if (strlen (needle) == 0)
-		return haystack;
-	if (strlen (haystack) == 0)
-		return NULL;
-	
-	puni = nuni = alloca (sizeof (gunichar) * strlen (needle));
-	
-	p = needle;
-	while ((u = utf8_get (&p)))
-		*puni++ = g_unichar_tolower (u);
-	
-	/* NULL means there was illegal utf-8 sequence */
-	if (!p)
-		return NULL;
-	
-	p = haystack;
-	while ((u = utf8_get (&p))) {
-		gunichar c;
-		
-		c = g_unichar_tolower (u);
-		/* We have valid stripped char */
-		if (c == nuni[0]) {
-			const gchar *q = p;
-			gint npos = 1;
-			
-			while (nuni + npos < puni) {
-				u = utf8_get (&q);
-				if (!q || !u)
-					return NULL;
-				
-				c = g_unichar_tolower (u);				
-				if (c != nuni[npos])
-					break;
-				
-				npos++;
-			}
-			
-			if (nuni + npos == puni)
-				return p;
-		}
-	}
-	
-	return NULL;
-}
-
-#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START {   \
-	if ((x) == (z)) {                              \
-		if ((y) == (z))                        \
-			return 0;                      \
-		else                                   \
-			return -1;                     \
-	} else if ((y) == (z))                         \
-		return 1;                              \
-} G_STMT_END
-
-static int
-camel_ustrcasecmp (const char *s1, const char *s2)
-{
-	gunichar u1, u2 = 0;
-	
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	u1 = utf8_get (&s1);
-	u2 = utf8_get (&s2);
-	while (u1 && u2) {
-		u1 = g_unichar_tolower (u1);
-		u2 = g_unichar_tolower (u2);
-		if (u1 < u2)
-			return -1;
-		else if (u1 > u2)
-			return 1;
-		
-		u1 = utf8_get (&s1);
-		u2 = utf8_get (&s2);
-	}
-	
-	/* end of one of the strings ? */
-	CAMEL_SEARCH_COMPARE (u1, u2, 0);
-	
-	/* if we have invalid utf8 sequence ?  */
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	return 0;
-}
-
-static int
-camel_ustrncasecmp (const char *s1, const char *s2, size_t len)
-{
-	gunichar u1, u2 = 0;
-	
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	u1 = utf8_get (&s1);
-	u2 = utf8_get (&s2);
-	while (len > 0 && u1 && u2) {
-		u1 = g_unichar_tolower (u1);
-		u2 = g_unichar_tolower (u2);
-		if (u1 < u2)
-			return -1;
-		else if (u1 > u2)
-			return 1;
-		
-		len--;
-		u1 = utf8_get (&s1);
-		u2 = utf8_get (&s2);
-	}
-	
-	if (len == 0)
-		return 0;
-	
-	/* end of one of the strings ? */
-	CAMEL_SEARCH_COMPARE (u1, u2, 0);
-	
-	/* if we have invalid utf8 sequence ?  */
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	return 0;
-}
-
-/* value is the match value suitable for exact match if required */
-static int
-header_match(const char *value, const char *match, camel_search_match_t how)
-{
-	const char *p;
-	int vlen, mlen;
-	
-	if (how == CAMEL_SEARCH_MATCH_SOUNDEX)
-		return header_soundex (value, match);
-
-	vlen = strlen(value);
-	mlen = strlen(match);
-	if (vlen < mlen)
-		return FALSE;
-	
-	/* from dan the man, if we have mixed case, perform a case-sensitive match,
-	   otherwise not */
-	p = match;
-	while (*p) {
-		if (isupper(*p)) {
-			switch (how) {
-			case CAMEL_SEARCH_MATCH_EXACT:
-				return strcmp(value, match) == 0;
-			case CAMEL_SEARCH_MATCH_CONTAINS:
-				return strstr(value, match) != NULL;
-			case CAMEL_SEARCH_MATCH_STARTS:
-				return strncmp(value, match, mlen) == 0;
-			case CAMEL_SEARCH_MATCH_ENDS:
-				return strcmp(value + vlen - mlen, match) == 0;
-			default:
-				break;
-			}
-			return FALSE;
-		}
-		p++;
-	}
-	
-	switch (how) {
-	case CAMEL_SEARCH_MATCH_EXACT:
-		return camel_ustrcasecmp(value, match) == 0;
-	case CAMEL_SEARCH_MATCH_CONTAINS:
-		return camel_ustrstrcase(value, match) != NULL;
-	case CAMEL_SEARCH_MATCH_STARTS:
-		return camel_ustrncasecmp(value, match, mlen) == 0;
-	case CAMEL_SEARCH_MATCH_ENDS:
-		return camel_ustrcasecmp(value + vlen - mlen, match) == 0;
-	default:
-		break;
-	}
-	
-	return FALSE;
-}
-
-/* searhces for match inside value, if match is mixed case, hten use case-sensitive,
-   else insensitive */
-gboolean
-camel_search_header_match (const char *value, const char *match, camel_search_match_t how, camel_search_t type, const char *default_charset)
-{
-	const char *name, *addr;
-	int truth = FALSE, i;
-	CamelInternetAddress *cia;
-	char *v, *vdom, *mdom;
-
-	while (*value && isspace (*value))
-		value++;
-	
-	switch(type) {
-	case CAMEL_SEARCH_TYPE_ENCODED:
-		v = header_decode_string(value, default_charset); /* FIXME: Find header charset */
-		truth = header_match(v, match, how);
-		g_free(v);
-		break;
-	case CAMEL_SEARCH_TYPE_MLIST:
-		/* Special mailing list old-version domain hack
-		   If one of the mailing list names doesn't have an @ in it, its old-style, so
-		   only match against the pre-domain part, which should be common */
-
-		vdom = strchr(value, '@');
-		mdom = strchr(match, '@');
-		if (mdom == NULL && vdom != NULL) {
-			v = alloca(vdom-value+1);
-			memcpy(v, value, vdom-value);
-			v[vdom-value] = 0;
-			value = (char *)v;
-		} else if (mdom != NULL && vdom == NULL) {
-			v = alloca(mdom-match+1);
-			memcpy(v, match, mdom-match);
-			v[mdom-match] = 0;
-			match = (char *)v;
-		}
-		/* Falls through */
-	case CAMEL_SEARCH_TYPE_ASIS:
-		truth = header_match(value, match, how);
-		break;
-	case CAMEL_SEARCH_TYPE_ADDRESS_ENCODED:
-	case CAMEL_SEARCH_TYPE_ADDRESS:
-		/* possible simple case to save some work if we can */
-		if (header_match(value, match, how))
-			return TRUE;
-
-		/* Now we decode any addresses, and try asis matches on name and address parts */
-		cia = camel_internet_address_new();
-		if (type == CAMEL_SEARCH_TYPE_ADDRESS_ENCODED)
-			camel_address_decode((CamelAddress *)cia, value);
-		else
-			camel_address_unformat((CamelAddress *)cia, value);
-
-		for (i=0; !truth && camel_internet_address_get(cia, i, &name, &addr);i++)
-			truth = (name && header_match(name, match, how)) || (addr && header_match(addr, match, how));
-
-		camel_object_unref((CamelObject *)cia);
-		break;
-	}
-
-	return truth;
-}
-
-/* performs a 'slow' content-based match */
-/* there is also an identical copy of this in camel-filter-search.c */
-gboolean
-camel_search_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;
-	
-	/* 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 = camel_search_message_body_contains (part, pattern);
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
-		/* for messages we only look at its contents */
-		truth = camel_search_message_body_contains ((CamelDataWrapper *)containee, pattern);
-	} else if (header_content_type_is(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, CAMEL_STREAM (mem));
-		camel_stream_write (CAMEL_STREAM (mem), "", 1);
-		truth = regexec (pattern, mem->buffer->data, 0, NULL, 0) == 0;
-		camel_object_unref (CAMEL_OBJECT (mem));
-	}
-	
-	return truth;
-}
-
-static __inline__ guint32
-camel_utf8_getc(const unsigned char **ptr)
-{
-	register unsigned char *p = (unsigned char *)*ptr;
-	register unsigned char c, r;
-	register guint32 v=0, /* this is only required because the stupid @@@%#%# compiler thinks it can be used uninitialised */
-		m;
-
-	r = *p++;
-loop:
-	if (r < 0x80) {
-		*ptr = p;
-		v = r;
-	} else if (r < 0xfe) { /* valid start char? */
-		v = r;
-		m = 0x7f80;	/* used to mask out the length bits */
-		do {
-			c = *p++;
-			if ((c & 0xc0) != 0x80) {
-				r = c;
-				goto loop;
-			}
-			v = (v<<6) | (c & 0x3f);
-			r<<=1;
-			m<<=5;
-		} while (r & 0x40);
-		
-		*ptr = p;
-
-		v &= ~m;
-	}
-
-	return v;
-}
-
-struct _camel_search_words *
-camel_search_words_split(const unsigned char *in)
-{
-	int type = CAMEL_SEARCH_WORD_SIMPLE, all = 0;
-	GString *w;
-	struct _camel_search_word *word;
-	struct _camel_search_words *words;
-	GPtrArray *list = g_ptr_array_new();
-	guint32 c;
-	int utf8len;
-	char utf8[8];
-
-	words = g_malloc0(sizeof(*words));	
-	w = g_string_new("");
-
-	do {
-		c = camel_utf8_getc(&in);
-		if (c == 0 || g_unichar_isspace(c)) {
-			if (w->len) {
-				word = g_malloc0(sizeof(*word));
-				word->word = g_strdup(w->str);
-				word->type = type;
-				g_ptr_array_add(list, word);
-				all |= type;
-				type = CAMEL_SEARCH_WORD_SIMPLE;
-				g_string_truncate(w, 0);
-			}
-		} else {
-			if (!g_unichar_isalnum(c))
-				type = CAMEL_SEARCH_WORD_COMPLEX;
-			else
-				c = g_unichar_tolower(c);
-			if (c > 0x80)
-				type |= CAMEL_SEARCH_WORD_8BIT;
-
-			utf8len = g_unichar_to_utf8(c, utf8);
-			utf8[utf8len] = 0;
-			g_string_append(w, utf8);
-		}
-	} while (c);
-
-	g_string_free(w, TRUE);
-	words->len = list->len;
-	words->words = (struct _camel_search_word **)list->pdata;
-	words->type = all;
-	g_ptr_array_free(list, FALSE);
-
-	return words;
-}
-
-/* takes an existing 'words' list, and converts it to another consisting of
-   only simple words, with any punctuation etc stripped */
-struct _camel_search_words *
-camel_search_words_simple(struct _camel_search_words *wordin)
-{
-	int i;
-	const unsigned char *ptr, *start, *last;
-	int type = CAMEL_SEARCH_WORD_SIMPLE, all = 0;
-	GPtrArray *list = g_ptr_array_new();
-	struct _camel_search_word *word;
-	struct _camel_search_words *words;
-	guint32 c;
-
-	words = g_malloc0(sizeof(*words));	
-
-	for (i=0;i<wordin->len;i++) {
-		if ((wordin->words[i]->type & CAMEL_SEARCH_WORD_COMPLEX) == 0) {
-			word = g_malloc0(sizeof(*word));
-			word->type = wordin->words[i]->type;
-			word->word = g_strdup(wordin->words[i]->word);
-			g_ptr_array_add(list, word);
-		} else {
-			ptr = wordin->words[i]->word;
-			start = last = ptr;
-			do {
-				c = camel_utf8_getc(&ptr);
-				if (c == 0 || !g_unichar_isalnum(c)) {
-					if (last > start) {
-						word = g_malloc0(sizeof(*word));
-						word->word = g_strndup(start, last-start);
-						word->type = type;
-						g_ptr_array_add(list, word);
-						all |= type;
-						type = CAMEL_SEARCH_WORD_SIMPLE;
-					}
-					start = ptr;
-				}
-				if (c > 0x80)
-					type = CAMEL_SEARCH_WORD_8BIT;
-				last = ptr;
-			} while (c);
-		}
-	}
-
-	words->len = list->len;
-	words->words = (struct _camel_search_word **)list->pdata;
-	words->type = all;
-	g_ptr_array_free(list, FALSE);
-
-	return words;
-}
-
-void
-camel_search_words_free(struct _camel_search_words *words)
-{
-	int i;
-
-	for (i=0;i<words->len;i++) {
-		struct _camel_search_word *word = words->words[i];
-
-		g_free(word->word);
-		g_free(word);
-	}
-	g_free(words->words);
-	g_free(words);
-}
-
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
deleted file mode 100644
index 7cc30b687f..0000000000
--- a/camel/camel-search-private.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SEARCH_PRIVATE_H
-#define _CAMEL_SEARCH_PRIVATE_H
-
-#include <regex.h>
-
-typedef enum {
-	CAMEL_SEARCH_MATCH_START = 1<<0,
-	CAMEL_SEARCH_MATCH_END = 1<<1,
-	CAMEL_SEARCH_MATCH_REGEX = 1<<2, /* disables the first 2 */
-	CAMEL_SEARCH_MATCH_ICASE = 1<<3,
-	CAMEL_SEARCH_MATCH_NEWLINE = 1<<4,
-} camel_search_flags_t;
-
-typedef enum {
-	CAMEL_SEARCH_MATCH_EXACT,
-	CAMEL_SEARCH_MATCH_CONTAINS,
-	CAMEL_SEARCH_MATCH_STARTS,
-	CAMEL_SEARCH_MATCH_ENDS,
-	CAMEL_SEARCH_MATCH_SOUNDEX,
-} camel_search_match_t;
-
-typedef enum {
-	CAMEL_SEARCH_TYPE_ASIS,
-	CAMEL_SEARCH_TYPE_ENCODED,
-	CAMEL_SEARCH_TYPE_ADDRESS,
-	CAMEL_SEARCH_TYPE_ADDRESS_ENCODED,
-	CAMEL_SEARCH_TYPE_MLIST, /* its a mailing list pseudo-header */
-} camel_search_t;
-
-/* builds a regex that represents a string search */
-int camel_search_build_match_regex(regex_t *pattern, camel_search_flags_t type, int argc, struct _ESExpResult **argv, CamelException *ex);
-gboolean camel_search_message_body_contains(CamelDataWrapper *object, regex_t *pattern);
-
-gboolean camel_search_header_match(const char *value, const char *match, camel_search_match_t how, camel_search_t type, const char *default_charset);
-gboolean camel_search_header_soundex(const char *header, const char *match);
-
-/* TODO: replace with a real search function */
-const char *camel_ustrstrcase(const char *haystack, const char *needle);
-
-/* Some crappy utility functions for handling multiple search words */
-enum _camel_search_word_t {
-	CAMEL_SEARCH_WORD_SIMPLE = 1,
-	CAMEL_SEARCH_WORD_COMPLEX = 2,
-	CAMEL_SEARCH_WORD_8BIT = 4,
-};
-struct _camel_search_word {
-	enum _camel_search_word_t type;
-	char *word;
-};
-
-struct _camel_search_words {
-	int len;
-	enum _camel_search_word_t type;	/* OR of all word types in list */
-	struct _camel_search_word **words;
-};
-
-struct _camel_search_words *camel_search_words_split(const unsigned char *in);
-struct _camel_search_words *camel_search_words_simple(struct _camel_search_words *wordin);
-void camel_search_words_free(struct _camel_search_words *);
-
-#endif /* ! _CAMEL_SEARCH_PRIVATE_H */
-
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
deleted file mode 100644
index 874d68e40c..0000000000
--- a/camel/camel-seekable-stream.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "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 9ac73c7ee8..0000000000
--- a/camel/camel-seekable-stream.h
+++ /dev/null
@@ -1,87 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <sys/types.h>
-#include <unistd.h>
-#include <camel/camel-stream.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 c51b52b99f..0000000000
--- a/camel/camel-seekable-substream.c
+++ /dev/null
@@ -1,303 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "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)
-{
-	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 written. */
-	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_write((CamelStream *)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_flush (CamelStream *stream)
-{
-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)stream;
-
-	return camel_stream_flush(CAMEL_STREAM(sus->parent_stream));
-}
-
-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:
-		if (seekable_stream->bound_end == CAMEL_STREAM_UNBOUND) {
-			real_offset = camel_seekable_stream_seek(seekable_substream->parent_stream,
-								 offset,
-								 CAMEL_STREAM_END);
-			if (real_offset != -1) {
-				if (real_offset<seekable_stream->bound_start)
-					real_offset = seekable_stream->bound_start;
-				seekable_stream->position = real_offset;
-			}
-			return real_offset;
-		}
-		real_offset = seekable_stream->bound_end + offset;
-		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 897342c737..0000000000
--- a/camel/camel-seekable-substream.h
+++ /dev/null
@@ -1,69 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 c704852a7c..0000000000
--- a/camel/camel-service.c
+++ /dev/null
@@ -1,937 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#include "e-util/e-msgport.h"
-#endif
-
-#include "e-util/e-host-utils.h"
-
-#include "camel-service.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-#include "camel-operation.h"
-#include "camel-private.h"
-
-#define d(x)
-#define w(x)
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelService */
-#define CSERV_CLASS(so) CAMEL_SERVICE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void construct (CamelService *service, CamelSession *session,
-		       CamelProvider *provider, CamelURL *url,
-		       CamelException *ex);
-static gboolean service_connect(CamelService *service, CamelException *ex);
-static gboolean service_disconnect(CamelService *service, gboolean clean,
-				   CamelException *ex);
-static void cancel_connect (CamelService *service);
-static GList *query_auth_types (CamelService *service, CamelException *ex);
-static char *get_name (CamelService *service, gboolean brief);
-static char *get_path (CamelService *service);
-
-static int service_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-static int service_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-
-static void
-camel_service_class_init (CamelServiceClass *camel_service_class)
-{
-	CamelObjectClass *object_class = CAMEL_OBJECT_CLASS (camel_service_class);
-	
-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);
-	
-	/* virtual method overloading */
-	object_class->setv = service_setv;
-	object_class->getv = service_getv;
-	
-	/* virtual method definition */
-	camel_service_class->construct = construct;
-	camel_service_class->connect = service_connect;
-	camel_service_class->disconnect = service_disconnect;
-	camel_service_class->cancel_connect = cancel_connect;
-	camel_service_class->query_auth_types = query_auth_types;
-	camel_service_class->get_name = get_name;
-	camel_service_class->get_path = get_path;
-}
-
-static void
-camel_service_init (void *o, void *k)
-{
-	CamelService *service = o;
-
-	service->priv = g_malloc0(sizeof(*service->priv));
-#ifdef ENABLE_THREADS
-	service->priv->connect_lock = e_mutex_new(E_MUTEX_REC);
-	service->priv->connect_op_lock = e_mutex_new(E_MUTEX_SIMPLE);
-#endif
-}
-
-static void
-camel_service_finalize (CamelObject *object)
-{
-	CamelService *service = CAMEL_SERVICE (object);
-	
-	if (service->status == CAMEL_SERVICE_CONNECTED) {
-		CamelException ex;
-		
-		camel_exception_init (&ex);
-		CSERV_CLASS (service)->disconnect (service, TRUE, &ex);
-		if (camel_exception_is_set (&ex)) {
-			w(g_warning ("camel_service_finalize: silent disconnect failure: %s",
-				     camel_exception_get_description (&ex)));
-		}
-		camel_exception_clear (&ex);
-	}
-	
-	if (service->url)
-		camel_url_free (service->url);
-	if (service->session)
-		camel_object_unref (CAMEL_OBJECT (service->session));
-	
-#ifdef ENABLE_THREADS
-	e_mutex_destroy (service->priv->connect_lock);
-	e_mutex_destroy (service->priv->connect_op_lock);
-#endif
-	g_free (service->priv);
-}
-
-
-
-CamelType
-camel_service_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type =
-			camel_type_register (CAMEL_OBJECT_TYPE,
-					     "CamelService",
-					     sizeof (CamelService),
-					     sizeof (CamelServiceClass),
-					     (CamelObjectClassInitFunc) camel_service_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_service_init,
-					     camel_service_finalize );
-	}
-	
-	return type;
-}
-
-
-static int
-service_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
-	CamelService *service = (CamelService *) object;
-	CamelURL *url = service->url;
-	gboolean reconnect = FALSE;
-	guint32 tag;
-	int i;
-	
-	for (i = 0; i < args->argc; i++) {
-		tag = args->argv[i].tag;
-		
-		/* make sure this arg wasn't already handled */
-		if (tag & CAMEL_ARG_IGNORE)
-			continue;
-		
-		/* make sure this is an arg we're supposed to handle */
-		if ((tag & CAMEL_ARG_TAG) <= CAMEL_SERVICE_ARG_FIRST ||
-		    (tag & CAMEL_ARG_TAG) >= CAMEL_SERVICE_ARG_FIRST + 100)
-			continue;
-		
-		if (tag == CAMEL_SERVICE_USERNAME) {
-			/* set the username */
-			if (strcmp (url->user, args->argv[i].ca_str) != 0) {
-				camel_url_set_user (url, args->argv[i].ca_str);
-				reconnect = TRUE;
-			}
-		} else if (tag == CAMEL_SERVICE_AUTH) {
-			/* set the auth mechanism */
-			if (strcmp (url->authmech, args->argv[i].ca_str) != 0) {
-				camel_url_set_authmech (url, args->argv[i].ca_str);
-				reconnect = TRUE;
-			}
-		} else if (tag == CAMEL_SERVICE_HOSTNAME) {
-			/* set the hostname */
-			if (strcmp (url->host, args->argv[i].ca_str) != 0) {
-				camel_url_set_host (url, args->argv[i].ca_str);
-				reconnect = TRUE;
-			}
-		} else if (tag == CAMEL_SERVICE_PORT) {
-			/* set the port */
-			if (url->port != args->argv[i].ca_int) {
-				camel_url_set_port (url, args->argv[i].ca_int);
-				reconnect = TRUE;
-			}
-		} else if (tag == CAMEL_SERVICE_PATH) {
-			/* set the path */
-			if (strcmp (url->path, args->argv[i].ca_str) != 0) {
-				camel_url_set_host (url, args->argv[i].ca_str);
-				reconnect = TRUE;
-			}
-		} else {
-			/* error? */
-			continue;
-		}
-		
-		/* let our parent know that we've handled this arg */
-		camel_argv_ignore (args, i);
-	}
-	
-	if (reconnect) {
-		/* reconnect the service using the new URL */
-		if (camel_service_disconnect (service, TRUE, ex))
-			camel_service_connect (service, ex);
-	}
-	
-	return CAMEL_OBJECT_CLASS (parent_class)->setv (object, ex, args);
-}
-
-static int
-service_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	CamelService *service = (CamelService *) object;
-	CamelURL *url = service->url;
-	guint32 tag;
-	int i;
-	
-	for (i = 0; i < args->argc; i++) {
-		tag = args->argv[i].tag;
-		
-		/* make sure this is an arg we're supposed to handle */
-		if ((tag & CAMEL_ARG_TAG) <= CAMEL_SERVICE_ARG_FIRST ||
-		    (tag & CAMEL_ARG_TAG) >= CAMEL_SERVICE_ARG_FIRST + 100)
-			continue;
-		
-		switch (tag) {
-		case CAMEL_SERVICE_USERNAME:
-			/* get the username */
-			*args->argv[i].ca_str = url->user;
-			break;
-		case CAMEL_SERVICE_AUTH:
-			/* get the auth mechanism */
-			*args->argv[i].ca_str = url->authmech;
-			break;
-		case CAMEL_SERVICE_HOSTNAME:
-			/* get the hostname */
-			*args->argv[i].ca_str = url->host;
-			break;
-		case CAMEL_SERVICE_PORT:
-			/* get the port */
-			*args->argv[i].ca_int = url->port;
-			break;
-		case CAMEL_SERVICE_PATH:
-			/* get the path */
-			*args->argv[i].ca_str = url->path;
-			break;
-		default:
-			/* error? */
-		}
-	}
-	
-	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
-}
-
-static void
-construct (CamelService *service, CamelSession *session,
-	   CamelProvider *provider, CamelURL *url, CamelException *ex)
-{
-	char *url_string;
-	
-	if (CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_USER) &&
-	    (url->user == NULL || url->user[0] == '\0')) {
-		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a username component"),
-				      url_string);
-		g_free (url_string);
-		return;
-	} else if (CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_HOST) &&
-		   (url->host == NULL || url->host[0] == '\0')) {
-		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a host component"),
-				      url_string);
-		g_free (url_string);
-		return;
-	} else if (CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_PATH) &&
-		   (url->path == NULL || url->path[0] == '\0')) {
-		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a path component"),
-				      url_string);
-		g_free (url_string);
-		return;
-	}
-	
-	service->provider = provider;
-	service->url = url;
-	service->session = session;
-	camel_object_ref (CAMEL_OBJECT (session));
-	
-	service->status = CAMEL_SERVICE_DISCONNECTED;
-}
-
-/**
- * camel_service_construct:
- * @service: the CamelService
- * @session: the session for the service
- * @provider: the service's provider
- * @url: the default URL for the service (may be NULL)
- * @ex: a CamelException
- *
- * Constructs a CamelService initialized with the given parameters.
- **/
-void
-camel_service_construct (CamelService *service, CamelSession *session,
-			 CamelProvider *provider, CamelURL *url,
-			 CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_SERVICE (service));
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	
-	CSERV_CLASS (service)->construct (service, session, provider, url, ex);
-}
-
-
-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)
-{
-	gboolean ret = FALSE;
-	gboolean unreg = FALSE;
-	
-	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);
-	
-	CAMEL_SERVICE_LOCK (service, connect_lock);
-	
-	if (service->status == CAMEL_SERVICE_CONNECTED) {
-		CAMEL_SERVICE_UNLOCK (service, connect_lock);
-		return TRUE;
-	}
-
-	/* Register a separate operation for connecting, so that
-	 * the offline code can cancel it.
-	 */
-	CAMEL_SERVICE_LOCK (service, connect_op_lock);
-	service->connect_op = camel_operation_registered ();
-	if (!service->connect_op) {
-		service->connect_op = camel_operation_new (NULL, NULL);
-		camel_operation_register (service->connect_op);
-		unreg = TRUE;
-	}
-	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
-
-	service->status = CAMEL_SERVICE_CONNECTING;
-	ret = CSERV_CLASS (service)->connect (service, ex);
-	service->status = ret ? CAMEL_SERVICE_CONNECTED : CAMEL_SERVICE_DISCONNECTED;
-
-	CAMEL_SERVICE_LOCK (service, connect_op_lock);
-	if (service->connect_op) {
-		if (unreg)
-			camel_operation_unregister (service->connect_op);
-		
-		camel_operation_unref (service->connect_op);
-		service->connect_op = NULL;
-	}
-	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
-
-	CAMEL_SERVICE_UNLOCK (service, connect_lock);
-	
-	return ret;
-}
-
-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 = TRUE;
-	int unreg = FALSE;
-
-	CAMEL_SERVICE_LOCK (service, connect_lock);
-	
-	if (service->status != CAMEL_SERVICE_DISCONNECTED
-	    && service->status != CAMEL_SERVICE_DISCONNECTING) {
-		CAMEL_SERVICE_LOCK (service, connect_op_lock);
-		service->connect_op = camel_operation_registered ();
-		if (!service->connect_op) {
-			service->connect_op = camel_operation_new (NULL, NULL);
-			camel_operation_register (service->connect_op);
-			unreg = TRUE;
-		}
-		CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
-
-		service->status = CAMEL_SERVICE_DISCONNECTING;
-		res = CSERV_CLASS (service)->disconnect (service, clean, ex);
-		service->status = CAMEL_SERVICE_DISCONNECTED;
-
-		CAMEL_SERVICE_LOCK (service, connect_op_lock);
-		if (unreg)
-			camel_operation_unregister (service->connect_op);
-
-		camel_operation_unref (service->connect_op);
-		service->connect_op = NULL;
-		CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
-	}
-	
-	CAMEL_SERVICE_UNLOCK (service, connect_lock);
-	
-	return res;
-}
-
-static void
-cancel_connect (CamelService *service)
-{
-	camel_operation_cancel (service->connect_op);
-}
-
-/**
- * camel_service_cancel_connect:
- * @service: a service
- *
- * If @service is currently attempting to connect to or disconnect
- * from a server, this causes it to stop and fail. Otherwise it is a
- * no-op.
- **/
-void
-camel_service_cancel_connect (CamelService *service)
-{
-	CAMEL_SERVICE_LOCK (service, connect_op_lock);
-	if (service->connect_op)
-		CSERV_CLASS (service)->cancel_connect (service);
-	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
-}
-
-/**
- * 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, CAMEL_URL_HIDE_PASSWORD);
-}
-
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	w(g_warning ("CamelService::get_name not implemented for `%s'",
-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service))));
-	return g_strdup ("???");
-}		
-
-/**
- * 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;
-	CamelProvider *prov = service->provider;
-	
-	/* A sort of ad-hoc default implementation that works for our
-	 * current set of services.
-	 */
-	
-	gpath = g_string_new (service->provider->protocol);
-	if (CAMEL_PROVIDER_ALLOWS (prov, CAMEL_URL_PART_USER)) {
-		if (CAMEL_PROVIDER_ALLOWS (prov, CAMEL_URL_PART_HOST)) {
-			g_string_sprintfa (gpath, "/%s@%s",
-					   url->user ? url->user : "",
-					   url->host ? url->host : "");
-			
-			if (url->port)
-				g_string_sprintfa (gpath, ":%d", url->port);
-		} else {
-			g_string_sprintfa (gpath, "/%s%s",
-					   url->user ? url->user : "",
-					   CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_USER) ? "" : "@");
-		}
-	} else if (CAMEL_PROVIDER_ALLOWS (prov, CAMEL_URL_PART_HOST)) {
-		g_string_sprintfa (gpath, "/%s%s",
-				   CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_HOST) ? "" : "@",
-				   url->host ? url->host : "");
-		
-		if (url->port)
-			g_string_sprintfa (gpath, ":%d", url->port);
-	}
-	if (CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_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;
-}
-
-static GList *
-query_auth_types (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.
- *
- * Return value: a list of CamelServiceAuthType records. The caller
- * must free the list with g_list_free() when it is done with it.
- **/
-GList *
-camel_service_query_auth_types (CamelService *service, CamelException *ex)
-{
-	GList *ret;
-	
-	/* note that we get the connect lock here, which means the callee
-	   must not call the connect functions itself */
-	CAMEL_SERVICE_LOCK (service, connect_lock);
-	ret = CSERV_CLASS (service)->query_auth_types (service, ex);
-	CAMEL_SERVICE_UNLOCK (service, connect_lock);
-	
-	return ret;
-}
-
-/* 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)
-{
-	char *hostname;
-	
-	if (service->url->host)
-		hostname = service->url->host;
-	else
-		hostname = "localhost";
-	
-	return camel_gethostbyname (hostname, ex);
-}
-
-#ifdef offsetof
-#define STRUCT_OFFSET(type, field)        ((gint) offsetof (type, field))
-#else
-#define STRUCT_OFFSET(type, field)        ((gint) ((gchar*) &((type *) 0)->field))
-#endif
-
-struct _lookup_msg {
-#ifdef ENABLE_THREADS
-	EMsg msg;
-#endif
-	const char *name;
-	int len;
-	int type;
-	int result;
-	int herr;
-	struct hostent hostbuf;
-	int hostbuflen;
-	char *hostbufmem;
-};
-
-static void *
-get_hostbyname(void *data)
-{
-	struct _lookup_msg *info = data;
-
-	while ((info->result = e_gethostbyname_r(info->name, &info->hostbuf, info->hostbufmem, info->hostbuflen, &info->herr)) == ERANGE) {
-		d(printf("gethostbyname fialed?\n"));
-#ifdef ENABLE_THREADS
-		pthread_testcancel();
-#endif
-                info->hostbuflen *= 2;
-                info->hostbufmem = g_realloc(info->hostbufmem, info->hostbuflen);
-	}
-
-	d(printf("gethostbyname ok?\n"));
-
-#ifdef ENABLE_THREADS
-	e_msgport_reply((EMsg *)info);
-#endif
-	return NULL;
-}
-
-struct hostent *
-camel_gethostbyname (const char *name, CamelException *ex)
-{
-#ifdef ENABLE_THREADS
-	int fdmax, status, fd, cancel_fd;
-#endif
-	struct _lookup_msg *msg;
-
-	g_return_val_if_fail(name != NULL, NULL);
-
-	if (camel_operation_cancel_check(NULL)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
-		return NULL;
-	}
-
-	camel_operation_start_transient(NULL, _("Resolving: %s"), name);
-
-	msg = g_malloc0(sizeof(*msg));
-	msg->hostbuflen = 1024;
-	msg->hostbufmem = g_malloc(msg->hostbuflen);
-	msg->name = name;
-
-#ifdef ENABLE_THREADS
-	cancel_fd = camel_operation_cancel_fd(NULL);
-	if (cancel_fd == -1) {
-#endif
-		get_hostbyname(msg);
-#ifdef ENABLE_THREADS
-	} else {
-		EMsgPort *reply_port;
-		pthread_t id;
-		fd_set rdset;
-
-		reply_port = msg->msg.reply_port = e_msgport_new();
-		fd = e_msgport_fd(msg->msg.reply_port);
-		if (pthread_create(&id, NULL, get_hostbyname, msg) == 0) {
-			d(printf("waiting for name return/cancellation in main process\n"));
-			do {
-				FD_ZERO(&rdset);
-				FD_SET(cancel_fd, &rdset);
-				FD_SET(fd, &rdset);
-				fdmax = MAX(fd, cancel_fd) + 1;
-				status = select (fdmax, &rdset, NULL, 0, NULL);
-			} while (status == -1 && errno == EINTR);
-			
-			if (status == -1) {
-				camel_exception_setv(ex, 1, _("Failure in name lookup: %s"), strerror(errno));
-				d(printf("Cancelling lookup thread\n"));
-				pthread_cancel(id);
-			} else if (FD_ISSET(cancel_fd, &rdset)) {
-				d(printf("Cancelling lookup thread\n"));
-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
-				pthread_cancel(id);
-			} else {
-				struct _lookup_msg *reply = (struct _lookup_msg *)e_msgport_get(reply_port);
-
-				g_assert(reply == msg);
-			}
-			d(printf("waiting for child to exit\n"));
-			pthread_join(id, NULL);
-			d(printf("child done\n"));
-		}
-		e_msgport_destroy(reply_port);
-	}
-#endif
-
-	camel_operation_end(NULL);
-
-	if (msg->herr) {
- 		if (!camel_exception_is_set(ex)) {
-			if (msg->herr == HOST_NOT_FOUND || msg->herr == NO_DATA)
-				camel_exception_setv(ex, 1, _("Host lookup failed: %s: host not found"), name);
-			else
-				camel_exception_setv(ex, 1, _("Host lookup failed: %s: unknown reason"), name);
-		}
-		g_free(msg->hostbufmem);
-		g_free(msg);
-		return NULL;
-	} else {
-		return &msg->hostbuf;
-	}
-}
-
-
-static void *
-get_hostbyaddr (void *data)
-{
-	struct _lookup_msg *info = data;
-
-	while ((info->result = e_gethostbyaddr_r (info->name, info->len, info->type, &info->hostbuf,
-						  info->hostbufmem, info->hostbuflen, &info->herr)) == ERANGE) {
-		d(printf ("gethostbyaddr fialed?\n"));
-#ifdef ENABLE_THREADS
-		pthread_testcancel ();
-#endif
-                info->hostbuflen *= 2;
-                info->hostbufmem = g_realloc (info->hostbufmem, info->hostbuflen);
-	}
-	
-	d(printf ("gethostbyaddr ok?\n"));
-	
-#ifdef ENABLE_THREADS
-	e_msgport_reply ((EMsg *) info);
-#endif
-	return NULL;
-}
-
-
-struct hostent *
-camel_gethostbyaddr (const char *addr, int len, int type, CamelException *ex)
-{
-#ifdef ENABLE_THREADS
-	int fdmax, status, fd, cancel_fd;
-#endif
-	struct _lookup_msg *msg;
-	
-	g_return_val_if_fail (addr != NULL, NULL);
-	
-	if (camel_operation_cancel_check (NULL)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
-		return NULL;
-	}
-	
-	camel_operation_start_transient (NULL, _("Resolving address"));
-	
-	msg = g_malloc0 (sizeof (struct _lookup_msg));
-	msg->hostbuflen = 1024;
-	msg->hostbufmem = g_malloc (msg->hostbuflen);
-	msg->name = addr;
-	msg->len = len;
-	msg->type = type;
-	
-#ifdef ENABLE_THREADS
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-#endif
-		get_hostbyaddr (msg);
-#ifdef ENABLE_THREADS
-	} else {
-		EMsgPort *reply_port;
-		pthread_t id;
-		fd_set rdset;
-		
-		reply_port = msg->msg.reply_port = e_msgport_new ();
-		fd = e_msgport_fd (msg->msg.reply_port);
-		if (pthread_create (&id, NULL, get_hostbyaddr, msg) == 0) {
-			d(printf("waiting for name return/cancellation in main process\n"));
-			do {
-				FD_ZERO(&rdset);
-				FD_SET(cancel_fd, &rdset);
-				FD_SET(fd, &rdset);
-				fdmax = MAX(fd, cancel_fd) + 1;
-				status = select (fdmax, &rdset, NULL, 0, NULL);
-			} while (status == -1 && errno == EINTR);
-			
-			if (status == -1) {
-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Failure in name lookup: %s"), g_strerror (errno));
-				d(printf ("Cancelling lookup thread\n"));
-				pthread_cancel (id);
-			} else if (FD_ISSET(cancel_fd, &rdset)) {
-				d(printf ("Cancelling lookup thread\n"));
-				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
-				pthread_cancel (id);
-			} else {
-				struct _lookup_msg *reply = (struct _lookup_msg *) e_msgport_get (reply_port);
-				
-				g_assert (reply == msg);
-			}
-			
-			d(printf ("waiting for child to exit\n"));
-			pthread_join (id, NULL);
-			d(printf ("child done\n"));
-		}
-		
-		e_msgport_destroy (reply_port);
-	}
-#endif
-	
-	camel_operation_end (NULL);
-	
-	if (msg->herr) {
- 		if (!camel_exception_is_set (ex)) {
-			if (msg->herr == HOST_NOT_FOUND || msg->herr == NO_DATA)
-				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-						     _("Host lookup failed: host not found"));
-			else
-				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-						     _("Host lookup failed: unknown reason"));
-		}
-		
-		g_free (msg->hostbufmem);
-		g_free (msg);
-		return NULL;
-	} else {
-		return &msg->hostbuf;
-	}
-}
-
-void camel_free_host(struct hostent *h)
-{
-	struct _lookup_msg *msg;
-
-	g_return_if_fail(h != NULL);
-
-	/* yeah this looks ugly but it is safe.  we passed out a reference to inside our structure, this maps it
-	   to the base structure, so we can free everything right without having to keep track of it separately */
-	msg = (struct _lookup_msg *)(((char *)h) - STRUCT_OFFSET(struct _lookup_msg, hostbuf));
-
-	g_free(msg->hostbufmem);
-	g_free(msg);
-}
diff --git a/camel/camel-service.h b/camel/camel-service.h
deleted file mode 100644
index 587749e242..0000000000
--- a/camel/camel-service.h
+++ /dev/null
@@ -1,155 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <netdb.h>
-#include <camel/camel-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-provider.h>
-#include <camel/camel-operation.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))
-
-enum {
-	CAMEL_SERVICE_ARG_FIRST  = CAMEL_ARG_FIRST + 100,
-	CAMEL_SERVICE_ARG_USERNAME,
-	CAMEL_SERVICE_ARG_AUTH,
-	CAMEL_SERVICE_ARG_HOSTNAME,
-	CAMEL_SERVICE_ARG_PORT,
-	CAMEL_SERVICE_ARG_PATH,
-};
-
-#define CAMEL_SERVICE_USERNAME     (CAMEL_SERVICE_ARG_USERNAME | CAMEL_ARG_STR)
-#define CAMEL_SERVICE_AUTH         (CAMEL_SERVICE_ARG_AUTH | CAMEL_ARG_STR)
-#define CAMEL_SERVICE_HOSTNAME     (CAMEL_SERVICE_ARG_HOSTNAME | CAMEL_ARG_STR)
-#define CAMEL_SERVICE_PORT         (CAMEL_SERVICE_ARG_PORT | CAMEL_ARG_INT)
-#define CAMEL_SERVICE_PATH         (CAMEL_SERVICE_ARG_PATH | CAMEL_ARG_STR)
-
-typedef enum {
-	CAMEL_SERVICE_DISCONNECTED,
-	CAMEL_SERVICE_CONNECTING,
-	CAMEL_SERVICE_CONNECTED,
-	CAMEL_SERVICE_DISCONNECTING
-} CamelServiceConnectionStatus;
-
-struct _CamelService {
-	CamelObject parent_object;
-	struct _CamelServicePrivate *priv;
-
-	CamelSession *session;
-	CamelProvider *provider;
-	CamelServiceConnectionStatus status;
-	CamelOperation *connect_op;
-	CamelURL *url;
-};
-
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	void      (*construct)         (CamelService *service,
-					CamelSession *session,
-					CamelProvider *provider,
-					CamelURL *url,
-					CamelException *ex);
-
-	gboolean  (*connect)           (CamelService *service, 
-					CamelException *ex);
-	gboolean  (*disconnect)        (CamelService *service,
-					gboolean clean,
-					CamelException *ex);
-	void      (*cancel_connect)    (CamelService *service);
-
-	GList *   (*query_auth_types)  (CamelService *service,
-					CamelException *ex);
-
-	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;               /* user-friendly name */
-	char *description;
-	char *authproto;
-	
-	gboolean need_password;   /* needs a password to authenticate */
-} CamelServiceAuthType;
-
-
-/* public methods */
-void                camel_service_construct          (CamelService *service,
-						      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);
-void                camel_service_cancel_connect     (CamelService *service);
-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);
-
-/* convenience functions */
-struct hostent *    camel_service_gethost            (CamelService *service,
-						      CamelException *ex);
-
-/* cancellable dns lookup */
-struct hostent *    camel_gethostbyname              (const char *name, CamelException *ex);
-struct hostent *    camel_gethostbyaddr              (const char *addr, int len, int type, CamelException *ex);
-void		    camel_free_host	    	     (struct hostent *h);
-
-/* 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 4e74c1bd9e..0000000000
--- a/camel/camel-session.c
+++ /dev/null
@@ -1,900 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-session.c : Abstract class for an email session */
-
-/*
- * Authors:
- *  Dan Winship <danw@ximian.com>
- *  Jeffrey Stedfast <fejj@ximian.com>
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999 - 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.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"
-#include "camel-vee-store.h"
-
-#include "camel-private.h"
-
-#define d(x)
-
-#define CS_CLASS(so) CAMEL_SESSION_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static void register_provider (CamelSession *session, CamelProvider *provider);
-static GList *list_providers (CamelSession *session, gboolean load);
-static CamelProvider *get_provider (CamelSession *session,
-				    const char *url_string,
-				    CamelException *ex);
-
-static CamelService *get_service (CamelSession *session,
-				  const char *url_string,
-				  CamelProviderType type,
-				  CamelException *ex);
-static char *get_storage_path (CamelSession *session,
-			       CamelService *service,
-			       CamelException *ex);
-
-#ifdef ENABLE_THREADS
-static void *session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);
-static void session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg);
-static int session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags);
-static void session_thread_wait(CamelSession *session, int id);
-#endif
-
-/* The vfolder provider is always available */
-static CamelProvider vee_provider = {
-	"vfolder",
-	N_("Virtual folder email provider"),
-
-	N_("For reading mail as a query of another set of folders"),
-
-	"vfolder",
-
-	CAMEL_PROVIDER_IS_STORAGE,
-
-	0, /* url_flags */
-
-	/* ... */
-};
-
-static void
-camel_session_init (CamelSession *session)
-{
-	session->online = TRUE;
-	session->modules = camel_provider_init ();
-	session->providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-	session->priv = g_malloc0(sizeof(*session->priv));
-#ifdef ENABLE_THREADS
-	session->priv->lock = g_mutex_new();
-	session->priv->thread_lock = g_mutex_new();
-	session->priv->thread_id = 1;
-	session->priv->thread_active = g_hash_table_new(NULL, NULL);
-	session->priv->thread_queue = NULL;
-#endif
-}
-
-static gboolean
-camel_session_destroy_provider (gpointer key, gpointer value, gpointer user_data)
-{
-	CamelProvider *prov = (CamelProvider *)value;
-	int i;
-
-	for (i = 0; i < CAMEL_NUM_PROVIDER_TYPES; i++) {
-		if (prov->service_cache[i])
-			g_hash_table_destroy (prov->service_cache[i]);
-	}
-	return TRUE;
-}
-
-static void
-camel_session_finalise (CamelObject *o)
-{
-	CamelSession *session = (CamelSession *)o;
-
-#ifdef ENABLE_THREADS
-	g_hash_table_destroy(session->priv->thread_active);
-	if (session->priv->thread_queue)
-		e_thread_destroy(session->priv->thread_queue);
-#endif
-
-	g_free(session->storage_path);
-	g_hash_table_foreach_remove (session->providers,
-				     camel_session_destroy_provider, NULL);
-	g_hash_table_destroy (session->providers);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(session->priv->lock);
-	g_mutex_free(session->priv->thread_lock);
-#endif
-	g_free(session->priv);
-}
-
-static void
-camel_session_class_init (CamelSessionClass *camel_session_class)
-{
-	/* virtual method definition */
-	camel_session_class->register_provider = register_provider;
-	camel_session_class->list_providers = list_providers;
-	camel_session_class->get_provider = get_provider;
-	camel_session_class->get_service = get_service;
-	camel_session_class->get_storage_path = get_storage_path;
-
-#ifdef ENABLE_THREADS
-	camel_session_class->thread_msg_new = session_thread_msg_new;
-	camel_session_class->thread_msg_free = session_thread_msg_free;
-	camel_session_class->thread_queue = session_thread_queue;
-	camel_session_class->thread_wait = session_thread_wait;
-#endif
-	
-	vee_provider.object_types[CAMEL_PROVIDER_STORE] = camel_vee_store_get_type ();
-	vee_provider.url_hash = camel_url_hash;
-	vee_provider.url_equal = camel_url_equal;
-}
-
-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_construct:
- * @session: a session object to construct
- * @storage_path: path to a directory the session can use for
- * persistent storage. (This directory must already exist.)
- *
- * Constructs @session.
- **/
-void
-camel_session_construct (CamelSession *session, const char *storage_path)
-{
-	session->storage_path = g_strdup (storage_path);
-	camel_session_register_provider(session, &vee_provider);
-}
-
-
-static void 
-register_provider (CamelSession *session, CamelProvider *provider)
-{
-	int i;
-	CamelProviderConfEntry *conf;
-	GList *l;
-
-	for (i = 0; i < CAMEL_NUM_PROVIDER_TYPES; i++) {
-		if (provider->object_types[i])
-			provider->service_cache[i] = g_hash_table_new (provider->url_hash, provider->url_equal);
-	}
-
-	/* Translate all strings here */
-	provider->name = _(provider->name);
-	provider->description = _(provider->description);
-	conf = provider->extra_conf;
-	if (conf) {
-		for (i=0;conf[i].type != CAMEL_PROVIDER_CONF_END;i++) {
-			if (conf[i].text)
-				conf[i].text = _(conf[i].text);
-		}
-	}
-	l = provider->authtypes;
-	while (l) {
-		CamelServiceAuthType *auth = l->data;
-
-		auth->name = _(auth->name);
-		auth->description = _(auth->description);
-		l = l->next;
-	}
-
-	g_hash_table_insert (session->providers, provider->protocol, provider);
-}
-
-/**
- * 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.
- *
- * Assumes the session lock has already been obtained,
- * which is the case for automatically loaded provider modules.
- **/
-void
-camel_session_register_provider (CamelSession *session,
-				 CamelProvider *provider)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (provider != NULL);
-
-	CS_CLASS (session)->register_provider (session, 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);
-}
-
-static GList *
-list_providers (CamelSession *session, gboolean load)
-{
-	GList *list = NULL;
-
-	if (load)
-		g_hash_table_foreach (session->modules, ensure_loaded, session);
-
-	g_hash_table_foreach (session->providers, add_to_list, &list);
-	return list;
-}
-
-/**
- * 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);
-
-	CAMEL_SESSION_LOCK (session, lock);
-	list = CS_CLASS (session)->list_providers (session, load);
-	CAMEL_SESSION_UNLOCK (session, lock);
-
-	return list;
-}
-
-
-static CamelProvider *
-get_provider (CamelSession *session, const char *url_string, CamelException *ex)
-{
-	CamelProvider *provider;
-	char *protocol;
-
-	protocol = g_strndup (url_string, strcspn (url_string, ":"));
-
-	provider = g_hash_table_lookup (session->providers, protocol);
-	if (!provider) {
-		/* See if there's one we can load. */
-		char *path;
-
-		path = g_hash_table_lookup (session->modules, protocol);
-		if (path) {
-			camel_provider_load (session, path, ex);
-			if (camel_exception_is_set (ex)) {
-				g_free (protocol);
-				return NULL;
-			}
-		}
-		provider = g_hash_table_lookup (session->providers, protocol);
-	}
-
-	if (!provider) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("No provider available for protocol `%s'"),
-				      protocol);
-	}
-	g_free (protocol);
-
-	return provider;
-}
-
-/**
- * camel_session_get_provider:
- * @session: the session
- * @url_string: the URL for the service whose provider you want
- * @ex: a CamelException
- *
- * This returns the CamelProvider that would be used to handle
- * @url_string, loading it in from disk if necessary.
- *
- * Return value: the provider, or %NULL, in which case @ex will be set.
- **/
-CamelProvider *
-camel_session_get_provider (CamelSession *session, const char *url_string,
-			    CamelException *ex)
-{
-	CamelProvider *provider;
-
-	CAMEL_SESSION_LOCK (session, lock);
-	provider = CS_CLASS (session)->get_provider (session, url_string, ex);
-	CAMEL_SESSION_UNLOCK (session, lock);
-
-	return provider;
-}
-
-
-static void
-service_cache_remove (CamelService *service, gpointer event_data, gpointer user_data)
-{
-	CamelSession *session = service->session;
-	CamelProviderType type = GPOINTER_TO_INT (user_data);
-
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (service != NULL);
-	g_return_if_fail (service->url != NULL);
-
-	CAMEL_SESSION_LOCK(session, lock);
-
-	g_hash_table_remove (service->provider->service_cache[type], service->url);
-
-	CAMEL_SESSION_UNLOCK(session, lock);
-}
-
-
-static CamelService *
-get_service (CamelSession *session, const char *url_string,
-	     CamelProviderType type, CamelException *ex)
-{
-	CamelURL *url;
-	CamelProvider *provider;
-	CamelService *service;
-	CamelException internal_ex;
-	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 = CS_CLASS (session)->get_provider (session, url->protocol, ex);
-	if (provider && !provider->object_types[type]) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("No provider available for protocol `%s'"),
-				      url->protocol);
-		provider = NULL;
-	}
-	if (!provider) {
-		camel_url_free (url);
-		return NULL;
-	}
-	
-	/* Now look up the service in the provider's cache */
-	service = g_hash_table_lookup (provider->service_cache[type], url);
-	if (service != NULL) {
-		camel_url_free (url);
-		camel_object_ref (CAMEL_OBJECT (service));
-		return service;
-	}
-
-	service = (CamelService *)camel_object_new (provider->object_types[type]);
-	camel_exception_init (&internal_ex);
-	camel_service_construct (service, session, provider, url, &internal_ex);
-	if (camel_exception_is_set (&internal_ex)) {
-		camel_exception_xfer (ex, &internal_ex);
-		camel_object_unref (CAMEL_OBJECT (service));
-		service = NULL;
-	} else {
-		g_hash_table_insert (provider->service_cache[type], url, service);
-		camel_object_hook_event (CAMEL_OBJECT (service), "finalize", (CamelObjectEventHookFunc) service_cache_remove, GINT_TO_POINTER (type));
-	}
-
-	return service;
-}
-
-/**
- * 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)
-{
-	CamelService *service;
-
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-	g_return_val_if_fail (url_string != NULL, NULL);
-
-	CAMEL_SESSION_LOCK (session, lock);
-	service = CS_CLASS (session)->get_service (session, url_string, type, ex);
-	CAMEL_SESSION_UNLOCK (session, lock);
-
-	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->status != CAMEL_SERVICE_CONNECTED) {
-		if (camel_service_connect (svc, ex) == FALSE) {
-			camel_object_unref (CAMEL_OBJECT (svc));
-			return NULL;
-		}
-	}
-
-	return svc;
-}
-
-
-static char *
-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 (camel_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_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)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-
-	return CS_CLASS (session)->get_storage_path (session, service, ex);
-}
-
-
-/**
- * camel_session_get_password:
- * @session: session object
- * @prompt: prompt to provide to user
- * @secret: whether or not the data is secret (eg, a password, as opposed
- * to a smartcard response)
- * @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 ask the application and
- * the user for a password or other authentication data.
- *
- * @service and @item together uniquely identify the piece of data the
- * caller is concerned with.
- *
- * @prompt 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 will 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.
- *
- * Return value: the authentication information or %NULL.
- **/
-char *
-camel_session_get_password (CamelSession *session, const char *prompt,
-			    gboolean secret, CamelService *service,
-			    const char *item, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-	g_return_val_if_fail (prompt != NULL, NULL);
-	g_return_val_if_fail (item != NULL, NULL);
-
-	return CS_CLASS (session)->get_password (session, prompt, secret, service, item, ex);
-}
-
-/**
- * camel_session_forget_password:
- * @session: session object
- * @service: the service rejecting the password
- * @item: an identifier, unique within this service, for the information
- * @ex: a CamelException
- *
- * This function is used by a CamelService to tell the application
- * that the authentication information it provided via
- * camel_session_get_password was rejected by the service. If the
- * application was caching this information, it should stop,
- * and if the service asks for it again, it should ask the user.
- *
- * @service and @item identify the rejected authentication information,
- * as with camel_session_get_password.
- **/
-void
-camel_session_forget_password (CamelSession *session, CamelService *service,
-			       const char *item, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (item != NULL);
-
-	CS_CLASS (session)->forget_password (session, service, item, ex);
-}
-
-/**
- * camel_session_alert_user:
- * @session: session object
- * @type: the type of alert (info, warning, or error)
- * @prompt: the message for the user
- * @cancel: whether or not to provide a "Cancel" option in addition to
- * an "OK" option.
- *
- * Presents the given @prompt to the user, in the style indicated by
- * @type. If @cancel is %TRUE, the user will be able to accept or
- * cancel. Otherwise, the message is purely informational.
- *
- * Return value: %TRUE if the user accepts, %FALSE if they cancel.
- */
-gboolean
-camel_session_alert_user (CamelSession *session, CamelSessionAlertType type,
-			  const char *prompt, gboolean cancel)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);
-	g_return_val_if_fail (prompt != NULL, FALSE);
-
-	return CS_CLASS (session)->alert_user (session, type, prompt, cancel);
-}
-
-/**
- * camel_session_register_timeout:
- * @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
- *
- * Registers the given timeout. @callback will be called every
- * @interval milliseconds with one argument, @user_data, until it
- * returns %FALSE.
- *
- * Return value: On success, a non-zero handle that can be used with
- * camel_session_remove_timeout(). On failure, 0.
- **/
-guint
-camel_session_register_timeout (CamelSession *session,
-				guint32 interval,
-				CamelTimeoutCallback callback,
-				gpointer user_data)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), 0);
-
-	return CS_CLASS (session)->register_timeout (session, interval, callback, user_data);
-}
-
-/**
- * camel_session_remove_timeout:
- * @session: the CamelSession
- * @handle: a value returned from camel_session_register_timeout()
- *
- * Removes the indicated timeout.
- *
- * Return value: %TRUE on success, %FALSE on failure.
- **/
-gboolean
-camel_session_remove_timeout (CamelSession *session, guint handle)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);
-
-	return CS_CLASS (session)->remove_timeout (session, handle);
-}
-
-
-/**
- * camel_session_is_online:
- * @session: the session.
- *
- * Return value: whether or not @session is online.
- **/
-gboolean
-camel_session_is_online (CamelSession *session)
-{
-	return session->online;
-}
-
-/**
- * camel_session_set_online:
- * @session: the session
- * @online: whether or not the session should be online
- *
- * Sets the online status of @session to @online.
- **/
-void
-camel_session_set_online (CamelSession *session, gboolean online)
-{
-	session->online = online;
-}
-
-
-/**
- * camel_session_get_filter_driver:
- * @session: the session
- * @type: the type of filter (eg, "incoming")
- * @ex: a CamelException
- *
- * Return value: a filter driver, loaded with applicable rules
- **/
-CamelFilterDriver *
-camel_session_get_filter_driver (CamelSession *session,
-				 const char *type,
-				 CamelException *ex)
-{
-	return CS_CLASS (session)->get_filter_driver (session, type, ex);
-}
-
-#ifdef ENABLE_THREADS
-
-static void *session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size)
-{
-	CamelSessionThreadMsg *m;
-
-	g_assert(size >= sizeof(*m));
-
-	m = g_malloc0(size);
-	m->ops = ops;
-
-	CAMEL_SESSION_LOCK(session, thread_lock);
-	m->id = session->priv->thread_id++;
-	g_hash_table_insert(session->priv->thread_active, (void *)m->id, m);
-	CAMEL_SESSION_UNLOCK(session, thread_lock);
-
-	return m;
-}
-
-static void session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg)
-{
-	g_assert(msg->ops != NULL);
-
-	d(printf("free message %p session %p\n", msg, session));
-
-	CAMEL_SESSION_LOCK(session, thread_lock);
-	g_hash_table_remove(session->priv->thread_active, (void *)msg->id);
-	CAMEL_SESSION_UNLOCK(session, thread_lock);
-
-	d(printf("free msg, ops->free = %p\n", msg->ops->free));
-	
-	if (msg->ops->free)
-		msg->ops->free(session, msg);
-	g_free(msg);
-}
-
-static void session_thread_destroy(EThread *thread, CamelSessionThreadMsg *msg, CamelSession *session)
-{
-	d(printf("destroy message %p session %p\n", msg, session));
-	session_thread_msg_free(session, msg);
-}
-
-static void session_thread_received(EThread *thread, CamelSessionThreadMsg *msg, CamelSession *session)
-{
-	d(printf("receive message %p session %p\n", msg, session));
-	if (msg->ops->receive)
-		msg->ops->receive(session, msg);
-}
-
-static int session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags)
-{
-	int id;
-
-	CAMEL_SESSION_LOCK(session, thread_lock);
-	if (session->priv->thread_queue == NULL) {
-		session->priv->thread_queue = e_thread_new(E_THREAD_QUEUE);
-		e_thread_set_msg_destroy(session->priv->thread_queue, (EThreadFunc)session_thread_destroy, session);
-		e_thread_set_msg_received(session->priv->thread_queue, (EThreadFunc)session_thread_received, session);
-	}
-	CAMEL_SESSION_UNLOCK(session, thread_lock);
-
-	id = msg->id;
-	e_thread_put(session->priv->thread_queue, &msg->msg);
-
-	return id;
-}
-
-static void session_thread_wait(CamelSession *session, int id)
-{
-	int wait;
-
-	/* we just busy wait, only other alternative is to setup a reply port? */
-	do {
-		CAMEL_SESSION_LOCK(session, thread_lock);
-		wait = g_hash_table_lookup(session->priv->thread_active, (void *)id) != NULL;
-		CAMEL_SESSION_UNLOCK(session, thread_lock);
-		if (wait) {
-			usleep(20000);
-		}
-	} while (wait);
-}
-
-/**
- * camel_session_thread_msg_new:
- * @session: 
- * @ops: 
- * @size: 
- * 
- * Create a new thread message, using ops as the receive/reply/free
- * ops, of @size bytes.
- *
- * @ops points to the operations used to recieve/process and finally
- * free the message.
- **/
-void *camel_session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size)
-{
-	g_assert(CAMEL_IS_SESSION(session));
-	g_assert(ops != NULL);
-	g_assert(size >= sizeof(CamelSessionThreadMsg));
-		 
-	return CS_CLASS (session)->thread_msg_new(session, ops, size);
-}
-
-/**
- * camel_session_thread_msg_free:
- * @session: 
- * @msg: 
- * 
- * Free a @msg.  Note that the message must have been allocated using
- * msg_new, and must nto have been submitted to any queue function.
- **/
-void camel_session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg)
-{
-	g_assert(CAMEL_IS_SESSION(session));
-	g_assert(msg != NULL);
-	g_assert(msg->ops != NULL);
-
-	return CS_CLASS (session)->thread_msg_free(session, msg);
-}
-
-/**
- * camel_session_thread_queue:
- * @session: 
- * @msg: 
- * @flags: queue type flags, currently 0.
- * 
- * Queue a thread message in another thread for processing.
- * The operation should be (but needn't) run in a queued manner
- * with other operations queued in this manner.
- * 
- * Return value: The id of the operation queued.
- **/
-int camel_session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags)
-{
-	g_assert(CAMEL_IS_SESSION(session));
-	g_assert(msg != NULL);
-
-	return CS_CLASS (session)->thread_queue(session, msg, flags);
-}
-
-/**
- * camel_session_thread_wait:
- * @session: 
- * @id: 
- * 
- * Wait on an operation to complete (by id).
- **/
-void camel_session_thread_wait(CamelSession *session, int id)
-{
-	g_assert(CAMEL_IS_SESSION(session));
-	
-	if (id == -1)
-		return;
-
-	return CS_CLASS (session)->thread_wait(session, id);
-}
-
-#endif
diff --git a/camel/camel-session.h b/camel/camel-session.h
deleted file mode 100644
index 00083fcdf8..0000000000
--- a/camel/camel-session.h
+++ /dev/null
@@ -1,216 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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>
-
-#include <e-util/e-msgport.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 gboolean (*CamelTimeoutCallback) (gpointer data);
-typedef enum {
-	CAMEL_SESSION_ALERT_INFO,
-	CAMEL_SESSION_ALERT_WARNING,
-	CAMEL_SESSION_ALERT_ERROR
-} CamelSessionAlertType;
-
-struct _CamelSession
-{
-	CamelObject parent_object;
-	struct _CamelSessionPrivate *priv;
-
-	char *storage_path;
-	GHashTable *providers, *modules;
-	gboolean online;
-};
-
-#ifdef ENABLE_THREADS
-typedef struct _CamelSessionThreadOps CamelSessionThreadOps;
-typedef struct _CamelSessionThreadMsg CamelSessionThreadMsg;
-#endif
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	void            (*register_provider) (CamelSession *session,
-					      CamelProvider *provider);
-	GList *         (*list_providers)    (CamelSession *session,
-					      gboolean load);
-	CamelProvider * (*get_provider)      (CamelSession *session,
-					      const char *url_string,
-					      CamelException *ex);
-
-	CamelService *  (*get_service)       (CamelSession *session,
-					      const char *url_string,
-					      CamelProviderType type,
-					      CamelException *ex);
-	char *          (*get_storage_path)  (CamelSession *session,
-					      CamelService *service,
-					      CamelException *ex);
-
-	char *          (*get_password)      (CamelSession *session,
-					      const char *prompt,
-					      gboolean secret,
-					      CamelService *service,
-					      const char *item,
-					      CamelException *ex);
-	void            (*forget_password)   (CamelSession *session,
-					      CamelService *service,
-					      const char *item,
-					      CamelException *ex);
-	gboolean        (*alert_user)        (CamelSession *session,
-					      CamelSessionAlertType type,
-					      const char *prompt,
-					      gboolean cancel);
-
-	guint           (*register_timeout)  (CamelSession *session,
-					      guint32 interval,
-					      CamelTimeoutCallback callback,
-					      gpointer user_data);
-	gboolean        (*remove_timeout)    (CamelSession *session,
-					      guint handle);
-
-	CamelFilterDriver * (*get_filter_driver) (CamelSession *session,
-						  const char *type,
-						  CamelException *ex);
-#ifdef ENABLE_THREADS
-	/* mechanism for creating and maintaining multiple threads of control */
-	void *(*thread_msg_new)(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);
-	void (*thread_msg_free)(CamelSession *session, CamelSessionThreadMsg *msg);
-	int (*thread_queue)(CamelSession *session, CamelSessionThreadMsg *msg, int flags);
-	void (*thread_wait)(CamelSession *session, int id);
-#endif
-	
-} CamelSessionClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_session_get_type (void);
-
-
-void            camel_session_construct             (CamelSession *session,
-						     const char *storage_path);
-
-void            camel_session_register_provider     (CamelSession *session,
-						     CamelProvider *provider);
-GList *         camel_session_list_providers        (CamelSession *session,
-						     gboolean load);
-
-CamelProvider * camel_session_get_provider          (CamelSession *session,
-						     const char *url_string,
-						     CamelException *ex);
-
-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_get_password       (CamelSession *session,
-						     const char *prompt,
-						     gboolean secret,
-						     CamelService *service,
-						     const char *item,
-						     CamelException *ex);
-void               camel_session_forget_password    (CamelSession *session,
-						     CamelService *service,
-						     const char *item,
-						     CamelException *ex);
-gboolean           camel_session_alert_user         (CamelSession *session,
-						     CamelSessionAlertType type,
-						     const char *prompt,
-						     gboolean cancel);
-
-guint              camel_session_register_timeout   (CamelSession *session,
-						     guint32 interval,
-						     CamelTimeoutCallback callback,
-						     gpointer user_data);
-
-gboolean           camel_session_remove_timeout     (CamelSession *session,
-						     guint handle);
-
-
-gboolean           camel_session_is_online          (CamelSession *session);
-void               camel_session_set_online         (CamelSession *session,
-						     gboolean online);
-
-CamelFilterDriver *camel_session_get_filter_driver  (CamelSession *session,
-						     const char *type,
-						     CamelException *ex);
-
-#ifdef ENABLE_THREADS
-struct _CamelSessionThreadOps {
-	void (*receive)(CamelSession *session, struct _CamelSessionThreadMsg *m);
-	void (*free)(CamelSession *session, struct _CamelSessionThreadMsg *m);
-};
-
-struct _CamelSessionThreadMsg {
-	EMsg msg;
-
-	CamelSessionThreadOps *ops;
-	int id;
-	/* user fields follow */
-};
-
-void *camel_session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);
-void camel_session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg);
-int camel_session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags);
-void camel_session_thread_wait(CamelSession *session, int id);
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SESSION_H */
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
deleted file mode 100644
index 9234b18988..0000000000
--- a/camel/camel-smime-context.c
+++ /dev/null
@@ -1,953 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#ifdef HAVE_NSS
-#include "camel-smime-context.h"
-
-#include "camel-mime-filter-from.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
-#include "camel-mime-part.h"
-#include "camel-multipart.h"
-
-#include "nss.h"
-#include <cms.h>
-#include <cert.h>
-#include <certdb.h>
-#include <pkcs11.h>
-#include <smime.h>
-
-#include <gtk/gtk.h> /* for _() macro */
-
-#define d(x)
-
-struct _CamelSMimeContextPrivate {
-	CERTCertDBHandle *certdb;
-};
-
-
-static CamelMimeMessage *smime_sign      (CamelCMSContext *ctx, CamelMimeMessage *message,
-					  const char *userid, gboolean signing_time,
-					  gboolean detached, CamelException *ex);
-
-static CamelMimeMessage *smime_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,
-					  const char *userid, GPtrArray *recipients,
-					  CamelException *ex);
-
-static CamelMimeMessage *smime_encrypt   (CamelCMSContext *ctx, CamelMimeMessage *message,
-					  const char *userid, GPtrArray *recipients, 
-					  CamelException *ex);
-
-static CamelMimeMessage *smime_envelope  (CamelCMSContext *ctx, CamelMimeMessage *message,
-					  const char *userid, GPtrArray *recipients, 
-					  CamelException *ex);
-
-static CamelMimeMessage *smime_decode    (CamelCMSContext *ctx, CamelMimeMessage *message,
-					  CamelCMSValidityInfo **info, CamelException *ex);
-
-static CamelCMSContextClass *parent_class;
-
-static void
-camel_smime_context_init (CamelSMimeContext *context)
-{
-	context->priv = g_new0 (struct _CamelSMimeContextPrivate, 1);
-}
-
-static void
-camel_smime_context_finalise (CamelObject *o)
-{
-	CamelSMimeContext *context = (CamelSMimeContext *)o;
-	
-	g_free (context->encryption_key);
-	g_free (context->priv);
-}
-
-static void
-camel_smime_context_class_init (CamelSMimeContextClass *camel_smime_context_class)
-{
-	CamelCMSContextClass *camel_cms_context_class =
-		CAMEL_CMS_CONTEXT_CLASS (camel_smime_context_class);
-	
-	parent_class = CAMEL_CMS_CONTEXT_CLASS (camel_type_get_global_classfuncs (camel_cms_context_get_type ()));
-	
-	camel_cms_context_class->sign = smime_sign;
-	camel_cms_context_class->certsonly = smime_certsonly;
-	camel_cms_context_class->encrypt = smime_encrypt;
-	camel_cms_context_class->envelope = smime_envelope;
-	camel_cms_context_class->decode = smime_decode;
-}
-
-CamelType
-camel_smime_context_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_cms_context_get_type (),
-					    "CamelSMimeContext",
-					    sizeof (CamelSMimeContext),
-					    sizeof (CamelSMimeContextClass),
-					    (CamelObjectClassInitFunc) camel_smime_context_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_smime_context_init,
-					    (CamelObjectFinalizeFunc) camel_smime_context_finalise);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_smime_context_new:
- * @session: CamelSession
- * @encryption_key: preferred encryption key (used when attaching cert chains to messages)
- *
- * This creates a new CamelSMimeContext object which is used to sign,
- * verify, encrypt and decrypt streams.
- *
- * Return value: the new CamelSMimeContext
- **/
-CamelSMimeContext *
-camel_smime_context_new (CamelSession *session, const char *encryption_key)
-{
-	CamelSMimeContext *context;
-	CERTCertDBHandle *certdb;
-	
-	g_return_val_if_fail (session != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-	
-	certdb = CERT_GetDefaultCertDB ();
-	if (!certdb)
-		return NULL;
-	
-	context = CAMEL_SMIME_CONTEXT (camel_object_new (CAMEL_SMIME_CONTEXT_TYPE));
-	
-	camel_cms_context_construct (CAMEL_CMS_CONTEXT (context), session);
-	
-	context->encryption_key = g_strdup (encryption_key);
-	context->priv->certdb = certdb;
-	
-	return context;
-}
-
-
-struct _GetPasswdData {
-	CamelSession *session;
-	const char *userid;
-	CamelException *ex;
-};
-
-static char *
-smime_get_password (PK11SlotInfo *info, PRBool retry, void *arg)
-{
-	CamelSession *session = ((struct _GetPasswdData *)arg)->session;
-	const char *userid = ((struct _GetPasswdData *)arg)->userid;
-	CamelException *ex = ((struct _GetPasswdData *)arg)->ex;
-	char *prompt, *passwd, *ret;
-	
-	prompt = g_strdup_printf (_("Please enter your password for %s"), userid);
-	passwd = camel_session_get_password (session, prompt, TRUE,
-					     NULL, userid, ex);
-	g_free (prompt);
-	
-	ret = PL_strdup (passwd);
-	g_free (passwd);
-	
-	return ret;
-}
-
-static PK11SymKey *
-decode_key_cb (void *arg, SECAlgorithmID *algid)
-{
-	return (PK11SymKey *)arg;
-}
-
-
-static NSSCMSMessage *
-signed_data (CamelSMimeContext *ctx, const char *userid, gboolean signing_time,
-	     gboolean detached, CamelException *ex)
-{
-	NSSCMSMessage *cmsg = NULL;
-	NSSCMSContentInfo *cinfo;
-	NSSCMSSignedData *sigd;
-	NSSCMSSignerInfo *signerinfo;
-	CERTCertificate *cert, *ekpcert;
-	
-	if (!userid) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Please indicate the nickname of a certificate to sign with."));
-		return NULL;
-	}
-	
-	if ((cert = CERT_FindCertByNickname (ctx->priv->certdb, (char *) userid)) == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("The signature certificate for \"%s\" does not exist."),
-				      userid);
-		return NULL;
-	}
-	
-	/* create the cms message object */
-	cmsg = NSS_CMSMessage_Create (NULL);
-	
-	/* build chain of objects: message->signedData->data */
-	sigd = NSS_CMSSignedData_Create (cmsg);
-	
-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);
-	NSS_CMSContentInfo_SetContent_SignedData (cmsg, cinfo, sigd); 
-	
-	cinfo = NSS_CMSSignedData_GetContentInfo (sigd);
-	
-	/* speciffy whether we want detached signatures or not */
-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, detached);
-	
-	/* create & attach signer information */
-	signerinfo = NSS_CMSSignerInfo_Create (cmsg, cert, SEC_OID_SHA1);
-	
-	/* include the cert chain */
-	NSS_CMSSignerInfo_IncludeCerts (signerinfo, NSSCMSCM_CertChain, 
-					certUsageEmailSigner);
-	
-	if (signing_time) {
-		NSS_CMSSignerInfo_AddSigningTime (signerinfo, PR_Now ());
-	}
-	
-	if (TRUE) {
-		/* Add S/MIME Capabilities */
-		NSS_CMSSignerInfo_AddSMIMECaps (signerinfo);
-	}
-	
-	if (ctx->encryption_key) {
-		/* get the cert, add it to the message */
-		ekpcert = CERT_FindCertByNickname (ctx->priv->certdb, ctx->encryption_key);
-		if (!ekpcert) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("The encryption certificate for \"%s\" does not exist."),
-					      ctx->encryption_key);
-			goto exception;
-		}
-		
-		NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs (signerinfo, ekpcert, ctx->priv->certdb);
-		
-		NSS_CMSSignedData_AddCertificate (sigd, ekpcert);
-	} else {
-		/* check signing cert for fitness as encryption cert */
-		/* if yes, add signing cert as EncryptionKeyPreference */
-		NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs (signerinfo, cert, ctx->priv->certdb);
-	}
-	
-	NSS_CMSSignedData_AddSignerInfo (sigd, signerinfo);
-	
-	return cmsg;
-	
- exception:
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	return NULL;
-}
-
-static void
-smime_sign_restore (CamelMimePart *mime_part, GSList **encodings)
-{
-	CamelDataWrapper *wrapper;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	if (!wrapper)
-		return;
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		int parts, i;
-		
-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));
-		for (i = 0; i < parts; i++) {
-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);
-			
-			smime_sign_restore (part, encodings);
-			*encodings = (*encodings)->next;
-		}
-	} else {
-		CamelMimePartEncodingType encoding;
-		
-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			/* restore the message parts' subparts */
-			smime_sign_restore (CAMEL_MIME_PART (wrapper), encodings);
-		} else {
-			encoding = GPOINTER_TO_INT ((*encodings)->data);
-			
-			camel_mime_part_set_encoding (mime_part, encoding);
-		}
-	}
-}
-
-static void
-smime_sign_prepare (CamelMimePart *mime_part, GSList **encodings)
-{
-	CamelDataWrapper *wrapper;
-	int parts, i;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	if (!wrapper)
-		return;
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));
-		for (i = 0; i < parts; i++) {
-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);
-			
-			smime_sign_prepare (part, encodings);
-		}
-	} else {
-		CamelMimePartEncodingType encoding;
-		
-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			/* prepare the message parts' subparts */
-			smime_sign_prepare (CAMEL_MIME_PART (wrapper), encodings);
-		} else {
-			encoding = camel_mime_part_get_encoding (mime_part);
-			
-			/* FIXME: find the best encoding for this part and use that instead?? */
-			/* the encoding should really be QP or Base64 */
-			if (encoding != CAMEL_MIME_PART_ENCODING_BASE64)
-				camel_mime_part_set_encoding (mime_part, CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE);
-			
-			*encodings = g_slist_append (*encodings, GINT_TO_POINTER (encoding));
-		}
-	}
-}
-
-
-static CamelMimeMessage *
-smime_sign (CamelCMSContext *ctx, CamelMimeMessage *message,
-	    const char *userid, gboolean signing_time,
-	    gboolean detached, CamelException *ex)
-{
-	CamelMimeMessage *mesg = NULL;
-	NSSCMSMessage *cmsg = NULL;
-	struct _GetPasswdData *data;
-	PLArenaPool *arena;
-	NSSCMSEncoderContext *ecx;
-	SECItem output = { 0, 0, 0 };
-	CamelStream *stream;
-	GSList *list, *encodings = NULL;
-	GByteArray *buf;
-	
-	cmsg = signed_data (CAMEL_SMIME_CONTEXT (ctx), userid, signing_time, detached, ex);
-	if (!cmsg)
-		return NULL;
-	
-	arena = PORT_NewArena (1024);
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = ctx->session;
-	data->userid = userid;
-	data->ex = ex;
-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &output, arena,
-				    smime_get_password, data, NULL, NULL,
-				    NULL, NULL);
-	
-	stream = camel_stream_mem_new ();
-	
-	smime_sign_prepare (CAMEL_MIME_PART (message), &encodings);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-	list = encodings;
-	smime_sign_restore (CAMEL_MIME_PART (message), &list);
-	g_slist_free (encodings);
-	
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	
-	NSS_CMSEncoder_Update (ecx, buf->data, buf->len);
-	NSS_CMSEncoder_Finish (ecx);
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	g_free (data);
-	
-	/* write the result to a camel stream */
-	stream = camel_stream_mem_new ();
-	camel_stream_write (stream, output.data, output.len);
-	PORT_FreeArena (arena, PR_FALSE);
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	/* parse the stream into a new CamelMimeMessage */
-	mesg = camel_mime_message_new ();
-	camel_stream_reset (stream);
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return mesg;
-}
-
-
-static NSSCMSMessage *
-certsonly_data (CamelSMimeContext *ctx, const char *userid, GPtrArray *recipients, CamelException *ex)
-{
-	NSSCMSMessage *cmsg = NULL;
-	NSSCMSContentInfo *cinfo;
-	NSSCMSSignedData *sigd;
-	CERTCertificate **rcerts;
-	int i = 0;
-	
-	/* find the signer's and the recipients' certs */
-	rcerts = g_new (CERTCertificate *, recipients->len + 2);
-	rcerts[0] = CERT_FindCertByNicknameOrEmailAddr (ctx->priv->certdb, (char *) userid);
-	if (!rcerts[0]) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to find certificate for \"%s\"."),
-				      recipients->pdata[i]);
-		goto exception;
-	}
-	
-	for (i = 0; i < recipients->len; i++) {
-		rcerts[i + 1] = CERT_FindCertByNicknameOrEmailAddr (ctx->priv->certdb,
-								    recipients->pdata[i]);
-		
-		if (!rcerts[i + 1]) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Failed to find certificate for \"%s\"."),
-					      recipients->pdata[i]);
-			goto exception;
-		}
-	}
-	rcerts[i + 1] = NULL;
-	
-	/* create the cms message object */
-	cmsg = NSS_CMSMessage_Create (NULL);
-	
-	sigd = NSS_CMSSignedData_CreateCertsOnly (cmsg, rcerts[0], PR_TRUE);
-	
-	/* add the recipient cert chain */
-	for (i = 0; i < recipients->len; i++) {
-		NSS_CMSSignedData_AddCertChain (sigd, rcerts[i]);
-	}
-	
-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);
-	NSS_CMSContentInfo_SetContent_SignedData (cmsg, cinfo, sigd);
-	
-	cinfo = NSS_CMSSignedData_GetContentInfo (sigd);
-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, PR_FALSE);
-	
-	g_free (rcerts);
-	
-	return cmsg;
-	
- exception:
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	g_free (rcerts);
-	
-	return NULL;
-}
-
-static CamelMimeMessage *
-smime_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,
-		 const char *userid, GPtrArray *recipients,
-		 CamelException *ex)
-{
-	CamelMimeMessage *mesg = NULL;
-	struct _GetPasswdData *data;
-	NSSCMSMessage *cmsg = NULL;
-	PLArenaPool *arena;
-	NSSCMSEncoderContext *ecx;
-	SECItem output = { 0, 0, 0 };
-	CamelStream *stream;
-	GByteArray *buf;
-	
-	cmsg = certsonly_data (CAMEL_SMIME_CONTEXT (ctx), userid, recipients, ex);
-	if (!cmsg)
-		return NULL;
-	
-	arena = PORT_NewArena (1024);
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = ctx->session;
-	data->userid = userid;
-	data->ex = ex;
-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &output, arena,
-				    smime_get_password, data, NULL, NULL,
-				    NULL, NULL);
-	
-	stream = camel_stream_mem_new ();
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	
-	NSS_CMSEncoder_Update (ecx, buf->data, buf->len);
-	NSS_CMSEncoder_Finish (ecx);
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	g_free (data);
-	
-	/* write the result to a camel stream */
-	stream = camel_stream_mem_new ();
-	camel_stream_write (stream, output.data, output.len);
-	PORT_FreeArena (arena, PR_FALSE);
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	/* parse the stream into a new CamelMimeMessage */
-	mesg = camel_mime_message_new ();
-	camel_stream_reset (stream);
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return mesg;
-}
-
-
-static NSSCMSMessage *
-enveloped_data (CamelSMimeContext *ctx, const char *userid, GPtrArray *recipients, CamelException *ex)
-{
-	NSSCMSMessage *cmsg = NULL;
-	NSSCMSContentInfo *cinfo;
-	NSSCMSEnvelopedData *envd;
-	NSSCMSRecipientInfo *rinfo;
-	CERTCertificate **rcerts;
-	SECOidTag bulkalgtag;
-	int keysize, i;
-	
-	/* find the recipient certs by email address or nickname */
-	rcerts = g_new (CERTCertificate *, recipients->len + 2);
-	rcerts[0] = CERT_FindCertByNicknameOrEmailAddr (ctx->priv->certdb, (char *) userid);
-	if (!rcerts[0]) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to find certificate for \"%s\"."),
-				      userid);
-		goto exception;
-	}
-	
-	for (i = 0; i < recipients->len; i++) {
-		rcerts[i + 1] = CERT_FindCertByNicknameOrEmailAddr (ctx->priv->certdb,  
-								    recipients->pdata[i]);
-		if (!rcerts[i + 1]) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Failed to find certificate for \"%s\"."),
-					      recipients->pdata[i]);
-			goto exception;
-		}
-	}
-	rcerts[i + 1] = NULL;
-	
-	/* find a nice bulk algorithm */
-	if (!NSS_SMIMEUtil_FindBulkAlgForRecipients (rcerts, &bulkalgtag, &keysize)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Failed to find a common bulk algorithm."));
-		goto exception;
-	}
-	
-	/* create a cms message object */
-	cmsg = NSS_CMSMessage_Create (NULL);
-	
-	envd = NSS_CMSEnvelopedData_Create (cmsg, bulkalgtag, keysize);
-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);
-	NSS_CMSContentInfo_SetContent_EnvelopedData (cmsg, cinfo, envd);
-	
-	cinfo = NSS_CMSEnvelopedData_GetContentInfo (envd);
-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, PR_FALSE);
-	
-	/* create & attach recipient information */
-	for (i = 0; rcerts[i] != NULL; i++) {
-		rinfo = NSS_CMSRecipientInfo_Create (cmsg, rcerts[i]);
-		NSS_CMSEnvelopedData_AddRecipient (envd, rinfo);
-	}
-	
-	g_free (rcerts);
-	
-	return cmsg;
-	
- exception:
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	g_free (rcerts);
-	
-	return NULL;
-}
-
-static CamelMimeMessage *
-smime_envelope (CamelCMSContext *ctx, CamelMimeMessage *message,
-		const char *userid, GPtrArray *recipients, 
-		CamelException *ex)
-{
-	CamelMimeMessage *mesg = NULL;
-	struct _GetPasswdData *data;
-	NSSCMSMessage *cmsg = NULL;
-	PLArenaPool *arena;
-	NSSCMSEncoderContext *ecx;
-	SECItem output = { 0, 0, 0 };
-	CamelStream *stream;
-	GByteArray *buf;
-	
-	cmsg = enveloped_data (CAMEL_SMIME_CONTEXT (ctx), userid, recipients, ex);
-	if (!cmsg)
-		return NULL;
-	
-	arena = PORT_NewArena (1024);
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = ctx->session;
-	data->userid = userid;
-	data->ex = ex;
-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &output, arena,
-				    smime_get_password, data, NULL, NULL,
-				    NULL, NULL);
-	
-	stream = camel_stream_mem_new ();
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	
-	NSS_CMSEncoder_Update (ecx, buf->data, buf->len);
-	NSS_CMSEncoder_Finish (ecx);
-	
-	camel_object_unref (CAMEL_OBJECT (stream));
-	g_free (data);
-	
-	/* write the result to a camel stream */
-	stream = camel_stream_mem_new ();
-	camel_stream_write (stream, output.data, output.len);
-	PORT_FreeArena (arena, PR_FALSE);
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	/* parse the stream into a new CamelMimeMessage */
-	mesg = camel_mime_message_new ();
-	camel_stream_reset (stream);
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return mesg;
-}
-
-
-struct _BulkKey {
-	PK11SymKey *bulkkey;
-	SECOidTag bulkalgtag;
-	int keysize;
-};
-
-static NSSCMSMessage *
-encrypted_data (CamelSMimeContext *ctx, GByteArray *input, struct _BulkKey *key,
-		CamelStream *ostream, CamelException *ex)
-{
-	NSSCMSMessage *cmsg = NULL;
-	NSSCMSContentInfo *cinfo;
-	NSSCMSEncryptedData *encd;
-	NSSCMSEncoderContext *ecx = NULL;
-	PLArenaPool *arena = NULL;
-	SECItem output = { 0, 0, 0 };
-	
-	/* arena for output */
-	arena = PORT_NewArena (1024);
-	
-	/* create cms message object */
-	cmsg = NSS_CMSMessage_Create (NULL);
-	
-	encd = NSS_CMSEncryptedData_Create (cmsg, key->bulkalgtag, key->keysize);
-	
-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);
-	NSS_CMSContentInfo_SetContent_EncryptedData (cmsg, cinfo, encd);
-	
-	cinfo = NSS_CMSEncryptedData_GetContentInfo (encd);
-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, PR_FALSE);
-	
-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &output, arena, NULL, NULL,
-				    decode_key_cb, key->bulkkey, NULL, NULL);
-	
-	NSS_CMSEncoder_Update (ecx, input->data, input->len);
-	
-	NSS_CMSEncoder_Finish (ecx);
-	
-	camel_stream_write (ostream, output.data, output.len);
-	
-	if (arena)
-		PORT_FreeArena (arena, PR_FALSE);
-	
-	return cmsg;
-}
-
-static struct _BulkKey *
-get_bulkkey (CamelSMimeContext *ctx, const char *userid, GPtrArray *recipients, CamelException *ex)
-{
-	struct _BulkKey *bulkkey = NULL;
-	NSSCMSMessage *env_cmsg;
-	NSSCMSContentInfo *cinfo;
-	SECItem dummyOut = { 0, 0, 0 };
-	SECItem dummyIn  = { 0, 0, 0 };
-	char str[] = "You are not a beautiful and unique snowflake.";
-	PLArenaPool *arena;
-	int i, nlevels;
-	
-	/* construct an enveloped data message to obtain bulk keys */
-	arena = PORT_NewArena (1024);
-	dummyIn.data = (unsigned char *)str;
-	dummyIn.len = strlen (str);
-	
-	env_cmsg = enveloped_data (ctx, userid, recipients, ex);
-	NSS_CMSDEREncode (env_cmsg, &dummyIn, &dummyOut, arena);
-	/*camel_stream_write (envstream, dummyOut.data, dummyOut.len);*/
-	PORT_FreeArena (arena, PR_FALSE);
-	
-	/* get the content info for the enveloped data */
-	nlevels = NSS_CMSMessage_ContentLevelCount (env_cmsg);
-	for (i = 0; i < nlevels; i++) {
-		SECOidTag typetag;
-		
-		cinfo = NSS_CMSMessage_ContentLevel (env_cmsg, i);
-		typetag = NSS_CMSContentInfo_GetContentTypeTag (cinfo);
-		if (typetag == SEC_OID_PKCS7_DATA) {
-			bulkkey = g_new (struct _BulkKey, 1);
-			
-			/* get the symmertic key */
-			bulkkey->bulkalgtag = NSS_CMSContentInfo_GetContentEncAlgTag (cinfo);
-			bulkkey->keysize = NSS_CMSContentInfo_GetBulkKeySize (cinfo);
-			bulkkey->bulkkey = NSS_CMSContentInfo_GetBulkKey (cinfo);
-			
-			return bulkkey;
-		}
-	}
-	
-	return NULL;
-}
-
-static CamelMimeMessage *
-smime_encrypt (CamelCMSContext *ctx, CamelMimeMessage *message,
-	       const char *userid, GPtrArray *recipients, 
-	       CamelException *ex)
-{
-	struct _BulkKey *bulkkey = NULL;
-	CamelMimeMessage *mesg = NULL;
-	NSSCMSMessage *cmsg = NULL;
-	CamelStream *stream;
-	GByteArray *buf;
-	
-	bulkkey = get_bulkkey (CAMEL_SMIME_CONTEXT (ctx), userid, recipients, ex);
-	if (!bulkkey)
-		return NULL;
-	
-	buf = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buf);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	stream = camel_stream_mem_new ();
-	cmsg = encrypted_data (CAMEL_SMIME_CONTEXT (ctx), buf, bulkkey, stream, ex);
-	g_byte_array_free (buf, TRUE);
-	g_free (bulkkey);
-	if (!cmsg) {
-		camel_object_unref (CAMEL_OBJECT (stream));
-		return NULL;
-	}
-	
-	NSS_CMSMessage_Destroy (cmsg);
-	
-	/* parse the stream into a new CamelMimeMessage */
-	mesg = camel_mime_message_new ();
-	camel_stream_reset (stream);
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return mesg;
-}
-
-
-static NSSCMSMessage *
-decode_data (CamelSMimeContext *ctx, GByteArray *input, CamelStream *ostream,
-	     CamelCMSValidityInfo **info, CamelException *ex)
-{
-	NSSCMSDecoderContext *dcx;
-	struct _GetPasswdData *data;
-	CamelCMSValidityInfo *vinfo = NULL;
-	NSSCMSMessage *cmsg = NULL;
-	NSSCMSContentInfo *cinfo;
-	NSSCMSSignedData *sigd = NULL;
-	NSSCMSEnvelopedData *envd;
-	NSSCMSEncryptedData *encd;
-	int nlevels, i, nsigners, j;
-	char *signercn;
-	NSSCMSSignerInfo *si;
-	SECOidTag typetag;
-	SECItem *item;
-	
-	data = g_new (struct _GetPasswdData, 1);
-	data->session = CAMEL_CMS_CONTEXT (ctx)->session;
-	data->userid = NULL;
-	data->ex = ex;
-	
-	dcx = NSS_CMSDecoder_Start (NULL,
-				    NULL, NULL,
-				    smime_get_password, data,
-				    decode_key_cb,
-				    NULL);
-	
-	NSS_CMSDecoder_Update (dcx, input->data, input->len);
-	
-	cmsg = NSS_CMSDecoder_Finish (dcx);
-	g_free (data);
-	if (cmsg == NULL) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Failed to decode message."));
-		return NULL;
-	}
-	
-	nlevels = NSS_CMSMessage_ContentLevelCount (cmsg);
-	for (i = 0; i < nlevels; i++) {
-		CamelCMSSigner *signers = NULL;
-		
-		cinfo = NSS_CMSMessage_ContentLevel (cmsg, i);
-		typetag = NSS_CMSContentInfo_GetContentTypeTag (cinfo);
-		
-		if (info && !vinfo) {
-			vinfo = g_new0 (CamelCMSValidityInfo, 1);
-			*info = vinfo;
-		} else if (vinfo) {
-			vinfo->next = g_new0 (CamelCMSValidityInfo, 1);
-			vinfo = vinfo->next;
-		}
-		
-		switch (typetag) {
-		case SEC_OID_PKCS7_SIGNED_DATA:
-			if (vinfo)
-				vinfo->type = CAMEL_CMS_TYPE_SIGNED;
-			
-			sigd = (NSSCMSSignedData *)NSS_CMSContentInfo_GetContent (cinfo);
-			
-			/* import the certificates */
-			NSS_CMSSignedData_ImportCerts (sigd, ctx->priv->certdb,
-						       certUsageEmailSigner, PR_FALSE);
-			
-			/* find out about signers */
-			nsigners = NSS_CMSSignedData_SignerInfoCount (sigd);
-			
-			if (nsigners == 0) {
-				/* must be a cert transport message */
-				SECStatus retval;
-				
-				/* XXX workaround for bug #54014 */
-				NSS_CMSSignedData_ImportCerts (sigd, ctx->priv->certdb, 
-							       certUsageEmailSigner, PR_TRUE);
-				
-				retval = NSS_CMSSignedData_VerifyCertsOnly (sigd, ctx->priv->certdb, 
-									    certUsageEmailSigner);
-				if (retval != SECSuccess) {
-					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-							     _("Failed to verify certificates."));
-					goto exception;
-				}
-				
-				return cmsg;
-			}
-			
-			for (j = 0; vinfo && j < nsigners; j++) {
-				if (!signers) {
-					signers = g_new0 (CamelCMSSigner, 1);
-					vinfo->signers = signers;
-				} else {
-					signers->next = g_new0 (CamelCMSSigner, 1);
-					signers = signers->next;
-				}
-				
-				si = NSS_CMSSignedData_GetSignerInfo (sigd, j);
-				signercn = NSS_CMSSignerInfo_GetSignerCommonName (si);
-				if (signercn == NULL)
-					signercn = "";
-				
-				NSS_CMSSignedData_VerifySignerInfo (sigd, j, ctx->priv->certdb, 
-								    certUsageEmailSigner);
-				
-				if (signers) {
-					signers->signercn = g_strdup (signercn);
-					signers->status = g_strdup (
-						NSS_CMSUtil_VerificationStatusToString (
-							NSS_CMSSignerInfo_GetVerificationStatus (si)));
-				}
-			}
-			break;
-		case SEC_OID_PKCS7_ENVELOPED_DATA:
-			if (vinfo)
-				vinfo->type = CAMEL_CMS_TYPE_ENVELOPED;
-			
-			envd = (NSSCMSEnvelopedData *)NSS_CMSContentInfo_GetContent (cinfo);
-			break;
-		case SEC_OID_PKCS7_ENCRYPTED_DATA:
-			if (vinfo)
-				vinfo->type = CAMEL_CMS_TYPE_ENCRYPTED;
-			
-			encd = (NSSCMSEncryptedData *)NSS_CMSContentInfo_GetContent (cinfo);
-			break;
-		case SEC_OID_PKCS7_DATA:
-			break;
-		default:
-			break;
-		}
-	}
-	
-	item = NSS_CMSMessage_GetContent (cmsg);
-	camel_stream_write (ostream, item->data, item->len);
-	
-	return cmsg;
-	
- exception:
-	
-	if (info)
-		camel_cms_validity_info_free (*info);
-	
-	if (cmsg)
-		NSS_CMSMessage_Destroy (cmsg);
-	
-	return NULL;
-}
-
-
-static CamelMimeMessage *
-smime_decode (CamelCMSContext *ctx, CamelMimeMessage *message,
-	      CamelCMSValidityInfo **info, CamelException *ex)
-{
-	CamelMimeMessage *mesg = NULL;
-	NSSCMSMessage *cmsg = NULL;
-	CamelStream *stream, *ostream;
-	GByteArray *buf;
-	
-	stream = camel_stream_mem_new ();
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-	buf = CAMEL_STREAM_MEM (stream)->buffer;
-	
-	ostream = camel_stream_mem_new ();
-	cmsg = decode_data (CAMEL_SMIME_CONTEXT (ctx), buf, ostream, info, ex);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	if (!cmsg) {
-		camel_object_unref (CAMEL_OBJECT (ostream));
-		return NULL;
-	}
-	
-	/* construct a new mime message from the stream */
-	mesg = camel_mime_message_new ();
-	camel_stream_reset (ostream);
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), ostream);
-	camel_object_unref (CAMEL_OBJECT (ostream));
-	
-	return mesg;
-}
-
-#endif /* HAVE_NSS */
diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h
deleted file mode 100644
index 940d715d22..0000000000
--- a/camel/camel-smime-context.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SMIME_CONTEXT_H
-#define CAMEL_SMIME_CONTEXT_H
-
-#include <camel/camel-session.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-cms-context.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CAMEL_SMIME_CONTEXT_TYPE     (camel_smime_context_get_type ())
-#define CAMEL_SMIME_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SMIME_CONTEXT_TYPE, CamelSMimeContext))
-#define CAMEL_SMIME_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMIME_CONTEXT_TYPE, CamelSMimeContextClass))
-#define CAMEL_IS_SMIME_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SMIME_CONTEXT_TYPE))
-
-typedef struct _CamelSMimeContext {
-	CamelCMSContext parent_object;
-	
-	struct _CamelSMimeContextPrivate *priv;
-	
-	char *encryption_key;
-} CamelSMimeContext;
-
-typedef struct _CamelSMimeContextClass {
-	CamelCMSContextClass parent_class;
-	
-} CamelSMimeContextClass;
-
-
-CamelType            camel_smime_context_get_type (void);
-
-CamelSMimeContext   *camel_smime_context_new (CamelSession *session, const char *encryption_key);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SMIME_CONTEXT_H */
diff --git a/camel/camel-smime-utils.c b/camel/camel-smime-utils.c
deleted file mode 100644
index 188ed8a17f..0000000000
--- a/camel/camel-smime-utils.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-smime-utils.h"
-#include "camel-multipart.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define d(x) x
-
-/** rfc2633 stuff (aka S/MIME v3) ********************************/
-
-gboolean
-camel_smime_is_smime_v3_signed (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-	const gchar *param, *micalg;
-	int nparts;
-	
-	/* check that we have a multipart/signed */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "signed"))
-		return FALSE;
-	
-	/* check that we have a protocol param with the value: "application/pkcs7-signature" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || g_strcasecmp (param, "application/pkcs7-signature"))
-		return FALSE;
-	
-	/* check that we have a micalg parameter */
-	micalg = header_content_type_param (type, "micalg");
-	if (!micalg)
-		return FALSE;
-	
-	/* check that we have exactly 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts != 2)
-		return FALSE;
-	
-	/* The first part may be of any type except for 
-	 * application/pkcs7-signature - check it. */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (header_content_type_is (type, "application", "pkcs7-signature"))
-		return FALSE;
-	
-	/* The second part should be application/pkcs7-signature. */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pkcs7-signature"))
-		return FALSE;
-	
-	return TRUE;
-}
-
-gboolean
-camel_smime_is_smime_v3_encrypted (CamelMimePart *mime_part)
-{
-	char *types[] = { "p7m", "p7c", "p7s", NULL };
-	const gchar *param, *filename;
-	CamelContentType *type;
-	int i;
-	
-	/* check that we have a application/pkcs7-mime part */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (header_content_type_is (type, "application", "pkcs7-mime")) {
-		/* check to make sure it's an encrypted pkcs7-mime part? */
-		return TRUE;
-	}
-	
-	if (header_content_type_is (type, "application", "octet-stream")) {
-		/* check to see if we have a paremeter called "smime-type" */
-		param = header_content_type_param (type, "smime-type");
-		if (param)
-			return TRUE;
-		
-		/* check to see if there is a name param and if it has a smime extension */
-		param = header_content_type_param (type, "name");
-		if (param && *param && strlen (param) > 4) {
-			for (i = 0; types[i]; i++)
-				if (!g_strcasecmp (param + strlen (param)-4, types[i]))
-					return TRUE;
-		}
-		
-		/* check to see if there is a filename param and if it has a smime extension */
-		filename = camel_mime_part_get_filename (mime_part);
-		if (filename && *filename && strlen (filename) > 4) {
-			for (i = 0; types[i]; i++)
-				if (!g_strcasecmp (filename + strlen (filename)-4, types[i]))
-					return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
diff --git a/camel/camel-smime-utils.h b/camel/camel-smime-utils.h
deleted file mode 100644
index 9259681d44..0000000000
--- a/camel/camel-smime-utils.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SMIME_UTILS_H
-#define CAMEL_SMIME_UTILS_H
-
-#include <glib.h>
-#include <camel/camel-mime-part.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-gboolean camel_smime_is_smime_v3_signed (CamelMimePart *part);
-
-gboolean camel_smime_is_smime_v3_encrypted (CamelMimePart *part);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! CAMEL_SMIME_UTILS_H */
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
deleted file mode 100644
index 8cd2bf37dd..0000000000
--- a/camel/camel-store-summary.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/*
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "camel-store-summary.h"
-
-#include "camel-file-utils.h"
-
-#include "hash-table-utils.h"
-#include "e-util/md5-utils.h"
-#include "e-util/e-memory.h"
-
-#include "camel-private.h"
-
-#define d(x)
-#define io(x)			/* io debug */
-
-#define CAMEL_STORE_SUMMARY_VERSION (13)
-
-#define _PRIVATE(o) (((CamelStoreSummary *)(o))->priv)
-
-static int summary_header_load(CamelStoreSummary *, FILE *);
-static int summary_header_save(CamelStoreSummary *, FILE *);
-
-static CamelFolderInfo * folder_info_new(CamelStoreSummary *, const char *);
-static CamelFolderInfo * folder_info_load(CamelStoreSummary *, FILE *);
-static int		 folder_info_save(CamelStoreSummary *, FILE *, CamelFolderInfo *);
-static void		 folder_info_free(CamelStoreSummary *, CamelFolderInfo *);
-
-static const char *folder_info_string(CamelStoreSummary *, const CamelFolderInfo *, int);
-static void folder_info_set_string(CamelStoreSummary *, CamelFolderInfo *, int, const char *);
-
-static void camel_store_summary_class_init (CamelStoreSummaryClass *klass);
-static void camel_store_summary_init       (CamelStoreSummary *obj);
-static void camel_store_summary_finalise   (CamelObject *obj);
-
-static CamelObjectClass *camel_store_summary_parent;
-
-static void
-camel_store_summary_class_init (CamelStoreSummaryClass *klass)
-{
-	camel_store_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->folder_info_new  = folder_info_new;
-	klass->folder_info_load = folder_info_load;
-	klass->folder_info_save = folder_info_save;
-	klass->folder_info_free = folder_info_free;
-
-	klass->folder_info_string = folder_info_string;
-	klass->folder_info_set_string = folder_info_set_string;
-}
-
-static void
-camel_store_summary_init (CamelStoreSummary *s)
-{
-	struct _CamelStoreSummaryPrivate *p;
-
-	p = _PRIVATE(s) = g_malloc0(sizeof(*p));
-
-	s->folder_info_size = sizeof(CamelFolderInfo);
-
-	s->folder_info_chunks = NULL;
-
-	s->version = CAMEL_STORE_SUMMARY_VERSION;
-	s->flags = 0;
-	s->count = 0;
-	s->time = 0;
-
-	s->folders = g_ptr_array_new();
-	s->folders_full = g_hash_table_new(g_str_hash, g_str_equal);
-
-#ifdef ENABLE_THREADS
-	p->summary_lock = g_mutex_new();
-	p->io_lock = g_mutex_new();
-	p->alloc_lock = g_mutex_new();
-	p->ref_lock = g_mutex_new();
-#endif
-}
-
-static void
-camel_store_summary_finalise (CamelObject *obj)
-{
-	struct _CamelStoreSummaryPrivate *p;
-	CamelStoreSummary *s = (CamelStoreSummary *)obj;
-
-	p = _PRIVATE(obj);
-
-	camel_store_summary_clear(s);
-	g_ptr_array_free(s->folders, TRUE);
-	g_hash_table_destroy(s->folders_full);
-
-	g_free(s->summary_path);
-
-	if (s->folder_info_chunks)
-		e_memchunk_destroy(s->folder_info_chunks);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(p->summary_lock);
-	g_mutex_free(p->io_lock);
-	g_mutex_free(p->alloc_lock);
-	g_mutex_free(p->ref_lock);
-#endif
-
-	g_free(p);
-}
-
-CamelType
-camel_store_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelStoreSummary",
-					    sizeof (CamelStoreSummary),
-					    sizeof (CamelStoreSummaryClass),
-					    (CamelObjectClassInitFunc) camel_store_summary_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_store_summary_init,
-					    (CamelObjectFinalizeFunc) camel_store_summary_finalise);
-	}
-	
-	return type;
-}
-
-/**
- * camel_store_summary_new:
- *
- * Create a new CamelStoreSummary object.
- * 
- * Return value: A new CamelStoreSummary widget.
- **/
-CamelStoreSummary *
-camel_store_summary_new (void)
-{
-	CamelStoreSummary *new = CAMEL_STORE_SUMMARY ( camel_object_new (camel_store_summary_get_type ()));	return new;
-}
-
-/**
- * camel_store_summary_set_filename:
- * @s: 
- * @name: 
- * 
- * Set the filename where the summary will be loaded to/saved from.
- **/
-void camel_store_summary_set_filename(CamelStoreSummary *s, const char *name)
-{
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	g_free(s->summary_path);
-	s->summary_path = g_strdup(name);
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-void camel_store_summary_set_uri_prefix(CamelStoreSummary *s, const char *prefix)
-{
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	g_free(s->uri_prefix);
-	s->uri_prefix = g_strdup(prefix);
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_store_summary_count:
- * @s: 
- * 
- * Get the number of summary items stored in this summary.
- * 
- * Return value: The number of items int he summary.
- **/
-int
-camel_store_summary_count(CamelStoreSummary *s)
-{
-	return s->folders->len;
-}
-
-/**
- * camel_store_summary_index:
- * @s: 
- * @i: 
- * 
- * Retrieve a summary item by index number.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- * 
- * Return value: The summary item, or NULL if the index @i is out
- * of range.
- * It must be freed using camel_store_summary_info_free().
- **/
-CamelFolderInfo *
-camel_store_summary_index(CamelStoreSummary *s, int i)
-{
-	CamelFolderInfo *info = NULL;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	if (i<s->folders->len)
-		info = g_ptr_array_index(s->folders, i);
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-
-	if (info)
-		info->refcount++;
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-
-	return info;
-}
-
-/**
- * camel_store_summary_index:
- * @s: 
- * @i: 
- * 
- * Obtain a copy of the summary array.  This is done atomically,
- * so cannot contain empty entries.
- *
- * It must be freed using camel_store_summary_array_free().
- **/
-GPtrArray *
-camel_store_summary_array(CamelStoreSummary *s)
-{
-	CamelFolderInfo *info;
-	GPtrArray *res = g_ptr_array_new();
-	int i;
-	
-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	g_ptr_array_set_size(res, s->folders->len);
-	for (i=0;i<s->folders->len;i++) {
-		info = res->pdata[i] = g_ptr_array_index(s->folders, i);
-		info->refcount++;
-	}
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-
-	return res;
-}
-
-/**
- * camel_store_summary_array_free:
- * @s: 
- * @array: 
- * 
- * Free the folder summary array.
- **/
-void
-camel_store_summary_array_free(CamelStoreSummary *s, GPtrArray *array)
-{
-	int i;
-
-	for (i=0;i<array->len;i++)
-		camel_store_summary_info_free(s, array->pdata[i]);
-
-	g_ptr_array_free(array, TRUE);
-}
-
-/**
- * camel_store_summary_full:
- * @s: 
- * @full: 
- * 
- * Retrieve a summary item by full name.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- * 
- * Return value: The summary item, or NULL if the @full name
- * is not available.
- * It must be freed using camel_store_summary_info_free().
- **/
-CamelFolderInfo *
-camel_store_summary_full(CamelStoreSummary *s, const char *full)
-{
-	CamelFolderInfo *info;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	info = g_hash_table_lookup(s->folders_full, full);
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-
-	if (info)
-		info->refcount++;
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-
-	return info;
-}
-
-int
-camel_store_summary_load(CamelStoreSummary *s)
-{
-	FILE *in;
-	int i;
-	CamelFolderInfo *mi;
-
-	g_assert(s->summary_path);
-
-	in = fopen(s->summary_path, "r");
-	if (in == NULL)
-		return -1;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, io_lock);
-	if ( ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_load(s, in) == -1)
-		goto error;
-
-	/* now read in each message ... */
-	for (i=0;i<s->count;i++) {
-		mi = ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->folder_info_load(s, in);
-
-		if (mi == NULL)
-			goto error;
-
-		camel_store_summary_add(s, mi);
-	}
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);
-	
-	if (fclose(in) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_STORE_SUMMARY_DIRTY;
-
-	return 0;
-
-error:
-	g_warning("Cannot load summary file: %s", strerror(ferror(in)));
-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);
-	fclose(in);
-	s->flags |= ~CAMEL_STORE_SUMMARY_DIRTY;
-
-	return -1;
-}
-
-/**
- * camel_store_summary_save:
- * @s: 
- * 
- * Writes the summary to disk.  The summary is only written if changes
- * have occured.
- * 
- * Return value: Returns -1 on error.
- **/
-int
-camel_store_summary_save(CamelStoreSummary *s)
-{
-	FILE *out;
-	int fd;
-	int i;
-	guint32 count;
-	CamelFolderInfo *mi;
-
-	g_assert(s->summary_path);
-
-	if ((s->flags & CAMEL_STORE_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"));
-
-	CAMEL_STORE_SUMMARY_LOCK(s, io_lock);
-
-	if ( ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_save(s, out) == -1) {
-		fclose(out);
-		CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);
-		return -1;
-	}
-
-	/* now write out each message ... */
-
-	/* FIXME: Locking? */
-
-	count = s->folders->len;
-	for (i=0;i<count;i++) {
-		mi = s->folders->pdata[i];
-		((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->folder_info_save(s, out, mi);
-	}
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);
-
-	if (fclose(out) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_STORE_SUMMARY_DIRTY;
-	return 0;
-}
-
-/**
- * camel_store_summary_header_load:
- * @s: Summary object.
- * 
- * Only load the header information from the summary,
- * keep the rest on disk.  This should only be done on
- * a fresh summary object.
- * 
- * Return value: -1 on error.
- **/
-int camel_store_summary_header_load(CamelStoreSummary *s)
-{
-	FILE *in;
-	int ret;
-
-	g_assert(s->summary_path);
-
-	in = fopen(s->summary_path, "r");
-	if (in == NULL)
-		return -1;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, io_lock);
-	ret = ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_load(s, in);
-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);
-	
-	fclose(in);
-	s->flags &= ~CAMEL_STORE_SUMMARY_DIRTY;
-	return ret;
-}
-
-/**
- * camel_store_summary_add:
- * @s: 
- * @info: 
- * 
- * Adds a new @info record to the summary.  If @info->uid is NULL, then a new
- * uid is automatically re-assigned by calling :next_uid_string().
- *
- * The @info record should have been generated by calling one of the
- * info_new_*() functions, as it will be free'd based on the summary
- * class.  And MUST NOT be allocated directly using malloc.
- **/
-void camel_store_summary_add(CamelStoreSummary *s, CamelFolderInfo *info)
-{
-	if (info == NULL)
-		return;
-
-	if (camel_folder_info_full(s, info) == NULL) {
-		g_warning("Trying to add a folder info with missing required full name\n");
-		return;
-	}
-
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	g_ptr_array_add(s->folders, info);
-	g_hash_table_insert(s->folders_full, (char *)camel_folder_info_full(s, info), info);
-	s->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_store_summary_add_from_full:
- * @s: 
- * @h: 
- * 
- * Build a new info record based on the name, and add it to the summary.
- *
- * Return value: The newly added record.
- **/
-CamelFolderInfo *camel_store_summary_add_from_full(CamelStoreSummary *s, const char *full)
-{
-	CamelFolderInfo *info;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-
-	info = g_hash_table_lookup(s->folders_full, full);
-	if (info != NULL) {
-		g_warning("Trying to add folder '%s' to summary that already has it", full);
-		info = NULL;
-	} else {
-		info = camel_store_summary_info_new_from_full(s, full);
-		g_ptr_array_add(s->folders, info);
-		g_hash_table_insert(s->folders_full, (char *)camel_folder_info_full(s, info), info);
-		s->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-	}
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-
-	return info;
-}
-
-/**
- * camel_store_summary_info_new_from_full:
- * @s: 
- * @h: 
- * 
- * Create a new info record from a name.
- * 
- * Return value: Guess?  This info record MUST be freed using
- * camel_store_summary_info_free(), camel_folder_info_free() will not work.
- **/
-CamelFolderInfo *camel_store_summary_info_new_from_full(CamelStoreSummary *s, const char *f)
-{
-	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s))) -> folder_info_new(s, f);
-}
-
-/**
- * camel_store_summary_info_free:
- * @s: 
- * @mi: 
- * 
- * Unref and potentially free the message info @mi, and all associated memory.
- **/
-void camel_store_summary_info_free(CamelStoreSummary *s, CamelFolderInfo *mi)
-{
-	g_assert(mi);
-	g_assert(s);
-
-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);
-
-	g_assert(mi->refcount >= 1);
-
-	mi->refcount--;
-	if (mi->refcount > 0) {
-		CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-		return;
-	}
-
-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-
-	((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->folder_info_free(s, mi);		
-}
-
-/**
- * camel_store_summary_info_ref:
- * @s: 
- * @mi: 
- * 
- * Add an extra reference to @mi.
- **/
-void camel_store_summary_info_ref(CamelStoreSummary *s, CamelFolderInfo *mi)
-{
-	g_assert(mi);
-	g_assert(s);
-
-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);
-	g_assert(mi->refcount >= 1);
-	mi->refcount++;
-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-}
-
-/**
- * camel_store_summary_touch:
- * @s: 
- * 
- * Mark the summary as changed, so that a save will save it.
- **/
-void
-camel_store_summary_touch(CamelStoreSummary *s)
-{
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-	s->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_store_summary_clear:
- * @s: 
- * 
- * Empty the summary contents.
- **/
-void
-camel_store_summary_clear(CamelStoreSummary *s)
-{
-	int i;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-	if (camel_store_summary_count(s) == 0) {
-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-		return;
-	}
-
-	for (i=0;i<s->folders->len;i++)
-		camel_store_summary_info_free(s, s->folders->pdata[i]);
-
-	g_ptr_array_set_size(s->folders, 0);
-	g_hash_table_destroy(s->folders_full);
-	s->folders_full = g_hash_table_new(g_str_hash, g_str_equal);
-	s->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_store_summary_remove:
- * @s: 
- * @info: 
- * 
- * Remove a specific @info record from the summary.
- **/
-void camel_store_summary_remove(CamelStoreSummary *s, CamelFolderInfo *info)
-{
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-	g_hash_table_remove(s->folders_full, camel_folder_info_full(s, info));
-	g_ptr_array_remove(s->folders, info);
-	s->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-
-	camel_store_summary_info_free(s, info);
-}
-
-/**
- * camel_store_summary_remove_uid:
- * @s: 
- * @full: 
- * 
- * Remove a specific info record from the summary, by @full.
- **/
-void camel_store_summary_remove_full(CamelStoreSummary *s, const char *full)
-{
-        CamelFolderInfo *oldinfo;
-        char *oldfull;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-        if (g_hash_table_lookup_extended(s->folders_full, full, (void *)&oldfull, (void *)&oldinfo)) {
-		/* make sure it doesn't vanish while we're removing it */
-		oldinfo->refcount++;
-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-		CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-		camel_store_summary_remove(s, oldinfo);
-		camel_store_summary_info_free(s, oldinfo);
-        } else {
-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-		CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
-	}
-}
-
-/**
- * camel_store_summary_remove_index:
- * @s: 
- * @index: 
- * 
- * Remove a specific info record from the summary, by index.
- **/
-void camel_store_summary_remove_index(CamelStoreSummary *s, int index)
-{
-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-	if (index < s->folders->len) {
-		CamelFolderInfo *info = s->folders->pdata[index];
-
-		g_hash_table_remove(s->folders_full, camel_folder_info_full(s, info));
-		g_ptr_array_remove_index(s->folders, index);
-		s->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-
-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-		camel_store_summary_info_free(s, info);
-	} else {
-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-	}
-}
-
-static int
-summary_header_load(CamelStoreSummary *s, FILE *in)
-{
-	gint32 version, flags, count;
-	time_t time;
-
-	fseek(in, 0, SEEK_SET);
-
-	io(printf("Loading header\n"));
-
-	if (camel_file_util_decode_fixed_int32(in, &version) == -1
-	    || camel_file_util_decode_fixed_int32(in, &flags) == -1
-	    || camel_file_util_decode_time_t(in, &time) == -1
-	    || camel_file_util_decode_fixed_int32(in, &count) == -1) {
-		return -1;
-	}
-
-	s->flags = flags;
-	s->time = time;
-	s->count = count;
-	if (s->version != version) {
-		g_warning("Summary header version mismatch");
-		return -1;
-	}
-	return 0;
-}
-
-static int
-summary_header_save(CamelStoreSummary *s, FILE *out)
-{
-	fseek(out, 0, SEEK_SET);
-
-	io(printf("Savining header\n"));
-
-	camel_file_util_encode_fixed_int32(out, s->version);
-	camel_file_util_encode_fixed_int32(out, s->flags);
-	camel_file_util_encode_time_t(out, s->time);
-	return camel_file_util_encode_fixed_int32(out, camel_store_summary_count(s));
-}
-
-/**
- * camel_store_summary_info_new:
- * @s: 
- * 
- * Allocate a new camel message info, suitable for adding
- * to this summary.
- * 
- * Return value: 
- **/
-CamelFolderInfo *
-camel_store_summary_info_new(CamelStoreSummary *s)
-{
-	CamelFolderInfo *mi;
-
-	CAMEL_STORE_SUMMARY_LOCK(s, alloc_lock);
-	if (s->folder_info_chunks == NULL)
-		s->folder_info_chunks = e_memchunk_new(32, s->folder_info_size);
-	mi = e_memchunk_alloc0(s->folder_info_chunks);
-	CAMEL_STORE_SUMMARY_UNLOCK(s, alloc_lock);
-	mi->refcount = 1;
-	return mi;
-}
-
-const char *camel_folder_info_string(CamelStoreSummary *s, const CamelFolderInfo *mi, int type)
-{
-	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->folder_info_string(s, mi, type);
-}
-
-void camel_folder_info_set_string(CamelStoreSummary *s, CamelFolderInfo *mi, int type, const char *value)
-{
-	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->folder_info_set_string(s, mi, type, value);
-}
-
-static CamelFolderInfo *
-folder_info_new(CamelStoreSummary *s, const char *f)
-{
-	CamelFolderInfo *mi;
-
-	mi = camel_store_summary_info_new(s);
-
-	mi->full = g_strdup(f);
-	mi->unread = CAMEL_STORE_SUMMARY_UNKNOWN;
-	mi->total = CAMEL_STORE_SUMMARY_UNKNOWN;
-
-	return mi;
-}
-
-static CamelFolderInfo *
-folder_info_load(CamelStoreSummary *s, FILE *in)
-{
-	CamelFolderInfo *mi;
-
-	mi = camel_store_summary_info_new(s);
-
-	io(printf("Loading folder info\n"));
-
-	camel_file_util_decode_string(in, &mi->full);
-	camel_file_util_decode_uint32(in, &mi->flags);
-	camel_file_util_decode_uint32(in, &mi->unread);
-	camel_file_util_decode_uint32(in, &mi->total);
-
-	if (!ferror(in))
-		return mi;
-
-	camel_store_summary_info_free(s, mi);
-
-	return NULL;
-}
-
-static int
-folder_info_save(CamelStoreSummary *s, FILE *out, CamelFolderInfo *mi)
-{
-	io(printf("Saving folder info\n"));
-
-	camel_file_util_encode_string(out, camel_folder_info_full(s, mi));
-	camel_file_util_encode_uint32(out, mi->flags);
-	camel_file_util_encode_uint32(out, mi->unread);
-	camel_file_util_encode_uint32(out, mi->total);
-
-	return ferror(out);
-}
-
-static void
-folder_info_free(CamelStoreSummary *s, CamelFolderInfo *mi)
-{
-	g_free(mi->full);
-	g_free(mi->uri);
-	e_memchunk_free(s->folder_info_chunks, mi);
-}
-
-static const char *
-folder_info_string(CamelStoreSummary *s, const CamelFolderInfo *mi, int type)
-{
-	const char *p;
-
-	/* FIXME: Locks? */
-
-	g_assert (mi != NULL);
-
-	switch (type) {
-	case CAMEL_STORE_SUMMARY_FULL:
-		return mi->full;
-	case CAMEL_STORE_SUMMARY_NAME:
-		p = strrchr(mi->full, '/');
-		if (p)
-			return p;
-		else
-			return mi->full;
-	case CAMEL_STORE_SUMMARY_URI:
-		if (mi->uri)
-			return mi->uri;
-		if (s->uri_prefix)
-			return (((CamelFolderInfo *)mi)->uri = g_strdup_printf("%s%s", s->uri_prefix, mi->full));
-	}
-
-	return "";
-}
-
-static void
-folder_info_set_string (CamelStoreSummary *s, CamelFolderInfo *mi, int type, const char *str)
-{
-	const char *p;
-	char *v;
-	int len;
-
-	g_assert (mi != NULL);
-
-	switch(type) {
-	case CAMEL_STORE_SUMMARY_FULL:
-		g_free(mi->full);
-		g_free(mi->uri);
-		mi->full = g_strdup(str);
-		break;
-	case CAMEL_STORE_SUMMARY_NAME:
-		p = strrchr(mi->full, '/');
-		if (p) {
-			len = p-mi->full+1;
-			v = g_malloc(len+strlen(str)+1);
-			memcpy(v, mi->full, len);
-			strcpy(v+len, str);
-		} else {
-			v = g_strdup(str);
-		}
-		g_free(mi->full);
-		mi->full = v;
-		break;
-	case CAMEL_STORE_SUMMARY_URI:
-		if (s->uri_prefix) {
-			len = strlen(s->uri_prefix);
-			if (len > strlen(str)
-			    || strncmp(s->uri_prefix, str, len) != 0) {
-				g_warning("Trying to set folderinfo uri '%s' for summary with prefix '%s'",
-					  str, s->uri_prefix);
-				return;
-			}
-			g_free(mi->full);
-			g_free(mi->uri);
-			mi->full = g_strdup(str + len);
-			mi->uri = g_strdup(str);
-		} else {
-			g_warning("Trying to set folderinfo uri '%s' for summary with no uri prefix", str);
-		}
-		break;
-	}
-}
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
deleted file mode 100644
index a26d2fa84c..0000000000
--- a/camel/camel-store-summary.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_SUMMARY_H
-#define _CAMEL_STORE_SUMMARY_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-object.h>
-
-#define CAMEL_STORE_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_store_summary_get_type (), CamelStoreSummary)
-#define CAMEL_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_store_summary_get_type (), CamelStoreSummaryClass)
-#define CAMEL_IS_FOLDER_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_store_summary_get_type ())
-
-typedef struct _CamelStoreSummary      CamelStoreSummary;
-typedef struct _CamelStoreSummaryClass CamelStoreSummaryClass;
-
-typedef struct _CamelFolderInfo CamelFolderInfo;
-
-enum _CamelFolderFlags {
-	CAMEL_STORE_SUMMARY_FOLDER_NOSELECT,
-	CAMEL_STORE_SUMMARY_FOLDER_READONLY,
-	CAMEL_STORE_SUMMARY_FOLDER_SUBSCRIBED,
-	CAMEL_STORE_SUMMARY_FOLDER_FLAGGED,
-};
-
-#define CAMEL_STORE_SUMMARY_UNKNOWN (~0)
-
-enum {
-	CAMEL_STORE_SUMMARY_FULL = 0,
-	CAMEL_STORE_SUMMARY_NAME,
-	CAMEL_STORE_SUMMARY_URI,
-	CAMEL_STORE_SUMMARY_LAST,
-};
-
-struct _CamelFolderInfo {
-	guint32 refcount;
-	char *uri;
-	char *full;
-	guint32 flags;
-	guint32 unread;
-	guint32 total;
-};
-
-enum _CamelStoreSummaryFlags {
-	CAMEL_STORE_SUMMARY_DIRTY = 1<<0,
-};
-
-struct _CamelStoreSummary {
-	CamelObject parent;
-
-	struct _CamelStoreSummaryPrivate *priv;
-
-	/* header info */
-	guint32 version;	/* version of file required, should be set by implementors */
-	guint32 flags;		/* flags */
-	guint32 count;		/* how many were saved/loaded */
-	time_t time;		/* timestamp for this summary (for implementors to use) */
-
-	/* sizes of memory objects */
-	guint32 folder_info_size;
-
-	/* memory allocators (setup automatically) */
-	struct _EMemChunk *folder_info_chunks;
-
-	char *summary_path;
-	char *uri_prefix;
-
-	GPtrArray *folders;	/* CamelFolderInfo's */
-	GHashTable *folders_full; /* CamelFolderInfo's by full name */
-};
-
-struct _CamelStoreSummaryClass {
-	CamelObjectClass parent_class;
-
-	/* load/save the global info */
-	int (*summary_header_load)(CamelStoreSummary *, FILE *);
-	int (*summary_header_save)(CamelStoreSummary *, FILE *);
-
-	/* create/save/load an individual message info */
-	CamelFolderInfo * (*folder_info_new)(CamelStoreSummary *, const char *full);
-	CamelFolderInfo * (*folder_info_load)(CamelStoreSummary *, FILE *);
-	int		  (*folder_info_save)(CamelStoreSummary *, FILE *, CamelFolderInfo *);
-	void		  (*folder_info_free)(CamelStoreSummary *, CamelFolderInfo *);
-
-	/* virtualise access methods */
-	const char *(*folder_info_string)(CamelStoreSummary *, const CamelFolderInfo *, int);
-	void (*folder_info_set_string)(CamelStoreSummary *, CamelFolderInfo *, int, const char *);
-};
-
-CamelType			 camel_store_summary_get_type	(void);
-CamelStoreSummary      *camel_store_summary_new	(void);
-
-void camel_store_summary_set_filename(CamelStoreSummary *, const char *);
-void camel_store_summary_set_uri_prefix(CamelStoreSummary *, const char *);
-
-/* load/save the summary in its entirety */
-int camel_store_summary_load(CamelStoreSummary *);
-int camel_store_summary_save(CamelStoreSummary *);
-
-/* only load the header */
-int camel_store_summary_header_load(CamelStoreSummary *);
-
-/* set the dirty bit on the summary */
-void camel_store_summary_touch(CamelStoreSummary *s);
-
-/* add a new raw summary item */
-void camel_store_summary_add(CamelStoreSummary *, CamelFolderInfo *info);
-
-/* build/add raw summary items */
-CamelFolderInfo *camel_store_summary_add_from_full(CamelStoreSummary *, const char *);
-
-/* Just build raw summary items */
-CamelFolderInfo *camel_store_summary_info_new(CamelStoreSummary *s);
-CamelFolderInfo *camel_store_summary_info_new_from_full(CamelStoreSummary *s, const char *);
-
-void camel_store_summary_info_ref(CamelStoreSummary *, CamelFolderInfo *);
-void camel_store_summary_info_free(CamelStoreSummary *, CamelFolderInfo *);
-
-/* removes a summary item */
-void camel_store_summary_remove(CamelStoreSummary *s, CamelFolderInfo *info);
-void camel_store_summary_remove_full(CamelStoreSummary *s, const char *full);
-void camel_store_summary_remove_index(CamelStoreSummary *s, int);
-
-/* remove all items */
-void camel_store_summary_clear(CamelStoreSummary *s);
-
-/* lookup functions */
-int camel_store_summary_count(CamelStoreSummary *);
-CamelFolderInfo *camel_store_summary_index(CamelStoreSummary *, int);
-CamelFolderInfo *camel_store_summary_full(CamelStoreSummary *, const char *uid);
-GPtrArray *camel_store_summary_array(CamelStoreSummary *s);
-void camel_store_summary_array_free(CamelStoreSummary *s, GPtrArray *array);
-
-const char *camel_folder_info_string(CamelStoreSummary *, const CamelFolderInfo *, int type);
-void camel_folder_info_set_string(CamelStoreSummary *, CamelFolderInfo *, int type, const char *value);
-
-/* helper macro's */
-#define camel_folder_info_full(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_FULL))
-#define camel_folder_info_uri(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_URI))
-#define camel_folder_info_name(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_NAME))
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_STORE_SUMMARY_H */
diff --git a/camel/camel-store.c b/camel/camel-store.c
deleted file mode 100644
index ab3d667fde..0000000000
--- a/camel/camel-store.c
+++ /dev/null
@@ -1,1150 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <sys/stat.h>
-#include <sys/types.h>
-#include <string.h>
-
-#include "camel-session.h"
-#include "camel-store.h"
-#include "camel-folder.h"
-#include "camel-vtrash-folder.h"
-#include "camel-exception.h"
-#include "camel-private.h"
-
-#define d(x)
-#define w(x)
-
-static CamelServiceClass *parent_class = NULL;
-
-/* Returns the class for a CamelStore */
-#define CS_CLASS(so) ((CamelStoreClass *)((CamelObject *)(so))->klass)
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name,
-				guint32 flags, CamelException *ex);
-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);
-
-static void        init_trash (CamelStore *store);
-static CamelFolder *get_trash (CamelStore *store, CamelException *ex);
-
-static CamelFolderInfo *create_folder (CamelStore *store,
-				       const char *parent_name,
-				       const char *folder_name,
-				       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 void store_sync (CamelStore *store, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 guint32 flags, CamelException *ex);
-static void free_folder_info (CamelStore *store, CamelFolderInfo *tree);
-
-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 construct (CamelService *service, CamelSession *session,
-		       CamelProvider *provider, CamelURL *url,
-		       CamelException *ex);
-
-static int store_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-static int store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-static void
-camel_store_class_init (CamelStoreClass *camel_store_class)
-{
-	CamelObjectClass *camel_object_class = CAMEL_OBJECT_CLASS (camel_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_store_class);
-	
-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method definition */
-	camel_store_class->hash_folder_name = g_str_hash;
-	camel_store_class->compare_folder_name = g_str_equal;
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->get_inbox = get_inbox;
-	camel_store_class->init_trash = init_trash;
-	camel_store_class->get_trash = get_trash;
-	camel_store_class->create_folder = create_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->sync = store_sync;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = free_folder_info;
-	camel_store_class->folder_subscribed = folder_subscribed;
-	camel_store_class->subscribe_folder = subscribe_folder;
-	camel_store_class->unsubscribe_folder = unsubscribe_folder;
-	
-	/* virtual method overload */
-	camel_service_class->construct = construct;
-	
-	camel_object_class->setv = store_setv;
-	camel_object_class->getv = store_getv;
-	
-	camel_object_class_add_event(camel_object_class, "folder_created", NULL);
-	camel_object_class_add_event(camel_object_class, "folder_deleted", NULL);
-	camel_object_class_add_event(camel_object_class, "folder_renamed", NULL);
-	camel_object_class_add_event(camel_object_class, "folder_subscribed", NULL);
-	camel_object_class_add_event(camel_object_class, "folder_unsubscribed", NULL);
-}
-
-static void
-camel_store_init (void *o)
-{
-	CamelStore *store = o;
-	CamelStoreClass *store_class = (CamelStoreClass *)CAMEL_OBJECT_GET_CLASS (o);
-
-	if (store_class->hash_folder_name) {
-		store->folders = g_hash_table_new (store_class->hash_folder_name,
-						   store_class->compare_folder_name);
-	} else
-		store->folders = NULL;
-	
-	/* set vtrash on by default */
-	store->flags = CAMEL_STORE_VTRASH;
-
-	store->dir_sep = '/';
-	
-	store->priv = g_malloc0 (sizeof (*store->priv));
-#ifdef ENABLE_THREADS
-	store->priv->folder_lock = e_mutex_new (E_MUTEX_REC);
-	store->priv->cache_lock = e_mutex_new (E_MUTEX_SIMPLE);
-#endif
-}
-
-static void
-camel_store_finalize (CamelObject *object)
-{
-	CamelStore *store = CAMEL_STORE (object);
-
-	if (store->folders) {
-		if (g_hash_table_size (store->folders) != 0) {
-			d(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);
-	}
-	
-#ifdef ENABLE_THREADS
-	e_mutex_destroy (store->priv->folder_lock);
-	e_mutex_destroy (store->priv->cache_lock);
-#endif
-	g_free (store->priv);
-}
-
-
-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 int
-store_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
-	/* CamelStore doesn't currently have anything to set */
-	return CAMEL_OBJECT_CLASS (parent_class)->setv (object, ex, args);
-}
-
-static int
-store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	/* CamelStore doesn't currently have anything to get */
-	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
-}
-
-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
-folder_finalize (CamelObject *folder, gpointer event_data, gpointer user_data)
-{
-	CamelStore *store = CAMEL_STORE (user_data);
-
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		g_hash_table_foreach_remove (store->folders, folder_matches, folder);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-}
-
-static void
-construct (CamelService *service, CamelSession *session,
-	   CamelProvider *provider, CamelURL *url,
-	   CamelException *ex)
-{
-	CamelStore *store = CAMEL_STORE(service);
-
-	parent_class->construct(service, session, provider, url, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	if (camel_url_get_param(url, "filter"))
-		store->flags |= CAMEL_STORE_FILTER_INBOX;
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	w(g_warning ("CamelStore::get_folder not implemented for `%s'",
-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
-	
-	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
-			      _("Cannot get folder: Invalid operation on this store"));
-	
-	return NULL;
-}
-
-/** 
- * camel_store_get_folder: Return the folder corresponding to a path.
- * @store: a CamelStore
- * @folder_name: name of the folder to get
- * @flags: folder flags (create, save body index, etc)
- * @ex: a CamelException
- * 
- * Return value: the folder corresponding to the path @folder_name.
- **/
-CamelFolder *
-camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder = NULL;
-	
-	g_return_val_if_fail (folder_name != NULL, NULL);
-	
-	CAMEL_STORE_LOCK(store, folder_lock);
-	
-	if (store->folders) {
-		/* Try cache first. */
-		CAMEL_STORE_LOCK(store, cache_lock);
-		folder = g_hash_table_lookup (store->folders, folder_name);
-		if (folder)
-			camel_object_ref (CAMEL_OBJECT (folder));
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-	
-	if (!folder) {
-		folder = CS_CLASS (store)->get_folder (store, folder_name, flags, ex);
-		if (folder) {
-			/* Add the folder to the vTrash folder if this store implements it */
-			if (store->vtrash)
-				camel_vee_folder_add_folder (CAMEL_VEE_FOLDER (store->vtrash), folder);
-			
-			if (store->folders) {
-				CAMEL_STORE_LOCK(store, cache_lock);
-				
-				g_hash_table_insert (store->folders, g_strdup (folder_name), folder);
-				
-				camel_object_hook_event (CAMEL_OBJECT (folder), "finalize", folder_finalize, store);
-				CAMEL_STORE_UNLOCK(store, cache_lock);
-			}
-		}
-	}
-	
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-	return folder;
-}
-
-static CamelFolderInfo *
-create_folder (CamelStore *store, const char *parent_name,
-	       const char *folder_name, CamelException *ex)
-{
-	w(g_warning ("CamelStore::create_folder not implemented for `%s'",
-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
-	
-	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
-			      _("Cannot create folder: Invalid operation on this store"));
-	
-	return NULL;
-}
-
-/** 
- * camel_store_create_folder:
- * @store: a CamelStore
- * @parent_name: name of the new folder's parent, or %NULL
- * @folder_name: name of the folder to create
- * @ex: a CamelException
- * 
- * Creates a new folder as a child of an existing folder.
- * @parent_name can be %NULL to create a new top-level folder.
- *
- * Return value: info about the created folder, which the caller must
- * free with camel_store_free_folder_info().
- **/
-CamelFolderInfo *
-camel_store_create_folder (CamelStore *store, const char *parent_name,
-			   const char *folder_name, CamelException *ex)
-{
-	CamelFolderInfo *fi;
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-	fi = CS_CLASS (store)->create_folder (store, parent_name, folder_name, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return fi;
-}
-
-
-static void
-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	w(g_warning ("CamelStore::delete_folder not implemented for `%s'",
-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
-}
-
-/** 
- * 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)
-{
-	CamelFolder *folder = NULL;
-	char *key;
-	
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	/* NB: Note similarity of this code to unsubscribe_folder */
-	
-	/* if we deleted a folder, force it out of the cache, and also out of the vtrash if setup */
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		folder = g_hash_table_lookup(store->folders, folder_name);
-		if (folder)
-			camel_object_ref((CamelObject *)folder);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-
-		if (folder) {
-			if (store->vtrash)
-				camel_vee_folder_remove_folder((CamelVeeFolder *)store->vtrash, folder);
-			camel_folder_delete (folder);
-		}
-	}
-
-	CS_CLASS (store)->delete_folder (store, folder_name, ex);
-
-	if (folder)
-		camel_object_unref((CamelObject *)folder);
-
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		if (g_hash_table_lookup_extended(store->folders, folder_name, (void **)&key, (void **)&folder)) {
-			g_hash_table_remove (store->folders, key);
-			g_free (key);
-		}
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-	
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
-
-static void
-rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
-{
-	w(g_warning ("CamelStore::rename_folder not implemented for `%s'",
-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
-}
-
-struct _get_info {
-	CamelStore *store;
-	GPtrArray *folders;
-	const char *old;
-	const char *new;
-};
-
-static void
-get_subfolders(char *key, CamelFolder *folder, struct _get_info *info)
-{
-	int oldlen, namelen;
-
-	namelen = strlen(folder->full_name);
-	oldlen = strlen(info->old);
-
-	if ((namelen == oldlen &&
-	     strcmp(folder->full_name, info->old) == 0)
-	    || ((namelen > oldlen)
-		&& strncmp(folder->full_name, info->old, oldlen) == 0
-		&& folder->full_name[oldlen] == info->store->dir_sep)) {
-
-		d(printf("Found subfolder of '%s' == '%s'\n", info->old, folder->full_name));
-		camel_object_ref((CamelObject *)folder);
-		g_ptr_array_add(info->folders, folder);
-		CAMEL_FOLDER_LOCK(folder, lock);
-	}
-}
-
-/**
- * camel_store_rename_folder:
- * @store: a CamelStore
- * @old_name: the current name of the folder
- * @new_name: the new name of the folder
- * @ex: a CamelException
- * 
- * 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 *key;
-	CamelFolder *folder, *oldfolder;
-	struct _get_info info = { store, NULL, old_name, new_name };
-	int i;
-
-	d(printf("store rename folder %s '%s' '%s'\n", ((CamelService *)store)->url->protocol, old_name, new_name));
-
-	if (strcmp(old_name, new_name) == 0)
-		return;
-
-	info.folders = g_ptr_array_new();
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	/* If the folder is open (or any subfolders of the open folder)
-	   We need to rename them atomically with renaming the actual folder path */
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		/* Get all subfolders that are about to have their name changed */
-		g_hash_table_foreach(store->folders, (GHFunc)get_subfolders, &info);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-
-	/* Now try the real rename (will emit renamed event) */
-	CS_CLASS (store)->rename_folder (store, old_name, new_name, ex);
-
-	/* If it worked, update all open folders/unlock them */
-	if (!camel_exception_is_set(ex)) {
-		guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
-		CamelRenameInfo reninfo;
-
-		CAMEL_STORE_LOCK(store, cache_lock);
-		for (i=0;i<info.folders->len;i++) {
-			char *new;
-
-			folder = info.folders->pdata[i];
-
-			new = g_strdup_printf("%s%s", new_name, folder->full_name+strlen(old_name));
-
-			if (g_hash_table_lookup_extended(store->folders, folder->full_name, (void **)&key, (void **)&oldfolder)) {
-				g_hash_table_remove(store->folders, key);
-				g_free(key);
-				g_hash_table_insert(store->folders, new, oldfolder);
-			}
-
-			camel_folder_rename(folder, new);
-
-			CAMEL_FOLDER_UNLOCK(folder, lock);
-			camel_object_unref((CamelObject *)folder);
-		}
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-
-		/* Emit changed signal */
-		if (store->flags & CAMEL_STORE_SUBSCRIPTIONS)
-			flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
-		
-		reninfo.old_base = (char *)old_name;
-		reninfo.new = ((CamelStoreClass *)((CamelObject *)store)->klass)->get_folder_info(store, new_name, flags, ex);
-		if (reninfo.new != NULL) {
-			camel_object_trigger_event(CAMEL_OBJECT(store), "folder_renamed", &reninfo);
-			((CamelStoreClass *)((CamelObject *)store)->klass)->free_folder_info(store, reninfo.new);
-		}
-	} else {
-		/* Failed, just unlock our folders for re-use */
-		for (i=0;i<info.folders->len;i++) {
-			folder = info.folders->pdata[i];
-			CAMEL_FOLDER_UNLOCK(folder, lock);
-			camel_object_unref((CamelObject *)folder);
-		}
-	}
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	g_ptr_array_free(info.folders, TRUE);
-}
-
-
-static CamelFolder *
-get_inbox (CamelStore *store, CamelException *ex)
-{
-	/* Default: assume the inbox's name is "inbox"
-	 * and open with default flags.
-	 */
-	return CS_CLASS (store)->get_folder (store, "inbox", 0, ex);
-}
-
-/** 
- * camel_store_get_inbox:
- * @store: a CamelStore
- * @ex: a CamelException
- *
- * Return value: the folder in the store into which new mail is
- * delivered, or %NULL if no such folder exists.
- **/
-CamelFolder *
-camel_store_get_inbox (CamelStore *store, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-	folder = CS_CLASS (store)->get_inbox (store, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return folder;
-}
-
-
-static void
-trash_add_folder (gpointer key, gpointer value, gpointer data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (value);
-	CamelStore *store = CAMEL_STORE (data);
-	
-	camel_vee_folder_add_folder (CAMEL_VEE_FOLDER (store->vtrash), folder);
-}
-
-static void
-trash_finalize (CamelObject *trash, gpointer event_data, gpointer user_data)
-{
-	CamelStore *store = CAMEL_STORE (user_data);
-	
-	store->vtrash = NULL;
-}
-
-static void
-init_trash (CamelStore *store)
-{
-	if ((store->flags & CAMEL_STORE_VTRASH) == 0)
-		return;
-
-	store->vtrash = camel_vtrash_folder_new (store, CAMEL_VTRASH_NAME);
-	
-	if (store->vtrash) {
-		/* attach to the finalise event of the vtrash */
-		camel_object_hook_event (CAMEL_OBJECT (store->vtrash), "finalize",
-					 trash_finalize, store);
-		
-		/* add all the pre-opened folders to the vtrash */
-		if (store->folders) {
-			CAMEL_STORE_LOCK(store, cache_lock);
-			g_hash_table_foreach (store->folders, trash_add_folder, store);
-			CAMEL_STORE_UNLOCK(store, cache_lock);
-		}
-	}
-}
-
-
-static CamelFolder *
-get_trash (CamelStore *store, CamelException *ex)
-{
-	if (store->vtrash) {
-		camel_object_ref (CAMEL_OBJECT (store->vtrash));
-		return store->vtrash;
-	} else {
-		CS_CLASS (store)->init_trash (store);
-		if (store->vtrash) {
-			/* We don't ref here because we don't want the
-                           store to own a ref on the trash folder */
-			/*camel_object_ref (CAMEL_OBJECT (store->vtrash));*/
-			return store->vtrash;
-		} else {
-			w(g_warning ("This store does not support vTrash."));
-			return NULL;
-		}
-	}
-}
-
-/** 
- * camel_store_get_trash:
- * @store: a CamelStore
- * @ex: a CamelException
- *
- * Return value: the folder in the store into which trash is
- * delivered, or %NULL if no such folder exists.
- **/
-CamelFolder *
-camel_store_get_trash (CamelStore *store, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	if ((store->flags & CAMEL_STORE_VTRASH) == 0)
-		return NULL;
-	
-	CAMEL_STORE_LOCK(store, folder_lock);
-	folder = CS_CLASS (store)->get_trash (store, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-	
-	return folder;
-}
-
-
-static void
-sync_folder (gpointer key, gpointer folder, gpointer ex)
-{
-	if (!camel_exception_is_set (ex))
-		camel_folder_sync (folder, FALSE, ex);
-	
-	camel_object_unref (CAMEL_OBJECT (folder));
-	g_free (key);
-}
-
-static void
-copy_folder_cache (gpointer key, gpointer folder, gpointer hash)
-{
-	g_hash_table_insert ((GHashTable *) hash, g_strdup (key), folder);
-	camel_object_ref (CAMEL_OBJECT (folder));
-}
-
-static void
-store_sync (CamelStore *store, CamelException *ex)
-{
-	if (store->folders) {
-		CamelException internal_ex;
-		GHashTable *hash;
-		
-		hash = g_hash_table_new (CS_CLASS (store)->hash_folder_name,
-					 CS_CLASS (store)->compare_folder_name);
-		
-		camel_exception_init (&internal_ex);
-		CAMEL_STORE_LOCK(store, cache_lock);
-		g_hash_table_foreach (store->folders, copy_folder_cache, hash);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-		camel_exception_xfer (ex, &internal_ex);
-		
-		g_hash_table_foreach (hash, sync_folder, &internal_ex);
-		g_hash_table_destroy (hash);
-	}
-}
-
-/**
- * camel_store_sync:
- * @store: a CamelStore
- * @ex: a CamelException
- *
- * Syncs any changes that have been made to the store object and its
- * folders with the real store.
- **/
-void
-camel_store_sync (CamelStore *store, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-
-	CS_CLASS (store)->sync (store, ex);
-}
-
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 guint32 flags, CamelException *ex)
-{
-	w(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
- * @flags: various CAMEL_STORE_FOLDER_INFO_* flags to control behavior
- * @ex: a CamelException
- *
- * This fetches information about the folder structure of @store,
- * starting with @top, and returns a tree of CamelFolderInfo
- * structures. If @flags includes %CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
- * only subscribed folders will be listed. (This flag can only be used
- * for stores that support subscriptions.) If @flags includes
- * %CAMEL_STORE_FOLDER_INFO_RECURSIVE, the returned tree will include
- * all levels of hierarchy below @top. If not, it will only include
- * the immediate subfolders of @top. If @flags includes
- * %CAMEL_STORE_FOLDER_INFO_FAST, the unread_message_count fields of
- * some or all of the structures may be set to -1, if the store cannot
- * determine that information quickly.
- * 
- * 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,
-			     guint32 flags, CamelException *ex)
-{
-	CamelFolderInfo *ret;
-
-	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);
-	g_return_val_if_fail ((store->flags & CAMEL_STORE_SUBSCRIPTIONS) ||
-			      !(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED),
-			      NULL);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-	ret = CS_CLASS (store)->get_folder_info (store, top, flags, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return ret;
-}
-
-
-static void
-free_folder_info (CamelStore *store, CamelFolderInfo *fi)
-{
-	w(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->path);
-		g_free (fi->url);
-		g_free (fi);
-	}
-}
-
-
-/**
- * camel_folder_info_build_path:
- * @fi: folder info
- * @separator: directory separator
- *
- * Sets the folder info path based on the folder's full name and
- * directory separator.
- **/
-void
-camel_folder_info_build_path (CamelFolderInfo *fi, char separator)
-{
-	fi->path = g_strdup_printf("/%s", fi->full_name);
-	if (separator != '/') {
-		char *p;
-		
-		p = fi->path;
-		while ((p = strchr (p, separator)))
-			*p = '/';
-	}
-}
-
-static int
-folder_info_cmp (const void *ap, const void *bp)
-{
-	const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0];
-	const CamelFolderInfo *b = ((CamelFolderInfo **)bp)[0];
-	
-	return strcmp (a->full_name, b->full_name);
-}
-
-/**
- * camel_folder_info_build:
- * @folders: an array of CamelFolderInfo
- * @namespace: an ignorable prefix on the folder names
- * @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 according
- * to the hierarchy described by their full_names and @separator. If
- * @namespace is non-%NULL, then it will be ignored as a full_name
- * prefix, for purposes of comparison. 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.
- *
- * Return value: the top level of the tree of linked folder info.
- **/
-CamelFolderInfo *
-camel_folder_info_build (GPtrArray *folders, const char *namespace,
-			 char separator, gboolean short_names)
-{
-	CamelFolderInfo *fi, *pfi, *top = NULL;
-	GHashTable *hash;
-	char *name, *p, *pname;
-	int i, nlen;
-	
-	if (!namespace)
-		namespace = "";
-	nlen = strlen (namespace);
-	
-	qsort (folders->pdata, folders->len, sizeof (folders->pdata[0]), folder_info_cmp);
-	
-	/* Hash the folders. */
-	hash = g_hash_table_new (g_str_hash, g_str_equal);
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (!strncmp (namespace, fi->full_name, nlen))
-			name = fi->full_name + nlen;
-		else
-			name = fi->full_name;
-		if (*name == separator)
-			name++;
-		g_hash_table_insert (hash, name, fi);
-	}
-	
-	/* Now find parents. */
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (!strncmp (namespace, fi->full_name, nlen))
-			name = fi->full_name + nlen;
-		else
-			name = fi->full_name;
-		if (*name == separator)
-			name++;
-		
-		/* set the path if it isn't already set */
-		if (!fi->path)
-			camel_folder_info_build_path (fi, separator);
-		
-		p = strrchr (name, separator);
-		if (p) {
-			pname = g_strndup (name, p - name);
-			pfi = g_hash_table_lookup (hash, pname);
-			if (pfi) {
-				g_free (pname);
-			} else {
-				/* we are missing a folder in the heirarchy so
-				   create a fake folder node */
-				CamelURL *url;
-				char *sep;
-				
-				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);
-				
-				url = camel_url_new (fi->url, NULL);
-				sep = strrchr (url->path, separator);
-				if (sep)
-					*sep = '\0';
-				else
-					d(g_warning ("huh, no \"%c\" in \"%s\"?", separator, fi->url));
-				
-				/* since this is a "fake" folder node, it is not selectable */
-				camel_url_set_param (url, "noselect", "yes");
-				pfi->url = camel_url_to_string (url, 0);
-				camel_url_free (url);
-				
-				g_hash_table_insert (hash, pname, pfi);
-				g_ptr_array_add (folders, pfi);
-			}
-			fi->sibling = pfi->child;
-			fi->parent = pfi;
-			pfi->child = fi;
-		} else if (!top)
-			top = fi;
-	}
-	g_hash_table_destroy (hash);
-
-	/* Link together the top-level folders */
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (fi->parent || fi == top)
-			continue;
-		if (top)
-			fi->sibling = top;
-		top = fi;
-	}
-	
-	return top;
-}
-
-static CamelFolderInfo *folder_info_clone_rec(CamelFolderInfo *fi, CamelFolderInfo *parent)
-{
-	CamelFolderInfo *info;
-
-	info = g_malloc(sizeof(*info));
-	info->parent = parent;
-	info->url = g_strdup(fi->url);
-	info->name = g_strdup(fi->name);
-	info->full_name = g_strdup(fi->full_name);
-	info->path = g_strdup(fi->path);
-	info->unread_message_count = fi->unread_message_count;
-
-	if (fi->sibling)
-		info->sibling = folder_info_clone_rec(fi->sibling, parent);
-	else
-		info->sibling = NULL;
-
-	if (fi->child)
-		info->child = folder_info_clone_rec(fi->child, info);
-	else
-		info->child = NULL;
-
-	return info;
-}
-
-CamelFolderInfo *
-camel_folder_info_clone(CamelFolderInfo *fi)
-{
-	if (fi == NULL)
-		return NULL;
-
-	return folder_info_clone_rec(fi, NULL);
-}
-
-gboolean
-camel_store_supports_subscriptions (CamelStore *store)
-{
-	return (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-}
-
-
-static gboolean
-folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	w(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)
-{
-	gboolean ret;
-
-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
-	g_return_val_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS, FALSE);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	ret = CS_CLASS (store)->folder_subscribed (store, folder_name);
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return ret;
-}
-
-static void
-subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	w(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);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	CS_CLASS (store)->subscribe_folder (store, folder_name, ex);
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
-
-static void
-unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	w(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)
-{
-	CamelFolder *folder = NULL;
-	char *key;
-
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	/* NB: Note similarity of this code to delete_folder */
-
-	/* if we deleted a folder, force it out of the cache, and also out of the vtrash if setup */
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		folder = g_hash_table_lookup(store->folders, folder_name);
-		if (folder)
-			camel_object_ref((CamelObject *)folder);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-
-		if (folder) {
-			if (store->vtrash)
-				camel_vee_folder_remove_folder((CamelVeeFolder *)store->vtrash, folder);
-			camel_folder_delete (folder);
-		}
-	}
-
-	CS_CLASS (store)->unsubscribe_folder (store, folder_name, ex);
-
-	if (folder)
-		camel_object_unref((CamelObject *)folder);
-
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		if (g_hash_table_lookup_extended(store->folders, folder_name, (void **)&key, (void **)&folder)) {
-			g_hash_table_remove (store->folders, key);
-			g_free (key);
-		}
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
-
-
-int
-camel_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;
-}
-
-
-/* Return true if these uri's refer to the same object */
-gboolean
-camel_store_uri_cmp(CamelStore *store, const char *uria, const char *urib)
-{
-	g_assert(CAMEL_IS_STORE(store));
-
-	return CS_CLASS(store)->compare_folder_name(uria, urib);
-}
diff --git a/camel/camel-store.h b/camel/camel-store.h
deleted file mode 100644
index 3d8e10af8c..0000000000
--- a/camel/camel-store.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-store.h : Abstract class for an email store */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 }*/
-
-/* for mode_t */
-#include <sys/types.h>
-
-#include <camel/camel-object.h>
-#include <camel/camel-service.h>
-
-enum {
-	CAMEL_STORE_ARG_FIRST  = CAMEL_SERVICE_ARG_FIRST + 100,
-};
-
-typedef struct _CamelFolderInfo {
-	struct _CamelFolderInfo *parent,
-		*sibling,
-		*child;
-	char *url;
-	char *name;
-	char *full_name;
-	char *path;
-	int unread_message_count;
-} CamelFolderInfo;
-
-/* Structure of rename event's event_data */
-typedef struct _CamelRenameInfo {
-	char *old_base;
-	struct _CamelFolderInfo *new;
-} CamelRenameInfo;
-
-#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)
-#define CAMEL_STORE_VTRASH		(1 << 1)
-#define CAMEL_STORE_FILTER_INBOX	(1 << 2)
-
-struct _CamelStore
-{
-	CamelService parent_object;
-	struct _CamelStorePrivate *priv;
-	
-	CamelFolder *vtrash;
-	
-	/* should have cache_lock when accessing this (priv->cache_lock) */
-	GHashTable *folders;
-
-	int flags;
-
-	/* FIXME: This is a temporary measure until IMAP namespaces are properly implemented,
-	   after that, all external folder api's will assume a dir separator of '/' */
-	/* This is always a copy of IMAP_STORE()->dir_sep, or '/' */
-	char dir_sep;
-};
-
-
-/* open mode for folder */
-#define CAMEL_STORE_FOLDER_CREATE (1<<0)
-#define CAMEL_STORE_FOLDER_BODY_INDEX (1<<1)
-#define CAMEL_STORE_FOLDER_PRIVATE (1<<2) /* a private folder, that shouldn't show up in unmatched/folder info's, etc */
-
-#define CAMEL_STORE_FOLDER_INFO_FAST       (1 << 0)
-#define CAMEL_STORE_FOLDER_INFO_RECURSIVE  (1 << 1)
-#define CAMEL_STORE_FOLDER_INFO_SUBSCRIBED (1 << 2)
-
-typedef struct {
-	CamelServiceClass parent_class;
-
-	GHashFunc       hash_folder_name;
-	GCompareFunc    compare_folder_name;
-
-	CamelFolder *   (*get_folder)               (CamelStore *store,
-						     const char *folder_name,
-						     guint32 flags,
-						     CamelException *ex);
-	CamelFolder *   (*get_inbox)                (CamelStore *store,
-						     CamelException *ex);
-	
-	void            (*init_trash)               (CamelStore *store);
-	CamelFolder *   (*get_trash)                (CamelStore *store,
-						     CamelException *ex);
-	
-	CamelFolderInfo *(*create_folder)           (CamelStore *store,
-						     const char *parent_name,
-						     const char *folder_name,
-						     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);
-	
-	void            (*sync)                     (CamelStore *store,
-						     CamelException *ex);
-	
-	CamelFolderInfo *(*get_folder_info)         (CamelStore *store,
-						     const char *top,
-						     guint32 flags,
-						     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_inbox          (CamelStore *store,
-						 CamelException *ex);
-CamelFolder *    camel_store_get_trash          (CamelStore *store,
-						 CamelException *ex);
-
-CamelFolderInfo *camel_store_create_folder      (CamelStore *store,
-						 const char *parent_name,
-						 const char *folder_name,
-						 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);
-
-void             camel_store_sync               (CamelStore *store,
-						 CamelException *ex);
-
-CamelFolderInfo *camel_store_get_folder_info    (CamelStore *store,
-						 const char *top,
-						 guint32 flags,
-						 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_path      (CamelFolderInfo *fi,
-						    char separator);
-CamelFolderInfo *camel_folder_info_build           (GPtrArray *folders,
-						    const char *namespace,
-						    char separator,
-						    gboolean short_names);
-CamelFolderInfo *camel_folder_info_clone	   (CamelFolderInfo *fi);
-
-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);
-
-gboolean	 camel_store_uri_cmp		      (CamelStore *store, const char *uria, const char *urib);
-
-/* utility needed by some stores */
-int camel_mkdir_hier (const char *path, mode_t mode);
-
-#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 fe3458a93f..0000000000
--- a/camel/camel-stream-buffer.c
+++ /dev/null
@@ -1,470 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "camel-stream-buffer.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) {
-					size_t bytes_used = bytes_read > n ? n : bytes_read;
-					sbf->ptr = sbf->buf;
-					sbf->end = sbf->buf+bytes_read;
-					memcpy(bptr, sbf->ptr, bytes_used);
-					sbf->ptr += bytes_used;
-					bptr += bytes_used;
-					n -= bytes_used;
-				}
-			}
-		} else {
-			memcpy(bptr, sbf->ptr, n);
-			sbf->ptr += n;
-			bptr += n;
-			n = 0;
-		}
-	}
-
-	return (ssize_t)(bptr - buffer);
-}
-
-/* only returns the number passed in, or -1 on an error */
-static ssize_t
-stream_write_all(CamelStream *stream, const char *buffer, size_t n)
-{
-	size_t left = n, w;
-
-	while (left > 0) {
-		w = camel_stream_write(stream, buffer, left);
-		if (w == -1)
-			return -1;
-		left -= w;
-		buffer += w;
-	}
-
-	return n;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-	ssize_t total = n;
-	ssize_t left, todo;
-
-	g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE, 0);
-
-	/* first, copy as much as we can */
-	left = sbf->size - (sbf->ptr-sbf->buf);
-	todo = MIN(left, n);
-
-	memcpy(sbf->ptr, buffer, todo);
-	n -= todo;
-	buffer += todo;
-	sbf->ptr += todo;
-
-	/* if we've filled the buffer, write it out, reset buffer */
-	if (left == todo) {
-		if (stream_write_all(sbf->stream, sbf->buf, sbf->size) == -1)
-			return -1;
-
-		sbf->ptr = sbf->buf;
-	}
-
-	/* if we still have more, write directly, or copy to buffer */
-	if (n > 0) {
-		if (n >= sbf->size/3) {
-			if (stream_write_all(sbf->stream, buffer, n) == -1)
-				return -1;
-		} else {
-			memcpy(sbf->ptr, buffer, n);
-			sbf->ptr += n;
-		}
-	}
-
-	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-1 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) {
-			if (buf == outptr)
-				return -1;
-			else
-				bytes_read = 0;
-		}
-		inptr = sbf->ptr = sbf->buf;
-		inend = sbf->end = sbf->buf + bytes_read;
-	} while (bytes_read>0);
-
-	sbf->ptr = inptr;
-	*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 > sbf->linebuf && 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 03a8517066..0000000000
--- a/camel/camel-stream-buffer.h
+++ /dev/null
@@ -1,106 +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@ximian.com>
- *
- * Copyright 2000 Ximian Inc. (www.ximian.com) .
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <camel/camel-seekable-stream.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_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 b325aea1f1..0000000000
--- a/camel/camel-stream-filter.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-#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 presize;
-	size_t len;
-	
-	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 3d265e8b4c..0000000000
--- a/camel/camel-stream-filter.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_FILTER_H
-#define _CAMEL_STREAM_FILTER_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#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 CAMEL_IS_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;
-};
-
-CamelType			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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
deleted file mode 100644
index a1d7cbaca3..0000000000
--- a/camel/camel-stream-fs.c
+++ /dev/null
@@ -1,412 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#include "camel-operation.h"
-#include "camel-stream-fs.h"
-#include "camel-session.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;
-	((CamelSeekableStream *)stream)->bound_end = CAMEL_STREAM_UNBOUND;
-}
-
-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;
-
-	if (fd == -1)
-		return NULL;
-
-	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;
-	int cancel_fd;
-	
-	if (camel_operation_cancel_check(NULL)) {
-		errno = EINTR;
-		return  -1;
-	}
-	
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable->bound_end - seekable->position, n);
-	
-	cancel_fd = camel_operation_cancel_fd(NULL);
-	if (cancel_fd == -1) {
-		do {
-			nread = read (stream_fs->fd, buffer, n);
-		} while (nread == -1 && (errno == EINTR || errno == EAGAIN));
-	} else {
-		fd_set rdset;
-		int error, flags, fdmax;
-		
-		flags = fcntl (stream_fs->fd, F_GETFL);
-		fcntl (stream_fs->fd, F_SETFL, flags | O_NONBLOCK);
-		
-		do {
-			FD_ZERO (&rdset);
-			FD_SET (stream_fs->fd, &rdset);
-			FD_SET (cancel_fd, &rdset);
-			fdmax = MAX (stream_fs->fd, cancel_fd) + 1;
-			
-			nread = -1;
-			if (select (fdmax, &rdset, 0, 0, NULL) != -1) {
-				if (FD_ISSET (cancel_fd, &rdset)) {
-					fcntl (stream_fs->fd, F_SETFL, flags);
-					errno = EINTR;
-					return -1;
-				}
-				
-				do {
-					nread = read (stream_fs->fd, buffer, n);
-				} while (nread == -1 && errno == EAGAIN);
-			} else if (errno == EINTR) {
-				errno = EAGAIN;
-			}
-		} while (nread == -1 && errno == EAGAIN);
-		
-		error = errno;
-		fcntl (stream_fs->fd, F_SETFL, flags);
-		errno = error;
-	}
-	
-	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 w, written = 0;
-	int cancel_fd;
-	
-	if (camel_operation_cancel_check(NULL)) {
-		errno = EINTR;
-		return  -1;
-	}
-	
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable->bound_end - seekable->position, n);
-	
-	cancel_fd = camel_operation_cancel_fd(NULL);
-	if (cancel_fd == -1) {
-		do {
-			do {
-				w = write (stream_fs->fd, buffer + written, n - written);
-			} while (w == -1 && (errno == EINTR || errno == EAGAIN));
-			
-			if (w > 0)
-				written += w;
-		} while (w != -1 && written < n);
-	} else {
-		fd_set rdset, wrset;
-		int error, flags, fdmax;
-		
-		flags = fcntl (stream_fs->fd, F_GETFL);
-		fcntl (stream_fs->fd, F_SETFL, flags | O_NONBLOCK);
-		
-		fdmax = MAX (stream_fs->fd, cancel_fd)+1;
-		do {
-			FD_ZERO (&rdset);
-			FD_ZERO (&wrset);
-			FD_SET (stream_fs->fd, &wrset);
-			FD_SET (cancel_fd, &rdset);
-			
-			w = -1;
-			if (select (fdmax, &rdset, &wrset, 0, NULL) != -1) {
-				if (FD_ISSET (cancel_fd, &rdset)) {
-					fcntl (stream_fs->fd, F_SETFL, flags);
-					errno = EINTR;
-					return -1;
-				}
-				
-				do {
-					w = write (stream_fs->fd, buffer + written, n - written);
-				} while (w == -1 && errno == EINTR);
-				
-				if (w == -1) {
-					if (errno == EAGAIN) {
-						w = 0;
-					} else {
-						error = errno;
-						fcntl (stream_fs->fd, F_SETFL, flags);
-						errno = error;
-						return -1;
-					}
-				} else
-					written += w;
-			} else if (errno == EINTR) {
-				w = 0;
-			}
-		} while (w != -1 && written < n);
-		
-		error = errno;
-		fcntl (stream_fs->fd, F_SETFL, flags);
-		errno = error;
-	}
-	
-	if (written > 0)
-		seekable->position += written;
-	else if (w == -1)
-		return -1;
-	
-	return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return fsync(((CamelStreamFs *)stream)->fd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	if (close (((CamelStreamFs *)stream)->fd) == -1)
-		return -1;
-	
-	((CamelStreamFs *)stream)->fd = -1;
-	return 0;
-}
-
-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) {
-				if (real<stream->bound_start)
-					real = stream->bound_start;
-				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 7db13ac244..0000000000
--- a/camel/camel-stream-fs.h
+++ /dev/null
@@ -1,74 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 }*/
-
-/* for open flags */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <camel/camel-seekable-stream.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 d81b304231..0000000000
--- a/camel/camel-stream-mem.c
+++ /dev/null
@@ -1,250 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "camel-stream-mem.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);
-	s->owner = TRUE;
-}
-
-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 = 0;
-
-	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) {
-		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 af51c36ff7..0000000000
--- a/camel/camel-stream-mem.h
+++ /dev/null
@@ -1,74 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <sys/types.h>
-#include <camel/camel-seekable-stream.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-null.c b/camel/camel-stream-null.c
deleted file mode 100644
index 3c0fdee47b..0000000000
--- a/camel/camel-stream-null.c
+++ /dev/null
@@ -1,91 +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:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "camel-stream-null.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelStream */
-#define CS_CLASS(so) CAMEL_STREAM_NULL_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-/* dummy implementations, for a NULL stream */
-static ssize_t   stream_read       (CamelStream *stream, char *buffer, size_t n) { return 0; }
-static ssize_t   stream_write      (CamelStream *stream, const char *buffer, size_t n) { ((CamelStreamNull *)stream)->written += n; return n; }
-static int       stream_close      (CamelStream *stream) { return 0; }
-static int       stream_flush      (CamelStream *stream) { return 0; }
-static gboolean  stream_eos        (CamelStream *stream) { return TRUE; }
-static int       stream_reset      (CamelStream *stream) { ((CamelStreamNull *)stream)->written = 0; return 0; }
-
-static void
-camel_stream_null_class_init (CamelStreamClass *camel_stream_null_class)
-{
-	CamelStreamClass *camel_stream_class = (CamelStreamClass *)camel_stream_null_class;
-
-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );
-
-	/* virtual method definition */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->eos = stream_eos;
-	camel_stream_class->reset = stream_reset;
-}
-
-CamelType
-camel_stream_null_get_type (void)
-{
-	static CamelType camel_stream_null_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_null_type == CAMEL_INVALID_TYPE) {
-		camel_stream_null_type = camel_type_register( camel_stream_get_type(),
-							      "CamelStreamNull",
-							      sizeof( CamelStreamNull ),
-							      sizeof( CamelStreamNullClass ),
-							      (CamelObjectClassInitFunc) camel_stream_null_class_init,
-							      NULL,
-							      NULL,
-							      NULL );
-	}
-
-	return camel_stream_null_type;
-}
-
-/**
- * camel_stream_null_new:
- *
- * Returns a NULL stream.  A null stream is always at eof, and
- * always returns success for all reads and writes.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_stream_null_new(void)
-{
-	return (CamelStream *)camel_object_new(camel_stream_null_get_type ());
-}
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
deleted file mode 100644
index be11da7741..0000000000
--- a/camel/camel-stream-null.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_NULL_H
-#define _CAMEL_STREAM_NULL_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-stream.h>
-
-#define CAMEL_STREAM_NULL(obj)         CAMEL_CHECK_CAST (obj, camel_stream_null_get_type (), CamelStreamNull)
-#define CAMEL_STREAM_NULL_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_null_get_type (), CamelStreamNullClass)
-#define CAMEL_IS_STREAM_NULL(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_null_get_type ())
-
-typedef struct _CamelStreamNullClass CamelStreamNullClass;
-
-struct _CamelStreamNull {
-	CamelStream parent;
-	
-	size_t written;
-};
-
-struct _CamelStreamNullClass {
-	CamelStreamClass parent_class;
-};
-
-CamelType			camel_stream_null_get_type	(void);
-
-CamelStream            *camel_stream_null_new		(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_STREAM_NULL_H */
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
deleted file mode 100644
index 709bfe107c..0000000000
--- a/camel/camel-stream.c
+++ /dev/null
@@ -1,274 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <string.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))
-
-/* default implementations, do very little */
-static ssize_t   stream_read       (CamelStream *stream, char *buffer, size_t n) { return 0; }
-static ssize_t   stream_write      (CamelStream *stream, const char *buffer, size_t n) { return n; }
-static int       stream_close      (CamelStream *stream) { return 0; }
-static int       stream_flush      (CamelStream *stream) { return 0; }
-static gboolean  stream_eos        (CamelStream *stream) { return stream->eos; }
-static int       stream_reset      (CamelStream *stream) { return 0; }
-
-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->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->eos = stream_eos;
-	camel_stream_class->reset = stream_reset;
-}
-
-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);
-}
-
-/**
- * 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);
-}
-
-/**
- * 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);
-}
-
-/**
- * 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;
-	ssize_t 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 f75e882a70..0000000000
--- a/camel/camel-stream.h
+++ /dev/null
@@ -1,90 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdarg.h>
-#include <unistd.h>
-#include <camel/camel-object.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-tcp-stream-openssl.c b/camel/camel-tcp-stream-openssl.c
deleted file mode 100644
index 785f5ad74b..0000000000
--- a/camel/camel-tcp-stream-openssl.c
+++ /dev/null
@@ -1,821 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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
-
-#ifdef HAVE_OPENSSL
-
-#include "camel-tcp-stream-ssl.h"
-
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include "camel-session.h"
-#include "camel-service.h"
-#include "camel-operation.h"
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#define d(x)
-
-#define TIMEOUT_USEC  (10000)
-
-static CamelTcpStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStreamSSL */
-#define CTSR_CLASS(so) CAMEL_TCP_STREAM_SSL_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 int stream_connect (CamelTcpStream *stream, struct hostent *host, int port);
-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-static CamelTcpAddress *stream_get_local_address (CamelTcpStream *stream);
-static CamelTcpAddress *stream_get_remote_address (CamelTcpStream *stream);
-
-static SSL *open_ssl_connection (CamelService *service, int sockfd, CamelTcpStreamSSL *openssl);
-
-struct _CamelTcpStreamSSLPrivate {
-	int sockfd;
-	SSL *ssl;
-	
-	CamelService *service;
-	char *expected_host;
-	gboolean ssl_mode;
-};
-
-static void
-camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *camel_tcp_stream_ssl_class)
-{
-	CamelTcpStreamClass *camel_tcp_stream_class =
-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_ssl_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_tcp_stream_ssl_class);
-	
-	parent_class = CAMEL_TCP_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_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_tcp_stream_class->connect = stream_connect;
-	camel_tcp_stream_class->getsockopt = stream_getsockopt;
-	camel_tcp_stream_class->setsockopt = stream_setsockopt;
-	camel_tcp_stream_class->get_local_address  = stream_get_local_address;
-	camel_tcp_stream_class->get_remote_address = stream_get_remote_address;
-	
-	/* init OpenSSL stuff */
-	SSLeay_add_ssl_algorithms ();
-	SSL_load_error_strings ();
-}
-
-static void
-camel_tcp_stream_ssl_init (gpointer object, gpointer klass)
-{
-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
-	
-	stream->priv = g_new0 (struct _CamelTcpStreamSSLPrivate, 1);
-	stream->priv->sockfd = -1;
-}
-
-static void
-camel_tcp_stream_ssl_finalize (CamelObject *object)
-{
-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
-	
-	if (stream->priv->ssl) {
-		SSL_shutdown (stream->priv->ssl);
-		
-		if (stream->priv->ssl->ctx) {
-			SSL_CTX_free (stream->priv->ssl->ctx);
-		}
-		
-		SSL_free (stream->priv->ssl);
-	}
-	
-	if (stream->priv->sockfd != -1)
-		close (stream->priv->sockfd);
-	
-	g_free (stream->priv->expected_host);
-	
-	g_free (stream->priv);
-}
-
-
-CamelType
-camel_tcp_stream_ssl_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_tcp_stream_get_type (),
-					    "CamelTcpStreamSSL",
-					    sizeof (CamelTcpStreamSSL),
-					    sizeof (CamelTcpStreamSSLClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_ssl_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_ssl_init,
-					    (CamelObjectFinalizeFunc) camel_tcp_stream_ssl_finalize);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_tcp_stream_ssl_new:
- * @service: camel service
- * @expected_host: host that the stream is expecting to connect with.
- *
- * Since the SSL certificate authenticator may need to prompt the
- * user, a CamelService is needed. @expected_host is needed as a
- * protection against an MITM attack.
- *
- * Return value: a ssl stream (in ssl mode)
- **/
-CamelStream *
-camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host)
-{
-	CamelTcpStreamSSL *stream;
-	
-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));
-	
-	stream->priv->service = service;
-	stream->priv->expected_host = g_strdup (expected_host);
-	stream->priv->ssl_mode = TRUE;
-	
-	return CAMEL_STREAM (stream);
-}
-
-
-/**
- * camel_tcp_stream_ssl_new_raw:
- * @service: camel service
- * @expected_host: host that the stream is expecting to connect with.
- *
- * Since the SSL certificate authenticator may need to prompt the
- * user, a CamelService is needed. @expected_host is needed as a
- * protection against an MITM attack.
- *
- * Return value: a ssl-capable stream (in non ssl mode)
- **/
-CamelStream *
-camel_tcp_stream_ssl_new_raw (CamelService *service, const char *expected_host)
-{
-	CamelTcpStreamSSL *stream;
-	
-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));
-	
-	stream->priv->service = service;
-	stream->priv->expected_host = g_strdup (expected_host);
-	stream->priv->ssl_mode = FALSE;
-	
-	return CAMEL_STREAM (stream);
-}
-
-
-static int
-ssl_errno (SSL *ssl, int ret)
-{
-	switch (SSL_get_error (ssl, ret)) {
-	case SSL_ERROR_NONE:
-		return 0;
-	case SSL_ERROR_ZERO_RETURN:
-		/* this one does not map well at all */
-		d(printf ("ssl_errno: SSL_ERROR_ZERO_RETURN\n"));
-		return EINVAL;
-	case SSL_ERROR_WANT_READ:   /* non-fatal; retry */
-	case SSL_ERROR_WANT_WRITE:  /* non-fatal; retry */
-		d(printf ("ssl_errno: SSL_ERROR_WANT_[READ,WRITE]\n"));
-		return EAGAIN;
-	case SSL_ERROR_SYSCALL:
-		d(printf ("ssl_errno: SSL_ERROR_SYSCALL\n"));
-		return EINTR;
-	case SSL_ERROR_SSL:
-		d(printf ("ssl_errno: SSL_ERROR_SSL  <-- very useful error...riiiiight\n"));
-		return EINTR;
-	default:
-		d(printf ("ssl_errno: default error\n"));
-		return EINTR;
-	}
-}
-
-
-/**
- * camel_tcp_stream_ssl_enable_ssl:
- * @stream: ssl stream
- *
- * Toggles an ssl-capable stream into ssl mode (if it isn't already).
- *
- * Returns 0 on success or -1 on fail.
- **/
-int
-camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *stream)
-{
-	SSL *ssl;
-	
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM_SSL (stream), -1);
-	
-	if (stream->priv->sockfd != -1 && !stream->priv->ssl_mode) {
-		ssl = open_ssl_connection (stream->priv->service, stream->priv->sockfd, stream);
-		if (ssl == NULL) {
-			stream->priv->sockfd = -1;
-			return -1;
-		}
-		
-		stream->priv->ssl = ssl;
-	}
-	
-	stream->priv->ssl_mode = TRUE;
-	
-	return 0;
-}
-
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelTcpStreamSSL *openssl = CAMEL_TCP_STREAM_SSL (stream);
-	SSL *ssl = openssl->priv->ssl;
-	ssize_t nread;
-	int cancel_fd;
-	
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-		do {
-			if (ssl) {
-				nread = SSL_read (ssl, buffer, n);
-				if (nread < 0)
-					errno = ssl_errno (ssl, nread);
-			} else {
-				nread = read (openssl->priv->sockfd, buffer, n);
-			}
-		} while (nread < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-	} else {
-		int error, flags, fdmax;
-		struct timeval timeout;
-		fd_set rdset;
-		
-		flags = fcntl (openssl->priv->sockfd, F_GETFL);
-		fcntl (openssl->priv->sockfd, F_SETFL, flags | O_NONBLOCK);
-		
-		fdmax = MAX (openssl->priv->sockfd, cancel_fd) + 1;
-		
-		do {
-			FD_ZERO (&rdset);
-			FD_SET (openssl->priv->sockfd, &rdset);
-			FD_SET (cancel_fd, &rdset);
-			
-			timeout.tv_sec = 0;
-			timeout.tv_usec = TIMEOUT_USEC;
-			select (fdmax, &rdset, 0, 0, &timeout);
-			if (FD_ISSET (cancel_fd, &rdset)) {
-				fcntl (openssl->priv->sockfd, F_SETFL, flags);
-				errno = EINTR;
-				return -1;
-			}
-			
-			do {
-				if (ssl) {
-					nread = SSL_read (ssl, buffer, n);
-					if (nread < 0)
-						errno = ssl_errno (ssl, nread);
-				} else {
-					nread = read (openssl->priv->sockfd, buffer, n);
-				}
-			} while (nread < 0 && errno == EINTR);
-		} while (nread < 0 && (errno == EAGAIN || errno == EWOULDBLOCK));
-		
-		error = errno;
-		fcntl (openssl->priv->sockfd, F_SETFL, flags);
-		errno = error;
-	}
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelTcpStreamSSL *openssl = CAMEL_TCP_STREAM_SSL (stream);
-	SSL *ssl = openssl->priv->ssl;
-	ssize_t w, written = 0;
-	int cancel_fd;
-	
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-		do {
-			do {
-				if (ssl) {
-					w = SSL_write (ssl, buffer + written, n - written);
-					if (w < 0)
-						errno = ssl_errno (ssl, w);
-				} else {
-					w = write (openssl->priv->sockfd, buffer + written, n - written);
-				}
-			} while (w < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-			
-			if (w > 0)
-				written += w;
-		} while (w != -1 && written < n);
-	} else {
-		int error, flags, fdmax;
-		struct timeval timeout;
-		fd_set rdset, wrset;
-		
-		flags = fcntl (openssl->priv->sockfd, F_GETFL);
-		fcntl (openssl->priv->sockfd, F_SETFL, flags | O_NONBLOCK);
-		
-		fdmax = MAX (openssl->priv->sockfd, cancel_fd) + 1;
-		do {
-			FD_ZERO (&rdset);
-			FD_ZERO (&wrset);
-			FD_SET (openssl->priv->sockfd, &wrset);
-			FD_SET (cancel_fd, &rdset);
-			
-			timeout.tv_sec = 0;
-			timeout.tv_usec = TIMEOUT_USEC;
-			select (fdmax, &rdset, &wrset, 0, &timeout);
-			if (FD_ISSET (cancel_fd, &rdset)) {
-				fcntl (openssl->priv->sockfd, F_SETFL, flags);
-				errno = EINTR;
-				return -1;
-			}
-			
-			do {
-				if (ssl) {
-					w = SSL_write (ssl, buffer + written, n - written);
-					if (w < 0)
-						errno = ssl_errno (ssl, w);
-				} else {
-					w = write (openssl->priv->sockfd, buffer + written, n - written);
-				}
-			} while (w < 0 && errno == EINTR);
-			
-			if (w < 0) {
-				if (errno == EAGAIN || errno == EWOULDBLOCK) {
-					w = 0;
-				} else {
-					error = errno;
-					fcntl (openssl->priv->sockfd, F_SETFL, flags);
-					errno = error;
-					return -1;
-				}
-			} else
-				written += w;
-		} while (w >= 0 && written < n);
-		
-		fcntl (openssl->priv->sockfd, F_SETFL, flags);
-	}
-	
-	return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return 0;
-}
-
-
-static void
-close_ssl_connection (SSL *ssl)
-{
-	if (ssl) {
-		SSL_shutdown (ssl);
-		
-		if (ssl->ctx)
-			SSL_CTX_free (ssl->ctx);
-		
-		SSL_free (ssl);
-	}
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	close_ssl_connection (((CamelTcpStreamSSL *)stream)->priv->ssl);
-	((CamelTcpStreamSSL *)stream)->priv->ssl = NULL;
-	
-	if (close (((CamelTcpStreamSSL *)stream)->priv->sockfd) == -1)
-		return -1;
-	
-	((CamelTcpStreamSSL *)stream)->priv->sockfd = -1;
-	return 0;
-}
-
-/* this is a 'cancellable' connect, cancellable from camel_operation_cancel etc */
-/* returns -1 & errno == EINTR if the connection was cancelled */
-static int
-socket_connect (struct hostent *h, int port)
-{
-	struct sockaddr_in sin;
-	int fd;
-	int ret;
-	socklen_t len;
-	struct timeval tv;
-	int cancel_fd;
-	
-	/* see if we're cancelled yet */
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	/* setup connect, we do it using a nonblocking socket so we can poll it */
-	sin.sin_port = htons (port);
-	sin.sin_family = h->h_addrtype;
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-		ret = connect (fd, (struct sockaddr *)&sin, sizeof (sin));
-		if (ret == -1) {
-			close (fd);
-			return -1;
-		}
-		
-		return fd;
-	} else {
-		fd_set rdset, wrset;
-		int flags, fdmax;
-		
-		flags = fcntl (fd, F_GETFL);
-		fcntl (fd, F_SETFL, flags | O_NONBLOCK);
-		
-		ret = connect (fd, (struct sockaddr *)&sin, sizeof (sin));
-		if (ret == 0) {
-			fcntl (fd, F_SETFL, flags);
-			return fd;
-		}
-		
-		if (errno != EINPROGRESS) {
-			close (fd);
-			return -1;
-		}
-		
-		FD_ZERO (&rdset);
-		FD_ZERO (&wrset);
-		FD_SET (fd, &wrset);
-		FD_SET (cancel_fd, &rdset);
-		fdmax = MAX (fd, cancel_fd) + 1;
-		tv.tv_usec = 0;
-		tv.tv_sec = 60 * 4;
-		
-		if (select (fdmax, &rdset, &wrset, 0, &tv) == 0) {
-			close (fd);
-			errno = ETIMEDOUT;
-			return -1;
-		}
-		
-		if (cancel_fd != -1 && FD_ISSET (cancel_fd, &rdset)) {
-			close (fd);
-			errno = EINTR;
-			return -1;
-		} else {
-			len = sizeof (int);
-			
-			if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &len) == -1) {
-				close (fd);
-				return -1;
-			}
-			
-			if (ret != 0) {
-				close (fd);
-				errno = ret;
-				return -1;
-			}
-		}
-		
-		fcntl (fd, F_SETFL, flags);
-	}
-	
-	return fd;
-}
-
-static void
-save_ssl_cert (const char *certid)
-{
-	char *path, *filename;
-	struct stat st;
-	int fd;
-	
-	path = g_strdup_printf ("%s/.camel_certs", getenv ("HOME"));
-	if (mkdir (path, 0700) == -1) {
-		if (errno != EEXIST)
-			return;
-		
-		if (stat (path, &st) == -1)
-			return;
-		
-		if (!S_ISDIR (st.st_mode))
-			return;
-	}
-	
-	filename = g_strdup_printf ("%s/%s", path, certid);
-	g_free (path);
-	
-	fd = open (filename, O_WRONLY | O_CREAT, 0600);
-	if (fd != -1)
-		close (fd);
-	
-	g_free (filename);
-}
-
-static gboolean
-ssl_cert_is_saved (const char *certid)
-{
-	char *filename;
-	struct stat st;
-	
-	filename = g_strdup_printf ("%s/.camel_certs/%s", getenv ("HOME"), certid);
-	
-	if (stat (filename, &st) == -1) {
-		g_free (filename);
-		return FALSE;
-	}
-	
-	g_free (filename);
-	
-	return st.st_uid == getuid ();
-}
-
-static int
-ssl_verify (int ok, X509_STORE_CTX *ctx)
-{
-	CamelTcpStreamSSL *stream;
-	X509 *cert;
-	SSL *ssl;
-	int err;
-	
-	ssl = X509_STORE_CTX_get_ex_data (ctx, SSL_get_ex_data_X509_STORE_CTX_idx ());
-	
-	stream = SSL_CTX_get_app_data (ssl->ctx);
-	
-	cert = X509_STORE_CTX_get_current_cert (ctx);
-	err = X509_STORE_CTX_get_error (ctx);
-	
-	if (stream)
-		ok = ssl_cert_is_saved (stream->priv->expected_host);
-	
-	if (!ok && stream) {
-		CamelService *service = stream->priv->service;
-		char *prompt, *cert_str;
-		char buf[257];
-		
-#define GET_STRING(name) X509_NAME_oneline (name, buf, 256)
-		
-		cert_str = g_strdup_printf (_("Issuer: %s\n"
-					      "Subject: %s"),
-					    GET_STRING (X509_get_issuer_name (cert)),
-					    GET_STRING (X509_get_subject_name (cert)));
-		
-		prompt = g_strdup_printf (_("Bad certificate from %s:\n\n%s\n\n"
-					    "Do you wish to accept anyway?"),
-					  service->url->host, cert_str);
-		
-		ok = camel_session_alert_user (service->session, CAMEL_SESSION_ALERT_WARNING, prompt, TRUE);
-		g_free (prompt);
-		
-		if (ok)
-			save_ssl_cert (stream->priv->expected_host);
-	}
-	
-	return ok;
-}
-
-static SSL *
-open_ssl_connection (CamelService *service, int sockfd, CamelTcpStreamSSL *openssl)
-{
-	SSL_CTX *ssl_ctx = NULL;
-	SSL *ssl = NULL;
-	int n;
-	
-	/* SSLv23_client_method will negotiate with SSL v2, v3, or TLS v1 */
-	ssl_ctx = SSL_CTX_new (SSLv23_client_method ());
-	g_return_val_if_fail (ssl_ctx != NULL, NULL);
-	
-	SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, &ssl_verify);
-	ssl = SSL_new (ssl_ctx);
-	SSL_set_fd (ssl, sockfd);
-	
-	SSL_CTX_set_app_data (ssl_ctx, openssl);
-	
-	n = SSL_connect (ssl);
-	if (n != 1) {
-		int errnosave = ssl_errno (ssl, n);
-		
-		SSL_shutdown (ssl);
-		
-		if (ssl->ctx)
-			SSL_CTX_free (ssl->ctx);
-		
-		SSL_free (ssl);
-		ssl = NULL;
-		
-		close (sockfd);
-		
-		errno = errnosave;
-	}
-	
-	return ssl;
-}
-
-static int
-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	CamelTcpStreamSSL *openssl = CAMEL_TCP_STREAM_SSL (stream);
-	SSL *ssl = NULL;
-	int fd;
-	
-	g_return_val_if_fail (host != NULL, -1);
-	
-	fd = socket_connect (host, port);
-	if (fd == -1)
-		return -1;
-	
-	if (openssl->priv->ssl_mode) {
-		ssl = open_ssl_connection (openssl->priv->service, fd, openssl);
-		if (!ssl)
-			return -1;
-	}
-	
-	openssl->priv->sockfd = fd;
-	openssl->priv->ssl = ssl;
-	
-	return 0;
-}
-
-
-static int
-get_sockopt_level (const CamelSockOptData *data)
-{
-	switch (data->option) {
-	case CAMEL_SOCKOPT_MAXSEGMENT:
-	case CAMEL_SOCKOPT_NODELAY:
-		return IPPROTO_TCP;
-	default:
-		return SOL_SOCKET;
-	}
-}
-
-static int
-get_sockopt_optname (const CamelSockOptData *data)
-{
-	switch (data->option) {
-	case CAMEL_SOCKOPT_MAXSEGMENT:
-		return TCP_MAXSEG;
-	case CAMEL_SOCKOPT_NODELAY:
-		return TCP_NODELAY;
-	case CAMEL_SOCKOPT_BROADCAST:
-		return SO_BROADCAST;
-	case CAMEL_SOCKOPT_KEEPALIVE:
-		return SO_KEEPALIVE;
-	case CAMEL_SOCKOPT_LINGER:
-		return SO_LINGER;
-	case CAMEL_SOCKOPT_RECVBUFFERSIZE:
-		return SO_RCVBUF;
-	case CAMEL_SOCKOPT_SENDBUFFERSIZE:
-		return SO_SNDBUF;
-	case CAMEL_SOCKOPT_REUSEADDR:
-		return SO_REUSEADDR;
-	case CAMEL_SOCKOPT_IPTYPEOFSERVICE:
-		return SO_TYPE;
-	default:
-		return -1;
-	}
-}
-
-static int
-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	int optname, optlen;
-	
-	if ((optname = get_sockopt_optname (data)) == -1)
-		return -1;
-	
-	if (data->option == CAMEL_SOCKOPT_NONBLOCKING) {
-		int flags;
-		
-		flags = fcntl (((CamelTcpStreamSSL *)stream)->priv->sockfd, F_GETFL);
-		if (flags == -1)
-			return -1;
-		
-		data->value.non_blocking = flags & O_NONBLOCK;
-		
-		return 0;
-	}
-	
-	return getsockopt (((CamelTcpStreamSSL *)stream)->priv->sockfd,
-			   get_sockopt_level (data),
-			   optname,
-			   (void *) &data->value,
-			   &optlen);
-}
-
-static int
-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	int optname;
-	
-	if ((optname = get_sockopt_optname (data)) == -1)
-		return -1;
-	
-	if (data->option == CAMEL_SOCKOPT_NONBLOCKING) {
-		int flags, set;
-		
-		flags = fcntl (((CamelTcpStreamSSL *)stream)->priv->sockfd, F_GETFL);
-		if (flags == -1)
-			return -1;
-		
-		set = data->value.non_blocking ? 1 : 0;
-		flags = (flags & ~O_NONBLOCK) | (set & O_NONBLOCK);
-		
-		if (fcntl (((CamelTcpStreamSSL *)stream)->priv->sockfd, F_SETFL, flags) == -1)
-			return -1;
-		
-		return 0;
-	}
-	
-	return setsockopt (((CamelTcpStreamSSL *)stream)->priv->sockfd,
-			   get_sockopt_level (data),
-			   optname,
-			   (void *) &data->value,
-			   sizeof (data->value));
-}
-
-static CamelTcpAddress *
-stream_get_local_address (CamelTcpStream *stream)
-{
-	struct sockaddr_in sin;
-	socklen_t len;
-
-	if (getsockname (CAMEL_TCP_STREAM_SSL (stream)->priv->sockfd,
-			 (struct sockaddr *)&sin, &len) == -1)
-		return NULL;
-
-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,
-				      4, &sin.sin_addr);
-}
-
-static CamelTcpAddress *
-stream_get_remote_address (CamelTcpStream *stream)
-{
-	struct sockaddr_in sin;
-	socklen_t len;
-
-	if (getpeername (CAMEL_TCP_STREAM_SSL (stream)->priv->sockfd,
-			 (struct sockaddr *)&sin, &len) == -1)
-		return NULL;
-
-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,
-				      4, &sin.sin_addr);
-}
-
-#endif /* HAVE_OPENSSL */
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
deleted file mode 100644
index 8b6a868b47..0000000000
--- a/camel/camel-tcp-stream-raw.c
+++ /dev/null
@@ -1,614 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#include "camel-tcp-stream-raw.h"
-#include "camel-operation.h"
-
-static CamelTcpStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStreamRaw */
-#define CTSR_CLASS(so) CAMEL_TCP_STREAM_RAW_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 int stream_connect (CamelTcpStream *stream, struct hostent *host, int port);
-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-static CamelTcpAddress *stream_get_local_address (CamelTcpStream *stream);
-static CamelTcpAddress *stream_get_remote_address (CamelTcpStream *stream);
-
-static void
-camel_tcp_stream_raw_class_init (CamelTcpStreamRawClass *camel_tcp_stream_raw_class)
-{
-	CamelTcpStreamClass *camel_tcp_stream_class =
-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_raw_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_tcp_stream_raw_class);
-	
-	parent_class = CAMEL_TCP_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_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_tcp_stream_class->connect = stream_connect;
-	camel_tcp_stream_class->getsockopt = stream_getsockopt;
-	camel_tcp_stream_class->setsockopt  = stream_setsockopt;
-	camel_tcp_stream_class->get_local_address  = stream_get_local_address;
-	camel_tcp_stream_class->get_remote_address = stream_get_remote_address;
-}
-
-static void
-camel_tcp_stream_raw_init (gpointer object, gpointer klass)
-{
-	CamelTcpStreamRaw *stream = CAMEL_TCP_STREAM_RAW (object);
-	
-	stream->sockfd = -1;
-}
-
-static void
-camel_tcp_stream_raw_finalize (CamelObject *object)
-{
-	CamelTcpStreamRaw *stream = CAMEL_TCP_STREAM_RAW (object);
-	
-	if (stream->sockfd != -1)
-		close (stream->sockfd);
-}
-
-
-CamelType
-camel_tcp_stream_raw_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_tcp_stream_get_type (),
-					    "CamelTcpStreamRaw",
-					    sizeof (CamelTcpStreamRaw),
-					    sizeof (CamelTcpStreamRawClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_raw_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_raw_init,
-					    (CamelObjectFinalizeFunc) camel_tcp_stream_raw_finalize);
-	}
-	
-	return type;
-}
-
-#ifdef SIMULATE_FLAKY_NETWORK
-static ssize_t
-flaky_tcp_write (int fd, const char *buffer, size_t buflen)
-{
-	size_t len = buflen;
-	ssize_t nwritten;
-	int val;
-	
-	if (buflen == 0)
-		return 0;
-	
-	val = 1 + (int) (10.0 * rand () / (RAND_MAX + 1.0));
-	
-	switch (val) {
-	case 1:
-		printf ("flaky_tcp_write (%d, ..., %d): (-1) EINTR\n", fd, buflen);
-		errno = EINTR;
-		return -1;
-	case 2:
-		printf ("flaky_tcp_write (%d, ..., %d): (-1) EAGAIN\n", fd, buflen);
-		errno = EAGAIN;
-		return -1;
-	case 3:
-		printf ("flaky_tcp_write (%d, ..., %d): (-1) EWOULDBLOCK\n", fd, buflen);
-		errno = EWOULDBLOCK;
-		return -1;
-	case 4:
-	case 5:
-	case 6:
-		len = 1 + (size_t) (buflen * rand () / (RAND_MAX + 1.0));
-		len = MIN (len, buflen);
-		/* fall through... */
-	default:
-		printf ("flaky_tcp_write (%d, ..., %d): (%d) '%.*s'", fd, buflen, len, (int) len, buffer);
-		nwritten = write (fd, buffer, len);
-		if (nwritten < 0)
-			printf (" errno => %s\n", g_strerror (errno));
-		else if (nwritten < len)
-			printf (" only wrote %d bytes\n", nwritten);
-		else
-			printf ("\n");
-		
-		return nwritten;
-	}
-}
-
-#define write(fd, buffer, buflen) flaky_tcp_write (fd, buffer, buflen)
-
-static ssize_t
-flaky_tcp_read (int fd, char *buffer, size_t buflen)
-{
-	size_t len = buflen;
-	ssize_t nread;
-	int val;
-	
-	if (buflen == 0)
-		return 0;
-	
-	val = 1 + (int) (10.0 * rand () / (RAND_MAX + 1.0));
-	
-	switch (val) {
-	case 1:
-		printf ("flaky_tcp_read (%d, ..., %d): (-1) EINTR\n", fd, buflen);
-		errno = EINTR;
-		return -1;
-	case 2:
-		printf ("flaky_tcp_read (%d, ..., %d): (-1) EAGAIN\n", fd, buflen);
-		errno = EAGAIN;
-		return -1;
-	case 3:
-		printf ("flaky_tcp_read (%d, ..., %d): (-1) EWOULDBLOCK\n", fd, buflen);
-		errno = EWOULDBLOCK;
-		return -1;
-	case 4:
-	case 5:
-	case 6:
-	case 7:
-	case 8:
-	case 9:
-	case 10:
-		len = 1 + (size_t) (10.0 * rand () / (RAND_MAX + 1.0));
-		len = MIN (len, buflen);
-		/* fall through... */
-	default:
-		printf ("flaky_tcp_read (%d, ..., %d): (%d)", fd, buflen, len);
-		nread = read (fd, buffer, len);
-		if (nread < 0)
-			printf (" errno => %s\n", g_strerror (errno));
-		else if (nread < len)
-			printf (" only read %d bytes\n", nread);
-		else
-			printf ("\n");
-		
-		return nread;
-	}
-}
-
-#define read(fd, buffer, buflen) flaky_tcp_read (fd, buffer, buflen)
-
-#endif /* SIMULATE_FLAKY_NETWORK */
-
-
-
-/**
- * camel_tcp_stream_raw_new:
- *
- * Return value: a tcp stream
- **/
-CamelStream *
-camel_tcp_stream_raw_new ()
-{
-	CamelTcpStreamRaw *stream;
-	
-	stream = CAMEL_TCP_STREAM_RAW (camel_object_new (camel_tcp_stream_raw_get_type ()));
-	
-	return CAMEL_STREAM (stream);
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelTcpStreamRaw *tcp_stream_raw = CAMEL_TCP_STREAM_RAW (stream);
-	ssize_t nread;
-	int cancel_fd;
-	
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-		do {
-			nread = read (tcp_stream_raw->sockfd, buffer, n);
-		} while (nread == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-	} else {
-		int error, flags, fdmax;
-		fd_set rdset;
-		
-		flags = fcntl (tcp_stream_raw->sockfd, F_GETFL);
-		fcntl (tcp_stream_raw->sockfd, F_SETFL, flags | O_NONBLOCK);
-		
-		do {
-			FD_ZERO (&rdset);
-			FD_SET (tcp_stream_raw->sockfd, &rdset);
-			FD_SET (cancel_fd, &rdset);
-			fdmax = MAX (tcp_stream_raw->sockfd, cancel_fd) + 1;
-			
-			nread = -1;
-			if (select (fdmax, &rdset, 0, 0, NULL) != -1) {
-				if (FD_ISSET (cancel_fd, &rdset)) {
-					fcntl (tcp_stream_raw->sockfd, F_SETFL, flags);
-					errno = EINTR;
-					return -1;
-				}
-				
-				do {
-					nread = read (tcp_stream_raw->sockfd, buffer, n);
-				} while (nread == -1 && errno == EINTR);
-			} else if (errno == EINTR) {
-				errno = EAGAIN;
-			}
-		} while (nread == -1 && (errno == EAGAIN || errno == EWOULDBLOCK));
-		
-		error = errno;
-		fcntl (tcp_stream_raw->sockfd, F_SETFL, flags);
-		errno = error;
-	}
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelTcpStreamRaw *tcp_stream_raw = CAMEL_TCP_STREAM_RAW (stream);
-	ssize_t w, written = 0;
-	int cancel_fd;
-	
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-		do {
-			do {
-				w = write (tcp_stream_raw->sockfd, buffer + written, n - written);
-			} while (w == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-			
-			if (w > 0)
-				written += w;
-		} while (w != -1 && written < n);
-	} else {
-		int error, flags, fdmax;
-		fd_set rdset, wrset;
-		
-		flags = fcntl (tcp_stream_raw->sockfd, F_GETFL);
-		fcntl (tcp_stream_raw->sockfd, F_SETFL, flags | O_NONBLOCK);
-		
-		fdmax = MAX (tcp_stream_raw->sockfd, cancel_fd) + 1;
-		do {
-			FD_ZERO (&rdset);
-			FD_ZERO (&wrset);
-			FD_SET (tcp_stream_raw->sockfd, &wrset);
-			FD_SET (cancel_fd, &rdset);
-			
-			w = -1;
-			if (select (fdmax, &rdset, &wrset, 0, NULL) != -1) {
-				if (FD_ISSET (cancel_fd, &rdset)) {
-					fcntl (tcp_stream_raw->sockfd, F_SETFL, flags);
-					errno = EINTR;
-					return -1;
-				}
-				
-				do {
-					w = write (tcp_stream_raw->sockfd, buffer + written, n - written);
-				} while (w == -1 && errno == EINTR);
-				
-				if (w == -1) {
-					if (errno == EAGAIN || errno == EWOULDBLOCK) {
-						w = 0;
-					} else {
-						error = errno;
-						fcntl (tcp_stream_raw->sockfd, F_SETFL, flags);
-						errno = error;
-						return -1;
-					}
-				} else
-					written += w;
-			} else if (errno == EINTR) {
-				w = 0;
-			}
-		} while (w != -1 && written < n);
-		
-		error = errno;
-		fcntl (tcp_stream_raw->sockfd, F_SETFL, flags);
-		errno = error;
-	}
-	
-	if (w == -1)
-		return -1;
-	
-	return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return 0;
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	if (close (((CamelTcpStreamRaw *)stream)->sockfd) == -1)
-		return -1;
-	
-	((CamelTcpStreamRaw *)stream)->sockfd = -1;
-	return 0;
-}
-
-/* this is a 'cancellable' connect, cancellable from camel_operation_cancel etc */
-/* returns -1 & errno == EINTR if the connection was cancelled */
-static int
-socket_connect (struct hostent *h, int port)
-{
-	struct sockaddr_in sin;
-	int fd;
-	int ret;
-	socklen_t len;
-	struct timeval tv;
-	int cancel_fd;
-	
-	/* see if we're cancelled yet */
-	if (camel_operation_cancel_check (NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-	
-	/* setup connect, we do it using a nonblocking socket so we can poll it */
-	sin.sin_port = htons (port);
-	sin.sin_family = h->h_addrtype;
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-	
-	cancel_fd = camel_operation_cancel_fd (NULL);
-	if (cancel_fd == -1) {
-		ret = connect (fd, (struct sockaddr *)&sin, sizeof (sin));
-		if (ret == -1) {
-			close (fd);
-			return -1;
-		}
-		
-		return fd;
-	} else {
-		int flags, fdmax, status;
-		fd_set rdset, wrset;
-		
-		flags = fcntl (fd, F_GETFL);
-		fcntl (fd, F_SETFL, flags | O_NONBLOCK);
-		
-		ret = connect (fd, (struct sockaddr *) &sin, sizeof (sin));
-		if (ret == 0) {
-			fcntl (fd, F_SETFL, flags);
-			return fd;
-		}
-		
-		if (errno != EINPROGRESS) {
-			close (fd);
-			return -1;
-		}
-		
-		do {
-			FD_ZERO (&rdset);
-			FD_ZERO (&wrset);
-			FD_SET (fd, &wrset);
-			FD_SET (cancel_fd, &rdset);
-			fdmax = MAX (fd, cancel_fd) + 1;
-			tv.tv_sec = 60 * 4;
-			tv.tv_usec = 0;
-			
-			status = select (fdmax, &rdset, &wrset, 0, &tv);
-		} while (status == -1 && errno == EINTR);
-		
-		if (status <= 0) {
-			close (fd);
-			errno = ETIMEDOUT;
-			return -1;
-		}
-		
-		if (cancel_fd != -1 && FD_ISSET (cancel_fd, &rdset)) {
-			close (fd);
-			errno = EINTR;
-			return -1;
-		} else {
-			len = sizeof (int);
-			
-			if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &len) == -1) {
-				close (fd);
-				return -1;
-			}
-			
-			if (ret != 0) {
-				close (fd);
-				errno = ret;
-				return -1;
-			}
-		}
-		
-		fcntl (fd, F_SETFL, flags);
-	}
-	
-	return fd;
-}
-
-static int
-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	CamelTcpStreamRaw *raw = CAMEL_TCP_STREAM_RAW (stream);
-	int fd;
-	
-	g_return_val_if_fail (host != NULL, -1);
-	
-	fd = socket_connect (host, port);
-	if (fd == -1)
-		return -1;
-	
-	raw->sockfd = fd;
-	
-	return 0;
-}
-
-
-static int
-get_sockopt_level (const CamelSockOptData *data)
-{
-	switch (data->option) {
-	case CAMEL_SOCKOPT_MAXSEGMENT:
-	case CAMEL_SOCKOPT_NODELAY:
-		return IPPROTO_TCP;
-	default:
-		return SOL_SOCKET;
-	}
-}
-
-static int
-get_sockopt_optname (const CamelSockOptData *data)
-{
-	switch (data->option) {
-	case CAMEL_SOCKOPT_MAXSEGMENT:
-		return TCP_MAXSEG;
-	case CAMEL_SOCKOPT_NODELAY:
-		return TCP_NODELAY;
-	case CAMEL_SOCKOPT_BROADCAST:
-		return SO_BROADCAST;
-	case CAMEL_SOCKOPT_KEEPALIVE:
-		return SO_KEEPALIVE;
-	case CAMEL_SOCKOPT_LINGER:
-		return SO_LINGER;
-	case CAMEL_SOCKOPT_RECVBUFFERSIZE:
-		return SO_RCVBUF;
-	case CAMEL_SOCKOPT_SENDBUFFERSIZE:
-		return SO_SNDBUF;
-	case CAMEL_SOCKOPT_REUSEADDR:
-		return SO_REUSEADDR;
-	case CAMEL_SOCKOPT_IPTYPEOFSERVICE:
-		return SO_TYPE;
-	default:
-		return -1;
-	}
-}
-
-static int
-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	int optname, optlen;
-	
-	if ((optname = get_sockopt_optname (data)) == -1)
-		return -1;
-	
-	if (data->option == CAMEL_SOCKOPT_NONBLOCKING) {
-		int flags;
-		
-		flags = fcntl (((CamelTcpStreamRaw *)stream)->sockfd, F_GETFL);
-		if (flags == -1)
-			return -1;
-		
-		data->value.non_blocking = flags & O_NONBLOCK;
-		
-		return 0;
-	}
-	
-	return getsockopt (((CamelTcpStreamRaw *)stream)->sockfd,
-			   get_sockopt_level (data),
-			   optname,
-			   (void *) &data->value,
-			   &optlen);
-}
-
-static int
-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	int optname;
-	
-	if ((optname = get_sockopt_optname (data)) == -1)
-		return -1;
-	
-	if (data->option == CAMEL_SOCKOPT_NONBLOCKING) {
-		int flags, set;
-		
-		flags = fcntl (((CamelTcpStreamRaw *)stream)->sockfd, F_GETFL);
-		if (flags == -1)
-			return -1;
-		
-		set = data->value.non_blocking ? 1 : 0;
-		flags = (flags & ~O_NONBLOCK) | (set & O_NONBLOCK);
-		
-		if (fcntl (((CamelTcpStreamRaw *)stream)->sockfd, F_SETFL, flags) == -1)
-			return -1;
-		
-		return 0;
-	}
-	
-	return setsockopt (((CamelTcpStreamRaw *)stream)->sockfd,
-			   get_sockopt_level (data),
-			   optname,
-			   (void *) &data->value,
-			   sizeof (data->value));
-}
-
-static CamelTcpAddress *
-stream_get_local_address (CamelTcpStream *stream)
-{
-	struct sockaddr_in sin;
-	socklen_t len;
-	
-	if (getsockname (CAMEL_TCP_STREAM_RAW (stream)->sockfd,
-			 (struct sockaddr *) &sin, &len) == -1)
-		return NULL;
-	
-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,
-				      4, &sin.sin_addr);
-}
-
-static CamelTcpAddress *
-stream_get_remote_address (CamelTcpStream *stream)
-{
-	struct sockaddr_in sin;
-	socklen_t len;
-	
-	if (getpeername (CAMEL_TCP_STREAM_RAW (stream)->sockfd,
-			 (struct sockaddr *) &sin, &len) == -1)
-		return NULL;
-	
-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,
-				      4, &sin.sin_addr);
-}
diff --git a/camel/camel-tcp-stream-raw.h b/camel/camel-tcp-stream-raw.h
deleted file mode 100644
index 0ffec5cd5c..0000000000
--- a/camel/camel-tcp-stream-raw.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_TCP_STREAM_RAW_H
-#define CAMEL_TCP_STREAM_RAW_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-tcp-stream.h>
-
-#define CAMEL_TCP_STREAM_RAW_TYPE     (camel_tcp_stream_raw_get_type ())
-#define CAMEL_TCP_STREAM_RAW(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRaw))
-#define CAMEL_TCP_STREAM_RAW_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRawClass))
-#define CAMEL_IS_TCP_STREAM_RAW(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_RAW_TYPE))
-
-struct _CamelTcpStreamRaw
-{
-	CamelTcpStream parent_object;
-	
-	int sockfd;
-};
-
-typedef struct {
-	CamelTcpStreamClass parent_class;
-	
-	/* virtual functions */
-	
-} CamelTcpStreamRawClass;
-
-/* Standard Camel function */
-CamelType camel_tcp_stream_raw_get_type (void);
-
-/* public methods */
-CamelStream *camel_tcp_stream_raw_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TCP_STREAM_RAW_H */
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
deleted file mode 100644
index a06fb93d1c..0000000000
--- a/camel/camel-tcp-stream-ssl.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-/* NOTE: This is the default implementation of CamelTcpStreamSSL,
- * used when the Mozilla NSS libraries are used. If you configured
- * OpenSSL support instead, then this file won't be compiled and
- * the CamelTcpStreamSSL implementation in camel-tcp-stream-openssl.c
- * will be used instead.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_NSS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#include <nspr.h>
-#include <prio.h>
-#include <prerror.h>
-#include <prerr.h>
-#include "nss.h"    /* Don't use <> here or it will include the system nss.h instead */
-#include <ssl.h>
-#include <cert.h>
-#include <certdb.h>
-#include <pk11func.h>
-
-/* this is commented because otherwise we get an error about the
-   redefinition of MD5Context...yay */
-/*#include <e-util/md5-utils.h>*/
-
-#include "camel-tcp-stream-ssl.h"
-#include "camel-session.h"
-
-
-static CamelTcpStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStreamSSL */
-#define CTSS_CLASS(so) CAMEL_TCP_STREAM_SSL_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 PRFileDesc *enable_ssl (CamelTcpStreamSSL *ssl, PRFileDesc *fd);
-
-static int stream_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-static CamelTcpAddress *stream_get_local_address (CamelTcpStream *stream);
-static CamelTcpAddress *stream_get_remote_address (CamelTcpStream *stream);
-
-struct _CamelTcpStreamSSLPrivate {
-	PRFileDesc *sockfd;
-	
-	CamelService *service;
-	char *expected_host;
-	gboolean ssl_mode;
-};
-
-static void
-camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *camel_tcp_stream_ssl_class)
-{
-	CamelTcpStreamClass *camel_tcp_stream_class =
-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_ssl_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_tcp_stream_ssl_class);
-	
-	parent_class = CAMEL_TCP_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_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_tcp_stream_class->connect = stream_connect;
-	camel_tcp_stream_class->getsockopt = stream_getsockopt;
-	camel_tcp_stream_class->setsockopt = stream_setsockopt;
-	camel_tcp_stream_class->get_local_address  = stream_get_local_address;
-	camel_tcp_stream_class->get_remote_address = stream_get_remote_address;
-}
-
-static void
-camel_tcp_stream_ssl_init (gpointer object, gpointer klass)
-{
-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
-	
-	stream->priv = g_new0 (struct _CamelTcpStreamSSLPrivate, 1);
-}
-
-static void
-camel_tcp_stream_ssl_finalize (CamelObject *object)
-{
-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
-	
-	if (stream->priv->sockfd != NULL)
-		PR_Close (stream->priv->sockfd);
-	
-	g_free (stream->priv->expected_host);
-	
-	g_free (stream->priv);
-}
-
-
-CamelType
-camel_tcp_stream_ssl_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_tcp_stream_get_type (),
-					    "CamelTcpStreamSSL",
-					    sizeof (CamelTcpStreamSSL),
-					    sizeof (CamelTcpStreamSSLClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_ssl_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_ssl_init,
-					    (CamelObjectFinalizeFunc) camel_tcp_stream_ssl_finalize);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_tcp_stream_ssl_new:
- * @service: camel service
- * @expected_host: host that the stream is expected to connect with.
- *
- * Since the SSL certificate authenticator may need to prompt the
- * user, a CamelService is needed. @expected_host is needed as a
- * protection against an MITM attack.
- *
- * Return value: a ssl stream (in ssl mode)
- **/
-CamelStream *
-camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host)
-{
-	CamelTcpStreamSSL *stream;
-	
-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));
-	
-	stream->priv->service = service;
-	stream->priv->expected_host = g_strdup (expected_host);
-	stream->priv->ssl_mode = TRUE;
-	
-	return CAMEL_STREAM (stream);
-}
-
-
-/**
- * camel_tcp_stream_ssl_new_raw:
- * @service: camel service
- * @expected_host: host that the stream is expected to connect with.
- *
- * Since the SSL certificate authenticator may need to prompt the
- * user, a CamelService is needed. @expected_host is needed as a
- * protection against an MITM attack.
- *
- * Return value: a ssl-capable stream (in non ssl mode)
- **/
-CamelStream *
-camel_tcp_stream_ssl_new_raw (CamelService *service, const char *expected_host)
-{
-	CamelTcpStreamSSL *stream;
-	
-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));
-	
-	stream->priv->service = service;
-	stream->priv->expected_host = g_strdup (expected_host);
-	stream->priv->ssl_mode = FALSE;
-	
-	return CAMEL_STREAM (stream);
-}
-
-
-static void
-set_errno (int code)
-{
-	/* FIXME: this should handle more. */
-	switch (code) {
-	case PR_INVALID_ARGUMENT_ERROR:
-		errno = EINVAL;
-		break;
-	case PR_PENDING_INTERRUPT_ERROR:
-		errno = EINTR;
-		break;
-	case PR_IO_PENDING_ERROR:
-	case PR_IO_TIMEOUT_ERROR:
-		errno = EAGAIN;
-		break;
-	case PR_WOULD_BLOCK_ERROR:
-		errno = EWOULDBLOCK;
-		break;
-	case PR_IN_PROGRESS_ERROR:
-		errno = EINPROGRESS;
-		break;
-	case PR_ALREADY_INITIATED_ERROR:
-		errno = EALREADY;
-		break;
-	case PR_NETWORK_UNREACHABLE_ERROR:
-		errno = EHOSTUNREACH;
-		break;
-	case PR_CONNECT_REFUSED_ERROR:
-		errno = ECONNREFUSED;
-		break;
-	case PR_CONNECT_TIMEOUT_ERROR:
-		errno = ETIMEDOUT;
-		break;
-	case PR_NOT_CONNECTED_ERROR:
-		errno = ENOTCONN;
-		break;
-	case PR_CONNECT_RESET_ERROR:
-		errno = ECONNRESET;
-		break;
-	case PR_IO_ERROR:
-	default:
-		errno = EIO;
-		break;
-	}
-}
-
-
-/**
- * camel_tcp_stream_ssl_enable_ssl:
- * @ssl: ssl stream
- *
- * Toggles an ssl-capable stream into ssl mode (if it isn't already).
- *
- * Returns 0 on success or -1 on fail.
- **/
-int
-camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl)
-{
-	PRFileDesc *fd;
-	
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM_SSL (ssl), -1);
-	
-	if (ssl->priv->sockfd && !ssl->priv->ssl_mode) {
-		fd = enable_ssl (ssl, NULL);
-		if (fd == NULL) {
-			int errnosave;
-			
-			set_errno (PR_GetError ());
-			errnosave = errno;
-			errno = errnosave;
-			
-			return -1;
-		}
-		
-		SSL_ResetHandshake (fd, FALSE);
-		
-		ssl->priv->sockfd = fd;
-	}
-	
-	ssl->priv->ssl_mode = TRUE;
-	
-	return 0;
-}
-
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelTcpStreamSSL *tcp_stream_ssl = CAMEL_TCP_STREAM_SSL (stream);
-	ssize_t nread;
-	
-	do {
-		if (camel_operation_cancel_check (NULL)) {
-			errno = EINTR;
-			return -1;
-		}
-		
-		nread = PR_Read (tcp_stream_ssl->priv->sockfd, buffer, n);
-		if (nread == -1)
-			set_errno (PR_GetError ());
-	} while (nread == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelTcpStreamSSL *tcp_stream_ssl = CAMEL_TCP_STREAM_SSL (stream);
-	ssize_t w, written = 0;
-	
-	do {
-		if (camel_operation_cancel_check (NULL)) {
-			errno = EINTR;
-			return -1;
-		}
-		
-		do {
-			w = PR_Write (tcp_stream_ssl->priv->sockfd, buffer + written, n - written);
-			if (w == -1)
-				set_errno (PR_GetError ());
-		} while (w == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-		
-		if (w > 0)
-			written += w;
-	} while (w != -1 && written < n);
-	
-	return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return PR_Sync (((CamelTcpStreamSSL *)stream)->priv->sockfd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	if (PR_Close (((CamelTcpStreamSSL *)stream)->priv->sockfd) == PR_FAILURE)
-		return -1;
-	
-	((CamelTcpStreamSSL *)stream)->priv->sockfd = NULL;
-	
-	return 0;
-}
-
-#if 0
-/* Since this is default implementation, let NSS handle it. */
-static SECStatus
-ssl_get_client_auth (void *data, PRFileDesc *sockfd,
-		     struct CERTDistNamesStr *caNames,
-		     struct CERTCertificateStr **pRetCert,
-		     struct SECKEYPrivateKeyStr **pRetKey) 
-{
-	SECStatus status = SECFailure;
-	SECKEYPrivateKey *privkey;
-	CERTCertificate *cert;
-	void *proto_win;
-	
-	proto_win = SSL_RevealPinArg (sockfd);
-	
-	if ((char *) data) {
-		cert = PK11_FindCertFromNickname ((char *) data, proto_win);
-		if (cert) {
-			privKey = PK11_FindKeyByAnyCert (cert, proto_win);
-			if (privkey) {
-				status = SECSuccess;
-			} else {
-				CERT_DestroyCertificate (cert);
-			}
-		}
-	} else {
-		/* no nickname given, automatically find the right cert */
-		CERTCertNicknames *names;
-		int i;
-		
-		names = CERT_GetCertNicknames (CERT_GetDefaultCertDB (), 
-					       SEC_CERT_NICKNAMES_USER,
-					       proto_win);
-		
-		if (names != NULL) {
-			for (i = 0; i < names->numnicknames; i++) {
-				cert = PK11_FindCertFromNickname (names->nicknames[i], 
-								  proto_win);
-				if (!cert)
-					continue;
-				
-				/* Only check unexpired certs */
-				if (CERT_CheckCertValidTimes (cert, PR_Now (), PR_FALSE) != secCertTimeValid) {
-					CERT_DestroyCertificate (cert);
-					continue;
-				}
-				
-				status = NSS_CmpCertChainWCANames (cert, caNames);
-				if (status == SECSuccess) {
-					privkey = PK11_FindKeyByAnyCert (cert, proto_win);
-					if (privkey)
-						break;
-					
-					status = SECFailure;
-					break;
-				}
-				
-				CERT_FreeNicknames (names);
-			}
-		}
-	}
-	
-	if (status == SECSuccess) {
-		*pRetCert = cert;
-		*pRetKey  = privkey;
-	}
-	
-	return status;
-}
-#endif
-
-#if 0
-/* Since this is the default NSS implementation, no need for us to use this. */
-static SECStatus
-ssl_auth_cert (void *data, PRFileDesc *sockfd, PRBool checksig, PRBool is_server)
-{
-	CERTCertificate *cert;
-	SECStatus status;
-	void *pinarg;
-	char *host;
-	
-	cert = SSL_PeerCertificate (sockfd);
-	pinarg = SSL_RevealPinArg (sockfd);
-	status = CERT_VerifyCertNow ((CERTCertDBHandle *)data, cert,
-				     checksig, certUsageSSLClient, pinarg);
-	
-	if (status != SECSuccess)
-		return SECFailure;
-	
-	/* Certificate is OK.  Since this is the client side of an SSL
-	 * connection, we need to verify that the name field in the cert
-	 * matches the desired hostname.  This is our defense against
-	 * man-in-the-middle attacks.
-	 */
-	
-	/* SSL_RevealURL returns a hostname, not a URL. */
-	host = SSL_RevealURL (sockfd);
-	
-	if (host && *host) {
-		status = CERT_VerifyCertName (cert, host);
-	} else {
-		PR_SetError (SSL_ERROR_BAD_CERT_DOMAIN, 0);
-		status = SECFailure;
-	}
-	
-	if (host)
-		PR_Free (host);
-	
-	return secStatus;
-}
-#endif
-
-static SECStatus
-ssl_bad_cert (void *data, PRFileDesc *sockfd)
-{
-	unsigned char md5sum[16], fingerprint[40], *f;
-	gboolean accept, valid_cert;
-	char *prompt, *cert_str;
-	CamelTcpStreamSSL *ssl;
-	CERTCertificate *cert;
-	CamelService *service;
-	int i;
-	
-	g_return_val_if_fail (data != NULL, SECFailure);
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM_SSL (data), SECFailure);
-	
-	ssl = CAMEL_TCP_STREAM_SSL (data);
-	service = ssl->priv->service;
-	
-	cert = SSL_PeerCertificate (sockfd);
-	
-	/* calculate the MD5 hash of the raw certificate */
-	md5_get_digest (cert->derCert.data, cert->derCert.len, md5sum);
-	/*HASH_HashBuf (HASH_AlgMD5, md5sum, cert->derCert.data, cert->derCert.len);*/
-	for (i = 0, f = fingerprint; i < 16; i++, f += 3)
-		sprintf (f, "%.2x%c", md5sum[i], i != 15 ? ':' : '\0');
-	
-	valid_cert = CERT_VerifyCertNow (CERT_GetDefaultCertDB (), cert, TRUE, certUsageSSLClient, NULL);
-	/*issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-	  valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);*/
-	
-	cert_str = g_strdup_printf (_("Issuer:            %s\n"
-				      "Subject:           %s\n"
-				      "Fingerprint:       %s\n"
-				      "Signature:         %s"),
-				    CERT_NameToAscii (&cert->issuer),
-				    CERT_NameToAscii (&cert->subject),
-				    fingerprint, valid_cert ? _("GOOD") : _("BAD"));
-	
-	/* construct our user prompt */
-	prompt = g_strdup_printf (_("SSL Certificate check for %s:\n\n%s\n\nDo you wish to accept?"),
-				  service->url->host, cert_str);
-	g_free (cert_str);
-	
-	/* query the user to find out if we want to accept this certificate */
-	accept = camel_session_alert_user (service->session, CAMEL_SESSION_ALERT_WARNING, prompt, TRUE);
-	g_free (prompt);
-	
-	if (accept) {
-#if 0
-		/* this is how mutt does it but last time I tried to
-                   use CERT_AddTempCertToPerm() I got link errors and
-                   I have also been told by the nss devs that that
-                   function has been deprecated... */
-		CERTCertTrust trust;
-		
-		CERT_DecodeTrustString (&trust, "P,,");
-		
-		CERT_AddTempCertToPerm (cert, NULL, &trust);
-#else
-		SECItem *certs[1];
-		
-		if (!cert->trust)
-			cert->trust = PORT_ZAlloc (sizeof (CERTCertTrust));
-		
-		cert->trust->sslFlags = CERTDB_VALID_PEER | CERTDB_TRUSTED;
-		
-		certs[0] = &cert->derCert;
-		
-		CERT_ImportCerts (CERT_GetDefaultCertDB (), certUsageSSLServer, 1, certs,
-				  NULL, TRUE, FALSE, cert->nickname);
-#endif
-		return SECSuccess;
-	}
-	
-	return SECFailure;
-}
-
-static PRFileDesc *
-enable_ssl (CamelTcpStreamSSL *ssl, PRFileDesc *fd)
-{
-	PRFileDesc *ssl_fd;
-	
-	ssl_fd = SSL_ImportFD (NULL, fd ? fd : ssl->priv->sockfd);
-	if (!ssl_fd)
-		return NULL;
-	
-	SSL_OptionSet (ssl_fd, SSL_SECURITY, PR_TRUE);
-	SSL_SetURL (ssl_fd, ssl->priv->expected_host);
-	
-	/*SSL_GetClientAuthDataHook (sslSocket, ssl_get_client_auth, (void *) certNickname);*/
-	/*SSL_AuthCertificateHook (ssl_fd, ssl_auth_cert, (void *) CERT_GetDefaultCertDB ());*/
-	SSL_BadCertHook (ssl_fd, ssl_bad_cert, ssl);
-	
-	ssl->priv->ssl_mode = TRUE;
-	
-	return ssl_fd;
-}
-
-static int
-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	CamelTcpStreamSSL *ssl = CAMEL_TCP_STREAM_SSL (stream);
-	PRIntervalTime timeout = PR_INTERVAL_MIN;
-	PRNetAddr netaddr;
-	PRFileDesc *fd;
-	
-	g_return_val_if_fail (host != NULL, -1);
-	
-	memset ((void *) &netaddr, 0, sizeof (PRNetAddr));
-	memcpy (&netaddr.inet.ip, host->h_addr, sizeof (netaddr.inet.ip));
-	
-	if (PR_InitializeNetAddr (PR_IpAddrNull, port, &netaddr) == PR_FAILURE) {
-		set_errno (PR_GetError ());
-		return -1;
-	}
-	
-	fd = PR_OpenTCPSocket (host->h_addrtype);
-	if (fd == NULL) {
-		set_errno (PR_GetError ());
-		return -1;
-	}
-	
-	if (ssl->priv->ssl_mode) {
-		PRFileDesc *ssl_fd;
-		
-		ssl_fd = enable_ssl (ssl, fd);
-		if (ssl_fd == NULL) {
-			int errnosave;
-			
-			set_errno (PR_GetError ());
-			errnosave = errno;
-			PR_Close (fd);
-			errno = errnosave;
-			
-			return -1;
-		}
-		
-		fd = ssl_fd;
-	}
-	
-	if (PR_Connect (fd, &netaddr, timeout) == PR_FAILURE) {
-		int errnosave;
-		
-		set_errno (PR_GetError ());
-		if (errno == EINPROGRESS) {
-			gboolean connected = FALSE;
-			PRPollDesc poll;
-			
-			do {
-				poll.fd = fd;
-				poll.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
-				poll.out_flags = 0;
-				
-				timeout = PR_INTERVAL_MIN;
-				
-				if (PR_Poll (&poll, 1, timeout) == PR_FAILURE) {
-					set_errno (PR_GetError ());
-					goto exception;
-				}
-				
-				if (PR_GetConnectStatus (&poll) == PR_FAILURE) {
-					set_errno (PR_GetError ());
-					if (errno != EINPROGRESS)
-						goto exception;
-				} else {
-					connected = TRUE;
-				}
-			} while (!connected);
-		} else {
-		exception:
-			errnosave = errno;
-			PR_Close (fd);
-			ssl->priv->sockfd = NULL;
-			errno = errnosave;
-			
-			return -1;
-		}
-		
-		errno = 0;
-	}
-	
-	ssl->priv->sockfd = fd;
-	
-	return 0;
-}
-
-
-static int
-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	PRSocketOptionData sodata;
-	
-	memset ((void *) &sodata, 0, sizeof (sodata));
-	memcpy ((void *) &sodata, (void *) data, sizeof (CamelSockOptData));
-	
-	if (PR_GetSocketOption (((CamelTcpStreamSSL *)stream)->priv->sockfd, &sodata) == PR_FAILURE)
-		return -1;
-	
-	memcpy ((void *) data, (void *) &sodata, sizeof (CamelSockOptData));
-	
-	return 0;
-}
-
-static int
-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	PRSocketOptionData sodata;
-	
-	memset ((void *) &sodata, 0, sizeof (sodata));
-	memcpy ((void *) &sodata, (void *) data, sizeof (CamelSockOptData));
-	
-	if (PR_SetSocketOption (((CamelTcpStreamSSL *)stream)->priv->sockfd, &sodata) == PR_FAILURE)
-		return -1;
-	
-	return 0;
-}
-
-static CamelTcpAddress *
-stream_get_local_address (CamelTcpStream *stream)
-{
-	PRFileDesc *sockfd = CAMEL_TCP_STREAM_SSL (stream)->priv->sockfd;
-	PRNetAddr addr;
-
-	PR_GetSockName (sockfd, &addr);
-	if (addr.inet.family != PR_AF_INET)
-		return NULL;
-
-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, addr.inet.port,
-				      4, &addr.inet.ip);
-}
-
-static CamelTcpAddress *
-stream_get_remote_address (CamelTcpStream *stream)
-{
-	PRFileDesc *sockfd = CAMEL_TCP_STREAM_SSL (stream)->priv->sockfd;
-	PRNetAddr addr;
-
-	PR_GetPeerName (sockfd, &addr);
-	if (addr.inet.family != PR_AF_INET)
-		return NULL;
-
-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, addr.inet.port,
-				      4, &addr.inet.ip);
-}
-
-#endif /* HAVE_NSS */
diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
deleted file mode 100644
index 5db4a0eb70..0000000000
--- a/camel/camel-tcp-stream-ssl.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_TCP_STREAM_SSL_H
-#define CAMEL_TCP_STREAM_SSL_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-tcp-stream.h>
-#include <camel/camel-service.h>
-
-#define CAMEL_TCP_STREAM_SSL_TYPE     (camel_tcp_stream_ssl_get_type ())
-#define CAMEL_TCP_STREAM_SSL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSL))
-#define CAMEL_TCP_STREAM_SSL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSLClass))
-#define CAMEL_IS_TCP_STREAM_SSL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_SSL_TYPE))
-
-struct _CamelTcpStreamSSL {
-	CamelTcpStream parent_object;
-	
-	struct _CamelTcpStreamSSLPrivate *priv;
-};
-
-typedef struct {
-	CamelTcpStreamClass parent_class;
-	
-	/* virtual functions */
-	
-} CamelTcpStreamSSLClass;
-
-/* Standard Camel function */
-CamelType camel_tcp_stream_ssl_get_type (void);
-
-/* public methods */
-CamelStream *camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host);
-
-CamelStream *camel_tcp_stream_ssl_new_raw (CamelService *service, const char *expected_host);
-
-int camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TCP_STREAM_SSL_H */
diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
deleted file mode 100644
index 2155fba6ad..0000000000
--- a/camel/camel-tcp-stream.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 "camel-tcp-stream.h"
-
-#define w(x)
-
-static CamelStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStream */
-#define CTS_CLASS(so) CAMEL_TCP_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static int tcp_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-static int tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-static CamelTcpAddress *tcp_get_local_address (CamelTcpStream *stream);
-static CamelTcpAddress *tcp_get_remote_address (CamelTcpStream *stream);
-
-
-static void
-camel_tcp_stream_class_init (CamelTcpStreamClass *camel_tcp_stream_class)
-{
-	/*CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_tcp_stream_class);*/
-	
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (CAMEL_STREAM_TYPE));
-	
-	/* tcp stream methods */
-	camel_tcp_stream_class->connect            = tcp_connect;
-	camel_tcp_stream_class->getsockopt         = tcp_getsockopt;
-	camel_tcp_stream_class->setsockopt         = tcp_setsockopt;
-	camel_tcp_stream_class->get_local_address  = tcp_get_local_address;
-	camel_tcp_stream_class->get_remote_address = tcp_get_remote_address;
-}
-
-static void
-camel_tcp_stream_init (void *o)
-{
-	;
-}
-
-CamelType
-camel_tcp_stream_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_STREAM_TYPE,
-					    "CamelTcpStream",
-					    sizeof (CamelTcpStream),
-					    sizeof (CamelTcpStreamClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_init,
-					    NULL);
-	}
-
-	return type;
-}
-
-
-static int
-tcp_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	w(g_warning ("CamelTcpStream::connect called on default implementation"));
-	return -1;
-}
-
-/**
- * camel_tcp_stream_connect:
- * @stream: a CamelTcpStream object.
- * @host: a hostent value
- * @port: port
- *
- * Create a socket and connect based upon the data provided.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->connect (stream, host, port);
-}
-
-
-static int
-tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	w(g_warning ("CamelTcpStream::getsockopt called on default implementation"));
-	return -1;
-}
-
-
-/**
- * camel_tcp_stream_getsockopt:
- * @stream: tcp stream object
- * @data: socket option data
- *
- * Get the socket options set on the stream and populate #data.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->getsockopt (stream, data);
-}
-
-
-static int
-tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	w(g_warning ("CamelTcpStream::setsockopt called on default implementation"));
-	return -1;
-}
-
-
-/**
- * camel_tcp_stream_setsockopt:
- * @stream: tcp stream object
- * @data: socket option data
- *
- * Set the socket options contained in #data on the stream.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->setsockopt (stream, data);
-}
-
-
-static CamelTcpAddress *
-tcp_get_local_address (CamelTcpStream *stream)
-{
-	w(g_warning ("CamelTcpStream::get_local_address called on default implementation"));
-	return NULL;
-}
-
-/**
- * camel_tcp_stream_get_local_address:
- * @stream: tcp stream object
- *
- * Get the local address of @stream.
- *
- * Return value: the stream's local address (which must be freed with
- * camel_tcp_address_free()) if the stream is connected, or %NULL if not.
- **/
-CamelTcpAddress *
-camel_tcp_stream_get_local_address (CamelTcpStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), NULL);
-	
-	return CTS_CLASS (stream)->get_local_address (stream);
-}
-
-
-static CamelTcpAddress *
-tcp_get_remote_address (CamelTcpStream *stream)
-{
-	w(g_warning ("CamelTcpStream::get_remote_address called on default implementation"));
-	return NULL;
-}
-
-/**
- * camel_tcp_stream_get_remote_address:
- * @stream: tcp stream object
- *
- * Get the remote address of @stream.
- *
- * Return value: the stream's remote address (which must be freed with
- * camel_tcp_address_free()) if the stream is connected, or %NULL if not.
- **/
-CamelTcpAddress *
-camel_tcp_stream_get_remote_address (CamelTcpStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), NULL);
-	
-	return CTS_CLASS (stream)->get_remote_address (stream);
-}
-
-
-/**
- * camel_tcp_address_new:
- * @family: the address family (currently must be CAMEL_TCP_ADDRESS_IPV4)
- * @port: the port number (in network byte order)
- * @length: the length of @address
- * @address: the address data (family dependent, in network byte order)
- *
- * Return value: a new CamelTcpAddress.
- **/
-CamelTcpAddress *
-camel_tcp_address_new  (CamelTcpAddressFamily family, gushort port,
-			gushort length, gpointer address)
-{
-	CamelTcpAddress *addr;
-
-	addr = g_malloc (sizeof (CamelTcpAddress) + length - 1);
-	addr->family = family;
-	addr->port   = port;
-	addr->length = length;
-	memcpy (&addr->address, address, length);
-
-	return addr;
-}
-
-/**
- * camel_tcp_address_free:
- * @address: the address
- *
- * Frees @address.
- **/
-void
-camel_tcp_address_free (CamelTcpAddress *address)
-{
-	g_free (address);
-}
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
deleted file mode 100644
index 2c4d022168..0000000000
--- a/camel/camel-tcp-stream.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_TCP_STREAM_H
-#define CAMEL_TCP_STREAM_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <unistd.h>
-
-#include <camel/camel-stream.h>
-
-#define CAMEL_TCP_STREAM_TYPE     (camel_tcp_stream_get_type ())
-#define CAMEL_TCP_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_TYPE, CamelTcpStream))
-#define CAMEL_TCP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_TYPE, CamelTcpStreamClass))
-#define CAMEL_IS_TCP_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_TYPE))
-
-typedef enum {
-	CAMEL_SOCKOPT_NONBLOCKING,     /* nonblocking io */
-	CAMEL_SOCKOPT_LINGER,          /* linger on close if data present */
-	CAMEL_SOCKOPT_REUSEADDR,       /* allow local address reuse */
-	CAMEL_SOCKOPT_KEEPALIVE,       /* keep connections alive */
-	CAMEL_SOCKOPT_RECVBUFFERSIZE,  /* receive buffer size */
-	CAMEL_SOCKOPT_SENDBUFFERSIZE,  /* send buffer size */
-	
-	CAMEL_SOCKOPT_IPTIMETOLIVE,    /* time to live */
-	CAMEL_SOCKOPT_IPTYPEOFSERVICE, /* type of service and precedence */
-	
-	CAMEL_SOCKOPT_ADDMEMBER,       /* add an IP group membership */
-	CAMEL_SOCKOPT_DROPMEMBER,      /* drop an IP group membership */
-	CAMEL_SOCKOPT_MCASTINTERFACE,  /* multicast interface address */
-	CAMEL_SOCKOPT_MCASTTIMETOLIVE, /* multicast timetolive */
-	CAMEL_SOCKOPT_MCASTLOOPBACK,   /* multicast loopback */
-	
-	CAMEL_SOCKOPT_NODELAY,         /* don't delay send to coalesce packets */
-	CAMEL_SOCKOPT_MAXSEGMENT,      /* maximum segment size */
-	CAMEL_SOCKOPT_BROADCAST,       /* enable broadcast */
-	CAMEL_SOCKOPT_LAST
-} CamelSockOpt;
-
-typedef struct linger CamelLinger;
-
-typedef struct _CamelSockOptData {
-	CamelSockOpt option;
-	union {
-		guint       ip_ttl;              /* IP time to live */
-		guint       mcast_ttl;           /* IP multicast time to live */
-		guint       tos;                 /* IP type of service and precedence */
-		gboolean    non_blocking;        /* Non-blocking (network) I/O */
-		gboolean    reuse_addr;          /* Allow local address reuse */
-		gboolean    keep_alive;          /* Keep connections alive */
-		gboolean    mcast_loopback;      /* IP multicast loopback */
-		gboolean    no_delay;            /* Don't delay send to coalesce packets */
-		gboolean    broadcast;           /* Enable broadcast */
-		size_t      max_segment;         /* Maximum segment size */
-		size_t      recv_buffer_size;    /* Receive buffer size */
-		size_t      send_buffer_size;    /* Send buffer size */
-		CamelLinger linger;              /* Time to linger on close if data present */
-	} value;
-} CamelSockOptData;
-
-typedef enum {
-	CAMEL_TCP_ADDRESS_IPV4,
-	CAMEL_TCP_ADDRESS_IPV6
-} CamelTcpAddressFamily;
-
-typedef struct {
-	CamelTcpAddressFamily family;
-	gushort port, length;
-	guint8 address[1];
-} CamelTcpAddress;
-
-
-struct _CamelTcpStream {
-	CamelStream parent_object;
-	
-};
-
-typedef struct {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-	int (*connect)    (CamelTcpStream *stream, struct hostent *host, int port);
-	int (*getsockopt) (CamelTcpStream *stream, CamelSockOptData *data);
-	int (*setsockopt) (CamelTcpStream *stream, const CamelSockOptData *data);
-	
-	CamelTcpAddress * (*get_local_address)  (CamelTcpStream *stream);
-	CamelTcpAddress * (*get_remote_address) (CamelTcpStream *stream);
-} CamelTcpStreamClass;
-
-/* Standard Camel function */
-CamelType camel_tcp_stream_get_type (void);
-
-/* public methods */
-int         camel_tcp_stream_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-int         camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-int         camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-
-CamelTcpAddress *camel_tcp_stream_get_local_address  (CamelTcpStream *stream);
-CamelTcpAddress *camel_tcp_stream_get_remote_address (CamelTcpStream *stream);
-
-CamelTcpAddress *camel_tcp_address_new  (CamelTcpAddressFamily family,
-					 gushort port, gushort length,
-					 gpointer address);
-void             camel_tcp_address_free (CamelTcpAddress *address);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TCP_STREAM_H */
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
deleted file mode 100644
index ab2ec72661..0000000000
--- a/camel/camel-text-index.c
+++ /dev/null
@@ -1,1935 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <ctype.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 <sys/stat.h>
-#include <fcntl.h>
-
-#include "e-util/e-msgport.h"
-#include "e-util/e-memory.h"
-
-#include "camel/camel-object.h"
-
-#include "camel-text-index.h"
-#include "camel-block-file.h"
-#include "camel-partition-table.h"
-
-#include <gal/unicode/gunicode.h>
-
-#include <stdio.h>
-
-#define w(x)
-#define io(x) 
-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
-
-/* cursor debug */
-#define c(x)
-
-#ifdef ENABLE_THREADS
-#define CAMEL_TEXT_INDEX_LOCK(kf, lock) (e_mutex_lock(((CamelTextIndex *)kf)->priv->lock))
-#define CAMEL_TEXT_INDEX_UNLOCK(kf, lock) (e_mutex_unlock(((CamelTextIndex *)kf)->priv->lock))
-#else
-#define CAMEL_TEXT_INDEX_LOCK(kf, lock)
-#define CAMEL_TEXT_INDEX_UNLOCK(kf, lock)
-#endif
-
-static int text_index_compress_nosync(CamelIndex *idx);
-
-void camel_text_index_dump(CamelTextIndex *idx);
-void camel_text_index_info(CamelTextIndex *idx);
-void camel_text_index_validate(CamelTextIndex *idx);
-
-/* ********************************************************************** */
-
-/* "private" data, shared between index/cursor/name classes */
-typedef struct _CamelTextIndexNamePrivate CamelTextIndexNamePrivate;
-
-struct _CamelTextIndexNamePrivate {
-	GString *buffer;
-	camel_key_t nameid;
-	EMemPool *pool;
-};
-
-CamelTextIndexName *camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid);
-
-/* ****************************** */
-
-typedef struct _CamelTextIndexCursorPrivate CamelTextIndexCursorPrivate;
-
-struct _CamelTextIndexCursorPrivate {
-	camel_block_t first;
-	camel_block_t next;
-
-	int record_index;
-
-	size_t record_count;
-	camel_key_t *records;
-
-	char *current;
-};
-
-CamelTextIndexCursor *camel_text_index_cursor_new(CamelTextIndex *idx, camel_block_t data);
-
-/* ****************************** */
-typedef struct _CamelTextIndexKeyCursorPrivate CamelTextIndexKeyCursorPrivate;
-
-struct _CamelTextIndexKeyCursorPrivate {
-	CamelKeyTable *table;
-
-	camel_key_t keyid;
-	unsigned int flags;
-	camel_block_t data;
-	char *current;
-};
-
-CamelTextIndexKeyCursor *camel_text_index_key_cursor_new(CamelTextIndex *idx, CamelKeyTable *table);
-
-/* ********************************************************************** */
-
-#define CAMEL_TEXT_INDEX_VERSION "TEXT.000"
-#define CAMEL_TEXT_INDEX_KEY_VERSION "KEYS.000"
-
-struct _CamelTextIndexPrivate {
-	CamelBlockFile *blocks;
-	CamelKeyFile *links;
-
-	CamelKeyTable *word_index;
-	CamelPartitionTable *word_hash;
-
-	CamelKeyTable *name_index;
-	CamelPartitionTable *name_hash;
-
-	/* Cache of words to write */
-	int word_cache_limit;
-	int word_cache_count;
-	EDList word_cache;
-	GHashTable *words;
-#ifdef ENABLE_THREADS
-	EMutex *lock;
-#endif
-};
-
-/* Root block of text index */
-struct _CamelTextIndexRoot {
-	struct _CamelBlockRoot root;
-
-	/* FIXME: the index root could contain a pointer to the hash root */
-	camel_block_t word_index_root; /* a keyindex containing the keyid -> word mapping */
-	camel_block_t word_hash_root; /* a partitionindex containing word -> keyid mapping */
-
-	camel_block_t name_index_root; /* same, for names */
-	camel_block_t name_hash_root;
-
-	guint32 words;		/* total words */
-	guint32 names;		/* total names */
-	guint32 deleted;	/* deleted names */
-	guint32 keys;		/* total key 'chunks' written, used with deleted to determine fragmentation */
-};
-
-struct _CamelTextIndexWord {
-	struct _CamelTextIndexWord *next;
-	struct _CamelTextIndexWord *prev;
-
-	camel_block_t data;	/* where the data starts */
-	camel_key_t wordid;
-	char *word;
-	unsigned int used;
-	camel_key_t names[32];
-};
-
-#define CTI_PRIVATE(o) (((CamelTextIndex *)(o))->priv)
-
-#define CI_CLASS(o) ((CamelTextIndexClass *)(((CamelObject *)o)->classfuncs))
-
-/* ********************************************************************** */
-/* CamelTextIndex */
-/* ********************************************************************** */
-
-static CamelObjectClass *camel_text_index_parent;
-
-/* call locked */
-static void
-text_index_add_name_to_word(CamelIndex *idx, const char *word, camel_key_t nameid)
-{
-	struct _CamelTextIndexWord *w, *wp, *ww;
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	camel_key_t wordid;
-	camel_block_t data;
-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p->blocks->root;
-
-	w = g_hash_table_lookup(p->words, word);
-	if (w == NULL) {
-		wordid = camel_partition_table_lookup(p->word_hash, word);
-		if (wordid == 0) {
-			data = 0;
-			wordid = camel_key_table_add(p->word_index, word, 0, 0);
-			if (wordid == 0){
-				g_warning("Could not create key entry for word '%s': %s\n", word, strerror(errno));
-				return;
-			}
-			if (camel_partition_table_add(p->word_hash, word, wordid) == -1) {
-				g_warning("Could not create hash entry for word '%s': %s\n", word, strerror(errno));
-				return;
-			}
-			rb->words++;
-			camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-		} else {
-			data = camel_key_table_lookup(p->word_index, wordid, NULL, 0);
-			if (data == 0) {
-				g_warning("Could not find key entry for word '%s': %s\n", word, strerror(errno));
-				return;
-			}
-		}
-		
-		w = g_malloc0(sizeof(*w));
-		w->word = g_strdup(word);
-		w->wordid = wordid;
-		w->used = 1;
-		w->data = data;
-
-		w->names[0] = nameid;
-		g_hash_table_insert(p->words, w->word, w);
-		e_dlist_addhead(&p->word_cache, (EDListNode *)w);
-		p->word_cache_count++;
-		ww = (struct _CamelTextIndexWord *)p->word_cache.tailpred;
-		wp = ww->prev;
-		while (wp && p->word_cache_count > p->word_cache_limit) {
-			io(printf("writing key file entry '%s' [%x]\n", ww->word, ww->data));
-			if (camel_key_file_write(p->links, &ww->data, ww->used, ww->names) != -1) {
-				io(printf("  new data [%x]\n", ww->data));
-				rb->keys++;
-				camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-				/* if this call fails - we still point to the old data - not fatal */
-				camel_key_table_set_data(p->word_index, ww->wordid, ww->data);
-				e_dlist_remove((EDListNode *)ww);
-				g_hash_table_remove(p->words, ww->word);
-				g_free(ww->word);
-				g_free(ww);
-				p->word_cache_count--;
-			}
-			ww = wp;
-			wp = wp->prev;
-		}
-	} else {
-		e_dlist_remove((EDListNode *)w);
-		e_dlist_addhead(&p->word_cache, (EDListNode *)w);
-		w->names[w->used] = nameid;
-		w->used++;
-		if (w->used == sizeof(w->names)/sizeof(w->names[0])) {
-			io(printf("writing key file entry '%s' [%x]\n", w->word, w->data));
-			if (camel_key_file_write(p->links, &w->data, w->used, w->names) != -1) {
-				rb->keys++;
-				camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-				/* if this call fails - we still point to the old data - not fatal */
-				camel_key_table_set_data(p->word_index, w->wordid, w->data);
-			}
-			/* FIXME: what to on error?  lost data? */
-			w->used = 0;
-		}
-	}
-}
-
-static int
-text_index_sync(CamelIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	struct _CamelTextIndexWord *ww;
-	struct _CamelTextIndexRoot *rb;
-	int ret = 0, wfrag, nfrag, work = FALSE;
-
-	if (p->blocks == NULL)
-		return 0;
-
-	rb = (struct _CamelTextIndexRoot *)p->blocks->root;
-
-	/* sync/flush word cache */
-
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	/* we sync, bump down the cache limits since we dont need them for reading */
-	p->blocks->block_cache_limit = 128;
-	/* this doesn't really need to be dropped, its only used in updates anyway */
-	p->word_cache_limit = 1024;
-
-	work = !e_dlist_empty(&p->word_cache);
-
-	while ( (ww = (struct _CamelTextIndexWord *)e_dlist_remhead(&p->word_cache)) ) {
-		if (ww->used > 0) {
-			io(printf("writing key file entry '%s' [%x]\n", ww->word, ww->data));
-			if (camel_key_file_write(p->links, &ww->data, ww->used, ww->names) != -1) {
-				io(printf("  new data [%x]\n", ww->data));
-				rb->keys++;
-				camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-				camel_key_table_set_data(p->word_index, ww->wordid, ww->data);
-			} else {
-				ret = -1;
-			}
-			ww->used = 0;
-		}
-		g_hash_table_remove(p->words, ww->word);
-		g_free(ww->word);
-		g_free(ww);
-	}	
-
-	if (camel_key_table_sync(p->word_index) == -1
-	    || camel_key_table_sync(p->name_index) == -1
-	    || camel_partition_table_sync(p->word_hash) == -1
-	    || camel_partition_table_sync(p->name_hash) == -1)
-		ret = -1;
-
-	/* only do the frag/compress check if we did some new writes on this index */
-	if (ret == 0 && work) {
-		wfrag = rb->words ? (((rb->keys - rb->words) * 100)/ rb->words) : 0;
-		nfrag = rb->names ? ((rb->deleted * 100) / rb->names) : 0;
-		d(printf("wfrag = %d, nfrag = %d\n", wfrag, nfrag));
-		d(printf("  words = %d, keys = %d\n", rb->words, rb->keys));
-		if (wfrag > 30 || nfrag > 20)
-			ret = text_index_compress_nosync(idx);
-	}
-
-	ret = camel_block_file_sync(p->blocks);
-
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-
-	return ret;
-}
-
-static void tmp_name(const char *in, char *o)
-{
-	char *s;
-
-	s = strrchr(in, '/');
-	if (s) {
-		memcpy(o, in, s-in+1);
-		memcpy(o+(s-in+1), ".#", 2);
-		strcpy(o+(s-in+3), s+1);
-	} else {
-		sprintf(o, ".#%s", in);
-	}
-}
-
-static int
-text_index_compress(CamelIndex *idx)
-{
-	int ret;
-
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	ret = camel_index_sync(idx);
-	if (ret != -1)
-		ret = text_index_compress_nosync(idx);
-
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-
-	return ret;
-}
-
-/* Attempt to recover index space by compressing the indices */
-static int
-text_index_compress_nosync(CamelIndex *idx)
-{
-	CamelTextIndex *newidx;
-	struct _CamelTextIndexPrivate *newp, *oldp;
-	camel_key_t oldkeyid, newkeyid;
-	GHashTable *remap;
-	unsigned int deleted;
-	camel_block_t data, newdata;
-	int i, ret = -1;
-	char *name = NULL;
-	unsigned int flags;
-	char *newpath, *savepath, *oldpath;
-	size_t count, newcount;
-	camel_key_t *records, newrecords[256];
-	struct _CamelTextIndexRoot *rb;
-
-	i = strlen(idx->path)+16;
-	oldpath = alloca(i);
-	newpath = alloca(i);
-	savepath = alloca(i);
-
-	strcpy(oldpath, idx->path);
-	oldpath[strlen(oldpath)-strlen(".index")] = 0;
-
-	tmp_name(oldpath, newpath);
-	sprintf(savepath, "%s~", oldpath);
-
-	d(printf("Old index: %s\n", idx->path));
-	d(printf("Old path: %s\n", oldpath));
-	d(printf("New: %s\n", newpath));
-	d(printf("Save: %s\n", savepath));
-
-	newidx = camel_text_index_new(newpath, O_RDWR|O_CREAT);
-	if (newidx == NULL)
-		return -1;
-
-	newp = CTI_PRIVATE(newidx);
-	oldp = CTI_PRIVATE(idx);
-
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	rb = (struct _CamelTextIndexRoot *)newp->blocks->root;
-
-	rb->words = 0;
-	rb->names = 0;
-	rb->deleted = 0;
-	rb->keys = 0;
-
-	/* Process:
-	   For each name we still have:
-	   Add it to the new index & setup remap table
-
-	   For each word:
-	   Copy word's data to a new file
-	   Add new word to index(*) (can we just copy blocks?) */
-
-	/* Copy undeleted names to new index file, creating new indices */
-	io(printf("Copying undeleted names to new file\n"));
-	remap = g_hash_table_new(NULL, NULL);
-	oldkeyid = 0;
-	deleted = 0;
-	while ( (oldkeyid = camel_key_table_next(oldp->name_index, oldkeyid, &name, &flags, &data)) ) {
-		if ((flags&1) == 0) {
-			io(printf("copying name '%s'\n", name));
-			newkeyid = camel_key_table_add(newp->name_index, name, data, flags);
-			if (newkeyid == 0)
-				goto fail;
-			rb->names++;
-			camel_partition_table_add(newp->name_hash, name, newkeyid);
-			g_hash_table_insert(remap, (void *)oldkeyid, (void *)newkeyid);
-		} else
-			io(printf("deleted name '%s'\n", name));
-		g_free(name);
-		name = NULL;
-		deleted |= flags;
-	}
-
-	/* Copy word data across, remapping/deleting and create new index for it */
-	/* We re-block the data into 256 entry lots while we're at it, since we only
-	   have to do 1 at a time and its cheap */
-	oldkeyid = 0;
-	while ( (oldkeyid = camel_key_table_next(oldp->word_index, oldkeyid, &name, &flags, &data)) ) {
-		io(printf("copying word '%s'\n", name));
-		newdata = 0;
-		newcount = 0;
-		if (data) {
-			rb->words++;
-			rb->keys++;
-		}
-		while (data) {
-			if (camel_key_file_read(oldp->links, &data, &count, &records) == -1) {
-				io(printf("could not read from old keys at %d for word '%s'\n", (int)data, name));
-				goto fail;
-			}
-			for (i=0;i<count;i++) {
-				newkeyid = (camel_key_t)g_hash_table_lookup(remap, (void *)records[i]);
-				if (newkeyid) {
-					newrecords[newcount++] = newkeyid;
-					if (newcount == sizeof(newrecords)/sizeof(newrecords[0])) {
-						if (camel_key_file_write(newp->links, &newdata, newcount, newrecords) == -1) {
-							g_free(records);
-							goto fail;
-						}
-						newcount = 0;
-					}
-				}
-			}
-			g_free(records);
-		}
-		
-		if (newcount > 0) {
-			if (camel_key_file_write(newp->links, &newdata, newcount, newrecords) == -1)
-				goto fail;
-		}
-		
-		newkeyid = camel_key_table_add(newp->word_index, name, newdata, flags);
-		if (newkeyid == 0)
-			goto fail;
-		camel_partition_table_add(newp->word_hash, name, newkeyid);
-		g_free(name);
-		name = NULL;
-	}
-
-	camel_block_file_touch_block(newp->blocks, newp->blocks->root_block);
-	
-	if (camel_index_sync((CamelIndex *)newidx) == -1)
-		goto fail;
-
-	/* Rename underlying files to match */
-	ret = camel_index_rename(idx, savepath);
-	if (ret == -1)
-		goto fail;
-
-	/* If this fails, we'll pick up something during restart? */
-	ret = camel_index_rename((CamelIndex *)newidx, oldpath);
-
-#define myswap(a, b) { void *tmp = a; a = b; b = tmp; }
-	/* Poke the private data across to the new object */
-	/* And change the fd's over, etc? */
-	myswap(newp->blocks, oldp->blocks);
-	myswap(newp->links, oldp->links);
-	myswap(newp->word_index, oldp->word_index);
-	myswap(newp->word_hash, oldp->word_hash);
-	myswap(newp->name_index, oldp->name_index);
-	myswap(newp->name_hash, oldp->name_hash);
-#undef myswap
-
-	ret = 0;
-fail:
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-
-	camel_object_unref((CamelObject *)newidx);
-	g_free(name);
-	g_hash_table_destroy(remap);
-
-	/* clean up temp files always */
-	camel_text_index_remove(newpath);
-
-	sprintf(savepath, "%s~.index", oldpath);
-	unlink(savepath);
-	sprintf(newpath, "%s.data", savepath);
-	unlink(newpath);
-
-	return ret;
-}
-
-static int
-text_index_rename(CamelIndex *idx, const char *path)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	char *newlink, *newblock;
-	int err, ret;
-
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	newblock = alloca(strlen(path)+8);
-	sprintf(newblock, "%s.index", path);
-	ret = camel_block_file_rename(p->blocks, newblock);
-	if (ret == -1) {
-		CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-		return -1;
-	}
-
-	newlink = alloca(strlen(path)+16);
-	sprintf(newlink, "%s.index.data", path);
-	ret = camel_key_file_rename(p->links, newlink);
-	if (ret == -1) {
-		err = errno;
-		camel_block_file_rename(p->blocks, idx->path);
-		CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-		errno = err;
-		return -1;
-	}
-
-	g_free(idx->path);
-	idx->path = g_strdup(newblock);
-
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-
-	return 0;
-}
-
-static int
-text_index_has_name(CamelIndex *idx, const char *name)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-
-	return camel_partition_table_lookup(p->name_hash, name) != 0;
-}
-
-static CamelIndexName *
-text_index_add_name(CamelIndex *idx, const char *name)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	camel_key_t keyid;
-	CamelIndexName *idn;
-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p->blocks->root;
-
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	/* if we're adding words, up the cache limits a lot */
-	if (p->blocks) {
-		p->blocks->block_cache_limit = 1024;
-		p->word_cache_limit = 8192;
-	}
-
-	/* If we have it already replace it */
-	keyid = camel_partition_table_lookup(p->name_hash, name);
-	if (keyid != 0) {
-		/* TODO: We could just update the partition table's
-		   key pointer rather than having to delete it */
-		rb->deleted++;
-		camel_key_table_set_flags(p->name_index, keyid, 1, 1);
-		camel_partition_table_remove(p->name_hash, name);
-	}
-	
-	keyid = camel_key_table_add(p->name_index, name, 0, 0);
-	if (keyid != 0) {
-		camel_partition_table_add(p->name_hash, name, keyid);
-		rb->names++;
-	}
-
-	camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-
-	/* TODO: if keyid == 0, we had a failure, we should somehow flag that, but for
-	   now just return a valid object but discard its results, see text_index_write_name */
-
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-
-	idn = (CamelIndexName *)camel_text_index_name_new((CamelTextIndex *)idx, name, keyid);
-
-	return idn;
-}
-
-/* call locked */
-static void
-hash_write_word(char *word, void *data, CamelIndexName *idn)
-{
-	CamelTextIndexName *tin = (CamelTextIndexName *)idn;
-
-	text_index_add_name_to_word(idn->index, word, tin->priv->nameid);
-}
-
-static int
-text_index_write_name(CamelIndex *idx, CamelIndexName *idn)
-{
-	/* force 'flush' of any outstanding data */
-	camel_index_name_add_buffer(idn, NULL, 0);
-
-	/* see text_index_add_name for when this can be 0 */
-	if (((CamelTextIndexName *)idn)->priv->nameid != 0) {
-		CAMEL_TEXT_INDEX_LOCK(idx, lock);
-		
-		g_hash_table_foreach(idn->words, (GHFunc)hash_write_word, idn);
-		
-		CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-	}
-
-	return 0;
-}
-
-static CamelIndexCursor *
-text_index_find_name(CamelIndex *idx, const char *name)
-{
-	/* what was this for, umm */
-	return NULL;
-}
-
-static void
-text_index_delete_name(CamelIndex *idx, const char *name)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	camel_key_t keyid;
-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p->blocks->root;
-
-	/* probably doesn't really need locking, but oh well */
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	/* We just mark the key deleted, and remove it from the hash table */
-	keyid = camel_partition_table_lookup(p->name_hash, name);
-	if (keyid != 0) {
-		rb->deleted++;
-		camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-		camel_key_table_set_flags(p->name_index, keyid, 1, 1);
-		camel_partition_table_remove(p->name_hash, name);
-	}
-
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-}
-
-static CamelIndexCursor *
-text_index_find(CamelIndex *idx, const char *word)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	camel_key_t keyid;
-	camel_block_t data = 0;
-	unsigned int flags;
-	CamelIndexCursor *idc;
-
-	CAMEL_TEXT_INDEX_LOCK(idx, lock);
-
-	keyid = camel_partition_table_lookup(p->word_hash, word);
-	if (keyid != 0) {
-		data = camel_key_table_lookup(p->word_index, keyid, NULL, &flags);
-		if (flags & 1)
-			data = 0;
-	}
-
-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);
-
-	idc = (CamelIndexCursor *)camel_text_index_cursor_new((CamelTextIndex *)idx, data);
-
-	return idc;
-}
-
-static CamelIndexCursor *
-text_index_words(CamelIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-
-	return (CamelIndexCursor *)camel_text_index_key_cursor_new((CamelTextIndex *)idx, p->word_index);
-}
-
-static CamelIndexCursor *
-text_index_names(CamelIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-
-	return (CamelIndexCursor *)camel_text_index_key_cursor_new((CamelTextIndex *)idx, p->name_index);
-}
-
-static void
-camel_text_index_class_init(CamelTextIndexClass *klass)
-{
-	CamelIndexClass *iklass = (CamelIndexClass *)klass;
-
-	camel_text_index_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));
-
-	iklass->sync = text_index_sync;
-	iklass->compress = text_index_compress;
-
-	iklass->rename = text_index_rename;
-
-	iklass->has_name = text_index_has_name;
-	iklass->add_name = text_index_add_name;
-	iklass->write_name = text_index_write_name;
-	iklass->find_name = text_index_find_name;
-	iklass->delete_name = text_index_delete_name;
-	iklass->find = text_index_find;
-
-	iklass->words = text_index_words;
-	iklass->names = text_index_names;
-}
-
-static void
-camel_text_index_init(CamelTextIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p;
-
-	p = CTI_PRIVATE(idx) = g_malloc0(sizeof(*p));
-
-	e_dlist_init(&p->word_cache);
-	p->words = g_hash_table_new(g_str_hash, g_str_equal);
-	p->word_cache_count = 0;
-	/* this cache size and the block cache size have been tuned for about the best
-	   with moderate memory usage.  Doubling the memory usage barely affects performance. */
-	p->word_cache_limit = 4096; /* 1024 = 128K */
-
-#ifdef ENABLE_THREADS
-	p->lock = e_mutex_new(E_MUTEX_REC);
-#endif
-}
-
-static void
-camel_text_index_finalise(CamelTextIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-
-	camel_index_sync((CamelIndex *)idx);
-
-	g_assert(e_dlist_empty(&p->word_cache));
-	g_assert(g_hash_table_size(p->words) == 0);
-
-	g_hash_table_destroy(p->words);
-
-	if (p->word_index)
-		camel_object_unref((CamelObject *)p->word_index);
-	if (p->word_hash)
-		camel_object_unref((CamelObject *)p->word_hash);
-	if (p->name_index)
-		camel_object_unref((CamelObject *)p->name_index);
-	if (p->name_hash)
-		camel_object_unref((CamelObject *)p->name_hash);
-
-	if (p->blocks)
-		camel_object_unref((CamelObject *)p->blocks);
-	if (p->links)
-		camel_object_unref((CamelObject *)p->links);
-
-#ifdef ENABLE_THREADS
-	e_mutex_destroy(p->lock);
-#endif
-
-	g_free(p);
-}
-
-CamelType
-camel_text_index_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelTextIndex",
-					   sizeof (CamelTextIndex),
-					   sizeof (CamelTextIndexClass),
-					   (CamelObjectClassInitFunc) camel_text_index_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_text_index_init,
-					   (CamelObjectFinalizeFunc) camel_text_index_finalise);
-	}
-	
-	return type;
-}
-
-static char *
-text_index_normalise(CamelIndex *idx, const char *in, void *data)
-{
-	char *word;
-
-	/* Sigh, this is really expensive */
-	word = g_strdup(in); /*g_utf8_normalize(in, strlen(in), G_NORMALIZE_ALL);*/
-	g_utf8_strdown(word);
-
-	return word;
-}
-
-CamelTextIndex *
-camel_text_index_new(const char *path, int flags)
-{
-	CamelTextIndex *idx = (CamelTextIndex *)camel_object_new(camel_text_index_get_type());
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	struct _CamelTextIndexRoot *rb;
-	char *link;
-	CamelBlock *bl;
-
-	camel_index_construct((CamelIndex *)idx, path, flags);
-	camel_index_set_normalise((CamelIndex *)idx, text_index_normalise, NULL);
-
-	p->blocks = camel_block_file_new(idx->parent.path, flags, CAMEL_TEXT_INDEX_VERSION, CAMEL_BLOCK_SIZE);
-	link = alloca(strlen(idx->parent.path)+7);
-	sprintf(link, "%s.data", idx->parent.path);
-	p->links = camel_key_file_new(link, flags, CAMEL_TEXT_INDEX_KEY_VERSION);
-
-	if (p->blocks == NULL || p->links == NULL) {
-		camel_object_unref((CamelObject *)idx);
-		return NULL;
-	}
-
-	rb = (struct _CamelTextIndexRoot *)p->blocks->root;
-
-	if (rb->word_index_root == 0) {
-		bl = camel_block_file_new_block(p->blocks);
-		rb->word_index_root = bl->id;
-		camel_block_file_unref_block(p->blocks, bl);
-		camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-	}	
-
-	if (rb->word_hash_root == 0) {
-		bl = camel_block_file_new_block(p->blocks);
-		rb->word_hash_root = bl->id;
-		camel_block_file_unref_block(p->blocks, bl);
-		camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-	}	
-
-	if (rb->name_index_root == 0) {
-		bl = camel_block_file_new_block(p->blocks);
-		rb->name_index_root = bl->id;
-		camel_block_file_unref_block(p->blocks, bl);
-		camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-	}	
-
-	if (rb->name_hash_root == 0) {
-		bl = camel_block_file_new_block(p->blocks);
-		rb->name_hash_root = bl->id;
-		camel_block_file_unref_block(p->blocks, bl);
-		camel_block_file_touch_block(p->blocks, p->blocks->root_block);
-	}	
-
-	p->word_index = camel_key_table_new(p->blocks, rb->word_index_root);
-	p->word_hash = camel_partition_table_new(p->blocks, rb->word_hash_root);
-	p->name_index = camel_key_table_new(p->blocks, rb->name_index_root);
-	p->name_hash = camel_partition_table_new(p->blocks, rb->name_hash_root);
-
-	if (p->word_index == NULL || p->word_hash == NULL
-	    || p->name_index == NULL || p->name_hash == NULL) {
-		camel_object_unref((CamelObject *)idx);
-		idx = NULL;
-	}
-
-	return idx;
-}
-
-/* returns 0 if the index exists, is valid, and synced, -1 otherwise */
-int
-camel_text_index_check(const char *path)
-{
-	char *block, *key;
-	CamelBlockFile *blocks;
-	CamelKeyFile *keys;
-
-	block = alloca(strlen(path)+7);
-	sprintf(block, "%s.index", path);
-	blocks = camel_block_file_new(block, O_RDONLY, CAMEL_TEXT_INDEX_VERSION, CAMEL_BLOCK_SIZE);
-	if (blocks == NULL) {
-		io(printf("Check failed: No block file: %s\n", strerror(errno)));
-		return -1;
-	}
-	key = alloca(strlen(path)+12);
-	sprintf(key, "%s.index.data", path);
-	keys = camel_key_file_new(key, O_RDONLY, CAMEL_TEXT_INDEX_KEY_VERSION);
-	if (keys == NULL) {
-		io(printf("Check failed: No key file: %s\n", strerror(errno)));
-		camel_object_unref((CamelObject *)blocks);
-		return -1;
-	}
-
-	camel_object_unref((CamelObject *)keys);
-	camel_object_unref((CamelObject *)blocks);
-
-	return 0;
-}
-
-int
-camel_text_index_rename(const char *old, const char *new)
-{
-	char *oldname, *newname;
-	int err;
-
-	/* TODO: camel_text_index_rename should find out if we have an active index and use that instead */
-
-	oldname = alloca(strlen(old)+12);
-	newname = alloca(strlen(new)+12);
-	sprintf(oldname, "%s.index", old);
-	sprintf(newname, "%s.index", new);
-
-	if (rename(oldname, newname) == -1 && errno != ENOENT)
-		return -1;
-
-	sprintf(oldname, "%s.index.data", old);
-	sprintf(newname, "%s.index.data", new);
-
-	if (rename(oldname, newname) == -1 && errno != ENOENT) {
-		err = errno;
-		sprintf(oldname, "%s.index", old);
-		sprintf(newname, "%s.index", new);
-		rename(newname, oldname);
-		errno = err;
-		return -1;
-	}
-
-	return 0;
-}
-
-int
-camel_text_index_remove(const char *old)
-{
-	char *block, *key;
-	int ret = 0;
-
-	/* TODO: needs to poke any active indices to remain unlinked */
-
-	block = alloca(strlen(old)+12);
-	key = alloca(strlen(old)+12);
-	sprintf(block, "%s.index", old);
-	sprintf(key, "%s.index.data", old);
-
-	if (unlink(block) == -1 && errno != ENOENT)
-		ret = -1;
-	if (unlink(key) == -1 && errno != ENOENT)
-		ret = -1;
-
-	return ret;
-}
-
-/* Debug */
-void
-camel_text_index_info(CamelTextIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p->blocks->root;
-	int frag;
-
-	printf("Path: '%s'\n", idx->parent.path);
-	printf("Version: %d\n", idx->parent.version);
-	printf("Flags: %08x\n", idx->parent.flags);
-	printf("Total words: %d\n", rb->words);
-	printf("Total names: %d\n", rb->names);
-	printf("Total deleted: %d\n", rb->deleted);
-	printf("Total key blocks: %d\n", rb->keys);
-
-	if (rb->words > 0) {
-		frag = ((rb->keys - rb->words) * 100)/ rb->words;
-		printf("Word fragmentation: %d%%\n", frag);
-	}
-
-	if (rb->names > 0) {
-		frag = (rb->deleted * 100)/ rb->names;
-		printf("Name fragmentation: %d%%\n", frag);
-	}
-}
-
-/* #define DUMP_RAW */
-
-#ifdef DUMP_RAW
-enum { KEY_ROOT = 1, KEY_DATA = 2, PARTITION_MAP = 4, PARTITION_DATA = 8 };
-
-static void
-add_type(GHashTable *map, camel_block_t id, int type)
-{
-	camel_block_t old;
-
-	old = g_hash_table_lookup(map, id);
-	if (old == type)
-		return;
-
-	if (old != 0 && old != type)
-		g_warning("block %x redefined as type %d, already type %d\n", id, type, old);
-	g_hash_table_insert(map, id, type|old);
-}
-
-static void
-add_partition(GHashTable *map, CamelBlockFile *blocks, camel_block_t id)
-{
-	CamelBlock *bl;
-	CamelPartitionMapBlock *pm;
-	int i;
-
-	while (id) {
-		add_type(map, id, PARTITION_MAP);
-		bl = camel_block_file_get_block(blocks, id);
-		if (bl == NULL) {
-			g_warning("couldn't get parition: %x\n", id);
-			return;
-		}
-
-		pm = (CamelPartitionMapBlock *)&bl->data;
-		if (pm->used > sizeof(pm->partition)/sizeof(pm->partition[0])) {
-			g_warning("Partition block %x invalid\n", id);
-			camel_block_file_unref_block(blocks, bl);
-			return;
-		}
-
-		for (i=0;i<pm->used;i++)
-			add_type(map, pm->partition[i].blockid, PARTITION_DATA);
-
-		id = pm->next;
-		camel_block_file_unref_block(blocks, bl);
-	}
-}
-
-static void
-add_keys(GHashTable *map, CamelBlockFile *blocks, camel_block_t id)
-{
-	CamelBlock *rbl, *bl;
-	CamelKeyRootBlock *root;
-	CamelKeyBlock *kb;
-
-	add_type(map, id, KEY_ROOT);
-	rbl = camel_block_file_get_block(blocks, id);
-	if (rbl == NULL) {
-		g_warning("couldn't get key root: %x\n", id);
-		return;
-	}
-	root = (CamelKeyRootBlock *)&rbl->data;
-	id = root->first;
-
-	while (id) {
-		add_type(map, id, KEY_DATA);
-		bl = camel_block_file_get_block(blocks, id);
-		if (bl == NULL) {
-			g_warning("couldn't get key: %x\n", id);
-			break;
-		}
-
-		kb = (CamelKeyBlock *)&bl->data;
-		id = kb->next;
-		camel_block_file_unref_block(blocks, bl);
-	}
-
-	camel_block_file_unref_block(blocks, rbl);
-}
-
-static void
-dump_raw(GHashTable *map, char *path)
-{
-	char buf[1024];
-	char line[256];
-	char *p, c, *e, *a, *o;
-	int v, n, len, i, type;
-	char hex[16] = "0123456789ABCDEF";
-	int fd;
-	camel_block_t id, total;
-
-	fd = open(path, O_RDONLY);
-	if (fd == -1)
-		return;
-
-	total = 0;
-	while ((len = read(fd, buf, 1024)) == 1024) {
-		id = total;
-
-
-
-		type = g_hash_table_lookup(map, id);
-		switch(type) {
-		case 0:
-			printf(" - unknown -\n");
-			break;
-		default:
-			printf(" - invalid -\n");
-			break;
-		case KEY_ROOT: {
-			CamelKeyRootBlock *r = (CamelKeyRootBlock *)buf;
-			printf("Key root:\n");
-			printf("First: %08x     Last: %08x     Free: %08x\n", r->first, r->last, r->free);
-		} break;
-		case KEY_DATA: {
-			CamelKeyBlock *k = (CamelKeyBlock *)buf;
-			printf("Key data:\n");
-			printf("Next: %08x      Used: %u\n", k->next, k->used);
-			for (i=0;i<k->used;i++) {
-				if (i == 0)
-					len = sizeof(k->u.keydata);
-				else
-					len = k->u.keys[i-1].offset;
-				len -= k->u.keys[i].offset;
-				printf("[%03d]: %08x %5d %06x %3d '%.*s'\n", i,
-				       k->u.keys[i].data, k->u.keys[i].offset, k->u.keys[i].flags,
-				       len, len, k->u.keydata+k->u.keys[i].offset);
-			}
-		} break;
-		case PARTITION_MAP: {
-			CamelPartitionMapBlock *m = (CamelPartitionMapBlock *)buf;
-			printf("Partition map\n");
-			printf("Next: %08x      Used: %u\n", m->next, m->used);
-			for (i=0;i<m->used;i++) {
-				printf("[%03d]: %08x -> %08x\n", i, m->partition[i].hashid, m->partition[i].blockid);
-			}
-		} break;
-		case PARTITION_DATA: {
-			CamelPartitionKeyBlock *k = (CamelPartitionKeyBlock *)buf;
-			printf("Partition data\n");
-			printf("Used: %u\n", k->used);
-		} break;
-		}
-
-
-		printf("--raw--\n");
-
-		len = 1024;
-		p = buf;
-		do {
-			sprintf(line, "%08x:                                                                      ", total);
-			total += 16;
-			o = line+10;
-			a = o+16*2+2;
-			i = 0;
-			while (len && i<16) {
-				c = *p++;
-				*a++ = isprint(c)?c:'.';
-				*o++ = hex[(c>>4)&0x0f];
-				*o++ = hex[c&0x0f];
-				i++;
-				if (i==8)
-					*o++ = ' ';
-				len--;
-			}
-			*a = 0;
-			printf("%s\n", line);
-		} while (len);
-		printf("\n");
-	}
-}
-#endif
-
-/* Debug */
-void
-camel_text_index_dump(CamelTextIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-#ifndef DUMP_RAW
-	camel_key_t keyid;
-	char *word;
-	const char *name;
-	unsigned int flags;
-	camel_block_t data;
-
-	/* Iterate over all names in the file first */
-
-	printf("UID's in index\n");
-
-	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data)) ) {
-		if ((flags & 1) == 0)
-			printf(" %s\n", word);
-		else
-			printf(" %s (deleted)\n", word);
-		g_free(word);
-	}
-
-	printf("Word's in index\n");
-
-	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data)) ) {
-		CamelIndexCursor *idc;
-
-		printf("Word: '%s':\n", word);
-		
-		idc = camel_index_find((CamelIndex *)idx, word);
-		while ( (name = camel_index_cursor_next(idc)) ) {
-			printf(" %s", name);
-		}
-		printf("\n");
-		camel_object_unref((CamelObject *)idc);
-		g_free(word);
-	}
-#else
-	/* a more low-level dump routine */
-	GHashTable *block_type = g_hash_table_new(NULL, NULL);
-	camel_block_t id;
-	struct stat st;
-	int type;
-
-	add_keys(block_type, p->blocks, p->word_index->rootid);
-	add_keys(block_type, p->blocks, p->name_index->rootid);
-
-	add_partition(block_type, p->blocks, p->word_hash->rootid);
-	add_partition(block_type, p->blocks, p->name_hash->rootid);
-
-	dump_raw(block_type, p->blocks->path);
-	g_hash_table_destroy(block_type);
-#endif
-}
-
-/* more debug stuff */
-void
-camel_text_index_validate(CamelTextIndex *idx)
-{
-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);
-	camel_key_t keyid;
-	char *word;
-	const char *name;
-	unsigned int flags;
-	camel_block_t data;
-	char *oldword;
-	camel_key_t *records;
-	size_t count;
-
-	GHashTable *names, *deleted, *words, *keys, *name_word, *word_word;
-
-	names = g_hash_table_new(NULL, NULL);
-	deleted = g_hash_table_new(NULL, NULL);
-
-	name_word = g_hash_table_new(g_str_hash, g_str_equal);
-
-	words = g_hash_table_new(NULL, NULL);
-	keys = g_hash_table_new(NULL, NULL);
-
-	word_word = g_hash_table_new(g_str_hash, g_str_equal);
-
-	/* Iterate over all names in the file first */
-
-	printf("Checking UID consistency\n");
-
-	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data)) ) {
-		if ((oldword = g_hash_table_lookup(names, (void *)keyid)) != NULL
-		    || (oldword = g_hash_table_lookup(deleted, (void *)keyid)) != NULL) {
-			printf("Warning, name '%s' duplicates key (%x) with name '%s'\n", word, keyid, oldword);
-			g_free(word);
-		} else {
-			g_hash_table_insert(name_word, word, (void *)1);
-			if ((flags & 1) == 0) {
-				g_hash_table_insert(names, (void *)keyid, word);
-			} else {
-				g_hash_table_insert(deleted, (void *)keyid, word);
-			}
-		}
-	}
-
-	printf("Checking WORD member consistency\n");
-
-	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data)) ) {
-		CamelIndexCursor *idc;
-		GHashTable *used;
-
-		/* first, check for duplicates of keyid, and data */
-		if ((oldword = g_hash_table_lookup(words, (void *)keyid)) != NULL) {
-			printf("Warning, word '%s' duplicates key (%x) with name '%s'\n", word, keyid, oldword);
-			g_free(word);
-			word = oldword;
-		} else {
-			g_hash_table_insert(words, (void *)keyid, word);
-		}
-
-		if (data == 0) {
-			/* This may not be an issue if things have been removed over time,
-			   though it is a problem if its a fresh index */
-			printf("Word '%s' has no data associated with it\n", word);
-		} else {
-			if ((oldword = g_hash_table_lookup(keys, (void *)data)) != NULL) {
-				printf("Warning, word '%s' duplicates data (%x) with name '%s'\n", word, data, oldword);
-			} else {
-				g_hash_table_insert(keys, (void *)data, word);
-			}
-		}
-
-		if ((oldword = g_hash_table_lookup(word_word, word)) != NULL) {
-			printf("Warning, word '%s' occurs more than once\n", word);
-		} else {
-			g_hash_table_insert(word_word, word, word);
-		}
-
-		used = g_hash_table_new(g_str_hash, g_str_equal);
-
-		idc = camel_index_find((CamelIndex *)idx, word);
-		while ( (name = camel_index_cursor_next(idc)) ) {
-			if (g_hash_table_lookup(name_word, name) == NULL) {
-				printf("word '%s' references non-existant name '%s'\n", word, name);
-			}
-			if (g_hash_table_lookup(used, name) != NULL) {
-				printf("word '%s' uses word '%s' more than once\n", word, name);
-			} else {
-				g_hash_table_insert(used, g_strdup(name), (void *)1);
-			}
-		}
-		camel_object_unref((CamelObject *)idc);
-
-		g_hash_table_foreach(used, (GHFunc)g_free, NULL);
-		g_hash_table_destroy(used);
-
-		printf("word '%s'\n", word);
-
-		while (data) {
-			printf(" data %x ", data);
-			if (camel_key_file_read(p->links, &data, &count, &records) == -1) {
-				printf("Warning, read failed for word '%s', at data '%d'\n", word, data);
-				data = 0;
-			} else {
-				printf("(%d)\n", count);
-				g_free(records);
-			}
-		}
-	}
-
-	g_hash_table_destroy(names);
-	g_hash_table_destroy(deleted);
-	g_hash_table_destroy(words);
-	g_hash_table_destroy(keys);
-
-	g_hash_table_foreach(name_word, (GHFunc)g_free, NULL);
-	g_hash_table_destroy(name_word);
-
-	g_hash_table_foreach(word_word, (GHFunc)g_free, NULL);
-	g_hash_table_destroy(word_word);
-}
-
-/* ********************************************************************** */
-/* CamelTextIndexName */
-/* ********************************************************************** */
-
-static CamelIndexNameClass *camel_text_index_name_parent;
-
-#define CIN_CLASS(o) ((CamelTextIndexNameClass *)(((CamelObject *)o)->classfuncs))
-#define CIN_PRIVATE(o) (((CamelTextIndexName *)(o))->priv)
-
-static void
-text_index_name_add_word(CamelIndexName *idn, const char *word)
-{
-	struct _CamelTextIndexNamePrivate *p = ((CamelTextIndexName *)idn)->priv;
-
-	if (g_hash_table_lookup(idn->words, word) == NULL) {
-		char *w = e_mempool_strdup(p->pool, word);
-
-		g_hash_table_insert(idn->words, w, w);
-	}
-}
-
-/* Why?
-   Because it doesn't hang/loop forever on bad data
-   Used to clean up utf8 before it gets further */
-
-static __inline__ guint32
-camel_utf8_next(const unsigned char **ptr, const unsigned char *ptrend)
-{
-	register unsigned char *p = (unsigned char *)*ptr;
-	register unsigned int c;
-	register guint32 v;
-	int l;
-
-	if (p == ptrend)
-		return 0;
-
-	while ( (c = *p++) ) {
-		if (c < 0x80) {
-			*ptr = p;
-			return c;
-		} else if ((c&0xe0) == 0xc0) {
-			v = c & 0x1f;
-			l = 1;
-		} else if ((c&0xf0) == 0xe0) {
-			v = c & 0x0f;
-			l = 2;
-		} else if ((c&0xf8) == 0xf0) {
-			v = c & 0x07;
-			l = 3;
-		} else if ((c&0xfc) == 0xf8) {
-			v = c & 0x03;
-			l = 4;
-		} else if ((c&0xfe) == 0xfc) {
-			v = c & 0x01;
-			l = 5;
-		} else
-			/* Invalid, ignore and look for next start char if room */
-			if (p == ptrend) {
-				return 0;
-			} else {
-				continue;
-			}
-
-		/* bad data or truncated buffer */
-		if (p + l > ptrend)
-			return 0;
-
-		while (l && ((c = *p) & 0xc0) == 0x80) {
-			p++;
-			l--;
-			v = (v << 6) | (c & 0x3f);
-		}
-
-		/* valid char */
-		if (l == 0) {
-			*ptr = p;
-			return v;
-		}
-
-		/* else look for a start char again */
-	}
-
-	return 0;
-}
-
-static size_t
-text_index_name_add_buffer(CamelIndexName *idn, const char *buffer, size_t len)
-{
-	CamelTextIndexNamePrivate *p = CIN_PRIVATE(idn);
-	const unsigned char *ptr, *ptrend;
-	guint32 c;
-	unsigned char utf8[8];
-	size_t utf8len;
-
-	if (buffer == NULL) {
-		if (p->buffer->len) {
-			camel_index_name_add_word(idn, p->buffer->str);
-			g_string_truncate(p->buffer, 0);
-		}
-		return 0;
-	}
-
-	ptr = buffer;
-	ptrend = buffer+len;
-	while ((c = camel_utf8_next(&ptr, ptrend))) {
-		if (g_unichar_isalnum(c)) {
-			c = g_unichar_tolower(c);
-			utf8len = g_unichar_to_utf8(c, utf8);
-			utf8[utf8len] = 0;
-			g_string_append(p->buffer, utf8);
-		} else {
-			if (p->buffer->len) {
-				text_index_name_add_word(idn, p->buffer->str);
-				/*camel_index_name_add_word(idn, p->buffer->str);*/
-				g_string_truncate(p->buffer, 0);
-			}
-		}
-	}
-
-	return 0;
-}
-
-static void
-camel_text_index_name_class_init(CamelTextIndexNameClass *klass)
-{
-	CamelIndexNameClass *nklass = (CamelIndexNameClass *)klass;
-
-	camel_text_index_name_parent = CAMEL_INDEX_NAME_CLASS(camel_type_get_global_classfuncs(camel_index_name_get_type()));
-
-	nklass->add_word = text_index_name_add_word;
-	nklass->add_buffer = text_index_name_add_buffer;
-}
-
-static void
-camel_text_index_name_init(CamelTextIndexName *idn)
-{
-	CamelTextIndexNamePrivate *p;
-
-	idn->parent.words = g_hash_table_new(g_str_hash, g_str_equal);
-
-	p = idn->priv = g_malloc0(sizeof(*idn->priv));
-	p->buffer = g_string_new("");
-	p->pool = e_mempool_new(256, 128, E_MEMPOOL_ALIGN_BYTE);
-}
-
-static void
-camel_text_index_name_finalise(CamelTextIndexName *idn)
-{
-	CamelTextIndexNamePrivate *p = CIN_PRIVATE(idn);
-	
-	g_hash_table_destroy(idn->parent.words);
-
-	g_string_free(p->buffer, TRUE);
-	e_mempool_destroy(p->pool);
-
-	g_free(p);
-}
-
-CamelType
-camel_text_index_name_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelTextIndexName",
-					   sizeof (CamelTextIndexName),
-					   sizeof (CamelTextIndexNameClass),
-					   (CamelObjectClassInitFunc) camel_text_index_name_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_text_index_name_init,
-					   (CamelObjectFinalizeFunc) camel_text_index_name_finalise);
-	}
-	
-	return type;
-}
-
-CamelTextIndexName *
-camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid)
-{
-	CamelTextIndexName *idn = (CamelTextIndexName *)camel_object_new(camel_text_index_name_get_type());
-	CamelIndexName *cin = &idn->parent;
-	CamelTextIndexNamePrivate *p = CIN_PRIVATE(idn);
-
-	cin->index = (CamelIndex *)idx;
-	camel_object_ref((CamelObject *)idx);
-	cin->name = e_mempool_strdup(p->pool, name);
-	p->nameid = nameid;
-
-	return idn;
-}
-
-/* ********************************************************************** */
-/* CamelTextIndexCursor */
-/* ********************************************************************** */
-
-static CamelIndexCursorClass *camel_text_index_cursor_parent;
-
-#define CIC_CLASS(o) ((CamelTextIndexCursorClass *)(((CamelObject *)o)->classfuncs))
-#define CIC_PRIVATE(o) (((CamelTextIndexCursor *)(o))->priv)
-
-static const char *
-text_index_cursor_next(CamelIndexCursor *idc)
-{
-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);
-	struct _CamelTextIndexPrivate *tip = CTI_PRIVATE(idc->index);
-	unsigned int flags;
-
-	c(printf("Going to next cursor for word with data '%08x' next %08x\n", p->first, p->next));
-
-	do {
-		while (p->record_index >= p->record_count) {
-			g_free(p->records);
-			p->records = NULL;
-			p->record_index = 0;
-			p->record_count = 0;
-			if (p->next == 0)
-				return NULL;
-			if (camel_key_file_read(tip->links, &p->next, &p->record_count, &p->records) == -1)
-				return NULL;
-		}
-
-		g_free(p->current);
-		camel_key_table_lookup(tip->name_index, p->records[p->record_index], &p->current, &flags);
-		if (flags & 1) {
-			g_free(p->current);
-			p->current = NULL;
-		}		
-		p->record_index++;
-	} while (p->current == NULL);
-
-	return p->current;
-}
-
-static void
-text_index_cursor_reset(CamelIndexCursor *idc)
-{
-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);
-
-	g_free(p->records);
-	p->records = NULL;
-	g_free(p->current);
-	p->current = NULL;
-	p->record_count = 0;
-	p->record_index = 0;
-	p->next = p->first;
-}
-
-static void
-camel_text_index_cursor_class_init(CamelTextIndexCursorClass *klass)
-{
-	CamelIndexCursorClass *cklass = (CamelIndexCursorClass *)klass;
-
-	camel_text_index_cursor_parent = CAMEL_INDEX_CURSOR_CLASS(camel_type_get_global_classfuncs(camel_index_cursor_get_type()));
-
-	cklass->next = text_index_cursor_next;
-	cklass->reset = text_index_cursor_reset;
-}
-
-static void
-camel_text_index_cursor_init(CamelTextIndexCursor *idc)
-{
-	CIC_PRIVATE(idc) = g_malloc0(sizeof(struct _CamelTextIndexCursorPrivate));
-}
-
-static void
-camel_text_index_cursor_finalise(CamelTextIndexCursor *idc)
-{
-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);
-
-	g_free(p->records);
-	g_free(p->current);
-	g_free(p);
-}
-
-CamelType
-camel_text_index_cursor_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelTextIndexCursor",
-					   sizeof (CamelTextIndexCursor),
-					   sizeof (CamelTextIndexCursorClass),
-					   (CamelObjectClassInitFunc) camel_text_index_cursor_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_text_index_cursor_init,
-					   (CamelObjectFinalizeFunc) camel_text_index_cursor_finalise);
-	}
-	
-	return type;
-}
-
-CamelTextIndexCursor *
-camel_text_index_cursor_new(CamelTextIndex *idx, camel_block_t data)
-{
-	CamelTextIndexCursor *idc = (CamelTextIndexCursor *)camel_object_new(camel_text_index_cursor_get_type());
-	CamelIndexCursor *cic = &idc->parent;
-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);
-
-	cic->index = (CamelIndex *)idx;
-	camel_object_ref((CamelObject *)idx);
-	p->first = data;
-	p->next = data;
-	p->record_count = 0;
-	p->record_index = 0;
-
-	return idc;
-}
-
-/* ********************************************************************** */
-/* CamelTextIndexKeyCursor */
-/* ********************************************************************** */
-
-static CamelIndexCursorClass *camel_text_index_key_cursor_parent;
-
-#define CIKC_CLASS(o) ((CamelTextIndexKeyCursorClass *)(((CamelObject *)o)->classfuncs))
-#define CIKC_PRIVATE(o) (((CamelTextIndexKeyCursor *)(o))->priv)
-
-static const char *
-text_index_key_cursor_next(CamelIndexCursor *idc)
-{
-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);
-
-	c(printf("Going to next cursor for keyid %08x\n", p->keyid));
-
-	g_free(p->current);
-	p->current = NULL;
-
-	while ( (p->keyid = camel_key_table_next(p->table, p->keyid, &p->current, &p->flags, &p->data)) ) {
-		if ((p->flags & 1) == 0) {
-			return p->current;
-		} else {
-			g_free(p->current);
-			p->current = NULL;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-text_index_key_cursor_reset(CamelIndexCursor *idc)
-{
-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);
-
-	p->keyid = 0;
-	p->flags = 0;
-	p->data = 0;
-	g_free(p->current);
-	p->current = NULL;
-}
-
-static void
-camel_text_index_key_cursor_class_init(CamelTextIndexKeyCursorClass *klass)
-{
-	CamelIndexCursorClass *cklass = (CamelIndexCursorClass *)klass;
-
-	camel_text_index_key_cursor_parent = CAMEL_INDEX_CURSOR_CLASS(camel_type_get_global_classfuncs(camel_index_cursor_get_type()));
-
-	cklass->next = text_index_key_cursor_next;
-	cklass->reset = text_index_key_cursor_reset;
-}
-
-static void
-camel_text_index_key_cursor_init(CamelTextIndexKeyCursor *idc)
-{
-	struct _CamelTextIndexKeyCursorPrivate *p;
-
-	p = idc->priv = g_malloc0(sizeof(struct _CamelTextIndexKeyCursorPrivate));
-	p->keyid = 0;
-	p->flags = 0;
-	p->data = 0;
-	p->current = NULL;
-}
-
-static void
-camel_text_index_key_cursor_finalise(CamelTextIndexKeyCursor *idc)
-{
-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);
-
-	g_free(p->current);
-	if (p->table)
-		camel_object_unref((CamelObject *)p->table);
-	g_free(p);
-}
-
-CamelType
-camel_text_index_key_cursor_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_object_get_type(), "CamelTextIndexKeyCursor",
-					   sizeof (CamelTextIndexKeyCursor),
-					   sizeof (CamelTextIndexKeyCursorClass),
-					   (CamelObjectClassInitFunc) camel_text_index_key_cursor_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_text_index_key_cursor_init,
-					   (CamelObjectFinalizeFunc) camel_text_index_key_cursor_finalise);
-	}
-	
-	return type;
-}
-
-CamelTextIndexKeyCursor *
-camel_text_index_key_cursor_new(CamelTextIndex *idx, CamelKeyTable *table)
-{
-	CamelTextIndexKeyCursor *idc = (CamelTextIndexKeyCursor *)camel_object_new(camel_text_index_key_cursor_get_type());
-	CamelIndexCursor *cic = &idc->parent;
-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);
-
-	cic->index = (CamelIndex *)idx;
-	camel_object_ref((CamelObject *)idx);
-	p->table = table;
-	camel_object_ref((CamelObject *)table);
-
-	return idc;
-}
-
-/* ********************************************************************** */
-
-#define m(x)
-
-#if 0
-
-struct _CamelIndexRoot {
-	struct _CamelBlockRoot root;
-
-	camel_block_t word_root; /* a keyindex containing the keyid -> word mapping */
-	camel_block_t word_hash_root; /* a partitionindex containing word -> keyid mapping */
-
-	camel_block_t name_root; /* same, for names */
-	camel_block_t name_hash_root;
-};
-
-char wordbuffer[] = "This is a buffer of multiple words.  Some of the words are duplicates"
-" while other words are the same, some are in difFerenT Different different case cAsE casE,"
-" with,with:with;with-with'with\"'\"various punctuation as well.  So much for those Words. and 10"
-" numbers in a row too 1,2,3,4,5,6,7,8,9,10!  Yay!.";
-
-int main(int argc, char **argv)
-{
-#if 0
-	CamelBlockFile *bs;
-	CamelKeyTable *ki;
-	CamelPartitionTable *cpi;
-	CamelBlock *keyroot, *partroot;
-	struct _CamelIndexRoot *root;
-	FILE *fp;
-	char line[256], *key;
-	camel_key_t keyid;
-	int index = 0, flags, data;
-#endif
-	CamelIndex *idx;
-	CamelIndexName *idn;
-	CamelIndexCursor *idc;
-	const char *word;
-	int i;
-
-	printf("Camel text index tester!\n");
-
-	g_thread_init(NULL);
-	camel_init(NULL, 0);
-
-	idx = (CamelIndex *)camel_text_index_new("textindex", O_CREAT|O_RDWR|O_TRUNC);
-
-
-#if 1
-	camel_index_compress(idx);
-
-	return 0;
-#endif
-
-	for (i=0;i<100;i++) {
-		char name[16];
-
-		sprintf(name, "%d", i);
-		printf("Adding words to name '%s'\n", name);
-		idn = camel_index_add_name(idx, name);
-		camel_index_name_add_buffer(idn, wordbuffer, sizeof(wordbuffer)-1);
-		camel_index_write_name(idx, idn);
-		camel_object_unref((CamelObject *)idn);
-	}
-
-	printf("Looking up which names contain word 'word'\n");
-	idc = camel_index_find(idx, "words");
-	while ( (word = camel_index_cursor_next(idc)) != NULL ) {
-		printf(" name is '%s'\n", word);
-	}
-	camel_object_unref((CamelObject *)idc);
-	printf("done.\n");
-
-	printf("Looking up which names contain word 'truncate'\n");
-	idc = camel_index_find(idx, "truncate");
-	while ( (word = camel_index_cursor_next(idc)) != NULL ) {
-		printf(" name is '%s'\n", word);
-	}
-	camel_object_unref((CamelObject *)idc);
-	printf("done.\n");
-
-	camel_index_sync(idx);
-	camel_object_unref((CamelObject *)idx);
-
-#if 0
-	bs = camel_block_file_new("blocks", "TESTINDX", CAMEL_BLOCK_SIZE);
-
-	root = (struct _CamelIndexRoot *)bs->root;
-	if (root->word_root == 0) {
-		keyroot = camel_block_file_new_block(bs);
-		root->word_root = keyroot->id;
-		camel_block_file_touch_block(bs, bs->root_block);
-	}
-	if (root->word_hash_root == 0) {
-		partroot = camel_block_file_new_block(bs);
-		root->word_hash_root = partroot->id;
-		camel_block_file_touch_block(bs, bs->root_block);
-	}
-
-	ki = camel_key_table_new(bs, root->word_root);
-	cpi = camel_partition_table_new(bs, root->word_hash_root);
-
-	fp = fopen("/usr/dict/words", "r");
-	if (fp == NULL) {
-		perror("fopen");
-		return 1;
-	}
-
-	while (fgets(line, sizeof(line), fp) != NULL) {
-		line[strlen(line)-1] = 0;
-
-		/* see if its already there */
-		keyid = camel_partition_table_lookup(cpi, line);		
-		if (keyid == 0) {
-			m(printf("Adding word '%s' %d\n", line, index));
-
-			keyid = camel_key_table_add(ki, line, index, 0);
-			m(printf(" key = %08x\n", keyid));
-
-			camel_partition_table_add(cpi, line, keyid);
-
-			m(printf("Lookup word '%s'\n", line));
-			keyid = camel_partition_table_lookup(cpi, line);		
-			m(printf(" key = %08x\n", keyid));
-		}
-
-		m(printf("Lookup key %08x\n", keyid));
-
-		camel_key_table_set_flags(ki, keyid, index, 1);
-
-		data = camel_key_table_lookup(ki, keyid, &key, &flags);
-		m(printf(" word = '%s' %d %04x\n", key, data, flags));
-
-		g_assert(data == index && strcmp(key, line) == 0);
-
-		g_free(key);
-
-		index++;
-	}
-
-	printf("Scanning again\n");
-	fseek(fp, SEEK_SET, 0);
-	index = 0;
-	while (fgets(line, sizeof(line), fp) != NULL) {
-		line[strlen(line)-1] = 0;
-		m(printf("Lookup word '%s' %d\n", line, index));
-		keyid = camel_partition_table_lookup(cpi, line);		
-		m(printf(" key = %08d\n", keyid));
-
-		m(printf("Lookup key %08x\n", keyid));
-		data = camel_key_table_lookup(ki, keyid, &key, &flags);
-		m(printf(" word = '%s' %d\n", key, data));
-
-		g_assert(data == index && strcmp(key, line) == 0);
-
-		g_free(key);
-
-		index++;
-	}
-
-	printf("Freeing partition index\n");
-	camel_partition_table_free(cpi);
-
-	printf("Syncing block file\n");
-	camel_block_file_sync(bs);
-#endif
-	return 0;
-}
-
-#endif
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
deleted file mode 100644
index de2a5252ec..0000000000
--- a/camel/camel-text-index.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_TEXT_INDEX_H
-#define _CAMEL_TEXT_INDEX_H
-
-#include <camel/camel-exception.h>
-#include <camel/camel-object.h>
-#include "camel-index.h"
-
-#define CAMEL_TEXT_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_text_index_get_type (), CamelTextIndex)
-#define CAMEL_TEXT_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_text_index_get_type (), CamelTextIndexClass)
-#define CAMEL_IS_TEXT_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_text_index_get_type ())
-
-typedef struct _CamelTextIndex      CamelTextIndex;
-typedef struct _CamelTextIndexClass CamelTextIndexClass;
-
-typedef struct _CamelTextIndexName      CamelTextIndexName;
-typedef struct _CamelTextIndexNameClass CamelTextIndexNameClass;
-
-typedef struct _CamelTextIndexCursor      CamelTextIndexCursor;
-typedef struct _CamelTextIndexCursorClass CamelTextIndexCursorClass;
-
-typedef struct _CamelTextIndexKeyCursor      CamelTextIndexKeyCursor;
-typedef struct _CamelTextIndexKeyCursorClass CamelTextIndexKeyCursorClass;
-
-typedef void (*CamelTextIndexFunc)(CamelTextIndex *idx, const char *word, char *buffer);
-
-/* ********************************************************************** */
-
-struct _CamelTextIndexCursor {
-	CamelIndexCursor parent;
-
-	struct _CamelTextIndexCursorPrivate *priv;
-};
-
-struct _CamelTextIndexCursorClass {
-	CamelIndexCursorClass parent;
-};
-
-CamelType camel_text_index_cursor_get_type(void);
-
-/* ********************************************************************** */
-
-struct _CamelTextIndexKeyCursor {
-	CamelIndexCursor parent;
-
-	struct _CamelTextIndexKeyCursorPrivate *priv;
-};
-
-struct _CamelTextIndexKeyCursorClass {
-	CamelIndexCursorClass parent;
-};
-
-CamelType camel_text_index_key_cursor_get_type(void);
-
-/* ********************************************************************** */
-
-struct _CamelTextIndexName {
-	CamelIndexName parent;
-
-	struct _CamelTextIndexNamePrivate *priv;
-};
-
-struct _CamelTextIndexNameClass {
-	CamelIndexNameClass parent;
-};
-
-CamelType camel_text_index_name_get_type(void);
-
-/* ********************************************************************** */
-
-struct _CamelTextIndex {
-	CamelIndex parent;
-
-	struct _CamelTextIndexPrivate *priv;
-};
-
-struct _CamelTextIndexClass {
-	CamelIndexClass parent_class;
-};
-
-CamelType	           camel_text_index_get_type	(void);
-CamelTextIndex    *camel_text_index_new(const char *path, int flags);
-
-/* static utility functions */
-int camel_text_index_check(const char *path);
-int camel_text_index_rename(const char *old, const char *new);
-int camel_text_index_remove(const char *old);
-
-#endif /* ! _CAMEL_TEXT_INDEX_H */
-
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
deleted file mode 100644
index ca241d95a6..0000000000
--- a/camel/camel-transport.c
+++ /dev/null
@@ -1,145 +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@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "camel-transport.h"
-#include "camel-address.h"
-#include "camel-mime-message.h"
-#include "camel-private.h"
-
-static CamelServiceClass *parent_class = NULL;
-
-/* Returns the class for a CamelTransport */
-#define CT_CLASS(so) CAMEL_TRANSPORT_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static int transport_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-static int transport_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-
-static void
-camel_transport_class_init (CamelTransportClass *camel_transport_class)
-{
-	CamelObjectClass *camel_object_class = CAMEL_OBJECT_CLASS (camel_transport_class);
-	
-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_object_class->setv = transport_setv;
-	camel_object_class->getv = transport_getv;
-}
-
-static void
-camel_transport_init (gpointer object, gpointer klass)
-{
-	CamelTransport *xport = object;
-	
-	xport->priv = g_malloc0 (sizeof (struct _CamelTransportPrivate));
-#ifdef ENABLE_THREADS
-	xport->priv->send_lock = g_mutex_new ();
-#endif
-}
-
-static void
-camel_transport_finalize (CamelObject *object)
-{
-	CamelTransport *xport = CAMEL_TRANSPORT (object);
-	
-#ifdef ENABLE_THREADS
-	g_mutex_free (xport->priv->send_lock);
-#endif
-	g_free (xport->priv);
-}
-
-CamelType
-camel_transport_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_SERVICE_TYPE,
-					    "CamelTransport",
-					    sizeof (CamelTransport),
-					    sizeof (CamelTransportClass),
-					    (CamelObjectClassInitFunc) camel_transport_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_transport_init,
-					    (CamelObjectFinalizeFunc) camel_transport_finalize);
-	}
-	
-	return type;
-}
-
-
-static int
-transport_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
-	/* CamelTransport doesn't currently have anything to set */
-	return CAMEL_OBJECT_CLASS (parent_class)->setv (object, ex, args);
-}
-
-static int
-transport_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	/* CamelTransport doesn't currently have anything to get */
-	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
-}
-
-
-/**
- * camel_transport_send_to:
- * @transport: the transport
- * @message: the message
- * @from: from address
- * @recipients: the recipients
- * @ex: a CamelException
- *
- * Sends the message to the given recipients, regardless of the contents
- * of @message. If the message contains a "Bcc" header, the transport
- * is responsible for stripping it.
- *
- * Return value: success or failure.
- **/
-gboolean
-camel_transport_send_to (CamelTransport *transport, CamelMimeMessage *message,
-			 CamelAddress *from, CamelAddress *recipients,
-			 CamelException *ex)
-{
-	gboolean sent;
-	
-	g_return_val_if_fail (CAMEL_IS_TRANSPORT (transport), FALSE);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), FALSE);
-	g_return_val_if_fail (CAMEL_IS_ADDRESS (from), FALSE);
-	g_return_val_if_fail (CAMEL_IS_ADDRESS (recipients), FALSE);
-	
-	CAMEL_TRANSPORT_LOCK (transport, send_lock);
-	sent = CT_CLASS (transport)->send_to (transport, message,
-					      from, recipients, ex);
-	CAMEL_TRANSPORT_UNLOCK (transport, send_lock);
-	
-	return sent;
-}
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
deleted file mode 100644
index d2c1e5b72c..0000000000
--- a/camel/camel-transport.h
+++ /dev/null
@@ -1,82 +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@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <glib.h>
-#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))
-
-
-enum {
-	CAMEL_TRANSPORT_ARG_FIRST  = CAMEL_SERVICE_ARG_FIRST + 100,
-};
-
-struct _CamelTransport
-{
-	CamelService parent_object;
-	
-	struct _CamelTransportPrivate *priv;
-};
-
-
-
-typedef struct {
-	CamelServiceClass parent_class;
-
-	gboolean (*send_to) (CamelTransport *transport,
-			     CamelMimeMessage *message,
-			     CamelAddress *from, CamelAddress *recipients,
-			     CamelException *ex);
-} CamelTransportClass;
-
-
-/* public methods */
-gboolean camel_transport_send_to (CamelTransport *transport,
-				  CamelMimeMessage *message,
-				  CamelAddress *from,
-				  CamelAddress *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 20790cd6f4..0000000000
--- a/camel/camel-types.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 _header_content_type CamelContentType;
-typedef struct _CamelDigestFolder CamelDigestFolder;
-typedef struct _CamelDigestStore CamelDigestStore;
-typedef struct _CamelDiscoDiary CamelDiscoDiary;
-typedef struct _CamelDiscoFolder CamelDiscoFolder;
-typedef struct _CamelDiscoStore CamelDiscoStore;
-typedef struct _CamelDataWrapper CamelDataWrapper;
-typedef struct _CamelException CamelException;
-typedef struct _CamelFilterDriver CamelFilterDriver;
-typedef struct _CamelFolder CamelFolder;
-typedef struct _CamelFolderSearch CamelFolderSearch;
-typedef struct _CamelFolderSummary CamelFolderSummary;
-typedef struct _CamelInternetAddress CamelInternetAddress;
-typedef struct _CamelMedium CamelMedium;
-typedef struct _CamelMessageContentInfo CamelMessageContentInfo;
-typedef struct _CamelMessageInfo CamelMessageInfo;
-typedef struct _CamelMimeFilter CamelMimeFilter;
-typedef struct _CamelMimeFilterBasic CamelMimeFilterBasic;
-typedef struct _CamelMimeFilterBestenc CamelMimeFilterBestenc;
-typedef struct _CamelMimeFilterCharset CamelMimeFilterCharset;
-typedef struct _CamelMimeFilterChomp CamelMimeFilterChomp;
-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 _CamelStreamNull CamelStreamNull;
-typedef struct _CamelStreamBuffer CamelStreamBuffer;
-typedef struct _CamelStreamDataWrapper CamelStreamDataWrapper;
-typedef struct _CamelStreamFilter CamelStreamFilter;
-typedef struct _CamelStreamFs CamelStreamFs;
-typedef struct _CamelStreamMem CamelStreamMem;
-typedef struct _CamelTcpStream CamelTcpStream;
-typedef struct _CamelTcpStreamRaw CamelTcpStreamRaw;
-typedef struct _CamelTcpStreamSSL CamelTcpStreamSSL;
-typedef struct _CamelTcpStreamOpenSSL CamelTcpStreamOpenSSL;
-typedef struct _CamelHttpStream CamelHttpStream;
-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 933f8b68e1..0000000000
--- a/camel/camel-uid-cache.c
+++ /dev/null
@@ -1,268 +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@ximian.com>
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "camel-uid-cache.h"
-
-struct _uid_state {
-	int level;
-	gboolean save;
-};
-
-static void free_uid (gpointer key, gpointer value, gpointer data);
-static void maybe_write_uid (gpointer key, gpointer value, gpointer data);
-
-
-static int
-mkdir_heir (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;
-}
-
-/**
- * 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 *dirname, *buf, **uids;
-	int fd, i;
-	
-	dirname = g_dirname (filename);
-	mkdir_heir (dirname, 0700);
-	g_free (dirname);
-	
-	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++) {
-		struct _uid_state *state;
-		
-		state = g_new (struct _uid_state, 1);
-		state->level = cache->level;
-		state->save = TRUE;
-		
-		g_hash_table_insert (cache->uids, uids[i], state);
-	}
-	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;
-	struct _uid_state *state = value;
-	
-	if (state && state->level == cache->level && state->save) {
-		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);
-	g_free (value);
-}
-
-
-/**
- * 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;
-	gpointer old_uid;
-	char *uid;
-	int i;
-	
-	new_uids = g_ptr_array_new ();
-	cache->level++;
-	
-	for (i = 0; i < uids->len; i++) {
-		struct _uid_state *state;
-		
-		uid = uids->pdata[i];
-		if (g_hash_table_lookup_extended (cache->uids, uid, (void **)&old_uid, (void **)&state)) {
-			g_hash_table_remove (cache->uids, uid);
-			g_free (old_uid);
-		} else {
-			g_ptr_array_add (new_uids, g_strdup (uid));
-			state = g_new (struct _uid_state, 1);
-			state->save = FALSE;
-		}
-		
-		state->level = cache->level;
-		g_hash_table_insert (cache->uids, g_strdup (uid), state);
-	}
-	
-	return new_uids;
-}
-
-
-/**
- * camel_uid_cache_save_uid:
- * @cache: a CamelUIDCache
- * @uid: a uid to save
- *
- * Marks a uid for saving.
- **/
-void
-camel_uid_cache_save_uid (CamelUIDCache *cache, const char *uid)
-{
-	struct _uid_state *state;
-	gpointer old_uid;
-	
-	g_return_if_fail (uid != NULL);
-	
-	if (g_hash_table_lookup_extended (cache->uids, uid, (void **)&old_uid, (void **)&state)) {
-		state->save = TRUE;
-		state->level = cache->level;
-	} else {
-		state = g_new (struct _uid_state, 1);
-		state->save = TRUE;
-		state->level = cache->level;
-		
-		g_hash_table_insert (cache->uids, g_strdup (uid), state);
-	}
-}
-
-
-/**
- * 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 e4327c9b12..0000000000
--- a/camel/camel-uid-cache.h
+++ /dev/null
@@ -1,54 +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 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <stdio.h>
-#include <glib.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_save_uid (CamelUIDCache *cache, const char *uid);
-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 a2d4e73dac..0000000000
--- a/camel/camel-url.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-url.c : utility functions to parse URLs */
-
-/* 
- * Authors:
- *  Dan Winship <danw@ximian.com>
- *  Tiago Ant�o <tiagoantao@bigfoot.com>
- *  Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 1999-2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "camel-url.h"
-#include "camel-exception.h"
-#include "camel-mime-utils.h"
-#include "camel-object.h"
-
-static void copy_param (GQuark key_id, gpointer data, gpointer user_data);
-static void output_param (GQuark key_id, gpointer data, gpointer user_data);
-
-/**
- * camel_url_new_with_base:
- * @base: a base URL
- * @url_string: the URL
- *
- * Parses @url_string relative to @base.
- *
- * Return value: a parsed CamelURL.
- **/
-CamelURL *
-camel_url_new_with_base (CamelURL *base, const char *url_string)
-{
-	CamelURL *url;
-	const char *end, *hash, *colon, *semi, *at, *slash, *question;
-	const char *p;
-
-	url = g_new0 (CamelURL, 1);
-
-	/* See RFC1808 for details. IF YOU CHANGE ANYTHING IN THIS
-	 * FUNCTION, RUN tests/misc/url AFTERWARDS.
-	 */
-
-	/* Find fragment. */
-	end = hash = strchr (url_string, '#');
-	if (hash && hash[1]) {
-		url->fragment = g_strdup (hash + 1);
-		camel_url_decode (url->fragment);
-	} else
-		end = url_string + strlen (url_string);
-
-	/* Find protocol: initial [a-z+.-]* substring until ":" */
-	p = url_string;
-	while (p < end && (isalnum ((unsigned char)*p) ||
-			   *p == '.' || *p == '+' || *p == '-'))
-		p++;
-
-	if (p > url_string && *p == ':') {
-		url->protocol = g_strndup (url_string, p - url_string);
-		g_strdown (url->protocol);
-		url_string = p + 1;
-	}
-
-	if (!*url_string && !base)
-		return url;
-
-	/* Check for authority */
-	if (strncmp (url_string, "//", 2) == 0) {
-		url_string += 2;
-
-		slash = url_string + strcspn (url_string, "/#");
-		at = strchr (url_string, '@');
-		if (at && 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 &&
-			    !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. */
-		colon = strchr (url_string, ':');
-		if (colon && colon < slash) {
-			url->host = g_strndup (url_string, colon - url_string);
-			url->port = strtoul (colon + 1, NULL, 10);
-		} else {
-			url->host = g_strndup (url_string, slash - url_string);
-			camel_url_decode (url->host);
-			url->port = 0;
-		}
-
-		url_string = slash;
-	}
-
-	/* Find query */
-	question = memchr (url_string, '?', end - url_string);
-	if (question) {
-		if (question[1]) {
-			url->query = g_strndup (question + 1,
-						end - (question + 1));
-			camel_url_decode (url->query);
-		}
-		end = question;
-	}
-
-	/* Find parameters */
-	semi = memchr (url_string, ';', end - url_string);
-	if (semi) {
-		if (semi[1]) {
-			const char *cur, *p, *eq;
-			char *name, *value;
-
-			for (cur = semi + 1; cur < end; cur = p + 1) {
-				p = memchr (cur, ';', end - cur);
-				if (!p)
-					p = end;
-				eq = memchr (cur, '=', p - cur);
-				if (eq) {
-					name = g_strndup (cur, eq - cur);
-					value = g_strndup (eq + 1, p - (eq + 1));
-					camel_url_decode (value);
-				} else {
-					name = g_strndup (cur, p - cur);
-					value = g_strdup ("");
-				}
-				camel_url_decode (name);
-				g_datalist_set_data_full (&url->params, name,
-							  value, g_free);
-				g_free (name);
-			}
-		}
-		end = semi;
-	}
-
-	if (end != url_string) {
-		url->path = g_strndup (url_string, end - url_string);
-		camel_url_decode (url->path);
-	}
-
-	/* Apply base URL. Again, this is spelled out in RFC 1808. */
-	if (base && !url->protocol && url->host)
-		url->protocol = g_strdup (base->protocol);
-	else if (base && !url->protocol) {
-		if (!url->user && !url->authmech && !url->passwd &&
-		    !url->host && !url->port && !url->path &&
-		    !url->params && !url->query && !url->fragment)
-			url->fragment = g_strdup (base->fragment);
-
-		url->protocol = g_strdup (base->protocol);
-		url->user = g_strdup (base->user);
-		url->authmech = g_strdup (base->authmech);
-		url->passwd = g_strdup (base->passwd);
-		url->host = g_strdup (base->host);
-		url->port = base->port;
-
-		if (!url->path) {
-			url->path = g_strdup (base->path);
-			if (!url->params) {
-				g_datalist_foreach (&base->params, copy_param,
-						    &url->params);
-				if (!url->query)
-					url->query = g_strdup (base->query);
-			}
-		} else if (*url->path != '/') {
-			char *newpath, *last, *p, *q;
-
-			last = strrchr (base->path, '/');
-			if (last) {
-				newpath = g_strdup_printf ("%.*s/%s",
-							   last - base->path,
-							   base->path,
-							   url->path);
-			} else
-				newpath = g_strdup_printf ("/%s", url->path);
-
-			/* Remove "./" where "." is a complete segment. */
-			for (p = newpath + 1; *p; ) {
-				if (*(p - 1) == '/' &&
-				    *p == '.' && *(p + 1) == '/')
-					memmove (p, p + 2, strlen (p + 2) + 1);
-				else
-					p++;
-			}
-			/* Remove "." at end. */
-			if (p > newpath + 2 &&
-			    *(p - 1) == '.' && *(p - 2) == '/')
-				*(p - 1) = '\0';
-			/* Remove "<segment>/../" where <segment> != ".." */
-			for (p = newpath + 1; *p; ) {
-				if (!strncmp (p, "../", 3)) {
-					p += 3;
-					continue;
-				}
-				q = strchr (p + 1, '/');
-				if (!q)
-					break;
-				if (strncmp (q, "/../", 4) != 0) {
-					p = q + 1;
-					continue;
-				}
-				memmove (p, q + 4, strlen (q + 4) + 1);
-				p = newpath + 1;
-			}
-			/* Remove "<segment>/.." at end */
-			q = strrchr (newpath, '/');
-			if (q && !strcmp (q, "/..")) {
-				p = q - 1;
-				while (p > newpath && *p != '/')
-					p--;
-				if (strncmp (p, "/../", 4) != 0)
-					*(p + 1) = 0;
-			}
-			g_free (url->path);
-			url->path = newpath;
-		}
-	}
-
-	return url;
-}
-
-static void
-copy_param (GQuark key_id, gpointer data, gpointer user_data)
-{
-	GData **copy = user_data;
-
-	g_datalist_id_set_data_full (copy, key_id, g_strdup (data), g_free);
-}
-
-/**
- * camel_url_new:
- * @url_string: a URL
- * @ex: a CamelException
- *
- * Parses an absolute URL.
- *
- * Return value: a CamelURL, or %NULL.
- **/
-CamelURL *
-camel_url_new (const char *url_string, CamelException *ex)
-{
-	CamelURL *url = camel_url_new_with_base (NULL, url_string);
-
-	if (!url->protocol) {
-		camel_url_free (url);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("Could not parse URL `%s'"),
-				      url_string);
-		return NULL;
-	}
-	return url;
-}
-
-/**
- * camel_url_to_string:
- * @url: a CamelURL
- * @flags: additional translation options.
- *
- * Return value: a string representing @url, which the caller must free.
- **/
-char *
-camel_url_to_string (CamelURL *url, guint32 flags)
-{
-	GString *str;
-	char *enc, *return_result;
-
-	/* IF YOU CHANGE ANYTHING IN THIS FUNCTION, RUN
-	 * tests/misc/url AFTERWARD.
-	 */
-
-	str = g_string_sized_new (20);
-
-	if (url->protocol)
-		g_string_sprintfa (str, "%s:", url->protocol);
-	if (url->host) {
-		g_string_append (str, "//");
-		if (url->user) {
-			enc = camel_url_encode (url->user, TRUE, ":;@/");
-			g_string_append (str, enc);
-			g_free (enc);
-		}
-		if (url->authmech && *url->authmech) {
-			enc = camel_url_encode (url->authmech, TRUE, ":@/");
-			g_string_sprintfa (str, ";auth=%s", enc);
-			g_free (enc);
-		}
-		if (url->passwd && !(flags & CAMEL_URL_HIDE_PASSWORD)) {
-			enc = camel_url_encode (url->passwd, TRUE, "@/");
-			g_string_sprintfa (str, ":%s", enc);
-			g_free (enc);
-		}
-		if (url->host) {
-			enc = camel_url_encode (url->host, TRUE, ":/");
-			g_string_sprintfa (str, "%s%s", url->user ? "@" : "", enc);
-			g_free (enc);
-		}
-		if (url->port)
-			g_string_sprintfa (str, ":%d", url->port);
-		if (!url->path && (url->params || url->query || url->fragment))
-			g_string_append_c (str, '/');
-	}
-
-	if (url->path) {
-		enc = camel_url_encode (url->path, FALSE, ";?#");
-		g_string_sprintfa (str, "%s", enc);
-		g_free (enc);
-	}
-	if (url->params && !(flags & CAMEL_URL_HIDE_PARAMS))
-		g_datalist_foreach (&url->params, output_param, str);
-	if (url->query) {
-		enc = camel_url_encode (url->query, FALSE, "#");
-		g_string_sprintfa (str, "?%s", enc);
-		g_free (enc);
-	}
-	if (url->fragment) {
-		enc = camel_url_encode (url->fragment, FALSE, NULL);
-		g_string_sprintfa (str, "#%s", enc);
-		g_free (enc);
-	}
-
-	return_result = str->str;
-	g_string_free (str, FALSE);
-	return return_result;
-}
-
-static void
-output_param (GQuark key_id, gpointer data, gpointer user_data)
-{
-	GString *str = user_data;
-	char *enc;
-
-	enc = camel_url_encode (g_quark_to_string (key_id), FALSE, "?#");
-	g_string_sprintfa (str, ";%s", enc);
-	g_free (enc);
-	if (*(char *)data) {
-		enc = camel_url_encode (data, FALSE, "?#");
-		g_string_sprintfa (str, "=%s", enc);
-		g_free (enc);
-	}
-}
-
-/**
- * camel_url_free:
- * @url: a CamelURL
- *
- * Frees @url
- **/
-void
-camel_url_free (CamelURL *url)
-{
-	if (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_datalist_clear (&url->params);
-		g_free (url->query);
-		g_free (url->fragment);
-		
-		g_free (url);
-	}
-}
-
-
-#define DEFINE_CAMEL_URL_SET(part)			\
-void							\
-camel_url_set_##part (CamelURL *url, const char *part)	\
-{							\
-	g_free (url->part);				\
-	url->part = g_strdup (part);			\
-}
-
-DEFINE_CAMEL_URL_SET (protocol)
-DEFINE_CAMEL_URL_SET (user)
-DEFINE_CAMEL_URL_SET (authmech)
-DEFINE_CAMEL_URL_SET (passwd)
-DEFINE_CAMEL_URL_SET (host)
-DEFINE_CAMEL_URL_SET (path)
-DEFINE_CAMEL_URL_SET (query)
-DEFINE_CAMEL_URL_SET (fragment)
-
-void
-camel_url_set_port (CamelURL *url, int port)
-{
-	url->port = port;
-}
-
-void
-camel_url_set_param (CamelURL *url, const char *name, const char *value)
-{
-	g_datalist_set_data_full (&url->params, name, value ? g_strdup (value) : NULL, g_free);
-}
-
-const char *
-camel_url_get_param (CamelURL *url, const char *name)
-{
-	return g_datalist_get_data (&url->params, name);
-}
-
-
-/**
- * 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 (const char *part, gboolean escape_unsafe,
-		  const 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';
-}
-
-guint
-camel_url_hash (const void *v)
-{
-	const CamelURL *u = v;
-	guint hash = 0;
-
-#define ADD_HASH(s) if (s) hash ^= g_str_hash (s);
-
-	ADD_HASH (u->protocol);
-	ADD_HASH (u->user);
-	ADD_HASH (u->authmech);
-	ADD_HASH (u->host);
-	ADD_HASH (u->path);
-	ADD_HASH (u->query);
-	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)
-		&& check_equal(u1->query, u2->query)
-		&& u1->port == u2->port;
-}
diff --git a/camel/camel-url.h b/camel/camel-url.h
deleted file mode 100644
index d60c9594c2..0000000000
--- a/camel/camel-url.h
+++ /dev/null
@@ -1,89 +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@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-	GData *params;
-	char  *query;
-	char  *fragment;
-} CamelURL;
-
-#define CAMEL_URL_HIDE_PASSWORD	(1 << 0)
-#define CAMEL_URL_HIDE_PARAMS	(1 << 1)
-#define CAMEL_URL_HIDE_AUTH	(1 << 2)
-
-#define CAMEL_URL_HIDE_ALL (CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS | CAMEL_URL_HIDE_AUTH)
-
-CamelURL *camel_url_new_with_base (CamelURL *base, const char *url_string);
-CamelURL *camel_url_new (const char *url_string, CamelException *ex);
-char *camel_url_to_string (CamelURL *url, guint32 flags);
-void camel_url_free (CamelURL *url);
-
-char *camel_url_encode (const char *part, gboolean escape_unsafe,
-			const char *escape_extra);
-void camel_url_decode (char *part);
-
-/* for editing url's */
-void camel_url_set_protocol (CamelURL *url, const char *protocol);
-void camel_url_set_user (CamelURL *url, const char *user);
-void camel_url_set_authmech (CamelURL *url, const char *authmech);
-void camel_url_set_passwd (CamelURL *url, const char *passwd);
-void camel_url_set_host (CamelURL *url, const char *host);
-void camel_url_set_port (CamelURL *url, int port);
-void camel_url_set_path (CamelURL *url, const char *path);
-void camel_url_set_param (CamelURL *url, const char *name, const char *value);
-void camel_url_set_query (CamelURL *url, const char *query);
-void camel_url_set_fragment (CamelURL *url, const char *fragment);
-
-const char *camel_url_get_param (CamelURL *url, const char *name);
-
-/* 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-vee-folder.c b/camel/camel-vee-folder.c
deleted file mode 100644
index 11912e3637..0000000000
--- a/camel/camel-vee-folder.c
+++ /dev/null
@@ -1,1532 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <string.h>
-
-#include "camel-exception.h"
-#include "camel-vee-folder.h"
-#include "camel-store.h"
-#include "camel-folder-summary.h"
-#include "camel-mime-message.h"
-#include "camel-folder-search.h"
-
-#include "camel-session.h"
-#include "camel-vee-store.h"	/* for open flags */
-#include "camel-private.h"
-
-#include "e-util/md5-utils.h"
-
-#if defined (DOEPOOLV) || defined (DOESTRV)
-#include "e-util/e-memory.h"
-#endif
-
-#define d(x)
-extern int camel_verbose_debug;
-#define dd(x) (camel_verbose_debug?(x):0)
-
-#define _PRIVATE(o) (((CamelVeeFolder *)(o))->priv)
-
-static void vee_refresh_info(CamelFolder *folder, CamelException *ex);
-
-static void vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static void vee_expunge (CamelFolder *folder, CamelException *ex);
-
-static CamelMimeMessage *vee_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex);
-static void vee_append_message(CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex);
-static void vee_transfer_messages_to(CamelFolder *source, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex);
-
-static GPtrArray *vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);
-static GPtrArray *vee_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex);
-
-static void vee_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);
-static void vee_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value);
-static void vee_rename(CamelFolder *folder, const char *new);
-
-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 int vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex);
-static void vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *source, int killun);
-
-static void message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf);
-static void folder_changed(CamelFolder *sub, CamelFolderChangeInfo *changes, CamelVeeFolder *vf);
-static void subfolder_deleted(CamelFolder *f, void *event_data, CamelVeeFolder *vf);
-
-static void folder_changed_remove_uid(CamelFolder *sub, const char *uid, const char hash[8], int keep, CamelVeeFolder *vf);
-
-static CamelFolderClass *camel_vee_folder_parent;
-
-/* a vfolder for unmatched messages */
-/* use folder_unmatched->summary_lock for access to unmatched_uids or appropriate internals, for consistency */
-static CamelVeeFolder *folder_unmatched;
-static GHashTable *unmatched_uids; /* a refcount of uid's that are matched by any rules */
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-static pthread_mutex_t unmatched_lock = PTHREAD_MUTEX_INITIALIZER;
-/* only used to initialise folder_unmatched */
-#define UNMATCHED_LOCK() pthread_mutex_lock(&unmatched_lock)
-#define UNMATCHED_UNLOCK() pthread_mutex_unlock(&unmatched_lock)
-#else
-#define UNMATCHED_LOCK()
-#define UNMATCHED_UNLOCK()
-#endif
-
-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->refresh_info = vee_refresh_info;
-	folder_class->sync = vee_sync;
-	folder_class->expunge = vee_expunge;
-
-	folder_class->get_message = vee_get_message;
-	folder_class->append_message = vee_append_message;
-	folder_class->transfer_messages_to = vee_transfer_messages_to;
-
-	folder_class->search_by_expression = vee_search_by_expression;
-	folder_class->search_by_uids = vee_search_by_uids;
-
-	folder_class->set_message_flags = vee_set_message_flags;
-	folder_class->set_message_user_flag = vee_set_message_user_flag;
-
-	folder_class->rename = vee_rename;
-}
-
-static void
-camel_vee_folder_init (CamelVeeFolder *obj)
-{
-	struct _CamelVeeFolderPrivate *p;
-	CamelFolder *folder = (CamelFolder *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
-				 CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);
-
-	/* 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;
-
-	obj->changes = camel_folder_change_info_new();
-	obj->search = camel_folder_search_new();
-
-#ifdef ENABLE_THREADS
-	p->summary_lock = g_mutex_new();
-	p->subfolder_lock = g_mutex_new();
-	p->changed_lock = g_mutex_new();
-#endif
-
-}
-
-static void
-camel_vee_folder_finalise (CamelObject *obj)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)obj;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	/* FIXME: check leaks */
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-
-		if (vf != folder_unmatched) {
-			camel_object_unhook_event((CamelObject *)f, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
-			camel_object_unhook_event((CamelObject *)f, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);
-			camel_object_unhook_event((CamelObject *)f, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
-			/* this updates the vfolder */
-			if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0)
-				vee_folder_remove_folder(vf, f, FALSE);
-		}
-		camel_object_unref((CamelObject *)f);
-
-		node = g_list_next(node);
-	}
-
-	g_free(vf->expression);
-	g_free(vf->vname);
-	
-	g_list_free(p->folders);
-	g_list_free(p->folders_changed);
-
-	camel_folder_change_info_free(vf->changes);
-	camel_object_unref((CamelObject *)vf->search);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(p->summary_lock);
-	g_mutex_free(p->subfolder_lock);
-	g_mutex_free(p->changed_lock);
-#endif
-	g_free(p);
-}
-
-static void
-vee_folder_construct (CamelVeeFolder *vf, CamelStore *parent_store, const char *name, guint32 flags)
-{
-	CamelFolder *folder = (CamelFolder *)vf;
-	char *tmp;
-	
-	vf->flags = flags;
-	vf->vname = g_strdup(name);
-	tmp = strrchr(vf->vname, '/');
-	if (tmp)
-		tmp++;
-	else
-		tmp = vf->vname;
-	camel_folder_construct(folder, parent_store, vf->vname, tmp);
-
-	/* should CamelVeeMessageInfo be subclassable ..? */
-	folder->summary = camel_folder_summary_new();
-	folder->summary->message_info_size = sizeof(CamelVeeMessageInfo);
-}
-
-void
-camel_vee_folder_construct(CamelVeeFolder *vf, CamelStore *parent_store, const char *name, guint32 flags)
-{
-	UNMATCHED_LOCK();
-	
-	/* setup unmatched folder if we haven't yet */
-	if (folder_unmatched == NULL) {
-		unmatched_uids = g_hash_table_new (g_str_hash, g_str_equal);
-		folder_unmatched = (CamelVeeFolder *)camel_object_new (camel_vee_folder_get_type ());
-		d(printf("created foldeer unmatched %p\n", folder_unmatched));
-		
-		vee_folder_construct (folder_unmatched, parent_store, CAMEL_UNMATCHED_NAME, CAMEL_STORE_FOLDER_PRIVATE);
-	}
-	
-	UNMATCHED_UNLOCK();
-	
-	vee_folder_construct (vf, parent_store, name, flags);
-}
-
-/**
- * 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, guint32 flags)
-{
-	CamelVeeFolder *vf;
-
-	UNMATCHED_LOCK();
-
-	/* setup unmatched folder if we haven't yet */
-	if (folder_unmatched == NULL) {
-		unmatched_uids = g_hash_table_new(g_str_hash, g_str_equal);
-		folder_unmatched = vf = (CamelVeeFolder *)camel_object_new(camel_vee_folder_get_type());
-		d(printf("created foldeer unmatched %p\n", folder_unmatched));
-		vee_folder_construct (vf, parent_store, CAMEL_UNMATCHED_NAME, CAMEL_STORE_FOLDER_PRIVATE);
-	}
-
-	UNMATCHED_UNLOCK();
-
-	if (strcmp(name, CAMEL_UNMATCHED_NAME) == 0) {
-		camel_object_ref((CamelObject *)folder_unmatched);
-		d(printf("returning unmatched %p, count = %d\n", folder_unmatched, camel_folder_get_message_count((CamelFolder *)folder_unmatched)));
-		return (CamelFolder *)folder_unmatched;
-	}
-
-	vf = (CamelVeeFolder *)camel_object_new(camel_vee_folder_get_type());
-	vee_folder_construct(vf, parent_store, name, flags);
-
-	d(printf("returning folder %s %p, count = %d\n", name, vf, camel_folder_get_message_count((CamelFolder *)vf)));
-
-	return (CamelFolder *)vf;
-}
-
-void
-camel_vee_folder_set_expression(CamelVeeFolder *vf, const char *query)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	/* no change, do nothing */
-	if ((vf->expression && query && strcmp(vf->expression, query) == 0)
-	    || (vf->expression == NULL && query == NULL)) {
-		CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-		return;
-	}
-
-	g_free(vf->expression);
-	if (query)
-		vf->expression = g_strdup(query);
-
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-
-		if (vee_folder_build_folder(vf, f, NULL) == -1)
-			break;
-
-		node = node->next;
-	}
-
-	CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);
-	g_list_free(p->folders_changed);
-	p->folders_changed = NULL;
-	CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-}
-
-/**
- * camel_vee_folder_add_folder:
- * @vf: Virtual Folder object
- * @sub: source CamelFolder to add to @vf
- *
- * Adds @sub as a source folder to @vf.
- **/
-void
-camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf), *up = _PRIVATE(folder_unmatched);
-
-	if (vf == (CamelVeeFolder *)sub) {
-		g_warning("Adding a virtual folder to itself as source, ignored");
-		return;
-	}
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	/* for normal vfolders we want only unique ones, for unmatched we want them all recorded */
-	if (g_list_find(p->folders, sub) == NULL) {
-		camel_object_ref((CamelObject *)sub);
-		p->folders = g_list_append(p->folders, sub);
-	}
-	if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) {
-		camel_object_ref((CamelObject *)sub);
-		up->folders = g_list_append(up->folders, sub);
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	d(printf("camel_vee_folder_add_folde(%p, %p)\n", vf, 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);
-	camel_object_hook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc)subfolder_deleted, vf);
-
-	vee_folder_build_folder(vf, sub, NULL);
-}
-
-/**
- * camel_vee_folder_remove_folder:
- * @vf: Virtual Folder object
- * @sub: source CamelFolder to remove from @vf
- *
- * Removed the source folder, @sub, from the virtual folder, @vf.
- **/
-void
-camel_vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *sub)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf), *up = _PRIVATE(folder_unmatched);
-	int killun = FALSE;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);
-	p->folders_changed = g_list_remove(p->folders_changed, sub);
-	CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);
-
-	if (g_list_find(p->folders, sub) == NULL) {
-		CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-		return;
-	}
-
-	camel_object_unhook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
-	camel_object_unhook_event((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);
-	camel_object_unhook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
-
-	p->folders = g_list_remove(p->folders, sub);
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, subfolder_lock);
-	/* if folder deleted, then blow it away from unmatched always, and remove all refs to it */
-	if (sub->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED) {
-		while (g_list_find(up->folders, sub)) {
-			killun = TRUE;
-			up->folders = g_list_remove(up->folders, sub);
-			camel_object_unref((CamelObject *)sub);
-		}
-	} else if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) {
-		if (g_list_find(up->folders, sub) != NULL) {
-			up->folders = g_list_remove(up->folders, sub);
-			camel_object_unref((CamelObject *)sub);
-		}
-		if (g_list_find(up->folders, sub) == NULL) {
-			killun = TRUE;
-		}
-	}
-	CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, subfolder_lock);
-
-	vee_folder_remove_folder(vf, sub, killun);
-
-	camel_object_unref((CamelObject *)sub);
-}
-
-static void
-remove_folders(CamelFolder *folder, CamelFolder *foldercopy, CamelVeeFolder *vf)
-{
-	camel_vee_folder_remove_folder(vf, folder);
-	camel_object_unref((CamelObject *)folder);
-}
-
-/**
- * camel_vee_folder_set_folders:
- * @vf: 
- * @folders: 
- * 
- * Set the whole list of folder sources on a vee folder.
- **/
-void
-camel_vee_folder_set_folders(CamelVeeFolder *vf, GList *folders)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GHashTable *remove = g_hash_table_new(NULL, NULL);
-	GList *l;
-	CamelFolder *folder;
-	int changed;
-
-	/* setup a table of all folders we have currently */
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-	l = p->folders;
-	while (l) {
-		g_hash_table_insert(remove, l->data, l->data);
-		camel_object_ref((CamelObject *)l->data);
-		l = l->next;
-	}
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	/* if we already have the folder, ignore it, otherwise add it */
-	l = folders;
-	while (l) {
-		if ((folder = g_hash_table_lookup(remove, l->data))) {
-			g_hash_table_remove(remove, folder);
-			camel_object_unref((CamelObject *)folder);
-
-			/* if this was a changed folder, re-update it while we're here */
-			CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);
-			changed = g_list_find(p->folders_changed, folder) != NULL;
-			if (changed)
-				p->folders_changed = g_list_remove(p->folders_changed, folder);
-			CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);
-			if (changed)
-				vee_folder_build_folder(vf, folder, NULL);
-		} else {
-			camel_vee_folder_add_folder(vf, l->data);
-		}
-		l = l->next;
-	}
-
-	/* then remove any we still have */
-	g_hash_table_foreach(remove, (GHFunc)remove_folders, vf);
-	g_hash_table_destroy(remove);
-}
-
-/**
- * camel_vee_folder_hash_folder:
- * @folder: 
- * @: 
- * 
- * Create a hash string representing the folder name, which should be
- * unique, and remain static for a given folder.
- **/
-void
-camel_vee_folder_hash_folder(CamelFolder *folder, char buffer[8])
-{
-	MD5Context ctx;
-	unsigned char digest[16];
-	unsigned int state = 0, save = 0;
-	char *tmp;
-	int i;
-
-	md5_init(&ctx);
-	tmp = camel_service_get_url((CamelService *)folder->parent_store);
-	md5_update(&ctx, tmp, strlen(tmp));
-	g_free(tmp);
-	md5_update(&ctx, folder->full_name, strlen(folder->full_name));
-	md5_final(&ctx, digest);
-	base64_encode_close(digest, 6, FALSE, buffer, &state, &save);
-
-	for (i=0;i<8;i++) {
-		if (buffer[i] == '+')
-			buffer[i] = '.';
-		if (buffer[i] == '/')
-			buffer[i] = '_';
-	}
-}
-
-static void vee_refresh_info(CamelFolder *folder, CamelException *ex)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node, *list;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);
-	list = p->folders_changed;
-	p->folders_changed = NULL;
-	CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);
-
-	node = list;
-	while (node) {
-		CamelFolder *f = node->data;
-
-		if (vee_folder_build_folder(vf, f, ex) == -1)
-			break;
-
-		node = node->next;
-	}
-
-	g_list_free(list);
-}
-
-static void
-vee_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-
-		camel_folder_sync(f, expunge, ex);
-		if (camel_exception_is_set(ex))
-			break;
-
-		if (expunge && vee_folder_build_folder(vf, f, ex) == -1)
-			break;
-
-		node = node->next;
-	}
-
-	if (expunge && node == NULL) {
-		CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);
-		g_list_free(p->folders_changed);
-		p->folders_changed = NULL;
-		CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-}
-
-static void
-vee_expunge (CamelFolder *folder, CamelException *ex)
-{
-	((CamelFolderClass *)((CamelObject *)folder)->klass)->sync(folder, TRUE, ex);
-}
-
-static CamelMimeMessage *
-vee_get_message(CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	CamelVeeMessageInfo *mi;
-	CamelMimeMessage *msg = NULL;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		msg =  camel_folder_get_message(mi->folder, camel_message_info_uid(mi)+8, ex);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("No such message %s in %s"), uid,
-				     folder->name);
-	}
-
-	return msg;
-}
-
-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);
-	GHashTable *searched = g_hash_table_new(NULL, NULL);
-	
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-	
-	if (vf != folder_unmatched)
-		expr = g_strdup_printf ("(and %s %s)", vf->expression, expression);
-	else
-		expr = g_strdup (expression);
-	
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-		int i;
-		char hash[8];
-		
-		/* make sure we only search each folder once - for unmatched folder to work right */
-		if (g_hash_table_lookup(searched, f) == NULL) {
-			camel_vee_folder_hash_folder(f, hash);
-			matches = camel_folder_search_by_expression(f, expression, ex);
-			for (i = 0; i < matches->len; i++) {
-				char *uid = matches->pdata[i], *vuid;
-
-				vuid = g_malloc(strlen(uid)+9);
-				memcpy(vuid, hash, 8);
-				strcpy(vuid+8, uid);
-				g_ptr_array_add(result, vuid);
-			}
-			camel_folder_search_free(f, matches);
-			g_hash_table_insert(searched, f, f);
-		}
-		node = g_list_next(node);
-	}
-
-	g_free(expr);
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	g_hash_table_destroy(searched);
-
-	return result;
-}
-
-static GPtrArray *
-vee_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)
-{
-	GList *node;
-	GPtrArray *matches, *result = g_ptr_array_new ();
-	GPtrArray *folder_uids = g_ptr_array_new();
-	char *expr;
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GHashTable *searched = g_hash_table_new(NULL, NULL);
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	expr = g_strdup_printf("(and %s %s)", vf->expression, expression);
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-		int i;
-		char hash[8];
-		
-		/* make sure we only search each folder once - for unmatched folder to work right */
-		if (g_hash_table_lookup(searched, f) == NULL) {
-			camel_vee_folder_hash_folder(f, hash);
-
-			/* map the vfolder uid's to the source folder uid's first */
-			g_ptr_array_set_size(folder_uids, 0);
-			for (i=0;i<uids->len;i++) {
-				char *uid = uids->pdata[i];
-
-				if (strlen(uid) >= 8 && strncmp(uid, hash, 8) == 0)
-					g_ptr_array_add(folder_uids, uid+8);
-			}
-			if (folder_uids->len > 0) {
-				matches = camel_folder_search_by_uids(f, expression, folder_uids, ex);
-				if (matches) {
-					for (i = 0; i < matches->len; i++) {
-						char *uid = matches->pdata[i], *vuid;
-				
-						vuid = g_malloc(strlen(uid)+9);
-						memcpy(vuid, hash, 8);
-						strcpy(vuid+8, uid);
-						g_ptr_array_add(result, vuid);
-					}
-					camel_folder_search_free(f, matches);
-				} else {
-					g_warning("Search failed: %s", camel_exception_get_description(ex));
-				}
-			}
-			g_hash_table_insert(searched, f, f);
-		}
-		node = g_list_next(node);
-	}
-
-	g_free(expr);
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	g_hash_table_destroy(searched);
-	g_ptr_array_free(folder_uids, 0);
-
-	return result;
-}
-
-static void
-vee_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelVeeMessageInfo *mi;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		camel_folder_set_message_flags(mi->folder, camel_message_info_uid(mi) + 8, flags, set);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-		((CamelFolderClass *)camel_vee_folder_parent)->set_message_flags(folder, uid, flags, set);
-	}
-}
-
-static void
-vee_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	CamelVeeMessageInfo *mi;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		camel_folder_set_message_user_flag(mi->folder, camel_message_info_uid(mi) + 8, name, value);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-		((CamelFolderClass *)camel_vee_folder_parent)->set_message_user_flag(folder, uid, name, value);
-	}
-}
-
-static void
-vee_append_message(CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)
-{
-	camel_exception_set(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot copy or move messages into a Virtual Folder"));
-}
-
-static void
-vee_transfer_messages_to (CamelFolder *folder, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex)
-{
-	camel_exception_set(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot copy or move messages into a Virtual Folder"));
-}
-
-static void vee_rename(CamelFolder *folder, const char *new)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-
-	g_free(vf->vname);
-	vf->vname = g_strdup(new);
-
-	((CamelFolderClass *)camel_vee_folder_parent)->rename(folder, new);
-}
-
-/* ********************************************************************** *
-   utility functions */
-
-/* must be called with summary_lock held */
-static CamelVeeMessageInfo *
-vee_folder_add_info(CamelVeeFolder *vf, CamelFolder *f, CamelMessageInfo *info, const char hash[8])
-{
-	CamelVeeMessageInfo *mi;
-	char *vuid;
-	const char *uid;
-	CamelFolder *folder = (CamelFolder *)vf;
-	CamelMessageInfo *dinfo;
-
-	uid = camel_message_info_uid(info);
-	vuid = alloca(strlen(uid)+9);
-	memcpy(vuid, hash, 8);
-	strcpy(vuid+8, uid);
-	dinfo = camel_folder_summary_uid(folder->summary, vuid);
-	if (dinfo) {
-		d(printf("w:clash, we already have '%s' in summary\n", vuid));
-		camel_folder_summary_info_free(folder->summary, dinfo);
-		return NULL;
-	}
-
-	d(printf("adding vuid %s to %s\n", vuid, vf->vname));
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_info_new(folder->summary);
-	camel_message_info_dup_to(info, (CamelMessageInfo *)mi);
-#ifdef DOEPOOLV
-	mi->info.strings = e_poolv_set(mi->info.strings, CAMEL_MESSAGE_INFO_UID, vuid, FALSE);
-#elif defined (DOESTRV)
-	mi->info.strings = e_strv_set_ref(mi->info.strings, CAMEL_MESSAGE_INFO_UID, vuid);
-	mi->info.strings = e_strv_pack(mi->info.strings);
-#else	
-	g_free(mi->info.uid);
-	mi->info.uid = g_strdup(vuid);
-#endif
-	mi->folder = f;
-	camel_folder_summary_add(folder->summary, (CamelMessageInfo *)mi);
-
-	return mi;
-}
-
-/* must be called with summary_lock held */
-static CamelVeeMessageInfo *
-vee_folder_add_uid(CamelVeeFolder *vf, CamelFolder *f, const char *inuid, const char hash[8])
-{
-	CamelMessageInfo *info;
-	CamelVeeMessageInfo *mi = NULL;
-
-	info = camel_folder_get_message_info(f, inuid);
-	if (info) {
-		mi = vee_folder_add_info(vf, f, info, hash);
-		camel_folder_free_message_info(f, info);
-	}
-	return mi;
-}
-
-static void
-vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *source, int killun)
-{
-	int i, count, n, still;
-	char *oldkey;
-	CamelFolder *folder = (CamelFolder *)vf;
-	char hash[8];
-	/*struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);*/
-	CamelFolderChangeInfo *vf_changes = NULL, *unmatched_changes = NULL;
-
-	if (vf == folder_unmatched)
-		return;
-
-	/* check if this folder is still to be part of unmatched */
-	if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0 && !killun) {
-		CAMEL_VEE_FOLDER_LOCK(folder_unmatched, subfolder_lock);
-		still = g_list_find(_PRIVATE(folder_unmatched)->folders, source) != NULL;
-		CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, subfolder_lock);
-		camel_vee_folder_hash_folder(source, hash);
-	} else {
-		still = FALSE;
-	}
-
-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
-
-	/* See if we just blow all uid's from this folder away from unmatched, regardless */
-	if (killun) {
-		count = camel_folder_summary_count(((CamelFolder *)folder_unmatched)->summary);
-		for (i=0;i<count;i++) {
-			CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(((CamelFolder *)folder_unmatched)->summary, i);
-			
-			if (mi) {
-				if (mi->folder == source) {
-					camel_folder_summary_remove_index(((CamelFolder *)folder_unmatched)->summary, i);
-					camel_folder_change_info_remove_uid(folder_unmatched->changes, camel_message_info_uid(mi));
-					i--;
-				}
-				camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)->summary, (CamelMessageInfo *)mi);
-			}
-		}
-	}
-
-	count = camel_folder_summary_count(folder->summary);
-	for (i=0;i<count;i++) {
-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(folder->summary, i);
-		if (mi) {
-			if (mi->folder == source) {
-				const char *uid = camel_message_info_uid(mi);
-
-				camel_folder_change_info_remove_uid(vf->changes, uid);
-				camel_folder_summary_remove_index(folder->summary, i);
-				i--;
-				if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) {
-					if (still) {
-						if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
-							if (n == 1) {
-								g_hash_table_remove(unmatched_uids, oldkey);
-								if (vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash))
-									camel_folder_change_info_add_uid(folder_unmatched->changes, oldkey);
-								g_free(oldkey);
-							} else {
-								g_hash_table_insert(unmatched_uids, oldkey, (void *)(n-1));
-							}
-						}
-					} else {
-						if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&oldkey, (void **)&n)) {
-							g_hash_table_remove(unmatched_uids, oldkey);
-							g_free(oldkey);
-						}
-					}
-				}
-			}
-			camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-		}
-	}
-
-	if (camel_folder_change_info_changed(folder_unmatched->changes)) {
-		unmatched_changes = folder_unmatched->changes;
-		folder_unmatched->changes = camel_folder_change_info_new();
-	}
-
-	if (camel_folder_change_info_changed(vf->changes)) {
-		vf_changes = vf->changes;
-		vf->changes = camel_folder_change_info_new();
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, summary_lock);
-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);
-
-	if (unmatched_changes) {
-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", unmatched_changes);
-		camel_folder_change_info_free(unmatched_changes);
-	}
-
-	if (vf_changes) {
-		camel_object_trigger_event((CamelObject *)vf, "folder_changed", vf_changes);
-		camel_folder_change_info_free(vf_changes);
-	}
-}
-
-struct _update_data {
-	CamelFolder *source;
-	CamelVeeFolder *vf;
-	char hash[8];
-};
-
-static void
-unmatched_check_uid(char *uidin, void *value, struct _update_data *u)
-{
-	char *uid;
-	int n;
-
-	uid = alloca(strlen(uidin)+9);
-	memcpy(uid, u->hash, 8);
-	strcpy(uid+8, uidin);
-	n = (int)g_hash_table_lookup(unmatched_uids, uid);
-	if (n == 0) {
-		if (vee_folder_add_uid(folder_unmatched, u->source, uidin, u->hash))
-			camel_folder_change_info_add_uid(folder_unmatched->changes, uid);
-	} else {
-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(((CamelFolder *)folder_unmatched)->summary, uid);
-		if (mi) {
-			camel_folder_summary_remove(((CamelFolder *)folder_unmatched)->summary, (CamelMessageInfo *)mi);
-			camel_folder_change_info_remove_uid(folder_unmatched->changes, uid);
-			camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)->summary, (CamelMessageInfo *)mi);
-		}
-	}
-}
-
-static void
-folder_added_uid(char *uidin, void *value, struct _update_data *u)
-{
-	CamelVeeMessageInfo *mi;
-	char *oldkey;
-	int n;
-
-	if ( (mi = vee_folder_add_uid(u->vf, u->source, uidin, u->hash)) ) {
-		camel_folder_change_info_add_uid(u->vf->changes, camel_message_info_uid(mi));
-
-		if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&oldkey, (void **)&n)) {
-			g_hash_table_insert(unmatched_uids, oldkey, (void *)(n+1));
-		} else {
-			g_hash_table_insert(unmatched_uids, g_strdup(camel_message_info_uid(mi)), (void *)1);
-		}
-	}
-}
-
-/* build query contents for a single folder */
-static int
-vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)
-{
-	GPtrArray *match, *all;
-	GHashTable *allhash, *matchhash;
-	CamelFolder *f = source;
-	CamelFolder *folder = (CamelFolder *)vf;
-	int i, n, count;
-	struct _update_data u;
-	CamelFolderChangeInfo *vf_changes = NULL, *unmatched_changes = NULL;
-
-	if (vf == folder_unmatched)
-		return 0;
-
-	/* if we have no expression, or its been cleared, then act as if no matches */
-	if (vf->expression == NULL) {
-		match = g_ptr_array_new();
-	} else {
-		match = camel_folder_search_by_expression(f, vf->expression, ex);
-		if (match == NULL)
-			return -1;
-	}
-
-	u.source = source;
-	u.vf = vf;
-	camel_vee_folder_hash_folder(source, u.hash);
-
-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-
-	/* we build 2 hash tables, one for all uid's not matched, the other for all matched uid's,
-	   we just ref the real memory */
-	matchhash = g_hash_table_new(g_str_hash, g_str_equal);
-	for (i=0;i<match->len;i++)
-		g_hash_table_insert(matchhash, match->pdata[i], (void *)1);
-
-	allhash = g_hash_table_new(g_str_hash, g_str_equal);
-	all = camel_folder_get_uids(f);
-	for (i=0;i<all->len;i++)
-		if (g_hash_table_lookup(matchhash, all->pdata[i]) == NULL)
-			g_hash_table_insert(allhash, all->pdata[i], (void *)1);
-
-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
-
-	/* scan, looking for "old" uid's to be removed */
-	count = camel_folder_summary_count(folder->summary);
-	for (i=0;i<count;i++) {